Merge branch 'mysql-5.7' into mysql-5.7-bug20595292

Author: kdjakevin

include/sslopt-longopts.h

@@ -19,7 +19,7 @@
    "If set to ON, this option enforces that SSL is established before client "
    "attempts to authenticate to the server. To disable client SSL capabilities "
    "use --ssl=OFF.",
-   &opt_use_ssl, &opt_use_ssl, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
+   &opt_use_ssl, &opt_use_ssl, 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0},
   {"ssl-ca", OPT_SSL_CA,
    "CA file in PEM format.",
    &opt_ssl_ca, &opt_ssl_ca, 0, GET_STR, REQUIRED_ARG,

man/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@ IF(MAN1_FILES)
   IF(MAN1_NDB AND NOT VERSION MATCHES "-ndb-")
     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_NDB})
   ENDIF()
+  INSTALL(FILES mysqltest.1 DESTINATION ${INSTALL_MANDIR}/man1
+  COMPONENT Test)
   INSTALL(FILES ${MAN1_FILES} DESTINATION ${INSTALL_MANDIR}/man1
   COMPONENT ManPages)
 ENDIF()

mysql-test/r/derived.result

@@ -2549,13 +2549,12 @@ a	b	a	b
 explain SELECT *
 FROM t1 JOIN (SELECT a, (SELECT b) AS b FROM t2) AS dt ON t1.a=dt.a;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
-1	PRIMARY	<derived2>	NULL	ref	<auto_key0>	<auto_key0>	5	test.t1.a	2	100.00	NULL
-2	DERIVED	t2	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	PRIMARY	t1	NULL	ALL	NULL	NULL	NULL	NULL	2	100.00	NULL
+1	PRIMARY	t2	NULL	ALL	NULL	NULL	NULL	NULL	2	50.00	Using where; Using join buffer (Block Nested Loop)
 3	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Note	1276	Field or reference 'test.t2.b' of SELECT #3 was resolved in SELECT #2
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`dt`.`a` AS `a`,`dt`.`b` AS `b` from `test`.`t1` join (/* select#2 */ select `test`.`t2`.`a` AS `a`,(/* select#3 */ select `test`.`t2`.`b`) AS `b` from `test`.`t2`) `dt` where (`dt`.`a` = `test`.`t1`.`a`)
+Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS `a`,(/* select#3 */ select `test`.`t2`.`b`) AS `b` from `test`.`t1` join `test`.`t2` where (`test`.`t2`.`a` = `test`.`t1`.`a`)
 SET @optimizer_switch_saved= @@optimizer_switch;
 SET @@optimizer_switch="derived_merge=off";
 SELECT *

mysql-test/r/grant_alter_user.result

@@ -984,3 +984,28 @@ SET GLOBAL log_output=        @old_log_output;
 
 End of 5.7 tests!
 
+
+Bug #20600865: IDENTIFIED BY PASSWORD IS NOT DEPRECATED FOR
+ALTER USER BUT DOESN\'T WORK
+
+CREATE USER u1;
+ALTER USER u1 IDENTIFIED BY PASSWORD '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'' at line 1
+ALTER USER u1 IDENTIFIED BY PASSWORD '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
+      PASSWORD EXPIRE;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
+      PASSWORD EXPIRE' at line 1
+ALTER USER u1 IDENTIFIED BY PASSWORD '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
+      WITH MAX_QUERIES_PER_HOUR 2 MAX_USER_CONNECTIONS 2;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
+      WITH MAX_QUERIES_PER_HOUR 2 MA' at line 1
+ALTER USER u1 IDENTIFIED BY PASSWORD '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
+      REQUIRE CIPHER "DHE-RSA-AES256-SHA" AND
+SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client";
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
+      REQUIRE CIPHER "DHE-RSA-AES256' at line 1
+ALTER USER u1 IDENTIFIED BY PASSWORD '*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
+      PASSWORD EXPIRE DEFAULT;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''*67092806AE91BFB6BE72DE6C7BE2B7CCA8CFA9DF'
+      PASSWORD EXPIRE DEFAULT' at line 1
+DROP USER u1;

mysql-test/r/mysql_ssl_default.result

@@ -0,0 +1,28 @@
+#
+# WL#7712 Support SSL by default in libmysql
+#
+# verify that mysql default connect with ssl channel
+Variable_name	Value
+Ssl_cipher	DHE-RSA-AES256-SHA
+# verify that mysql --skip-ssl connect with unencrypted channel
+Variable_name	Value
+Ssl_cipher	
+# verify that mysql --ssl=0 connect with unencrypted channel
+Variable_name	Value
+Ssl_cipher	
+# verify that mysql --ssl=1 connect with ssl channel
+Variable_name	Value
+Ssl_cipher	DHE-RSA-AES256-SHA
+CREATE USER u1@localhost IDENTIFIED BY 'secret' REQUIRE SSL;
+# verify that mysqladmin default connect with ssl channel
+mysqladmin: [Warning] Using a password on the command line interface can be insecure.
+mysqld is alive
+# verify that mysql_show default connect with ssl channel
+mysqlshow: [Warning] Using a password on the command line interface can be insecure.
++--------------------+
+|     Databases      |
++--------------------+
+| information_schema |
+| test               |
++--------------------+
+DROP USER u1@localhost;

mysql-test/r/ps_ddl.result

@@ -2252,10 +2252,14 @@ create table t1 (a int);
 prepare stmt from "show variables where (1) in (select * from t1)";
 execute stmt;
 Variable_name	Value
+Warnings:
+Warning	1681	'@@SESSION.GTID_EXECUTED' is deprecated and will be removed in a future release.
 drop table t1;
 create table t1 (x int);
 execute stmt;
 Variable_name	Value
+Warnings:
+Warning	1681	'@@SESSION.GTID_EXECUTED' is deprecated and will be removed in a future release.
 drop table t1;
 deallocate prepare stmt;
 #

mysql-test/r/sp-error.result

@@ -1232,7 +1232,7 @@ CREATE PROCEDURE bug20953()
 CREATE VIEW v AS SELECT i FROM t1 PROCEDURE ANALYSE();
 ERROR HY000: View's SELECT contains a 'PROCEDURE' clause
 CREATE PROCEDURE bug20953() CREATE VIEW v AS SELECT 1 FROM (SELECT 1) AS d1;
-ERROR HY000: View's SELECT contains a subquery in the FROM clause
+DROP PROCEDURE bug20953;
 CREATE PROCEDURE bug20953(i INT) CREATE VIEW v AS SELECT i;
 ERROR HY000: View's SELECT contains a variable or parameter
 CREATE PROCEDURE bug20953()