1.修改上一个修改DROP TABLE IF EXISTS的bug代码不合适的地方。2.提升一个版本号

tan-chao · Feb 16, 2017 · e037e9a · e037e9a
1 parent c2a0124
commit e037e9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
@@ -53,7 +53,7 @@ MACRO(GET_MYSQL_VERSION)
     MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.")
   ENDIF()
 
-  SET(VERSION "Inception2.1.49")
+  SET(VERSION "Inception2.1.50")
   MESSAGE(STATUS "MySQL ${VERSION}")
   SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
   SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
@@ -10898,6 +10898,9 @@ mysql_backup_sql(
     sql_cache_node_t* sql_cache_node
 )
 {
+    if (sql_cache_node->table_info == NULL)
+        return FALSE;
+
     if (mysql_sql_cache_is_valid_for_ddl(sql_cache_node) &&
         mysql_backup_single_ddl_statement(thd, mi, mysql, sql_cache_node))
     {
@@ -11011,7 +11014,7 @@ int mysql_execute_commit(THD *thd)
                 while (sql_cache_node != NULL)
                 {
                     next_sql_cache_node = LIST_GET_NEXT(link, sql_cache_node);
-                    if ((mysql = thd->get_audit_connection()) == NULL || sql_cache_node->table_info == NULL)
+                    if ((mysql = thd->get_audit_connection()) == NULL)
                         goto error;
 
                     //如果一条语句备份失败了，则要重新请求一次，对下一条语句做备份