diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2008-05-12 12:02:06 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2008-05-12 12:02:06 +0300 |
| commit | 0844a628aa07918b5c8c0bc69e590dfd230e3b64 (patch) | |
| tree | a348bfbd4381f6ce0229bb1fa220075360a22f90 | |
| parent | 5bdd04bffa920aa2447a549b75b569c19a1a59ec (diff) | |
| download | mariadb-git-0844a628aa07918b5c8c0bc69e590dfd230e3b64.tar.gz | |
Fixed:
- a 64 bit compile warning in embedded
- disabled the new (and failing tests for Bug#36522
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 6dfecdb2f5c..1a9f33e66fe 100644 --- 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; diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 004f3e2cb78..2fd6adaba78 100644 --- 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 |