current/SOURCES/mariadb-5.5-mysql_upgrade-exit-status.patch

--- 5.5_orig/mysql-test/t/mysql_upgrade.test    2011-11-01 16:20:49.000000000 +0100
+++ 5.5/mysql-test/t/mysql_upgrade.test 2011-11-05 13:28:54.605647682 +0100
@@ -14,7 +14,7 @@
 
 --echo Run it again - should say already completed
 --replace_result $MYSQL_SERVER_VERSION VERSION
---error 1
+--error 0
 --exec $MYSQL_UPGRADE 2>&1
 
 # It should have created a file in the MySQL Servers datadir
1	--- 5.5_orig/mysql-test/t/mysql_upgrade.test 2011-11-01 16:20:49.000000000 +0100
2	+++ 5.5/mysql-test/t/mysql_upgrade.test 2011-11-05 13:28:54.605647682 +0100
3	@@ -14,7 +14,7 @@
4
5	--echo Run it again - should say already completed
6	--replace_result $MYSQL_SERVER_VERSION VERSION
7	---error 1
8	+--error 0
9	--exec $MYSQL_UPGRADE 2>&1
10
11	# It should have created a file in the MySQL Servers datadir