summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <thek@adventure.(none)>2008-05-12 12:09:10 +0200
committerunknown <thek@adventure.(none)>2008-05-12 12:09:10 +0200
commit3703bbf6236f0ea9b5181a254f97c88aebc8f54c (patch)
tree42dc393819c3fccbf11f7abfb1835f5a6f381121 /libmysqld
parent5908a32eeafa2a0410bd0575d51a423bf73b35f1 (diff)
downloadmariadb-git-3703bbf6236f0ea9b5181a254f97c88aebc8f54c.tar.gz
Bug#35997 Event scheduler seems to let the server crash, if it is embedded.
SHOW commands fail in embedded mode because schema_table array doesn't correspond to enum_schema_tables. This patch implements a dummy implementation of the abstract fill_table function to be used when the event scheduler (or other core feature) isn't part of the build. libmysqld/lib_sql.cc: Fixed type conversion warning. sql/sql_show.cc: Leave entry for EVENTS to keep array consistent but set the fill_table function pointer to a dummy function instead.
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index 6dfecdb2f5c..5cce8c6147c 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]= (uchar)stmt->flags;
thd= (THD*)stmt->mysql->thd;
thd->client_param_count= stmt->param_count;
thd->client_params= stmt->params;