bzr commit into mysql-6.0 branch (guilhem:2864)

[Guilhem Bichot]

#At file:///home/mysql_src/tmp/monty/repo/mysql-6.0-maria-tmp/

 2864 Guilhem Bichot	2008-10-20
      Post-merge fixes, after the merge of 5.1-maria into 6.0
modified:
  mysql-test/suite/maria/r/maria.result
  mysql-test/suite/maria/r/ps_maria.result
  mysql-test/suite/maria/t/maria.test

per-file messages:
  mysql-test/suite/maria/r/maria.result
    post-merge fix:
    - max key length longer in 6.0 as seen elsewhere in the result file)
    - some changes which mimick similar changes see in myisam.result in 6.0: charset
number,
    recordlength, table description.
  mysql-test/suite/maria/r/ps_maria.result
    similar 320 as ps_2myisam.result has in 6.0. The change which introduced 4096 in 5.1
    was null-merged in 6.0 it seems.
  mysql-test/suite/maria/t/maria.test
    - just unlock table before dropping it (6.0 requirement).
    - 6.0 forbids FLUSH TABLES WITH READ LOCK when having LOCK TABLES
=== modified file 'mysql-test/suite/maria/r/maria.result'
--- a/mysql-test/suite/maria/r/maria.result	2008-10-20 09:16:47 +0000
+++ b/mysql-test/suite/maria/r/maria.result	2008-10-20 12:42:30 +0000
@@ -1899,12 +1899,12 @@ t1	CREATE TABLE `t1` (
 drop table t1;
 create table t1 (a varchar(2048), key `a` (a) key_block_size=1000000000000000000);
 Warnings:
-Warning	1071	Specified key was too long; max key length is 1112 bytes
+Warning	1071	Specified key was too long; max key length is 1444 bytes
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` varchar(2048) DEFAULT NULL,
-  KEY `a` (`a`(1112)) KEY_BLOCK_SIZE=8192
+  KEY `a` (`a`(1444)) KEY_BLOCK_SIZE=8192
 ) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
 drop table t1;
 create table t1 (a int not null, key `a` (a) key_block_size=1025);
@@ -2136,15 +2136,15 @@ KEY (c2)
 MARIA file:          MYSQLTEST_VARDIR/master-data/test/t1
 Record format:       Block
 Crashsafe:           yes
-Character set:       utf8_general_ci (33)
+Character set:       utf8_general_ci (45)
 Data records:                       0  Deleted blocks:                      0
 Block_size:                      8192
-Recordlength:                      99
+Recordlength:                     129
 
 table description:
 Key Start Len Index   Type
-1   2     30  multip. varchar                
-2   33    30  multip. char NULL              
+1   2     40  multip. varchar                
+2   43    40  multip. char NULL              
 DROP TABLE t1;
 create table t1 (n int not null, c char(1)) transactional=1;
 show create table t1;
@@ -2551,6 +2551,7 @@ insert into t1 values (1);
 lock table t1 write concurrent;
 delete from t1;
 ERROR 42000: The storage engine for the table doesn't support DELETE in WRITE CONCURRENT
+unlock tables;
 drop table t1;
 create table t1 (p int primary key, i int, a char(10), key k1(i), key k2(a))
 engine maria;
@@ -2607,5 +2608,6 @@ create table t1 (c1 int);
 create table t2 (c1 int);
 lock table t1 read, t2 read;
 flush tables with read lock;
+ERROR HY000: Can't execute the given command because you have active locked tables or an
active transaction
 unlock tables;
 drop table t1, t2;

=== modified file 'mysql-test/suite/maria/r/ps_maria.result'
--- a/mysql-test/suite/maria/r/ps_maria.result	2008-10-20 09:16:47 +0000
+++ b/mysql-test/suite/maria/r/ps_maria.result	2008-10-20 12:42:30 +0000
@@ -1159,7 +1159,7 @@ def					table	253	64	2	Y	0	31	8
 def					type	253	10	3	Y	0	31	8
 def					possible_keys	253	4096	0	Y	0	31	8
 def					key	253	64	0	Y	0	31	8
-def					key_len	253	4096	0	Y	0	31	8
+def					key_len	253	320	0	Y	0	31	8
 def					ref	253	1024	0	Y	0	31	8
 def					rows	8	10	1	Y	32928	0	63
 def					Extra	253	255	0	N	1	31	8

=== modified file 'mysql-test/suite/maria/t/maria.test'
--- a/mysql-test/suite/maria/t/maria.test	2008-10-20 09:16:47 +0000
+++ b/mysql-test/suite/maria/t/maria.test	2008-10-20 12:42:30 +0000
@@ -1832,8 +1832,6 @@ lock table t1 write concurrent;
 # should be fixed with fully implemented versioning
 --error ER_CHECK_NOT_IMPLEMENTED
 delete from t1;
---error 1099
-drop table t1;
 unlock tables;
 drop table t1;
 
@@ -1903,6 +1901,8 @@ drop table t1;
 create table t1 (c1 int);
 create table t2 (c1 int);
 lock table t1 read, t2 read;
+# 6.0 throws this error, unlike 5.1
+--error ER_LOCK_OR_ACTIVE_TRANSACTION
 flush tables with read lock;
 unlock tables;
 drop table t1, t2;