Merge lp:~percona-dev/percona-server/bug692211 into lp:percona-server/release-5.1.54-12

[Alexey Kopytov]

[Vadim Tkachenko (vadim-tk)]

can we add mysql-test for it ?

review: Needs Fixing

[Vadim Tkachenko (vadim-tk)]

ok, thanks

review: Approve

=== modified file 'innodb_lru_dump_restore.patch'
--- innodb_lru_dump_restore.patch	2010-12-16 11:35:26 +0000
+++ innodb_lru_dump_restore.patch	2010-12-22 18:27:11 +0000
@@ -5,6 +5,40 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ b/mysql-test/suite/innodb_plugin/r/percona_bug692211.result	2010-12-22 20:48:19.000000000 +0300
+@@ -0,0 +1,7 @@
++#
++# LP bug #692211: innodb_auto_lru_dump crashes if ib_lru_dump doesn't 
++#                 exist
++#
++SELECT @@innodb_auto_lru_dump;
++@@innodb_auto_lru_dump
++300
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ b/mysql-test/suite/innodb_plugin/t/percona_bug692211-master.opt	2010-12-22 20:25:59.000000000 +0300
+@@ -0,0 +1 @@
++--innodb_auto_lru_dump=300
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ b/mysql-test/suite/innodb_plugin/t/percona_bug692211.test	2010-12-22 20:17:57.000000000 +0300
+@@ -0,0 +1,17 @@
++--source include/have_innodb_plugin.inc
++
++--echo #
++--echo # LP bug #692211: innodb_auto_lru_dump crashes if ib_lru_dump doesn't 
++--echo #                 exist
++--echo #
++
++SELECT @@innodb_auto_lru_dump;
++
++# We want to check that the server does not crash on startup when there is no 
++# ib_lru_dump in the datadir. If we are here, we have already started up
++# successfully. So we only have to check that there is no ib_lru_dump in the 
++# datadir.
++
++--let $MYSQLD_DATADIR= `SELECT @@datadir`
++--error 1
++--file_exists $MYSQLD_DATADIR/ib_lru_dump;
 diff -ruN a/storage/innodb_plugin/buf/buf0lru.c b/storage/innodb_plugin/buf/buf0lru.c
 --- a/storage/innodb_plugin/buf/buf0lru.c	2010-08-27 16:13:11.070058073 +0900
 +++ b/storage/innodb_plugin/buf/buf0lru.c	2010-08-27 16:34:33.860400549 +0900
@@ -155,7 +189,7 @@
 +	ulint		req = 0;
 +	ibool		terminated = FALSE;
 +	ibool		ret = FALSE;
-+	dump_record_t*	records;
++	dump_record_t*	records = NULL;
 +	ulint		size;
 +	ulint		size_high;
 +	ulint		length;