diff --git a/dbcon/mysql/ha_calpont_ddl.cpp b/dbcon/mysql/ha_calpont_ddl.cpp
index bdce5e4ce..b822e0fd5 100644
--- a/dbcon/mysql/ha_calpont_ddl.cpp
+++ b/dbcon/mysql/ha_calpont_ddl.cpp
@@ -2206,8 +2206,8 @@ int ha_calpont_impl_rename_table_(const char* from, const char* to, cal_connecti
         return -1;
     }
 
-    // This explicitely shields both db objects with quotes that the lexer strips down later.
-    stmt = "alter table `" + fromPair.second + "` rename to `" + toPair.second + "`;";
+    stmt = thd->query();
+    stmt += ';';
     string db;
 
     if ( thd->db )
@@ -2220,7 +2220,7 @@ int ha_calpont_impl_rename_table_(const char* from, const char* to, cal_connecti
     int rc = ProcessDDLStatement(stmt, db, "", tid2sid(thd->thread_id), emsg);
 
     if (rc != 0)
-        push_warning(thd, Sql_condition::WARN_LEVEL_ERROR, 9999, emsg.c_str());
+        push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, emsg.c_str());
 
     return rc;
 }
@@ -2262,7 +2262,7 @@ extern "C"
         int rc = ProcessDDLStatement(stmt, db, "", tid2sid(thd->thread_id), emsg, compressiontype);
 
         if (rc != 0)
-            push_warning(thd, Sql_condition::WARN_LEVEL_ERROR, 9999, emsg.c_str());
+            push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, emsg.c_str());
 
         return rc;
     }