Merge 10.1 into 10.2

client/mysqladmin.cc

@@ -47,6 +47,7 @@ static uint opt_count_iterations= 0, my_end_arg;
 static ulong opt_connect_timeout, opt_shutdown_timeout;
 static char * unix_port=0;
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
+static bool sql_log_bin_off= false;
 
 #ifdef HAVE_SMEM
 static char *shared_memory_base_name=0;
@@ -600,6 +601,31 @@ static my_bool sql_connect(MYSQL *mysql, uint wait)
 }
 
 
+static int maybe_disable_binlog(MYSQL *mysql)
+{
+  if (opt_local && !sql_log_bin_off)
+  {
+    if (mysql_query(mysql,  "set local sql_log_bin=0"))
+    {
+      my_printf_error(0, "SET LOCAL SQL_LOG_BIN=0 failed; error: '%-.200s'",
+                      error_flags, mysql_error(mysql));
+      return -1;
+    }
+  }
+  sql_log_bin_off= true;
+  return 0;
+}
+
+
+int flush(MYSQL *mysql, const char *what)
+{
+  char buf[FN_REFLEN];
+  my_snprintf(buf, sizeof(buf), "flush %s%s",
+              (opt_local && !sql_log_bin_off ? "local " : ""), what);
+  return mysql_query(mysql, buf);
+}
+
+
 /**
    @brief Execute all commands
 
@@ -629,17 +655,6 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
   struct my_rnd_struct rand_st;
   char buff[FN_REFLEN + 20];
 
-  if (opt_local)
-  {
-    sprintf(buff, "set local sql_log_bin=0");
-    if (mysql_query(mysql, buff))
-    {
-      my_printf_error(0, "SET LOCAL SQL_LOG_BIN=0 failed; error: '%-.200s'",
-                      error_flags, mysql_error(mysql));
-      return -1;
-    }
-  }
-
   for (; argc > 0 ; argv++,argc--)
   {
     int command;
@@ -651,6 +666,8 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
 	my_printf_error(0, "Too few arguments to create", error_flags);
 	return 1;
       }
+      if (maybe_disable_binlog(mysql))
+        return -1;
       sprintf(buff,"create database `%.*s`",FN_REFLEN,argv[1]);
       if (mysql_query(mysql,buff))
       {
@@ -668,6 +685,8 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
 	my_printf_error(0, "Too few arguments to drop", error_flags);
 	return 1;
       }
+      if (maybe_disable_binlog(mysql))
+        return -1;
       if (drop_db(mysql,argv[1]))
 	return -1;
       argc--; argv++;
@@ -708,7 +727,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_PRIVILEGES:
     case ADMIN_RELOAD:
-      if (mysql_query(mysql,"flush privileges"))
+      if (flush(mysql, "privileges"))
       {
 	my_printf_error(0, "reload failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -912,7 +931,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_LOGS:
     {
-      if (mysql_query(mysql,"flush logs"))
+      if (flush(mysql, "logs"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -922,7 +941,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_BINARY_LOG:
     {
-      if (mysql_query(mysql, "flush binary logs"))
+      if (flush(mysql, "binary logs"))
       {
         my_printf_error(0, "flush failed; error: '%s'", error_flags,
                         mysql_error(mysql));
@@ -932,7 +951,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_ENGINE_LOG:
     {
-      if (mysql_query(mysql,"flush engine logs"))
+      if (flush(mysql, "engine logs"))
       {
         my_printf_error(0, "flush failed; error: '%s'", error_flags,
                         mysql_error(mysql));
@@ -942,7 +961,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_ERROR_LOG:
     {
-      if (mysql_query(mysql, "flush error logs"))
+      if (flush(mysql, "error logs"))
       {
         my_printf_error(0, "flush failed; error: '%s'", error_flags,
                         mysql_error(mysql));
@@ -952,7 +971,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_GENERAL_LOG:
     {
-      if (mysql_query(mysql, "flush general logs"))
+      if (flush(mysql, "general logs"))
       {
         my_printf_error(0, "flush failed; error: '%s'", error_flags,
                         mysql_error(mysql));
@@ -962,7 +981,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_RELAY_LOG:
     {
-      if (mysql_query(mysql, "flush relay logs"))
+      if (flush(mysql, "relay logs"))
       {
         my_printf_error(0, "flush failed; error: '%s'", error_flags,
                         mysql_error(mysql));
@@ -972,7 +991,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_SLOW_LOG:
     {
-      if (mysql_query(mysql,"flush slow logs"))
+      if (flush(mysql, "slow logs"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -982,7 +1001,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_HOSTS:
     {
-      if (mysql_query(mysql,"flush hosts"))
+      if (flush(mysql, "hosts"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -992,7 +1011,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_TABLES:
     {
-      if (mysql_query(mysql,"flush tables"))
+      if (flush(mysql, "tables"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -1002,7 +1021,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_STATUS:
     {
-      if (mysql_query(mysql,"flush status"))
+      if (flush(mysql, "status"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -1012,7 +1031,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_TABLE_STATISTICS:
     {
-      if (mysql_query(mysql,"flush table_statistics"))
+      if (flush(mysql, "table_statistics"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -1022,7 +1041,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_INDEX_STATISTICS:
     {
-      if (mysql_query(mysql,"flush index_statistics"))
+      if (flush(mysql, "index_statistics"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -1032,7 +1051,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_USER_STATISTICS:
     {
-      if (mysql_query(mysql,"flush user_statistics"))
+      if (flush(mysql, "user_statistics"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -1042,7 +1061,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_USER_RESOURCES:
     {
-      if (mysql_query(mysql, "flush user_resources"))
+      if (flush(mysql, "user_resources"))
       {
         my_printf_error(0, "flush failed; error: '%s'", error_flags,
                         mysql_error(mysql));
@@ -1052,7 +1071,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_CLIENT_STATISTICS:
     {
-      if (mysql_query(mysql,"flush client_statistics"))
+      if (flush(mysql, "client_statistics"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -1062,9 +1081,8 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_ALL_STATISTICS:
     {
-      if (mysql_query(mysql,
-                      "flush table_statistics,index_statistics,"
-                      "user_statistics,client_statistics"))
+      if (flush(mysql, "table_statistics,index_statistics,"
+                       "user_statistics,client_statistics"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -1074,9 +1092,8 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     }
     case ADMIN_FLUSH_ALL_STATUS:
     {
-      if (mysql_query(mysql,
-                      "flush status,table_statistics,index_statistics,"
-                      "user_statistics,client_statistics"))
+      if (flush(mysql, "status,table_statistics,index_statistics,"
+                       "user_statistics,client_statistics"))
       {
 	my_printf_error(0, "flush failed; error: '%s'", error_flags,
 			mysql_error(mysql));
@@ -1094,6 +1111,8 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
       start_time=time((time_t*) 0);
       my_rnd_init(&rand_st,(ulong) start_time,(ulong) start_time/2);
 
+      if (maybe_disable_binlog(mysql))
+        return -1;
       if (argc < 1)
       {
 	my_printf_error(0, "Too few arguments to change password", error_flags);

mysql-test/r/alter_table_online.result

@@ -184,6 +184,35 @@ CREATE TABLE t1 (a LONGTEXT COLLATE latin1_general_ci);
 ALTER TABLE t1 MODIFY a LONGTEXT COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
 ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
-#
-# End of MDEV-8948 ALTER ... INPLACE does work for BINARY, BLOB
-#
+select @@global.delay_key_write;
+@@global.delay_key_write
+ON
+create table t1 (a int, b int, key(b));
+flush tables;
+flush status;
+show status like 'Feature_delay_key_write';
+Variable_name	Value
+Feature_delay_key_write	0
+insert t1 values (1,2),(2,3),(3,4);
+show status like 'Feature_delay_key_write';
+Variable_name	Value
+Feature_delay_key_write	0
+alter online table t1 delay_key_write=1;
+show status like 'Feature_delay_key_write';
+Variable_name	Value
+Feature_delay_key_write	1
+flush tables;
+insert t1 values (1,2),(2,3),(3,4);
+show status like 'Feature_delay_key_write';
+Variable_name	Value
+Feature_delay_key_write	2
+alter online table t1 delay_key_write=0;
+show status like 'Feature_delay_key_write';
+Variable_name	Value
+Feature_delay_key_write	2
+flush tables;
+insert t1 values (1,2),(2,3),(3,4);
+show status like 'Feature_delay_key_write';
+Variable_name	Value
+Feature_delay_key_write	2
+drop table t1;

mysql-test/r/partition_alter.result

@@ -51,3 +51,50 @@ execute stmt;
 execute stmt;
 deallocate prepare stmt;
 drop table test_data;
+create table t1(id int, d date not null, b bool not null default 0, primary key(id,d))
+engine=innodb
+partition by range columns (d) (
+partition p1 values less than ('2016-10-18'),
+partition p2 values less than ('2020-10-19'));
+insert t1 values (0, '2000-01-02', 0);
+insert t1 values (1, '2020-01-02', 10);
+alter table t1 add check (b in (0, 1));
+ERROR 23000: CONSTRAINT `CONSTRAINT_1` failed for `test`.`#sql-temporary`
+alter table t1 add check (b in (0, 10));
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `d` date NOT NULL,
+  `b` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`,`d`),
+  CONSTRAINT `CONSTRAINT_1` CHECK (`b` in (0,10))
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+ PARTITION BY RANGE  COLUMNS(d)
+(PARTITION p1 VALUES LESS THAN ('2016-10-18') ENGINE = InnoDB,
+ PARTITION p2 VALUES LESS THAN ('2020-10-19') ENGINE = InnoDB)
+insert t1 values (2, '2020-01-03', 20);
+ERROR 23000: CONSTRAINT `CONSTRAINT_1` failed for `test`.`t1`
+drop table t1;
+create table t1(id int, d date not null, b bool not null default 0, primary key(id,d))
+partition by range columns (d) (
+partition p1 values less than ('2016-10-18'),
+partition p2 values less than ('2020-10-19'));
+insert t1 values (0, '2000-01-02', 0);
+insert t1 values (1, '2020-01-02', 10);
+alter table t1 add check (b in (0, 1));
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `d` date NOT NULL,
+  `b` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`,`d`),
+  CONSTRAINT `CONSTRAINT_1` CHECK (`b` in (0,1))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ PARTITION BY RANGE  COLUMNS(d)
+(PARTITION p1 VALUES LESS THAN ('2016-10-18') ENGINE = MyISAM,
+ PARTITION p2 VALUES LESS THAN ('2020-10-19') ENGINE = MyISAM)
+insert t1 values (2, '2020-01-03', 20);
+ERROR 23000: CONSTRAINT `CONSTRAINT_1` failed for `test`.`t1`
+drop table t1;

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

@@ -0,0 +1,12 @@
+create user adm@localhost identified by 'foobar';
+grant reload on *.* to adm@localhost;
+reset master;
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Gtid	#	#	GTID #-#-#
+master-bin.000001	#	Query	#	#	flush status
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Gtid	#	#	GTID #-#-#
+master-bin.000001	#	Query	#	#	flush status
+drop user adm@localhost;

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

@@ -0,0 +1,12 @@
+source include/have_binlog_format_statement.inc;
+#
+# MDEV-12612 mysqladmin --local flush... to use FLUSH LOCAL
+#
+create user adm@localhost identified by 'foobar';
+grant reload on *.* to adm@localhost;
+reset master;
+exec $MYSQLADMIN -uadm -pfoobar flush-status;
+source include/show_binlog_events.inc;
+exec $MYSQLADMIN --local -uadm -pfoobar flush-status;
+source include/show_binlog_events.inc;
+drop user adm@localhost;