Fixed:

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

Fixed:
- a 64 bit compile warning in embedded - disabled the new (and failing tests for Bug#36522
0844a628 · gkodinov/kgeorge@magare.gmz · 5bdd04bf · 0844a628 · 0844a628
Commit 0844a628 authored May 12, 2008 by gkodinov/kgeorge@magare.gmz
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

libmysqld/lib_sql.cc libmysqld/lib_sql.cc +1 -1

mysql-test/t/disabled.def mysql-test/t/disabled.def +3 -1

No files found.
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -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;

--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -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