Commit 0844a628 authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Fixed: 

 - a 64 bit compile warning in embedded
 - disabled the new (and failing tests for Bug#36522
parent 5bdd04bf

libmysqld/lib_sql.cc

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int emb_stmt_execute(MYSQL_STMT *stmt) 
  my_bool res;



  int4store(header, stmt->stmt_id);

  header[4]= stmt->flags;

  header[4]= (char)stmt->flags;

  thd= (THD*)stmt->mysql->thd;

  thd->client_param_count= stmt->param_count;

  thd->client_params= stmt->params;

mysql-test/t/disabled.def

+3 −1
Original line number Diff line number Diff line
@@ -14,4 +14,6 @@ status : Bug#32966 main.status fails 
ps_ddl               : Bug#12093 2007-12-14 pending WL#4165 / WL#4166

csv_alter_table      : Bug#33696 2008-01-21 pcrews no .result file - bug allows NULL columns in CSV tables

user_limits     : Bug#23921 random failure of user_limits.test

key_buffer_size_basic_64    : Bug #36522: Some tests of system variables have diffs on 64bit platorms

rpl_recovery_rank_basic_64  : Bug #36522: Some tests of system variables have diffs on 64bit platorms

sort_buffer_size_basic_64   : Bug #36522: Some tests of system variables have diffs on 64bit platorms