database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

WL1019: complete patch. Reapplied patch to the clean

Browse Source 
tree to get rid of multiple typos in CS comments and
unify the patch.
This commit is contained in:
cps@outpost.site
2006-01-19 05:56:06 +03:00
parent b6ed13a36b
commit ce2eb6d8cb
46 changed files with 2199 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
sql/sql_delete.cc
View File

@ -857,6 +857,8 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
char path[FN_REFLEN];
TABLE *table;
bool error;
uint closed_log_tables= 0, lock_logger= 0;
TABLE_LIST *tmp_table_list;
uint path_length;
DBUG_ENTER("mysql_truncate");
@ -905,13 +907,36 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok)
HTON_CAN_RECREATE)
|| thd->lex->sphead)
goto trunc_by_del;
if (lock_and_wait_for_table_name(thd, table_list))
DBUG_RETURN(TRUE);
}
// Remove the .frm extension
// AIX 5.2 64-bit compiler bug (BUG#16155): this crashes, replacement works.
// *(path + path_length - reg_ext_length)= '\0';
/* close log tables in use */
if (!my_strcasecmp(system_charset_info, table_list->db, "mysql"))
{
if (!my_strcasecmp(system_charset_info, table_list->table_name,
"general_log"))
{
lock_logger= 1;
logger.lock();
logger.close_log_table(LOG_GENERAL, FALSE);
closed_log_tables= closed_log_tables | LOG_GENERAL;
}
else
if (!my_strcasecmp(system_charset_info, table_list->table_name,
"slow_log"))
{
lock_logger= 1;
logger.lock();
logger.close_log_table(LOG_SLOW, FALSE);
closed_log_tables= closed_log_tables | LOG_SLOW;
}
}
// Remove the .frm extension AIX 5.2 64-bit compiler bug (BUG#16155): this
// crashes, replacement works. *(path + path_length - reg_ext_length)=
// '\0';
path[path_length - reg_ext_length] = 0;
error= ha_create_table(thd, path, table_list->db, table_list->table_name,
&create_info, 1);
@ -937,6 +962,14 @@ end:
VOID(pthread_mutex_lock(&LOCK_open));
unlock_table_name(thd, table_list);
VOID(pthread_mutex_unlock(&LOCK_open));
if (closed_log_tables & LOG_SLOW)
logger.reopen_log_table(LOG_SLOW);
if (closed_log_tables & LOG_GENERAL)
logger.reopen_log_table(LOG_GENERAL);
if (lock_logger)
logger.unlock();
}
else if (error)
{