mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge from mysql-5.1-innodb to mysql-5.5-innodb.

Browse source
This commit is contained in:
Jimmy Yang 2010-10-14 04:39:42 -07:00
commit 9970a9cfa8
4 changed files with 1138 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/handler/ha_innodb.cc
View file

@ -8295,8 +8295,6 @@ ha_innobase::get_foreign_key_create_info(void)
flen = ftell(srv_dict_tmpfile);
if (flen < 0) {
flen = 0;
} else if (flen > 64000 - 1) {
flen = 64000 - 1;
}
/* allocate buffer for the string, and

5
storage/innobase/srv/srv0start.c
View file

@ -477,7 +477,6 @@ io_handler_thread(
the aio array */
{
ulint segment;
ulint i;
segment = *((ulint*)arg);
@ -490,7 +489,7 @@ io_handler_thread(
pfs_register_thread(io_handler_thread_key);
#endif /* UNIV_PFS_THREAD */
for (i = 0;; i++) {
while (srv_shutdown_state != SRV_SHUTDOWN_EXIT_THREADS) {
fil_aio_wait(segment);
mutex_enter(&ios_mutex);
@ -498,8 +497,6 @@ io_handler_thread(
mutex_exit(&ios_mutex);
}
thr_local_free(os_thread_get_curr_id());
/* We count the number of threads in os_thread_exit(). A created
thread should always use that to exit and not use return() to exit.
The thread actually never comes here because it is exited in an