diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 20:20:26 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-30 20:20:26 +0200 |
| commit | 184d7b0250da10e685d2c3f12a69f8a58d1f39cf (patch) | |
| tree | 2d1788c10fb236cceb33b0b073390568b163d0fb /sql/ha_ndbcluster_binlog.cc | |
| parent | 558feaa2087397d43a48116743dcdaee9558485e (diff) | |
| parent | 3962da934f6e2a92ba04505bd6a33dd7d8322005 (diff) | |
| download | mariadb-git-184d7b0250da10e685d2c3f12a69f8a58d1f39cf.tar.gz | |
mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on the next step
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index e37a520c659..0421c0ecc15 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -241,8 +241,8 @@ static void dbug_print_table(const char *info, TABLE *table) static void run_query(THD *thd, char *buf, char *end, const int *no_print_error, my_bool disable_binlog) { - ulong save_thd_query_length= thd->query_length; - char *save_thd_query= thd->query; + ulong save_thd_query_length= thd->query_length(); + char *save_thd_query= thd->query(); ulong save_thread_id= thd->variables.pseudo_thread_id; struct system_status_var save_thd_status_var= thd->status_var; THD_TRANS save_thd_transaction_all= thd->transaction.all; @@ -259,12 +259,12 @@ static void run_query(THD *thd, char *buf, char *end, if (disable_binlog) thd->options&= ~OPTION_BIN_LOG; - DBUG_PRINT("query", ("%s", thd->query)); + DBUG_PRINT("query", ("%s", thd->query())); DBUG_ASSERT(!thd->in_sub_stmt); DBUG_ASSERT(!thd->prelocked_mode); - mysql_parse(thd, thd->query, thd->query_length, &found_semicolon); + mysql_parse(thd, thd->query(), thd->query_length(), &found_semicolon); if (no_print_error && thd->is_slave_error) { |