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

Fixed compilation error on windows

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2003-01-29 19:10:33 +02:00
parent 02f274c855
commit b025fa8b32
2 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/mysqld.cc
View File

@ -1382,8 +1382,10 @@ static void init_signals(void)
} }
static void start_signal_handler(void) static void start_signal_handler(void)
{ {}
}
static void check_data_home(const char *path)
{}
#elif defined(__NETWARE__) #elif defined(__NETWARE__)
@ -1500,12 +1502,10 @@ static void init_signals(void)
} }
static void start_signal_handler(void) static void start_signal_handler(void)
{ {}
}
static void check_data_home(const char *path) static void check_data_home(const char *path)
{ {}
}
#else /* if ! __WIN__ && ! __EMX__ */ #else /* if ! __WIN__ && ! __EMX__ */
@ -1830,8 +1830,7 @@ extern "C" void *signal_hand(void *arg __attribute__((unused)))
} }
static void check_data_home(const char *path) static void check_data_home(const char *path)
{ {}
}
#endif /* __WIN__*/ #endif /* __WIN__*/

48
sql/sql_table.cc
View File

@ -40,11 +40,28 @@ static int copy_data_between_tables(TABLE *from,TABLE *to,
ORDER *order, ORDER *order,
ha_rows *copied,ha_rows *deleted); ha_rows *copied,ha_rows *deleted);
/***************************************************************************** /*
** Remove all possbile tables and give a compact errormessage for all delete (drop) tables.
** wrong tables.
** This will wait for all users to free the table before dropping it SYNOPSIS
*****************************************************************************/ mysql_rm_table()
thd Thread handle
tables List of tables to delete
if_exists If 1, don't give error if one table doesn't exists
NOTES
Will delete all tables that can be deleted and give a compact error
messages for tables that could not be deleted.
If a table is in use, we will wait for all users to free the table
before dropping it
Wait if global_read_lock (FLUSH TABLES WITH READ LOCK) is set.
RETURN
0 ok. In this case ok packet is sent to user
-1 Error (Error message given but not sent to user)
*/
int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists) int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists)
{ {
@ -89,6 +106,26 @@ int mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*
delete (drop) tables.
SYNOPSIS
mysql_rm_table_part2_with_lock()
thd Thread handle
tables List of tables to delete
if_exists If 1, don't give error if one table doesn't exists
dont_log_query Don't write query to log files
NOTES
Works like documented in mysql_rm_table(), but don't check
global_read_lock and don't send_ok packet to server.
RETURN
0 ok
1 error
*/
int mysql_rm_table_part2_with_lock(THD *thd, int mysql_rm_table_part2_with_lock(THD *thd,
TABLE_LIST *tables, bool if_exists, TABLE_LIST *tables, bool if_exists,
bool dont_log_query) bool dont_log_query)
@ -110,6 +147,7 @@ int mysql_rm_table_part2_with_lock(THD *thd,
return error; return error;
} }
/* /*
TODO: TODO:
When logging to the binary log, we should log When logging to the binary log, we should log