mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
trx0sys.c, srv0start.c, ibuf0ibuf.c, trx0sys.h, srv0srv.h:
DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet innobase/include/srv0srv.h: DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet innobase/include/trx0sys.h: DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet innobase/ibuf/ibuf0ibuf.c: DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet innobase/srv/srv0start.c: DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet innobase/trx/trx0sys.c: DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet
This commit is contained in:
parent
b703338d76
commit
7219513743
5 changed files with 140 additions and 1 deletions
|
|
@ -1479,6 +1479,31 @@ NetWare. */
|
|||
|
||||
os_fast_mutex_free(&srv_os_test_mutex);
|
||||
|
||||
/***********************************************************/
|
||||
/* Do NOT merge to the 4.1 code base! */
|
||||
if (trx_sys_downgrading_from_4_1_1) {
|
||||
fprintf(stderr,
|
||||
"InnoDB: You are downgrading from an InnoDB version which allows multiple\n"
|
||||
"InnoDB: tablespaces. Wait that purge and insert buffer merge run to\n"
|
||||
"InnoDB: completion...\n");
|
||||
for (;;) {
|
||||
os_thread_sleep(10000000);
|
||||
|
||||
if (0 == strcmp(srv_main_thread_op_info,
|
||||
"waiting for server activity")) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
fprintf(stderr,
|
||||
"InnoDB: Full purge and insert buffer merge completed.\n");
|
||||
|
||||
trx_sys_mark_downgraded_from_4_1_1();
|
||||
|
||||
fprintf(stderr,
|
||||
"InnoDB: Downgraded from >= 4.1.1 to 4.0\n");
|
||||
}
|
||||
/***********************************************************/
|
||||
|
||||
if (srv_print_verbose_log) {
|
||||
ut_print_timestamp(stderr);
|
||||
fprintf(stderr, " InnoDB: Started\n");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue