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

merge mysql-5.1 -> mysql-5.5

Browse Source
This commit is contained in:
Mattias Jonsson 2012-12-01 09:17:56 +01:00
commit b0f2505258
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_table.cc
View File

@ -857,6 +857,7 @@ static void set_ddl_log_entry_from_buf(uint read_entry,
{ {
uint inx; uint inx;
uchar single_char; uchar single_char;
DBUG_ENTER("set_ddl_log_entry_from_buf");
ddl_log_entry->entry_pos= read_entry; ddl_log_entry->entry_pos= read_entry;
single_char= file_entry_buf[DDL_LOG_ENTRY_TYPE_POS]; single_char= file_entry_buf[DDL_LOG_ENTRY_TYPE_POS];
ddl_log_entry->entry_type= (enum ddl_log_entry_code)single_char; ddl_log_entry->entry_type= (enum ddl_log_entry_code)single_char;
@ -869,6 +870,7 @@ static void set_ddl_log_entry_from_buf(uint read_entry,
ddl_log_entry->from_name= (char*) &file_entry_buf[inx]; ddl_log_entry->from_name= (char*) &file_entry_buf[inx];
inx+= global_ddl_log.name_len; inx+= global_ddl_log.name_len;
ddl_log_entry->handler_name= (char*) &file_entry_buf[inx]; ddl_log_entry->handler_name= (char*) &file_entry_buf[inx];
DBUG_VOID_RETURN;
} }
@ -1431,7 +1433,7 @@ bool execute_ddl_log_entry(THD *thd, uint first_entry)
{ {
if (read_ddl_log_file_entry(file_entry_buf, read_entry, IO_SIZE)) if (read_ddl_log_file_entry(file_entry_buf, read_entry, IO_SIZE))
{ {
/* Write to error log and continue with next log entry */ /* Print the error to the log and continue with next log entry */
sql_print_error("Failed to read entry = %u from ddl log", sql_print_error("Failed to read entry = %u from ddl log",
read_entry); read_entry);
break; break;
@ -1442,7 +1444,7 @@ bool execute_ddl_log_entry(THD *thd, uint first_entry)
if (execute_ddl_log_action(thd, &ddl_log_entry)) if (execute_ddl_log_action(thd, &ddl_log_entry))
{ {
/* Write to error log and continue with next log entry */ /* Print the error to the log and continue with next log entry */
sql_print_error("Failed to execute action for entry = %u from ddl log", sql_print_error("Failed to execute action for entry = %u from ddl log",
read_entry); read_entry);
break; break;