merge from mysql-trunk

Author: Christopher Powers

client/mysql.cc

@@ -1413,6 +1413,17 @@ int main(int argc,char *argv[])
 
 void mysql_end(int sig)
 {
+#ifndef _WIN32
+  /*
+    Ingnoring SIGQUIT, SIGINT and SIGHUP signals when cleanup process starts.
+    This will help in resolving the double free issues, which occures in case
+    the signal handler function is started in between the clean up function.
+  */
+  signal(SIGQUIT, SIG_IGN);
+  signal(SIGINT, SIG_IGN);
+  signal(SIGHUP, SIG_IGN);
+#endif
+
   mysql_close(&mysql);
 #ifdef HAVE_READLINE
   if (!status.batch && !quick && !opt_html && !opt_xml &&

include/my_pthread.h

@@ -214,7 +214,7 @@ extern native_mutexattr_t my_errorcheck_mutexattr;
 #define ESRCH 1
 #endif
 
-typedef ulong my_thread_id;
+typedef uint32 my_thread_id;
 
 extern my_bool my_thread_global_init(void);
 extern void my_thread_global_reinit(void);

include/mysql/psi/mysql_thread.h

@@ -1289,7 +1289,7 @@ static inline int inline_mysql_thread_create(
   return result;
 }
 
-static inline void inline_mysql_thread_set_psi_id(ulong id)
+static inline void inline_mysql_thread_set_psi_id(my_thread_id id)
 {
   struct PSI_thread *psi= PSI_THREAD_CALL(get_thread)();
   PSI_THREAD_CALL(set_thread_id)(psi, id);

include/prealloced_array.h

@@ -289,6 +289,28 @@ class Prealloced_array
     return std::make_pair(p.first, false);
   }
 
+  /**
+    Similar to std::set<>::erase()
+    Removes a single element from the array by value.
+    The removed element is destroyed.
+    This effectively reduces the container size by one.
+
+    This is generally an inefficient operation, since we need to copy
+    elements to fill the "hole" in the array.
+
+    Assumes that the array is sorted with std::less<Element_type>.
+
+    @retval number of elements removed, 0 or 1.
+  */
+  size_type erase_unique(const value_type &val)
+  {
+    std::pair<iterator, iterator> p= std::equal_range(begin(), end(), val);
+    if (p.first == p.second)
+      return 0; // Not found
+    erase(p.first);
+    return 1;
+  }
+
   /**
     Removes a single element from the array.
     The removed element is destroyed.

libmysqld/lib_sql.cc

@@ -702,9 +702,7 @@ void init_embedded_mysql(MYSQL *mysql, int client_flag)
 void *create_embedded_thd(int client_flag)
 {
   THD * thd= new THD;
-  Global_THD_manager *thd_manager= Global_THD_manager::get_instance();
-  thd->variables.pseudo_thread_id= thd_manager->get_inc_thread_id();
-  thd->thread_id= thd->variables.pseudo_thread_id;
+  thd->set_new_thread_id();
 
   thd->thread_stack= (char*) &thd;
   if (thd->store_globals())
@@ -735,7 +733,7 @@ void *create_embedded_thd(int client_flag)
   thd->first_data= 0;
   thd->data_tail= &thd->first_data;
   memset(&thd->net, 0, sizeof(thd->net));
-  thd_manager->add_thd(thd);
+  Global_THD_manager::get_instance()->add_thd(thd);
   thd->mysys_var= 0;
   return thd;
 err:

mysql-test/collections/default.experimental

@@ -3,6 +3,7 @@
 
 
 innodb.innodb_wl6326_big                 # 2013-09-04 mleich Mention the test as long as I fear sporadic failures in PB2.
+innodb_zip.innodb_wl6501_1               # Bug#19233510 2014-07-23 anitha  Test unstable after WL#7277 was pushed
 main.func_math @freebsd                  # Bug#11751977 2010-05-04 alik main.func_math fails on FreeBSD in PB2
 main.mysqlslap @windows                  # Bug#11761520 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 
@@ -12,6 +13,7 @@ rpl.rpl_show_slave_running               # BUG#12346048 2011-04-11 sven fails sp
 rpl.rpl_gtid_logs_without_rotate_or_stop_event @windows    # Bug#16207800 2013-02-09 anitha Fails very frequently on windows
 rpl.rpl_gtid_stress_failover             # Bug#18385953 2014-03-10 horst Failing very frequently on PB2
 rpl.rpl_parallel                         # Bug#17506885 2013-09-30 agopi Fails for all runs with MTS
+rpl.rpl_get_master_version_and_clock     # Bug#18900198 2014-07-22 agopi Failes very frequently on PB2
 
 perfschema.transaction_nested_events     # Bug#17752288 2013-12-17 agopi Fails several times each day in PB2 
 main.ssl-big @windows                    # Bug#18200216 2014-03-14 horst Fails too often in daily in PB2.

mysql-test/include/subquery_sj.inc

@@ -6444,6 +6444,86 @@ DROP TABLE t1, t2;
 
 --echo # End of test for bug#14064201.
 
+--echo #
+--echo # Bug#18223655:ASSERTION FAILED: (INT)IDX >= 0
+--echo #               && IDX < PARENT_JOIN->TABLES
+--echo #
+
+CREATE TABLE b (d INT);
+CREATE TABLE c (a INT, b INT,c INT,d BLOB NOT NULL);
+
+SELECT(SELECT  1
+       FROM b WHERE(SELECT 1 IN (SELECT 1 FROM b WHERE 1 NOT BETWEEN d AND 1)
+         FROM  b) IN (SELECT d FROM c)) as cc FROM  b;
+
+INSERT INTO b VALUE(1);
+INSERT INTO c VALUES(1,2,3,'1'),(2,3,4,'1'),(3,4,5,'C');
+SELECT(SELECT d FROM b WHERE(SELECT d IN 
+	(SELECT d FROM b WHERE 1 NOT BETWEEN d AND 1) FROM b) IN
+  	(SELECT d FROM c)) as cc FROM  c;
+DROP TABLE b,c;
+
+--echo #
+--echo # Bug#18447874:WRONG RESULT COMING FROM SEMI-JOIN 
+--echo #
+CREATE TABLE b (
+  d INT(11)
+);
+CREATE TABLE c (
+  d BLOB
+) ;
+CREATE TABLE d (
+  b INT(11)
+);
+
+INSERT INTO b VALUES(1),(2),(4);
+INSERT INTO c VALUES(1),(2),(3);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+INSERT INTO d VALUES(2);
+SELECT  1 FROM b  WHERE (SELECT 1 FROM d ) IN (SELECT d FROM c) ;
+
+DROP TABLE b,c,d;
+
+--echo #
+--echo # Bug#17292723:INCORRECT RESULT FOR (SELECT...) IN (SELECT...) STATEMENT
+--echo #
+CREATE TABLE t1 (
+  ID int(11) NOT NULL AUTO_INCREMENT,
+  id2 int(11) DEFAULT NULL,
+  id3 int(11) DEFAULT NULL,
+  id4 varchar(150) COLLATE utf8_spanish_ci NOT NULL,
+  id5 int(11) DEFAULT NULL,
+  PRIMARY KEY (ID),
+  KEY id2 (id2),
+  KEY id3 (id3),
+  KEY id5 (id5)
+) ENGINE=InnoDB;
+
+INSERT INTO t1 VALUES
+(123,1,1,'1',NULL),
+(124,1,1,'2',NULL),
+(125,1,1,'4',NULL),
+(126,1,1,'3',NULL),
+(127,1,1,'6',NULL),
+(128,1,1,'8',NULL);
+
+CREATE TABLE t2 (
+  id6 int(11) NOT NULL,
+  id7 int(11) NOT NULL,
+  PRIMARY KEY (id6,id7),
+  KEY id7 (id7)
+) ENGINE=InnoDB;
+
+INSERT INTO t2 VALUES (126,123),(130,123),(135,123);
+
+SELECT ID
+   FROM t1 p0
+   WHERE  p0.id3=1
+   AND ( (SELECT p1.id FROM t1 p1 WHERE p1.id=123) IN (SELECT p3.id FROM t2
+p2, t1 p3 WHERE p0.id=p2.id6 AND p2.id7=p3.id));
+
+DROP TABLE t1,t2;
+
 set @@optimizer_switch=@old_opt_switch;
 # New tests go here.
 

mysql-test/include/sync_slave_sql.inc

@@ -14,6 +14,7 @@
 # --connection slave
 # [--let $slave_timeout= X]
 # [--let $use_gtids= 1]
+# [--let $wait_for_executed_gtid_set= 1]
 # --source include/sync_slave.inc
 #
 # Parameters:
@@ -27,6 +28,9 @@
 #     Forces the use of master file and position, even if $use_gtids is set.
 #     This might be used if the slave will not have all the GTIDs of the master
 #     but have to read and apply all master events to the end.
+#
+#   $wait_for_executed_gtid_set
+#     See include/sync_slave_sql_with_master.inc
 
 --let $include_filename= sync_slave_sql.inc
 --source include/begin_include_file.inc
@@ -74,12 +78,24 @@ if ($ignore_gtids_on_sync)
 
 if ($_sync_with_gtids)
 {
-  if ($rpl_debug)
+  if($wait_for_executed_gtid_set)
   {
-    --echo debug: WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS('$_saved_gtids', $_sss_slave_timeout)
+    if ($rpl_debug)
+    {
+      --echo debug: WAIT_FOR_EXECUTED_GTID_SET('$_saved_gtids', $_sss_slave_timeout)
+    }
+    --let $_sss_result= `SELECT -WAIT_FOR_EXECUTED_GTID_SET('$_saved_gtids', $_sss_slave_timeout)`
+  }
+  if(!$wait_for_executed_gtid_set)
+  {
+    if ($rpl_debug)
+    {
+      --echo debug: WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS('$_saved_gtids', $_sss_slave_timeout)
+    }
+    --let $_sss_result= `SELECT WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS('$_saved_gtids', $_sss_slave_timeout)`
   }
-  --let $_sss_result= `SELECT WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS('$_saved_gtids', $_sss_slave_timeout)`
 }
+
 if (!$_sync_with_gtids)
 {
   if ($rpl_debug)
@@ -96,7 +112,7 @@ if ($_sss_result == '')
 }
 if ($_sss_result == -1)
 {
-  --let $error_type= Timeout after $slave_timeout seconds.
+  --let $error_type= Timeout after $_sss_slave_timeout seconds.
 }
 
 if ($_sss_result < 0)

mysql-test/include/sync_slave_sql_with_master.inc

@@ -13,6 +13,7 @@
 # [--let $use_gtids= 1]
 # [--let $slave_timeout= NUMBER]
 # [--let $rpl_debug= 1]
+# [--let $wait_for_executed_gtid_set= 1]
 # --source include/sync_slave_io_with_master.inc
 #
 # Must be called on the master. Will change connection to the slave.
@@ -32,7 +33,17 @@
 #
 #   $rpl_debug
 #      See include/rpl_init.inc
-
+#
+#   $ignore_gtids_on_sync
+#     Forces the use of master file and position, even if $use_gtids is set.
+#     This might be used if the slave will not have all the GTIDs of the
+#     master but have to read and apply all master events to the end.
+#
+#   $wait_for_executed_gtid_set
+#      This option makes the test use WAIT_FOR_EXECUTED_GTID_SET instead of
+#      WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS. This options also requires
+#      $use_gtids and !$ignore_gtids_on_sync to be set.
+#
 
 --let $include_filename= sync_slave_sql_with_master.inc
 --source include/begin_include_file.inc

mysql-test/include/wait_for_slave_param.inc

@@ -12,7 +12,7 @@
 # [--let $slave_timeout= NUMBER]
 # [--let $slave_error_param= [Slave_SQL_Errno | Slave_IO_Errno]]
 # [--let $rpl_debug= 1]
-# --source include/slave_wait_param.inc
+# --source include/wait_for_slave_param.inc
 #
 # Parameters:
 #

mysql-test/r/lock_sync.result

@@ -776,3 +776,39 @@ SET DEBUG_SYNC="RESET";
 disconnect con1;
 disconnect con2;
 DROP TABLES t1, t2;
+#
+#Bug#18110156: RECREATE+ANALYZE OPTIMIZE TABLE T AND ONLINE 
+#              ALTER TABLE T MAY DEADLOCK
+CREATE TABLE t1 (fld1 INT) ENGINE=InnoDB;
+connection con1;
+SET DEBUG_SYNC= 'before_lock_tables_takes_lock SIGNAL before_thr_lock WAIT_FOR do_thr_lock EXECUTE 3';
+SET DEBUG_SYNC= 'ha_admin_open_ltable SIGNAL opti_recreate WAIT_FOR opti_analyze';
+OPTIMIZE TABLE t1;
+connection con2;
+# Skip thr_lock acquisition during the initial phase of OPTIMIZE TABLE
+SET DEBUG_SYNC= 'now WAIT_FOR before_thr_lock';
+SET DEBUG_SYNC= 'now SIGNAL do_thr_lock';
+# Skip thr_lock acquisition during the recreate phase of OPTIMIZE TABLE
+SET DEBUG_SYNC= 'now WAIT_FOR before_thr_lock';
+SET DEBUG_SYNC= 'now SIGNAL do_thr_lock';
+SET DEBUG_SYNC= 'now WAIT_FOR opti_recreate';
+SET DEBUG_SYNC= 'alter_table_inplace_after_lock_downgrade SIGNAL lock_downgraded
+WAIT_FOR finish_alter';
+ALTER TABLE t1 ADD INDEX index1(fld1), ALGORITHM=INPLACE, LOCK=NONE;
+#Without the patch, the test case hangs.
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR lock_downgraded';
+SET DEBUG_SYNC= 'now SIGNAL opti_analyze';
+SET DEBUG_SYNC= 'now WAIT_FOR before_thr_lock';
+SET DEBUG_SYNC= 'now SIGNAL finish_alter';
+SET DEBUG_SYNC= 'now SIGNAL do_thr_lock';
+#Reap: OPTIMIZE TABLE t1
+connection con1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
+test.t1	optimize	status	OK
+#Reap: ALTER TABLE t1
+connection con2;
+#Clean up.
+DROP TABLE t1;
+SET DEBUG_SYNC= 'RESET';

mysql-test/r/log_errchk.result

@@ -0,0 +1,10 @@
+call mtr.add_suppression("Could not use");
+# Case 1: Setting fife file to general_log_file and slow_query_log_file
+#         system variable.
+SET GLOBAL general_log_file="MYSQLTEST_VARDIR/tmp/general_log.fifo";;
+ERROR 42000: Variable 'general_log_file' can't be set to the value of 'MYSQLTEST_VARDIR/tmp/general_log.fifo'
+SET GLOBAL slow_query_log_file="MYSQLTEST_VARDIR/tmp/slow_log.fifo";;
+ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of 'MYSQLTEST_VARDIR/tmp/slow_log.fifo'
+# Case 2: Starting server with fifo file as general log file
+#         and slow query log file.
+Setting fifo file as general log file and slow query log failed.