Merge branch 'mysql-5.7' of myrepo.no.oracle.com:mysql into mysql-5.7

Author: awulkiew

client/mysqladmin.cc

@@ -306,9 +306,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     error++;
     break;
   case OPT_CHARSETS_DIR:
-#if MYSQL_VERSION_ID > 32300
     charsets_dir = argument;
-#endif
     break;
   case OPT_MYSQL_PROTOCOL:
     opt_protocol= find_type_or_exit(argument, &sql_protocol_typelib,
@@ -1286,11 +1284,9 @@ static void usage(void)
   flush-threads         Flush the thread cache\n\
   flush-privileges      Reload grant tables (same as reload)\n\
   kill id,id,...	Kill mysql threads");
-#if MYSQL_VERSION_ID >= 32200
   puts("\
   password [new-password] Change old password to new-password in current format\n\
   old-password [new-password] Change old password to new-password in old format");
-#endif
   puts("\
   ping			Check if mysqld is alive\n\
   processlist		Show list of active threads in server\n\

client/mysqldump.c

@@ -284,7 +284,7 @@ static struct my_option my_long_options[] =
   {"debug-check", OPT_DEBUG_CHECK, "This is a non-debug version. Catch this and exit.",
    0, 0, 0,
    GET_DISABLED, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"debug-info", 'T', "This is a non-debug version. Catch this and exit.", 0,
+  {"debug-info", OPT_DEBUG_INFO, "This is a non-debug version. Catch this and exit.", 0,
    0, 0, GET_DISABLED, NO_ARG, 0, 0, 0, 0, 0, 0},
 #else
   {"debug", '#', "Output debug log.", &default_dbug_option,
@@ -1719,11 +1719,9 @@ static void unescape(FILE *file,char *pos,uint length)
 
 static my_bool test_if_special_chars(const char *str)
 {
-#if MYSQL_VERSION_ID >= 32300
   for ( ; *str ; str++)
     if (!my_isvar(charset_info,*str) && *str != '$')
       return 1;
-#endif
   return 0;
 } /* test_if_special_chars */
 

client/mysqltest.cc

@@ -5399,11 +5399,7 @@ void set_reconnect(MYSQL* mysql, int val)
   my_bool reconnect= val;
   DBUG_ENTER("set_reconnect");
   DBUG_PRINT("info", ("val: %d", val));
-#if MYSQL_VERSION_ID < 50000
-  mysql->reconnect= reconnect;
-#else
   mysql_options(mysql, MYSQL_OPT_RECONNECT, (char *)&reconnect);
-#endif
   DBUG_VOID_RETURN;
 }
 
@@ -8111,7 +8107,6 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
     parameter markers.
   */
 
-#if MYSQL_VERSION_ID >= 50000
   if (cursor_protocol_enabled)
   {
     /*
@@ -8122,7 +8117,6 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
       die("mysql_stmt_attr_set(STMT_ATTR_CURSOR_TYPE) failed': %d %s",
           mysql_stmt_errno(stmt), mysql_stmt_error(stmt));
   }
-#endif
 
   /*
     Execute the query

client/upgrade/program.cc

@@ -26,6 +26,7 @@
 #include "mysqld_error.h"
 #include "my_default.h"
 #include "check/mysqlcheck.h"
+#include "mysql_version.h"
 #include "../scripts/mysql_fix_privilege_tables_sql.c"
 #include "../scripts/sql_commands_sys_schema.h"
 

include/mysql/plugin.h

@@ -18,6 +18,7 @@
 
 #ifndef MYSQL_ABI_CHECK
 #include <stddef.h>
+#include "mysql_version.h" /* MYSQL_VERSION_ID */
 #endif
 
 /*

include/mysql_com.h

@@ -455,9 +455,7 @@ enum mysql_enum_shutdown_level {
   /* don't flush InnoDB buffers, flush other storage engines' buffers*/
   SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1,
   /* Now the 2 levels of the KILL command */
-#if MYSQL_VERSION_ID >= 50000
   KILL_QUERY= 254,
-#endif
   KILL_CONNECTION= 255
 };
 

mysql-test/mysql-test-run.pl

@@ -3801,6 +3801,13 @@ sub mysql_install_db {
               "Could not install system database from $bootstrap_sql_file\n" .
 	      "see $path_bootstrap_log for errors");
   }
+
+  # Remove the auto.cnf so that a new auto.cnf is generated
+  # for master and slaves when the server is restarted
+  if (-f "$datadir/auto.cnf")
+  {
+    unlink "$datadir/auto.cnf";
+  }
 }
 
 

mysql-test/r/gis-precise.result

@@ -2058,6 +2058,16 @@ select ST_ASTEXT(ST_UNION(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(MULTILINESTRING((0
 ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(POINT(7 0),MULTILINESTRING((-13 -18,-16 0),(17 11,-1 11,-18 -19,-4 -18),(-8 -8,-15 -13,3 -18,6 8)),LINESTRING(5 16,0 -9,-6 4,-15 17),MULTIPOINT(-9 -5,5 15,12 -11,12 11))'))) as result;
 result
 GEOMETRYCOLLECTION(MULTIPOINT(0 14,-9 -11),MULTIPOINT(16 1,-9 -17,-16 6,-17 3),POINT(-9 -5),POINT(5 15),POINT(12 -11),MULTILINESTRING((0 -14,13 -8),(-5 -3,8 7),(-6 18,17 -11,-12 19,19 5),(16 11,9 -5),(17 -5,5 10),(-4 17,6 4),(-12 15,17 13,-18 11,15 10),(7 0,2 -16,-18 13,-6 4),(-17 -6,-6 -7,1 4,-18 0),(-11 -2,17 -14),(18 -12,18 -8),(-13 -16,9 16,9 -10,-7 20),(-14 -5,10 -9,4 1,17 -8),(-9 -4,-2 -12,9 -13,-5 4),(15 17,13 20),(5 16,0 -9,-6 4,-15 17),(-13 -18,-16 0),(17 11,-1 11,-18 -19,-4 -18),(-8 -8,-15 -13,3 -18,6 8)))
+#
+# Bug#21127270 CAN NOT CREATE EMPTY GEOMETRY WITH GEOMETRYCOLLECTION()
+#
+select st_astext(geometrycollection()) as result;
+result
+GEOMETRYCOLLECTION()
+set @empty_geom = geometrycollection();
+select 1, @empty_geom = st_geomfromtext('geometrycollection()') as equal;
+1	equal
+1	1
 DROP TABLE IF EXISTS p1;
 CREATE PROCEDURE p1(dist DOUBLE, geom TEXT)
 BEGIN

mysql-test/r/type_enum.result

@@ -1836,6 +1836,7 @@ CREATE TABLE t1(a enum('a','b','c','d'));
 INSERT INTO t1 VALUES (4),(1),(0),(3);
 Warnings:
 Warning	1265	Data truncated for column 'a' at row 3
+ANALYZE TABLE t1;
 SELECT a FROM t1;
 a
 d

mysql-test/r/type_newdecimal.result

@@ -2130,3 +2130,6 @@ SELECT * FROM t1 WHERE value = '100000000000000000000002';
 value
 100000000000000000000002
 DROP TABLE t1;
+SELECT CAST(-0.0e0 AS DECIMAL) = 0;
+CAST(-0.0e0 AS DECIMAL) = 0
+1

mysql-test/suite/binlog/r/binlog_error_action.result

@@ -6,6 +6,8 @@ call mtr.add_suppression("Could not open .*");
 call mtr.add_suppression("Could not use .*");
 call mtr.add_suppression("Can't generate a unique log-filename master-bin");
 call mtr.add_suppression("The server was unable to create a new log file *");
+call mtr.add_suppression("An error occured during flushing cache to file.");
+call mtr.add_suppression("Either disk is full or file system is read only");
 RESET MASTER;
 Test case1
 SET GLOBAL binlog_error_action= ABORT_SERVER;
@@ -67,5 +69,19 @@ t2
 DROP TABLE t2;
 SET SESSION debug="-d,fault_injection_init_name";
 # restart
+Test case9
+CREATE TABLE t1(i INT);
+SET SESSION debug="+d,simulate_error_during_flush_cache_to_file";
+SET GLOBAL binlog_error_action= ABORT_SERVER;
+INSERT INTO t1 VALUES (1);
+ERROR HY000: Binary logging not possible. Message: An error occured during flushing cache to file. 'binlog_error_action' is set to 'ABORT_SERVER'. Hence aborting the server
+include/assert.inc [Count of elements in t1 should be 0.]
+SET SESSION debug="+d,simulate_error_during_flush_cache_to_file";
+SET GLOBAL binlog_error_action= IGNORE_ERROR;
+INSERT INTO t1 VALUES (2);
+include/assert.inc [Count of elements in t1 should be 1.]
+DROP table t1;
+SET SESSION debug="-d,simulate_error_during_flush_cache_to_file";
+# restart
 SET SESSION debug="";
 SET GLOBAL binlog_error_action= ABORT_SERVER;

mysql-test/suite/binlog/r/binlog_xa_handling.result

@@ -8,10 +8,12 @@ XA END'';
 XA PREPARE'';
 XA COMMIT'';
 DROP TABLE t1;
+RESET MASTER;
 CREATE TABLE t1 (c1 INT);
 XA BEGIN 'xa1';
 INSERT INTO t1 VALUES (1);
 XA END 'xa1';
 XA COMMIT 'xa1' ONE PHASE;
 [Validate that SHOW BINLOG EVENTS shows the ONE PHASE statement.]
 DROP TABLE t1;
+RESET MASTER;

mysql-test/suite/binlog/t/binlog_error_action.test

@@ -33,7 +33,8 @@ call mtr.add_suppression("Could not open .*");
 call mtr.add_suppression("Could not use .*");
 call mtr.add_suppression("Can't generate a unique log-filename master-bin");
 call mtr.add_suppression("The server was unable to create a new log file *");
-
+call mtr.add_suppression("An error occured during flushing cache to file.");
+call mtr.add_suppression("Either disk is full or file system is read only");
 let $old=`select @@debug`;
 
 --let $saved_binlog_error_action=`SELECT @@GLOBAL.binlog_error_action`
@@ -141,6 +142,35 @@ DROP TABLE t2;
 SET SESSION debug="-d,fault_injection_init_name";
 --source include/restart_mysqld.inc
 
+--echo Test case9
+CREATE TABLE t1(i INT);
+# Simulate error during flushing cache to file and test the behaviour
+# when binlog_error_action is set to ABORT_SERVER/IGNORE_ERROR.
+SET SESSION debug="+d,simulate_error_during_flush_cache_to_file";
+SET GLOBAL binlog_error_action= ABORT_SERVER;
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--error ER_BINLOG_LOGGING_IMPOSSIBLE
+INSERT INTO t1 VALUES (1);
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--let $assert_cond= COUNT(*) = 0 FROM t1;
+--let $assert_text= Count of elements in t1 should be 0.
+--source include/assert.inc
+
+SET SESSION debug="+d,simulate_error_during_flush_cache_to_file";
+SET GLOBAL binlog_error_action= IGNORE_ERROR;
+INSERT INTO t1 VALUES (2);
+
+--let $assert_cond= COUNT(*) = 1 FROM t1;
+--let $assert_text= Count of elements in t1 should be 1.
+--source include/assert.inc
+
+DROP table t1;
+SET SESSION debug="-d,simulate_error_during_flush_cache_to_file";
+--source include/restart_mysqld.inc
+
 # Cleanup
 eval SET SESSION debug="$old";
 --eval SET GLOBAL binlog_error_action= $saved_binlog_error_action

mysql-test/suite/binlog/t/binlog_xa_handling.test

@@ -37,6 +37,11 @@ DROP TABLE t1;
 # mysql-test/extra/binlog_tests/binlog_xa_prepared.test
 #
 
+# clean up binary log so that the following operation
+# does not have to scan through a long history of
+# events in the log (potentially causing a failure).
+RESET MASTER;
+
 CREATE TABLE t1 (c1 INT);
 XA BEGIN 'xa1';
 INSERT INTO t1 VALUES (1);
@@ -48,3 +53,7 @@ XA COMMIT 'xa1' ONE PHASE;
 --source include/wait_for_binlog_event.inc
 
 DROP TABLE t1;
+
+# clean up the binary log at in the end of the test
+# case as well.
+RESET MASTER;

mysql-test/suite/gcol/inc/gcol_column_def_options.inc

@@ -231,3 +231,16 @@ CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, a AS c2 from t2;
 CREATE TABLE t1 (c1 INT, c2 INT AS (c1 * 2)) SELECT 1 AS c1, 5;
 SELECT * FROM t1;
 DROP TABLE t1, t2;
+
+--echo # Bug#20757211: GENERATED COLUMNS: ALTER TABLE CRASHES
+--echo #  IN FIND_FIELD_IN_TABLE
+--echo # 
+CREATE TABLE t1(a int);
+--error 1064
+ALTER TABLE t1 ADD COLUMN z int GENERATED ALWAYS AS
+( 1 NOT IN (SELECT 1 FROM t1 WHERE c0006) ) virtual;
+--error 1064
+CREATE TABLE t2(a int, b int as (1 NOT IN (SELECT 1 FROM t1 WHERE not_exist_col)));
+--error 1064
+CREATE TABLE t2(a int, b int as (1 NOT IN (SELECT 1 FROM dual)));
+DROP TABLE t1;

mysql-test/suite/gcol/inc/gcol_ins_upd.inc

@@ -314,3 +314,51 @@ UPDATE t1 SET col7 = DEFAULT;
 UPDATE t1 SET col8 = DEFAULT;
 DROP TABLE t1;
 
+--echo # Bug#21081742: ASSERTION !TABLE || (!TABLE->WRITE_SET || 
+--echo # BITMAP_IS_SET(TABLE->WRITE_SET
+--echo #
+
+CREATE TABLE b ( 
+pk INTEGER AUTO_INCREMENT,
+col_varchar_nokey VARCHAR(1),
+col_varchar_key VARCHAR(2) GENERATED ALWAYS AS
+(CONCAT(col_varchar_nokey, col_varchar_nokey)),
+PRIMARY KEY (pk)
+);
+
+INSERT INTO b (col_varchar_nokey) VALUES ('v'),('v');
+
+CREATE TABLE d (
+pk INTEGER AUTO_INCREMENT,
+col_varchar_nokey VARCHAR(1),
+col_varchar_key VARCHAR(2) GENERATED ALWAYS AS
+(CONCAT(col_varchar_nokey, col_varchar_nokey)),
+PRIMARY KEY (pk)
+) ;
+
+INSERT INTO d (col_varchar_nokey) VALUES ('q'),('g'),('e'),('l'),(NULL),('v'),('c'),('u'),('x');
+
+CREATE TABLE bb (
+pk INTEGER AUTO_INCREMENT,
+col_varchar_nokey VARCHAR(1) /*! NULL */,
+col_varchar_key VARCHAR(2) GENERATED ALWAYS AS
+(CONCAT(col_varchar_nokey, col_varchar_nokey)),
+PRIMARY KEY (pk)
+);
+
+INSERT INTO bb (col_varchar_nokey) VALUES ('j'),('h');
+
+EXPLAIN UPDATE
+d AS OUTR1, b AS OUTR2
+SET OUTR1.col_varchar_nokey = NULL
+WHERE
+( 't', 'b' )  IN
+(
+SELECT
+INNR1.col_varchar_nokey AS x,
+INNR1.col_varchar_key AS y
+FROM bb AS INNR1
+WHERE OUTR1.pk = 1
+);
+
+DROP TABLE IF EXISTS b,bb,d;

mysql-test/suite/gcol/r/gcol_column_def_options_innodb.result

@@ -361,6 +361,18 @@ SELECT * FROM t1;
 c2	c1	5
 2	1	5
 DROP TABLE t1, t2;
+# Bug#20757211: GENERATED COLUMNS: ALTER TABLE CRASHES
+#  IN FIND_FIELD_IN_TABLE
+# 
+CREATE TABLE t1(a int);
+ALTER TABLE t1 ADD COLUMN z int GENERATED ALWAYS AS
+( 1 NOT IN (SELECT 1 FROM t1 WHERE c0006) ) virtual;
+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 'SELECT 1 FROM t1 WHERE c0006))' at line 1
+CREATE TABLE t2(a int, b int as (1 NOT IN (SELECT 1 FROM t1 WHERE not_exist_col)));
+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 'SELECT 1 FROM t1 WHERE not_exist_col))' at line 1
+CREATE TABLE t2(a int, b int as (1 NOT IN (SELECT 1 FROM dual)));
+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 'SELECT 1 FROM dual))' at line 1
+DROP TABLE t1;
 DROP VIEW  IF EXISTS v1,v2;
 DROP TABLE IF EXISTS t1,t2,t3;
 DROP PROCEDURE IF EXISTS p1;

mysql-test/suite/gcol/r/gcol_column_def_options_myisam.result

@@ -361,6 +361,18 @@ SELECT * FROM t1;
 c2	c1	5
 2	1	5
 DROP TABLE t1, t2;
+# Bug#20757211: GENERATED COLUMNS: ALTER TABLE CRASHES
+#  IN FIND_FIELD_IN_TABLE
+# 
+CREATE TABLE t1(a int);
+ALTER TABLE t1 ADD COLUMN z int GENERATED ALWAYS AS
+( 1 NOT IN (SELECT 1 FROM t1 WHERE c0006) ) virtual;
+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 'SELECT 1 FROM t1 WHERE c0006))' at line 1
+CREATE TABLE t2(a int, b int as (1 NOT IN (SELECT 1 FROM t1 WHERE not_exist_col)));
+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 'SELECT 1 FROM t1 WHERE not_exist_col))' at line 1
+CREATE TABLE t2(a int, b int as (1 NOT IN (SELECT 1 FROM dual)));
+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 'SELECT 1 FROM dual))' at line 1
+DROP TABLE t1;
 DROP VIEW  IF EXISTS v1,v2;
 DROP TABLE IF EXISTS t1,t2,t3;
 DROP PROCEDURE IF EXISTS p1;