diff options
| author | malff/marcsql@weblab.(none) <> | 2007-04-25 21:38:12 -0600 |
|---|---|---|
| committer | malff/marcsql@weblab.(none) <> | 2007-04-25 21:38:12 -0600 |
| commit | 62fd6aa69664cf98d96458d30aa18b39b5b6bc1d (patch) | |
| tree | f8e46975bbaed334eddc4cc2ab0c1b752a7b321d /sql/ha_ndbcluster_binlog.cc | |
| parent | 18d7ed6564fe7009d8cea940b12a909fce118300 (diff) | |
| download | mariadb-git-62fd6aa69664cf98d96458d30aa18b39b5b6bc1d.tar.gz | |
manual merge 5.0-runtime -> 5.1->runtime, with 25411 part I
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index c65c81c088c..a7c2d1f51e9 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -230,6 +230,7 @@ static void run_query(THD *thd, char *buf, char *end, ulonglong save_thd_options= thd->options; DBUG_ASSERT(sizeof(save_thd_options) == sizeof(thd->options)); NET save_net= thd->net; + const char* found_semicolon= NULL; bzero((char*) &thd->net, sizeof(NET)); thd->query_length= end - buf; @@ -239,7 +240,7 @@ static void run_query(THD *thd, char *buf, char *end, thd->options&= ~OPTION_BIN_LOG; DBUG_PRINT("query", ("%s", thd->query)); - mysql_parse(thd, thd->query, thd->query_length); + mysql_parse(thd, thd->query, thd->query_length, &found_semicolon); if (print_error && thd->query_error) { |