bzr commit into mysql-6.0-maria branch (guilhem:2691)

[Guilhem Bichot]

#At file:///home/mysql_src/bzrrepos/mysql-6.0-maria2/

 2691 Guilhem Bichot	2008-06-28
      Fix for trifle-style test failures
modified:
  mysql-test/r/maria-recover.result
  mysql-test/suite/funcs_1/r/is_tables_ndb.result
  mysql-test/t/maria-recover.test

per-file messages:
  mysql-test/r/maria-recover.result
    result update
  mysql-test/suite/funcs_1/r/is_tables_ndb.result
    forgotten from yesterday.
  mysql-test/t/maria-recover.test
    substituation which works also when explicit --vardir in mtr.
=== modified file 'mysql-test/r/maria-recover.result'
--- a/mysql-test/r/maria-recover.result	2008-06-27 13:30:49 +0000
+++ b/mysql-test/r/maria-recover.result	2008-06-28 09:54:53 +0000
@@ -24,8 +24,8 @@ select * from t_corrupted2;
 a
 ThursdayMorningsMarket
 Warnings:
-Error	145	Table 't_corrupted2' is marked as crashed and should be repaired
-Error	1194	Table 't_corrupted2' is marked as crashed and should be repaired
+Error	145	t_corrupted2' is marked as crashed and should be repaired
+Error	1194	t_corrupted2' is marked as crashed and should be repaired
 Error	1034	1 client is using or hasn't closed the table properly
 Error	1034	Wrong base information on indexpage at page: 1
 select * from t_corrupted2;

=== modified file 'mysql-test/suite/funcs_1/r/is_tables_ndb.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_ndb.result	2008-06-18 17:23:55 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_ndb.result	2008-06-28 09:54:53 +0000
@@ -23,7 +23,7 @@ TABLE_NAME	t1
 TABLE_TYPE	BASE TABLE
 ENGINE	ndbcluster
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -46,7 +46,7 @@ TABLE_NAME	t2
 TABLE_TYPE	BASE TABLE
 ENGINE	ndbcluster
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -69,7 +69,7 @@ TABLE_NAME	t1
 TABLE_TYPE	BASE TABLE
 ENGINE	ndbcluster
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -115,7 +115,7 @@ TABLE_NAME	t1
 TABLE_TYPE	BASE TABLE
 ENGINE	ndbcluster
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#
@@ -138,7 +138,7 @@ TABLE_NAME	t2
 TABLE_TYPE	BASE TABLE
 ENGINE	ndbcluster
 VERSION	10
-ROW_FORMAT	Dynamic
+ROW_FORMAT	DYNAMIC_OR_PAGE
 TABLE_ROWS	#TBLR#
 AVG_ROW_LENGTH	#ARL#
 DATA_LENGTH	#DL#

=== modified file 'mysql-test/t/maria-recover.test'
--- a/mysql-test/t/maria-recover.test	2008-06-27 13:30:49 +0000
+++ b/mysql-test/t/maria-recover.test	2008-06-28 09:54:53 +0000
@@ -48,7 +48,7 @@ EOF
 
 # line below will be removed
 disable_ps_protocol;
-replace_regex /\..mysqltest.t_corrupted2/t_corrupted2/ ;
+replace_regex /Table.*t_corrupted2/t_corrupted2/ ;
 select * from t_corrupted2; # should show corruption and repair messages
 enable_ps_protocol;
 select * from t_corrupted2; # should show just rows