diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-10-07 11:35:19 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-10-07 11:35:19 +0300 |
| commit | f222e7d471079cd164d6cc822fce311b67b92ecd (patch) | |
| tree | a834a40945875291c62f9b9c713728db3a9a1949 /sql/wsrep_sst.cc | |
| parent | 61bda9a2f0017b1fbe88c63a0ada68ad1024a72c (diff) | |
| download | mariadb-git-f222e7d471079cd164d6cc822fce311b67b92ecd.tar.gz | |
Merge fixes, now at level 3430 in mariadb-galera-5.5
Diffstat (limited to 'sql/wsrep_sst.cc')
| -rw-r--r-- | sql/wsrep_sst.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 204a937ea8f..4afe269cfe2 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -725,9 +725,9 @@ static int run_sql_command(THD *thd, const char *query) mysql_parse(thd, thd->query(), thd->query_length(), &ps); if (thd->is_error()) { - int const err= thd->stmt_da->sql_errno(); + int const err= thd->get_stmt_da()->sql_errno(); WSREP_WARN ("error executing '%s': %d (%s)%s", - query, err, thd->stmt_da->message(), + query, err, thd->get_stmt_da()->message(), err == ER_UNKNOWN_SYSTEM_VARIABLE ? ". Was mysqld built with --with-innodb-disallow-writes ?" : ""); thd->clear_error(); |