From 7219513743ec021216f8ad81dc8e80607d431769 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Jan 2004 13:40:14 +0200 Subject: 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 --- innobase/ibuf/ibuf0ibuf.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'innobase/ibuf') 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); -- cgit v1.2.1