diff options
author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-12 12:02:06 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-12 12:02:06 +0300 |
commit | a5b4d41508cf41d2321d750d7dd76d82eb65b648 (patch) | |
tree | a348bfbd4381f6ce0229bb1fa220075360a22f90 /libmysqld | |
parent | 7febbe459584fbd96b581fe4c7d9dede8e6454ff (diff) | |
download | mariadb-git-a5b4d41508cf41d2321d750d7dd76d82eb65b648.tar.gz |
Fixed:
- a 64 bit compile warning in embedded
- disabled the new (and failing tests for Bug#36522
libmysqld/lib_sql.cc:
Fixed: win64 warning
mysql-test/t/disabled.def:
Disabled the new (and failing) tests for 36522
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 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; |