diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:31:51 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:31:51 +0400 |
| commit | 484351d108b923038421b003f39770d3c96aeae0 (patch) | |
| tree | 9413ba739bc0dbf1e647293756a3503f17dcde07 /sql/ha_ndbcluster_binlog.cc | |
| parent | db0ee68b38a3506e6d6e74a976f2e2b9a6fb1772 (diff) | |
| parent | 71377f189fd9d6ac59d66773168cfd2bd75a052a (diff) | |
| download | mariadb-git-484351d108b923038421b003f39770d3c96aeae0.tar.gz | |
Merge trunk-bugfixing -> trunk-runtime
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 0db7956fe28..ab046164485 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -277,8 +277,9 @@ static void run_query(THD *thd, char *buf, char *end, DBUG_ASSERT(!thd->locked_tables_mode); { - Parser_state parser_state(thd, thd->query(), thd->query_length()); - mysql_parse(thd, thd->query(), thd->query_length(), &parser_state); + Parser_state parser_state; + if (!parser_state.init(thd, thd->query(), thd->query_length())) + mysql_parse(thd, thd->query(), thd->query_length(), &parser_state); } if (no_print_error && thd->is_slave_error) |