From 2fc1ec43560b453b4694adbc1aac11f3f23b1761 Mon Sep 17 00:00:00 2001
From: Seppo Jaakola <seppo.jaakola@codership.com>
Date: Fri, 13 Apr 2012 01:33:24 +0300
Subject: Initial push of codership-wsrep API implementation for MariaDB. Merge
 of: lp:maria/5.5, #3334:
 http://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/3334
 lp:codership-mysql/5.5, #3725:
 http://bazaar.launchpad.net/~codership/codership-mysql/wsrep-5.5/revision/3725

---
 sql/sql_table.cc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'sql/sql_table.cc')

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 01832036701..1fdd81de089 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -6158,12 +6158,18 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
       error= 0;
       break;
     }
-    if (error == HA_ERR_WRONG_COMMAND)
+#ifdef WITH_WSREP
+    bool do_log_write(true);
+#endif /* WITH_WSREP */
+     if (error == HA_ERR_WRONG_COMMAND)
     {
       error= 0;
       push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 			  ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA),
 			  table->alias.c_ptr());
+#ifdef WITH_WSREP
+      WSREP_DEBUG("ignoring DDL failure: %d %s", error, thd->query());
+#endif /* WITH_WSREP */
     }
 
     if (!error && (new_name != table_name || new_db != db))
@@ -6215,6 +6221,9 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
       push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 			  ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA),
 			  table->alias.c_ptr());
+#ifdef WITH_WSREP
+      WSREP_DEBUG("ignoring DDL failure: %d %s", error, thd->query());
+#endif /* WITH_WSREP */
     }
 
     if (!error)
-- 
cgit v1.2.1