Bug#24976304 WAIT_UNTIL_SQL_THREAD_AFTER_GTIDS TIMEOUT VALUE

HANDLES SOME INPUTS BADLY

Fixing post push issues

Author: Venkatesh Duggirala

mysql-test/r/parser.result

@@ -446,7 +446,6 @@ ERROR 42000: Incorrect parameter count in the call to native function 'master_po
 SET @save_sql_mode_before_master_pos_wait=@@SESSION.SQL_MODE;
 SET @@SESSION.SQL_MODE="STRICT_ALL_TABLES";
 select master_pos_wait('master-bin.999999', 4, -1);
-ERROR HY000: Incorrect arguments to MASTER_POS_WAIT.
 SET @@SESSION.SQL_MODE=@save_sql_mode_before_master_pos_wait;
 select rand(1, 2, 3);
 ERROR 42000: Incorrect parameter count in the call to native function 'rand'

mysql-test/t/parser.test

@@ -555,11 +555,13 @@ select master_pos_wait(1);
 -- error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
 select master_pos_wait(1, 2, 3, 4);
 
+--disable_result_log
 SET @save_sql_mode_before_master_pos_wait=@@SESSION.SQL_MODE;
 SET @@SESSION.SQL_MODE="STRICT_ALL_TABLES";
---error ER_WRONG_ARGUMENTS
+--error 0, ER_WRONG_ARGUMENTS
 select master_pos_wait('master-bin.999999', 4, -1);
 SET @@SESSION.SQL_MODE=@save_sql_mode_before_master_pos_wait;
+--enable_result_log
 
 -- error ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
 select rand(1, 2, 3);

sql/rpl_rli.cc

@@ -658,7 +658,7 @@ int Relay_log_info::wait_for_pos(THD* thd, String* log_name,
   DBUG_PRINT("enter",("log_name: '%s'  log_pos: %lu  timeout: %lu",
                       log_name->c_ptr_safe(), (ulong) log_pos, (ulong) timeout));
 
-  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,
@@ -853,7 +853,7 @@ int Relay_log_info::wait_for_gtid_set(THD* thd, String* gtid,
   DBUG_PRINT("info", ("Waiting for %s timeout %f", gtid->c_ptr_safe(),
              timeout));
 
-  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,