mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug #2461)
DROP DATABASE now assumes RAID directories are in hex. (Bug #2627) Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506) Test in configure if pthread_key_delete() exists (to fix compile problem on SCO) (Bug #2461) BUILD/compile-pentium-max: Added --with-raid configure.in: Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug #2461) include/my_pthread.h: Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug #2461) innobase/include/data0data.ic: Added missing newline mysql-test/r/raid.result: Test of DROP DATABASE with RAID directories in hex mysql-test/t/raid.test: Test of DROP DATABASE with RAID directories in hex sql/sql_db.cc: DROP DATABASE could not drop databases with RAID tables that had more than 9 RAID_CHUNKS because DROP DATABASE assumed raid tables where in decimal while the RAID CREATE code assumed directories was in hex.(Bug #2627) sql/sql_select.cc: Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506) sql/sql_udf.cc: mysqld crashed if mysql.func table didn't exists (Bug #2577)
This commit is contained in:
@@ -116,6 +116,7 @@ void udf_init()
|
||||
udf_func *tmp;
|
||||
TABLE_LIST tables;
|
||||
READ_RECORD read_record_info;
|
||||
TABLE *table;
|
||||
int error;
|
||||
DBUG_ENTER("ufd_init");
|
||||
|
||||
@@ -148,13 +149,11 @@ void udf_init()
|
||||
if (open_and_lock_tables(new_thd, &tables))
|
||||
{
|
||||
DBUG_PRINT("error",("Can't open udf table"));
|
||||
sql_print_error("Can't open mysql/func table");
|
||||
close_thread_tables(new_thd);
|
||||
delete new_thd;
|
||||
DBUG_VOID_RETURN;
|
||||
sql_print_error("Can't open the mysql/func table. Please run the mysql_install_db script to create it.");
|
||||
goto end;
|
||||
}
|
||||
|
||||
TABLE *table = tables.table;
|
||||
table= tables.table;
|
||||
init_read_record(&read_record_info, new_thd, table, NULL,1,0);
|
||||
while (!(error = read_record_info.read_record(&read_record_info)))
|
||||
{
|
||||
@@ -200,6 +199,8 @@ void udf_init()
|
||||
sql_print_error(ER(ER_GET_ERRNO), my_errno);
|
||||
end_read_record(&read_record_info);
|
||||
new_thd->version--; // Force close to free memory
|
||||
|
||||
end:
|
||||
close_thread_tables(new_thd);
|
||||
delete new_thd;
|
||||
/* Remember that we don't have a THD */
|
||||
|
Reference in New Issue
Block a user