1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.1 to mysql-5.5

Browse Source
This commit is contained in:
Annamalai Gurusami 2013-07-25 15:31:06 +05:30
commit 00bd412b5f
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/innobase/handler/ha_innodb.cc
View File

@ -1205,7 +1205,8 @@ innobase_convert_from_id(
} }
/********************************************************************** /**********************************************************************
Converts an identifier from my_charset_filename to UTF-8 charset. */ Converts an identifier from my_charset_filename to UTF-8 charset.
@return result string length, as returned by strconvert() */
extern "C" extern "C"
uint uint
innobase_convert_to_system_charset( innobase_convert_to_system_charset(
@ -12022,7 +12023,8 @@ test_innobase_convert_name()
#endif /* UNIV_COMPILE_TEST_FUNCS */ #endif /* UNIV_COMPILE_TEST_FUNCS */
/********************************************************************** /**********************************************************************
Converts an identifier from my_charset_filename to UTF-8 charset. */ Converts an identifier from my_charset_filename to UTF-8 charset.
@return result string length, as returned by strconvert() */
extern "C" extern "C"
uint uint
innobase_convert_to_filename_charset( innobase_convert_to_filename_charset(

20
storage/innobase/row/row0mysql.c
View File

@ -3958,12 +3958,28 @@ row_rename_table_for_mysql(
} else if (!new_is_tmp) { } else if (!new_is_tmp) {
/* Rename all constraints. */ /* Rename all constraints. */
char new_table_name[MAX_TABLE_NAME_LEN] = ""; char new_table_name[MAX_TABLE_NAME_LEN] = "";
char old_table_utf8[MAX_TABLE_NAME_LEN] = "";
uint errors = 0; uint errors = 0;
strncpy(old_table_utf8, old_name, MAX_TABLE_NAME_LEN);
innobase_convert_to_system_charset(
strchr(old_table_utf8, '/') + 1,
strchr(old_name, '/') +1,
MAX_TABLE_NAME_LEN, &errors);
if (errors) {
/* Table name could not be converted from charset
my_charset_filename to UTF-8. This means that the
table name is already in UTF-8 (#mysql#50). */
strncpy(old_table_utf8, old_name, MAX_TABLE_NAME_LEN);
}
info = pars_info_create(); info = pars_info_create();
pars_info_add_str_literal(info, "new_table_name", new_name); pars_info_add_str_literal(info, "new_table_name", new_name);
pars_info_add_str_literal(info, "old_table_name", old_name); pars_info_add_str_literal(info, "old_table_name", old_name);
pars_info_add_str_literal(info, "old_table_name_utf8",
old_table_utf8);
strncpy(new_table_name, new_name, MAX_TABLE_NAME_LEN); strncpy(new_table_name, new_name, MAX_TABLE_NAME_LEN);
innobase_convert_to_system_charset( innobase_convert_to_system_charset(
@ -4000,6 +4016,8 @@ row_rename_table_for_mysql(
"new_db_name := SUBSTR(:new_table_name, 0,\n" "new_db_name := SUBSTR(:new_table_name, 0,\n"
" new_db_name_len);\n" " new_db_name_len);\n"
"old_t_name_len := LENGTH(:old_table_name);\n" "old_t_name_len := LENGTH(:old_table_name);\n"
"gen_constr_prefix := CONCAT(:old_table_name_utf8,\n"
" '_ibfk_');\n"
"WHILE found = 1 LOOP\n" "WHILE found = 1 LOOP\n"
" SELECT ID INTO foreign_id\n" " SELECT ID INTO foreign_id\n"
" FROM SYS_FOREIGN\n" " FROM SYS_FOREIGN\n"
@ -4016,7 +4034,7 @@ row_rename_table_for_mysql(
" id_len := LENGTH(foreign_id);\n" " id_len := LENGTH(foreign_id);\n"
" IF (INSTR(foreign_id, '/') > 0) THEN\n" " IF (INSTR(foreign_id, '/') > 0) THEN\n"
" IF (INSTR(foreign_id,\n" " IF (INSTR(foreign_id,\n"
" '_ibfk_') > 0)\n" " gen_constr_prefix) > 0)\n"
" THEN\n" " THEN\n"
" offset := INSTR(foreign_id, '_ibfk_') - 1;\n" " offset := INSTR(foreign_id, '_ibfk_') - 1;\n"
" new_foreign_id :=\n" " new_foreign_id :=\n"