diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-09-10 03:18:29 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-09-10 03:18:29 -0600 |
| commit | 63e56390a3f1a4f80642932a790ab74f28de8010 (patch) | |
| tree | 8b611255f83ad274f072855f5acfe484a971de87 /sql/repl_failsafe.cc | |
| parent | 905d715f10e711860311e0a10488c6bb5e19ee49 (diff) | |
| download | mariadb-git-63e56390a3f1a4f80642932a790ab74f28de8010.tar.gz | |
WL#2110 (SIGNAL)
WL#2265 (RESIGNAL)
Manual merge of SIGNAL and RESIGNAL to mysql-trunk-signal,
plus required dependencies.
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 582348608de..e470317abef 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -913,7 +913,7 @@ bool load_master_data(THD* thd) goto err; } /* Clear the result of mysql_create_db(). */ - thd->main_da.reset_diagnostics_area(); + thd->stmt_da->reset_diagnostics_area(); if (mysql_select_db(&mysql, db) || mysql_real_query(&mysql, STRING_WITH_LEN("SHOW TABLES")) || |