bk commit into 5.1 tree (gkodinov:1.2623) BUG#36522

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of gkodinov.  When gkodinov does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-12 12:02:06+03:00, gkodinov@stripped +2 -0
  Fixed:
   - a 64 bit compile warning in embedded
   - disabled the new (and failing tests for Bug#36522

  libmysqld/lib_sql.cc@stripped, 2008-05-12 12:02:04+03:00, gkodinov@stripped +1 -1
    Fixed: win64 warning

  mysql-test/t/disabled.def@stripped, 2008-05-12 12:02:04+03:00, gkodinov@stripped +3 -1
    Disabled the new (and failing) tests for 36522 

diff -Nrup a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
--- a/libmysqld/lib_sql.cc	2008-05-01 04:14:40 +03:00
+++ b/libmysqld/lib_sql.cc	2008-05-12 12:02:04 +03:00
@@ -285,7 +285,7 @@ static int emb_stmt_execute(MYSQL_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;
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2008-05-09 12:10:34 +03:00
+++ b/mysql-test/t/disabled.def	2008-05-12 12:02:04 +03:00
@@ -14,4 +14,6 @@ status               : Bug#32966 main.st
 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