Merge tag 'clone-5.5.62-build' into mysql-5.5-cluster-7.2

arnabray21 · arnabray21 · commit db594de39639 · 2018-08-29T16:00:42.000+05:30
Change-Id: I3b1e7b6baf1c4b8096714a34164415b3e71625d0
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=61
+MYSQL_VERSION_PATCH=62
 MYSQL_VERSION_EXTRA=-ndb-7.2.35
diff --git a/client/mysql.cc b/client/mysql.cc
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2018, 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
@@ -1395,7 +1395,7 @@ static struct my_option my_long_options[] =
   {"batch", 'B',
    "Don't use history file. Disable interactive behavior. (Enables --silent.)",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"binary-as-hex", 'b', "Print binary data as hex", &opt_binhex, &opt_binhex,
+  {"binary-as-hex", 0, "Print binary data as hex", &opt_binhex, &opt_binhex,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifndef MCP_WL3126
   {"bind-address", 0, "IP address to bind to.",
@@ -2679,7 +2679,7 @@ You can turn off this feature to get a quicker startup with -A\n\n");
         mysql_free_result(fields);
         break;
       }
-      field_names[i][num_fields*2]= '\0';
+      field_names[i][num_fields*2]= NULL;
       j=0;
       while ((sql_field=mysql_fetch_field(fields)))
       {
diff --git a/cmake/tags.cmake b/cmake/tags.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2018, 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
@@ -15,12 +15,29 @@
 
 # Generate tag files
 IF(UNIX)
-  ADD_CUSTOM_TARGET (tags
-    COMMAND support-files/build-tags
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-  ADD_CUSTOM_TARGET (ctags
-    COMMAND  ctags -R -f CTAGS
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
+  FIND_PROGRAM(CTAGS_EXECUTABLE ctags)
+  IF(NOT CTAGS_EXECUTABLE)
+    RETURN()
+  ENDIF()
+  EXEC_PROGRAM(${CTAGS_EXECUTABLE} ARGS --version OUTPUT_VARIABLE CTAGS_VERSION)
+
+  IF(CTAGS_VERSION MATCHES "Exuberant")
+    ADD_CUSTOM_TARGET(tags
+      COMMAND support-files/build-tags
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      )
+    ADD_CUSTOM_TARGET(ctags
+      COMMAND support-files/build-tags ctags
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      )
+  ELSE()
+    ADD_CUSTOM_TARGET (tags
+      COMMAND exit 1
+      COMMENT "Please install Exuberant Ctags"
+      )
+    ADD_CUSTOM_TARGET (ctags
+      COMMAND exit 1
+      COMMENT "Please install Exuberant Ctags"
+      )
+  ENDIF()
 ENDIF()
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
@@ -1505,3 +1505,53 @@ SELECT * FROM t1;
 �
 10
 DROP TABLE t1;
+#
+# BUG#27788685: NO WARNING WHEN TRUNCATING A STRING WITH DATA LOSS
+#
+SET GLOBAL max_allowed_packet=17825792;
+CREATE TABLE t1 (t1_fld1 TEXT) ENGINE=InnoDB;
+CREATE TABLE t2 (t2_fld1 MEDIUMTEXT) ENGINE=InnoDB;
+CREATE TABLE t3 (t3_fld1 LONGTEXT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (REPEAT('a',300));
+INSERT INTO t2 VALUES (REPEAT('b',65680));
+INSERT INTO t3 VALUES (REPEAT('c',16777300));
+SELECT LENGTH(t1_fld1) FROM t1;
+LENGTH(t1_fld1)
+300
+SELECT LENGTH(t2_fld1) FROM t2;
+LENGTH(t2_fld1)
+65680
+SELECT LENGTH(t3_fld1) FROM t3;
+LENGTH(t3_fld1)
+16777300
+# With strict mode
+SET SQL_MODE='STRICT_ALL_TABLES';
+ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT;
+ERROR 22001: Data too long for column 'my_t1_fld1' at row 1
+ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT;
+ERROR 22001: Data too long for column 'my_t2_fld1' at row 1
+ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT;
+ERROR 22001: Data too long for column 'my_t3_fld1' at row 1
+# With non-strict mode
+SET SQL_MODE='';
+ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT;
+Warnings:
+Warning	1265	Data truncated for column 'my_t1_fld1' at row 1
+ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT;
+Warnings:
+Warning	1265	Data truncated for column 'my_t2_fld1' at row 1
+ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT;
+Warnings:
+Warning	1265	Data truncated for column 'my_t3_fld1' at row 1
+SELECT LENGTH(my_t1_fld1) FROM t1;
+LENGTH(my_t1_fld1)
+44
+SELECT LENGTH(my_t2_fld1) FROM t2;
+LENGTH(my_t2_fld1)
+144
+SELECT LENGTH(my_t3_fld1) FROM t3;
+LENGTH(my_t3_fld1)
+84
+DROP TABLE t1, t2, t3;
+SET SQL_MODE=default;
+SET GLOBAL max_allowed_packet=default;
diff --git a/mysql-test/r/myisam-blob.result b/mysql-test/r/myisam-blob.result
@@ -29,6 +29,8 @@ select length(data) from t1;
 length(data)
 18874368
 alter table t1 modify data blob;
+Warnings:
+Warning	1265	Data truncated for column 'data' at row 1
 select length(data) from t1;
 length(data)
 0
diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result
@@ -20,7 +20,7 @@ from performance_schema.file_summary_by_instance
 where file_name like "%master-%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 master-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-master-bin.index	wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
+master-bin.index	wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
 select * from performance_schema.file_summary_by_instance
 where file_name like "%slave-%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
@@ -36,7 +36,7 @@ from performance_schema.file_summary_by_instance
 where event_name like "%binlog%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 master-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-master-bin.index	wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
+master-bin.index	wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
 select
 EVENT_NAME,
 if (count_read > 0, "MANY", "NONE") as COUNT_READ,
@@ -47,7 +47,7 @@ from performance_schema.file_summary_by_event_name
 where event_name like "%binlog%" order by event_name;
 EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
+wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
 select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
@@ -93,7 +93,7 @@ where file_name like "%slave-%"
 order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 slave-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-slave-bin.index	wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
+slave-bin.index	wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
 slave-relay-bin.000001	wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
 slave-relay-bin.000002	wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
 slave-relay-bin.index	wait/io/file/sql/relaylog_index	MANY	MANY	MANY	MANY
@@ -109,7 +109,7 @@ from performance_schema.file_summary_by_instance
 where event_name like "%binlog%" order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 slave-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-slave-bin.index	wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
+slave-bin.index	wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
 select
 EVENT_NAME,
 if (count_read > 0, "MANY", "NONE") as COUNT_READ,
@@ -120,7 +120,7 @@ from performance_schema.file_summary_by_event_name
 where event_name like "%binlog%" order by event_name;
 EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
-wait/io/file/sql/binlog_index	NONE	MANY	NONE	MANY
+wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
 select
 EVENT_NAME,
 if (count_star > 0, "MANY", "NONE") as COUNT_STAR
diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
@@ -1280,3 +1280,52 @@ ALTER TABLE t1 ADD INDEX (`
 SELECT * FROM t1;
 DROP TABLE t1;
 
+--echo #
+--echo # BUG#27788685: NO WARNING WHEN TRUNCATING A STRING WITH DATA LOSS
+--echo #
+
+SET GLOBAL max_allowed_packet=17825792;
+
+--connect(con1, localhost, root,,)
+CREATE TABLE t1 (t1_fld1 TEXT) ENGINE=InnoDB;
+CREATE TABLE t2 (t2_fld1 MEDIUMTEXT) ENGINE=InnoDB;
+CREATE TABLE t3 (t3_fld1 LONGTEXT) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES (REPEAT('a',300));
+INSERT INTO t2 VALUES (REPEAT('b',65680));
+INSERT INTO t3 VALUES (REPEAT('c',16777300));
+
+SELECT LENGTH(t1_fld1) FROM t1;
+SELECT LENGTH(t2_fld1) FROM t2;
+SELECT LENGTH(t3_fld1) FROM t3;
+
+--echo # With strict mode
+SET SQL_MODE='STRICT_ALL_TABLES';
+
+--error ER_DATA_TOO_LONG
+ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT;
+--error ER_DATA_TOO_LONG
+ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT;
+--error ER_DATA_TOO_LONG
+ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT;
+
+--echo # With non-strict mode
+SET SQL_MODE='';
+
+ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT;
+ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT;
+ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT;
+
+SELECT LENGTH(my_t1_fld1) FROM t1;
+SELECT LENGTH(my_t2_fld1) FROM t2;
+SELECT LENGTH(my_t3_fld1) FROM t3;
+
+# Cleanup
+--disconnect con1
+--source include/wait_until_disconnected.inc
+
+--connection default
+DROP TABLE t1, t2, t3;
+
+SET SQL_MODE=default;
+SET GLOBAL max_allowed_packet=default;
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2018, 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
@@ -102,14 +102,14 @@ my_off_t my_b_append_tell(IO_CACHE* info)
   */
   {
     volatile my_off_t save_pos;
-    save_pos = my_tell(info->file,MYF(0));
-    my_seek(info->file,(my_off_t)0,MY_SEEK_END,MYF(0));
+    save_pos = mysql_file_tell(info->file,MYF(0));
+    mysql_file_seek(info->file,(my_off_t)0,MY_SEEK_END,MYF(0));
     /*
       Save the value of my_tell in res so we can see it when studying coredump
     */
     DBUG_ASSERT(info->end_of_file - (info->append_read_pos-info->write_buffer)
-		== (res=my_tell(info->file,MYF(0))));
-    my_seek(info->file,save_pos,MY_SEEK_SET,MYF(0));
+		== (res=mysql_file_tell(info->file,MYF(0))));
+    mysql_file_seek(info->file,save_pos,MY_SEEK_SET,MYF(0));
   }
 #endif  
   res = info->end_of_file + (info->write_pos-info->append_read_pos);
@@ -203,7 +203,7 @@ size_t my_b_fill(IO_CACHE *info)
 
   if (info->seek_not_done)
   {					/* File touched, do seek */
-    if (my_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0)) ==
+    if (mysql_file_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0)) ==
 	MY_FILEPOS_ERROR)
     {
       info->error= 0;
@@ -223,7 +223,7 @@ size_t my_b_fill(IO_CACHE *info)
   }
   DBUG_EXECUTE_IF ("simulate_my_b_fill_error",
                    {DBUG_SET("+d,simulate_file_read_error");});
-  if ((length= my_read(info->file,info->buffer,max_length,
+  if ((length= mysql_file_read(info->file,info->buffer,max_length,
                        info->myflags)) == (size_t) -1)
   {
     info->error= -1;
@@ -287,7 +287,7 @@ my_off_t my_b_filelength(IO_CACHE *info)
     return my_b_tell(info);
 
   info->seek_not_done= 1;
-  return my_seek(info->file, 0L, MY_SEEK_END, MYF(0));
+  return mysql_file_seek(info->file, 0L, MY_SEEK_END, MYF(0));
 }
 
 
diff --git a/packaging/rpm-oel/mysql.init b/packaging/rpm-oel/mysql.init
@@ -159,7 +159,7 @@ stop(){
 	fi
 	MYSQLPID=`cat "$mypidfile"`
 	if [ -n "$MYSQLPID" ]; then
-	    /bin/kill "$MYSQLPID" >/dev/null 2>&1
+	    /bin/su - mysql -s /bin/bash -c "/bin/kill $MYSQLPID" >/dev/null 2>&1
 	    ret=$?
 	    if [ $ret -eq 0 ]; then
 		TIMEOUT="$STOPTIMEOUT"
diff --git a/packaging/rpm-sles/mysql.init b/packaging/rpm-sles/mysql.init
@@ -163,7 +163,7 @@ stop () {
 
     # We use a signal to avoid having to know the root password
     # Send single kill command and then wait
-    if kill $pid >/dev/null 2>&1; then
+    if su - mysql -s /bin/bash -c "kill $pid" >/dev/null 2>&1; then
 	timer=$STOPTIMEOUT
 	while [ $timer -gt 0 ]; do
             kill -0 $pid >/dev/null 2>&1 || break
@@ -196,7 +196,7 @@ reload () {
     ret=0
     if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
 	pid=$(cat "$pidfile")
-	kill -HUP $pid >/dev/null 2>&1
+	su - mysql -s /bin/bash -c "kill -HUP $pid" >/dev/null 2>&1
 	echo -n "Reloading service MySQL:"
 	rc_reset
     else
diff --git a/sql/field_conv.cc b/sql/field_conv.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2018, 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
@@ -287,9 +287,23 @@ static void do_copy_next_number(Copy_field *copy)
 
 static void do_copy_blob(Copy_field *copy)
 {
-  ulong length=((Field_blob*) copy->from_field)->get_length();
-  ((Field_blob*) copy->to_field)->store_length(length);
+  ulong from_length=((Field_blob*) copy->from_field)->get_length();
+  ((Field_blob*) copy->to_field)->store_length(from_length);
   memcpy(copy->to_ptr, copy->from_ptr, sizeof(char*));
+  ulong to_length=((Field_blob*) copy->to_field)->get_length();
+  if (to_length < from_length)
+  {
+    if (copy->to_field->table->in_use->abort_on_warning)
+    {
+      copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
+                                  ER_DATA_TOO_LONG, 1);
+    }
+    else
+    {
+      copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
+                                  WARN_DATA_TRUNCATED, 1);
+    }
+  }
 }
 
 static void do_conv_blob(Copy_field *copy)
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
diff --git a/storage/heap/hp_create.c b/storage/heap/hp_create.c
diff --git a/support-files/build-tags b/support-files/build-tags
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ select length(data) from t1;`
`29`	`29`	`length(data)`
`30`	`30`	`18874368`
`31`	`31`	`alter table t1 modify data blob;`
	`32`	`+Warnings:`
	`33`	`+Warning 1265 Data truncated for column 'data' at row 1`
`32`	`34`	`select length(data) from t1;`
`33`	`35`	`length(data)`
`34`	`36`	`0`