bzr push into mysql-6.0 branch (guilhem:2926 to 2927)

[Guilhem Bichot]

 2927 Guilhem Bichot	2008-11-27 [merge]
      Merge of 5.1-maria into 6.0-maria
modified:
  mysql-test/suite/maria/r/maria.result
  mysql-test/suite/maria/r/maria_notembedded.result
  mysql-test/suite/maria/t/maria.test
  mysql-test/suite/maria/t/maria_notembedded.test
  sql/mysqld.cc

 2926 Guilhem Bichot	2008-11-25 [merge]
      Merge of 5.1-maria into 6.0-maria
modified:
  mysql-test/r/partition.result
  mysql-test/t/partition.test
  sql/ha_partition.cc

=== modified file 'mysql-test/suite/maria/r/maria.result'
--- a/mysql-test/suite/maria/r/maria.result	2008-11-24 13:58:30 +0000
+++ b/mysql-test/suite/maria/r/maria.result	2008-11-27 15:18:17 +0000
@@ -2205,19 +2205,6 @@ check table t2 extended;
 Table	Op	Msg_type	Msg_text
 test.t2	check	status	OK
 drop table t2;
-create table t1 (a int unique) transactional=1;
-insert t1 values (1);
-lock table t1 write concurrent;
-insert t1 values (2);
-lock table t1 write concurrent;
-insert t1 values (3);
-insert t1 values (2);
-insert t1 values (3);
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
-unlock tables;
-ERROR 23000: Duplicate entry '2' for key 'a'
-unlock tables;
-drop table t1;
 CREATE TABLE t1 (
 col0 float DEFAULT NULL,
 col1 date DEFAULT NULL,   

=== modified file 'mysql-test/suite/maria/r/maria_notembedded.result'
--- a/mysql-test/suite/maria/r/maria_notembedded.result	2008-10-20 09:16:47 +0000
+++ b/mysql-test/suite/maria/r/maria_notembedded.result	2008-11-27 15:18:17 +0000
@@ -23,3 +23,16 @@ select count(*) from t1;
 count(*)
 1
 drop table t1;
+create table t1 (a int unique) transactional=1;
+insert t1 values (1);
+lock table t1 write concurrent;
+insert t1 values (2);
+lock table t1 write concurrent;
+insert t1 values (3);
+insert t1 values (2);
+insert t1 values (3);
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+unlock tables;
+ERROR 23000: Duplicate entry '2' for key 'a'
+unlock tables;
+drop table t1;

=== modified file 'mysql-test/suite/maria/t/maria.test'
--- a/mysql-test/suite/maria/t/maria.test	2008-11-24 13:58:30 +0000
+++ b/mysql-test/suite/maria/t/maria.test	2008-11-27 15:18:17 +0000
@@ -1471,31 +1471,6 @@ insert into t2 values (repeat('x',28)), 
 check table t2 extended;
 drop table t2;
 
-#
-# an example of a deadlock
-#
-create table t1 (a int unique) transactional=1;
-insert t1 values (1);
-lock table t1 write concurrent;
-insert t1 values (2);
-connect(con_d,localhost,root,,);
-lock table t1 write concurrent;
-insert t1 values (3);
-send insert t1 values (2);
-connection default;
-let $wait_condition=select count(*) = 1 from information_schema.processlist where state="waiting for a resource";
---source include/wait_condition.inc
---error ER_LOCK_DEADLOCK
-insert t1 values (3);
-unlock tables;
-connection con_d;
---error ER_DUP_ENTRY
-reap;
-unlock tables;
-disconnect con_d;
-connection default;
-drop table t1;
-
 CREATE TABLE t1 (
 col0 float DEFAULT NULL,
 col1 date DEFAULT NULL,   

=== modified file 'mysql-test/suite/maria/t/maria_notembedded.test'
--- a/mysql-test/suite/maria/t/maria_notembedded.test	2008-10-20 09:16:47 +0000
+++ b/mysql-test/suite/maria/t/maria_notembedded.test	2008-11-27 15:18:17 +0000
@@ -26,6 +26,34 @@ select * from t1;
 select count(*) from t1;
 drop table t1;
 
+# This cannot be run in embedded server, see BUG#40661, because
+# mysqltest runs "send" commands in separate OS thread.
+#
+# an example of a deadlock
+#
+create table t1 (a int unique) transactional=1;
+insert t1 values (1);
+lock table t1 write concurrent;
+insert t1 values (2);
+connect(con_d,localhost,root,,);
+lock table t1 write concurrent;
+insert t1 values (3);
+send insert t1 values (2);
+connection default;
+let $wait_condition=select count(*) = 1 from information_schema.processlist where state="waiting for a resource";
+--source include/wait_condition.inc
+--error ER_LOCK_DEADLOCK
+insert t1 values (3);
+unlock tables;
+connection con_d;
+--error ER_DUP_ENTRY
+reap;
+unlock tables;
+disconnect con_d;
+connection default;
+drop table t1;
+
+
 --disable_result_log
 --disable_query_log
 eval set session storage_engine=$default_engine;

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-11-22 15:24:06 +0000
+++ b/sql/mysqld.cc	2008-11-27 15:18:17 +0000
@@ -2984,7 +2984,8 @@ void my_message_sql(uint error, const ch
   if (error == 0)
   {
     /* At least, prevent new abuse ... */
-    DBUG_ASSERT(strncmp(str, "MyISAM table", 12) == 0);
+    DBUG_ASSERT(strncmp(str, "MyISAM table", 12) == 0 ||
+                strncmp(str, "MARIA table", 11) == 0);
     error= ER_UNKNOWN_ERROR;
   }