diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-01-06 13:40:14 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-01-06 13:40:14 +0200 |
| commit | 7219513743ec021216f8ad81dc8e80607d431769 (patch) | |
| tree | d2e3115611693d6885f2fc3d1bca9a6a401f66e0 /innobase/ibuf | |
| parent | b703338d76e40859ae39b669816eba768d0f7ed7 (diff) | |
| download | mariadb-git-7219513743ec021216f8ad81dc8e80607d431769.tar.gz | |
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
Diffstat (limited to 'innobase/ibuf')
| -rw-r--r-- | innobase/ibuf/ibuf0ibuf.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/innobase/ibuf/ibuf0ibuf.c b/innobase/ibuf/ibuf0ibuf.c index c07756ab308..7c31ca7c320 100644 --- a/innobase/ibuf/ibuf0ibuf.c +++ b/innobase/ibuf/ibuf0ibuf.c @@ -2622,6 +2622,14 @@ loop: goto reset_bit; } + /* Do NOT merge to the 4.1 code base! */ + if (trx_sys_downgrading_from_4_1_1) { + fprintf(stderr, +"InnoDB: Fatal error: you are downgrading from >= 4.1.1 to 4.0, but\n" +"InnoDB: the insert buffer was not empty.\n"); + ut_a(0); + } + if (corruption_noticed) { rec_sprintf(err_buf, 450, ibuf_rec); |