Merge branch 'mysql-5.6' into mysql-5.7

Author: Venkatesh Duggirala

mysql-test/r/parser.result

@@ -473,7 +473,6 @@ ERROR 42000: Incorrect parameter count in the call to native function 'master_po
 select master_pos_wait(1);
 ERROR 42000: Incorrect parameter count in the call to native function 'master_pos_wait'
 select master_pos_wait('master-bin.999999', 4, -1);
-ERROR HY000: Incorrect arguments to MASTER_POS_WAIT.
 select rand(1, 2, 3);
 ERROR 42000: Incorrect parameter count in the call to native function 'rand'
 select round(1, 2, 3);

mysql-test/t/parser.test

@@ -576,8 +576,10 @@ select master_pos_wait();
 -- error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
 select master_pos_wait(1);
 
---error ER_WRONG_ARGUMENTS
+--disable_result_log
+--error 0,ER_WRONG_ARGUMENTS
 select master_pos_wait('master-bin.999999', 4, -1);
+--enable_result_log
 
 -- error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
 select rand(1, 2, 3);

sql/rpl_gtid_state.cc

@@ -325,7 +325,7 @@ bool Gtid_state::wait_for_gtid_set(THD *thd, Gtid_set* wait_for,
   DBUG_ASSERT(wait_for->get_sid_map() == global_sid_map);
 
   if (timeout > 0)
-    set_timespec_nsec(&abstime, timeout * 1000000000ULL);
+    set_timespec_nsec(&abstime, (ulonglong) timeout * 1000000000ULL);
 
   /*
     Algorithm:

sql/rpl_rli.cc

@@ -735,7 +735,7 @@ int Relay_log_info::wait_for_pos(THD* thd, String* log_name,
 
   DEBUG_SYNC(thd, "begin_master_pos_wait");
 
-  set_timespec_nsec(&abstime, timeout * 1000000000ULL);
+  set_timespec_nsec(&abstime, (ulonglong)timeout * 1000000000ULL);
   mysql_mutex_lock(&data_lock);
   thd->ENTER_COND(&data_cond, &data_lock,
                   &stage_waiting_for_the_slave_thread_to_advance_position,
@@ -956,7 +956,7 @@ int Relay_log_info::wait_for_gtid_set(THD* thd, const Gtid_set* wait_gtid_set,
 
   DEBUG_SYNC(thd, "begin_wait_for_gtid_set");
 
-  set_timespec_nsec(&abstime, timeout * 1000000000ULL);
+  set_timespec_nsec(&abstime, (ulonglong) timeout * 1000000000ULL);
 
   mysql_mutex_lock(&data_lock);
   thd->ENTER_COND(&data_cond, &data_lock,