[Commits] Rev 3007: After-merge fix of result file (MARIA <-> Aria) in http://bazaar.launchpad.net/~maria-captains/maria/5.2

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Aug 1 11:56:24 EEST 2011


At http://bazaar.launchpad.net/~maria-captains/maria/5.2

------------------------------------------------------------
revno: 3007
revision-id: knielsen at knielsen-hq.org-20110801085624-tltcaz0w4sits9gh
parent: knielsen at knielsen-hq.org-20110731204619-zjwb9d3wbcicnr6w
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.2
timestamp: Mon 2011-08-01 10:56:24 +0200
message:
  After-merge fix of result file (MARIA <-> Aria)
=== modified file 'mysql-test/suite/maria/r/max_length.result'
--- a/mysql-test/suite/maria/r/max_length.result	2011-07-24 08:25:28 +0000
+++ b/mysql-test/suite/maria/r/max_length.result	2011-08-01 08:56:24 +0000
@@ -7,8 +7,8 @@ create table t2 (id int(10) unsigned not
 lock tables t1 write,t2 write;
 show table status like "t_";
 Name    Engine  Version Row_format      Rows    Avg_row_length  Data_length     Max_data_length Index_length    Data_free       Auto_increment  Create_time     Update_time     Check_time      Collation       Checksum        Create_options  Comment
-t1      MARIA   10      Page    0       0       8192    268320768       8192    0       1       #       #       #       latin1_swedish_ci       NULL    max_rows=2 row_format=PAGE      
-t2      MARIA   10      Page    0       0       8192    17592186011648  8192    0       1       #       #       #       latin1_swedish_ci       NULL    max_rows=20000000 row_format=PAGE       
+t1      Aria    10      Page    0       0       8192    268320768       8192    0       1       #       #       #       latin1_swedish_ci       NULL    max_rows=2 row_format=PAGE      
+t2      Aria    10      Page    0       0       8192    17592186011648  8192    0       1       #       #       #       latin1_swedish_ci       NULL    max_rows=20000000 row_format=PAGE       
 insert into t1 values(null, repeat("ab",100),repeat("def",1000));
 insert into t1 values(null, repeat("de",200),repeat("ghi",2000));
 insert into t1 values(null, repeat("fe",300),repeat("ghi",3000));



More information about the commits mailing list