List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:February 1 2012 11:14am
Subject:bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3477 to 3478) WL#5534
View as plain text  
 3478 Jon Olav Hauglid	2012-02-01
      WL#5534 Online ALTER, Phase 1
      
      Patch #84:
      Fix two issues which caused CREATE TABLE and in-place ALTER TABLE
      to not preserve case with lower_case_table_names set to 2.

    modified:
      sql/sql_table.cc
 3477 Jon Olav Hauglid	2012-02-01
      WL#5534 Online ALTER, Phase 1.
      
      Patch #82:
      - Updated two result files with changes in
        behavior from patch#80 (no longer duplicated warnings)
      - Fixed typo in comment.

    modified:
      mysql-test/suite/innodb/r/innodb_index_large_prefix_4k.result
      mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result
      sql/sql_table.cc
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2012-02-01 07:50:40 +0000
+++ b/sql/sql_table.cc	2012-02-01 09:57:58 +0000
@@ -4542,7 +4542,10 @@ bool mysql_create_table_no_lock(THD *thd
   if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
     build_tmptable_filename(thd, path, sizeof(path));
   else
-    build_table_filename(path, sizeof(path) - 1, db, table_name, "", 0);
+  {
+    const char *alias= table_case_name(create_info, table_name);
+    build_table_filename(path, sizeof(path) - 1, db, alias, "", 0);
+  }
 
   return create_table_impl(thd, db, table_name, path, create_info, alter_info,
                            false, select_field_count, false, is_trans,
@@ -5918,7 +5921,7 @@ static bool mysql_inplace_alter_table(TH
     Rename to the new name (if needed) will be handled separately below.
   */
   if (mysql_rename_table(db_type, alter_ctx->new_db, alter_ctx->tmp_name,
-                         alter_ctx->db, alter_ctx->table_name,
+                         alter_ctx->db, alter_ctx->alias,
                          FN_FROM_IS_TMP | NO_HA_TABLE))
   {
     // Since changes were done in-place, we can't revert them.

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3477 to 3478) WL#5534Jon Olav Hauglid1 Feb