Merge of recent MyISAM changes into Maria. Testsuite passes as much

as in the main 5.1 (partition and ndb_alter_table fail).


mysql-test/r/maria.result:
  merge from MyISAM
mysql-test/r/ps_maria.result:
  merge from MyISAM
mysql-test/t/maria.test:
  merge from MyISAM
sql/mysql_priv.h:
  fix after wrong merge
sql/mysqld.cc:
  fix after wrong merge
sql/set_var.cc:
  adding _db like other engines have
storage/maria/Makefile.am:
  merge from MyISAM
storage/maria/ha_maria.cc:
  merge from MyISAM
storage/maria/ha_maria.h:
  merge from MyISAM
storage/maria/ma_check.c:
  merge from MyISAM
storage/maria/ma_delete.c:
  merge from MyISAM
storage/maria/ma_init.c:
  maria_inited should rather be my_bool
storage/maria/ma_locking.c:
  merge from MyISAM
storage/maria/ma_packrec.c:
  merge from MyISAM
storage/maria/ma_panic.c:
  maria_panic() should not take mutex if engine has not been inited.
storage/maria/ma_rkey.c:
  merge from MyISAM
storage/maria/ma_write.c:
  merge from MyISAM
storage/maria/maria_def.h:
  merge from MyISAM. maria_inited is needed for maria_panic().
storage/maria/maria_ftdump.c:
  merge from MyISAM

3 files changed, 224 insertions, 160 deletions

diff --git a/mysql-test/r/maria.result b/mysql-test/r/maria.result
index b6924e4395b..396b5da4bc1 100644
--- a/mysql-test/r/maria.result
+++ b/mysql-test/r/maria.result
@@ -517,6 +517,34 @@ select c1 from t1 order by c1 limit 1;
 c1
 a
 drop table t1;
+create table t1 (a int not null, primary key(a));
+create table t2 (a int not null, b int not null, primary key(a,b));
+insert into t1 values (1),(2),(3),(4),(5),(6);
+insert into t2 values (1,1),(2,1);
+lock tables t1 read local, t2 read local;
+select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
+a	a	b
+1	1	1
+2	2	1
+insert into t2 values(2,0);
+select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
+a	a	b
+1	1	1
+2	2	1
+drop table t1,t2;
+CREATE TABLE t1 (c1 varchar(250) NOT NULL);
+CREATE TABLE t2 (c1 varchar(250) NOT NULL, PRIMARY KEY (c1));
+INSERT INTO t1 VALUES ('test000001'), ('test000002'), ('test000003');
+INSERT INTO t2 VALUES ('test000002'), ('test000003'), ('test000004');
+LOCK TABLES t1 READ LOCAL, t2 READ LOCAL;
+SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
+WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
+t1c1	t2c1
+INSERT INTO t2 VALUES ('test000001'), ('test000005');
+SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
+WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
+t1c1	t2c1
+DROP TABLE t1,t2;
 CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`));
 Got one of the listed errors
 create table t1 (a int, b varchar(200), c text not null) checksum=1;
diff --git a/mysql-test/r/ps_maria.result b/mysql-test/r/ps_maria.result
index f47c72187e2..9268c44eecd 100644
--- a/mysql-test/r/ps_maria.result
+++ b/mysql-test/r/ps_maria.result
@@ -1929,26 +1929,26 @@ def					@arg09	253	23	1	Y	128	31	63
 def					@arg10	253	23	1	Y	128	31	63
 def					@arg11	253	67	6	Y	128	30	63
 def					@arg12	253	67	6	Y	128	30	63
-def					@arg13	253	8192	10	Y	128	31	63
-def					@arg14	253	8192	19	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	8	Y	128	31	63
+def					@arg13	253	16777216	10	Y	128	31	63
+def					@arg14	253	16777216	19	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	8	Y	128	31	63
 def					@arg17	253	20	4	Y	128	0	63
 def					@arg18	253	20	1	Y	128	0	63
 def					@arg19	253	20	1	Y	128	0	63
-def					@arg20	253	8192	1	Y	0	31	8
-def					@arg21	253	8192	10	Y	0	31	8
-def					@arg22	253	8192	30	Y	0	31	8
-def					@arg23	253	8192	8	Y	128	31	63
-def					@arg24	253	8192	8	Y	0	31	8
-def					@arg25	253	8192	4	Y	128	31	63
-def					@arg26	253	8192	4	Y	0	31	8
-def					@arg27	253	8192	10	Y	128	31	63
-def					@arg28	253	8192	10	Y	0	31	8
-def					@arg29	253	8192	8	Y	128	31	63
-def					@arg30	253	8192	8	Y	0	31	8
-def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	0	31	8
+def					@arg20	253	16777216	1	Y	0	31	8
+def					@arg21	253	16777216	10	Y	0	31	8
+def					@arg22	253	16777216	30	Y	0	31	8
+def					@arg23	253	16777216	8	Y	128	31	63
+def					@arg24	253	16777216	8	Y	0	31	8
+def					@arg25	253	16777216	4	Y	128	31	63
+def					@arg26	253	16777216	4	Y	0	31	8
+def					@arg27	253	16777216	10	Y	128	31	63
+def					@arg28	253	16777216	10	Y	0	31	8
+def					@arg29	253	16777216	8	Y	128	31	63
+def					@arg30	253	16777216	8	Y	0	31	8
+def					@arg31	253	16777216	3	Y	0	31	8
+def					@arg32	253	16777216	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -1976,26 +1976,26 @@ def					@arg09	253	23	0	Y	128	31	63
 def					@arg10	253	23	0	Y	128	31	63
 def					@arg11	253	67	0	Y	128	30	63
 def					@arg12	253	67	0	Y	128	30	63
-def					@arg13	253	8192	0	Y	128	31	63
-def					@arg14	253	8192	0	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	0	Y	128	31	63
+def					@arg13	253	16777216	0	Y	128	31	63
+def					@arg14	253	16777216	0	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	0	Y	128	31	63
 def					@arg17	253	20	0	Y	128	0	63
 def					@arg18	253	20	0	Y	128	0	63
 def					@arg19	253	20	0	Y	128	0	63
-def					@arg20	253	8192	0	Y	0	31	8
-def					@arg21	253	8192	0	Y	0	31	8
-def					@arg22	253	8192	0	Y	0	31	8
-def					@arg23	253	8192	0	Y	128	31	63
-def					@arg24	253	8192	0	Y	0	31	8
-def					@arg25	253	8192	0	Y	128	31	63
-def					@arg26	253	8192	0	Y	0	31	8
-def					@arg27	253	8192	0	Y	128	31	63
-def					@arg28	253	8192	0	Y	0	31	8
-def					@arg29	253	8192	0	Y	128	31	63
-def					@arg30	253	8192	0	Y	0	31	8
-def					@arg31	253	8192	0	Y	0	31	8
-def					@arg32	253	8192	0	Y	0	31	8
+def					@arg20	253	16777216	0	Y	0	31	8
+def					@arg21	253	16777216	0	Y	0	31	8
+def					@arg22	253	16777216	0	Y	0	31	8
+def					@arg23	253	16777216	0	Y	128	31	63
+def					@arg24	253	16777216	0	Y	0	31	8
+def					@arg25	253	16777216	0	Y	128	31	63
+def					@arg26	253	16777216	0	Y	0	31	8
+def					@arg27	253	16777216	0	Y	128	31	63
+def					@arg28	253	16777216	0	Y	0	31	8
+def					@arg29	253	16777216	0	Y	128	31	63
+def					@arg30	253	16777216	0	Y	0	31	8
+def					@arg31	253	16777216	0	Y	0	31	8
+def					@arg32	253	16777216	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select 
@@ -2026,26 +2026,26 @@ def					@arg09	253	23	1	Y	128	31	63
 def					@arg10	253	23	1	Y	128	31	63
 def					@arg11	253	67	6	Y	128	30	63
 def					@arg12	253	67	6	Y	128	30	63
-def					@arg13	253	8192	10	Y	128	31	63
-def					@arg14	253	8192	19	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	8	Y	128	31	63
+def					@arg13	253	16777216	10	Y	128	31	63
+def					@arg14	253	16777216	19	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	8	Y	128	31	63
 def					@arg17	253	20	4	Y	128	0	63
 def					@arg18	253	20	1	Y	128	0	63
 def					@arg19	253	20	1	Y	128	0	63
-def					@arg20	253	8192	1	Y	0	31	8
-def					@arg21	253	8192	10	Y	0	31	8
-def					@arg22	253	8192	30	Y	0	31	8
-def					@arg23	253	8192	8	Y	128	31	63
-def					@arg24	253	8192	8	Y	0	31	8
-def					@arg25	253	8192	4	Y	128	31	63
-def					@arg26	253	8192	4	Y	0	31	8
-def					@arg27	253	8192	10	Y	128	31	63
-def					@arg28	253	8192	10	Y	0	31	8
-def					@arg29	253	8192	8	Y	128	31	63
-def					@arg30	253	8192	8	Y	0	31	8
-def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	0	31	8
+def					@arg20	253	16777216	1	Y	0	31	8
+def					@arg21	253	16777216	10	Y	0	31	8
+def					@arg22	253	16777216	30	Y	0	31	8
+def					@arg23	253	16777216	8	Y	128	31	63
+def					@arg24	253	16777216	8	Y	0	31	8
+def					@arg25	253	16777216	4	Y	128	31	63
+def					@arg26	253	16777216	4	Y	0	31	8
+def					@arg27	253	16777216	10	Y	128	31	63
+def					@arg28	253	16777216	10	Y	0	31	8
+def					@arg29	253	16777216	8	Y	128	31	63
+def					@arg30	253	16777216	8	Y	0	31	8
+def					@arg31	253	16777216	3	Y	0	31	8
+def					@arg32	253	16777216	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2066,26 +2066,26 @@ def					@arg09	253	23	0	Y	128	31	63
 def					@arg10	253	23	0	Y	128	31	63
 def					@arg11	253	67	0	Y	128	30	63
 def					@arg12	253	67	0	Y	128	30	63
-def					@arg13	253	8192	0	Y	128	31	63
-def					@arg14	253	8192	0	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	0	Y	128	31	63
+def					@arg13	253	16777216	0	Y	128	31	63
+def					@arg14	253	16777216	0	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	0	Y	128	31	63
 def					@arg17	253	20	0	Y	128	0	63
 def					@arg18	253	20	0	Y	128	0	63
 def					@arg19	253	20	0	Y	128	0	63
-def					@arg20	253	8192	0	Y	0	31	8
-def					@arg21	253	8192	0	Y	0	31	8
-def					@arg22	253	8192	0	Y	0	31	8
-def					@arg23	253	8192	0	Y	128	31	63
-def					@arg24	253	8192	0	Y	0	31	8
-def					@arg25	253	8192	0	Y	128	31	63
-def					@arg26	253	8192	0	Y	0	31	8
-def					@arg27	253	8192	0	Y	128	31	63
-def					@arg28	253	8192	0	Y	0	31	8
-def					@arg29	253	8192	0	Y	128	31	63
-def					@arg30	253	8192	0	Y	0	31	8
-def					@arg31	253	8192	0	Y	0	31	8
-def					@arg32	253	8192	0	Y	0	31	8
+def					@arg20	253	16777216	0	Y	0	31	8
+def					@arg21	253	16777216	0	Y	0	31	8
+def					@arg22	253	16777216	0	Y	0	31	8
+def					@arg23	253	16777216	0	Y	128	31	63
+def					@arg24	253	16777216	0	Y	0	31	8
+def					@arg25	253	16777216	0	Y	128	31	63
+def					@arg26	253	16777216	0	Y	0	31	8
+def					@arg27	253	16777216	0	Y	128	31	63
+def					@arg28	253	16777216	0	Y	0	31	8
+def					@arg29	253	16777216	0	Y	128	31	63
+def					@arg30	253	16777216	0	Y	0	31	8
+def					@arg31	253	16777216	0	Y	0	31	8
+def					@arg32	253	16777216	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select ? := c1 from t9 where c1= 1" ;
@@ -2114,26 +2114,26 @@ def					@arg09	253	23	1	Y	128	31	63
 def					@arg10	253	23	1	Y	128	31	63
 def					@arg11	253	67	6	Y	128	30	63
 def					@arg12	253	67	6	Y	128	30	63
-def					@arg13	253	8192	10	Y	128	31	63
-def					@arg14	253	8192	19	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	8	Y	128	31	63
+def					@arg13	253	16777216	10	Y	128	31	63
+def					@arg14	253	16777216	19	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	8	Y	128	31	63
 def					@arg17	253	20	4	Y	128	0	63
 def					@arg18	253	20	1	Y	128	0	63
 def					@arg19	253	20	1	Y	128	0	63
-def					@arg20	253	8192	1	Y	0	31	8
-def					@arg21	253	8192	10	Y	0	31	8
-def					@arg22	253	8192	30	Y	0	31	8
-def					@arg23	253	8192	8	Y	128	31	63
-def					@arg24	253	8192	8	Y	0	31	8
-def					@arg25	253	8192	4	Y	128	31	63
-def					@arg26	253	8192	4	Y	0	31	8
-def					@arg27	253	8192	10	Y	128	31	63
-def					@arg28	253	8192	10	Y	0	31	8
-def					@arg29	253	8192	8	Y	128	31	63
-def					@arg30	253	8192	8	Y	0	31	8
-def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	0	31	8
+def					@arg20	253	16777216	1	Y	0	31	8
+def					@arg21	253	16777216	10	Y	0	31	8
+def					@arg22	253	16777216	30	Y	0	31	8
+def					@arg23	253	16777216	8	Y	128	31	63
+def					@arg24	253	16777216	8	Y	0	31	8
+def					@arg25	253	16777216	4	Y	128	31	63
+def					@arg26	253	16777216	4	Y	0	31	8
+def					@arg27	253	16777216	10	Y	128	31	63
+def					@arg28	253	16777216	10	Y	0	31	8
+def					@arg29	253	16777216	8	Y	128	31	63
+def					@arg30	253	16777216	8	Y	0	31	8
+def					@arg31	253	16777216	3	Y	0	31	8
+def					@arg32	253	16777216	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2158,26 +2158,26 @@ def					@arg09	253	23	0	Y	128	31	63
 def					@arg10	253	23	0	Y	128	31	63
 def					@arg11	253	67	0	Y	128	30	63
 def					@arg12	253	67	0	Y	128	30	63
-def					@arg13	253	8192	0	Y	128	31	63
-def					@arg14	253	8192	0	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	0	Y	128	31	63
+def					@arg13	253	16777216	0	Y	128	31	63
+def					@arg14	253	16777216	0	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	0	Y	128	31	63
 def					@arg17	253	20	0	Y	128	0	63
 def					@arg18	253	20	0	Y	128	0	63
 def					@arg19	253	20	0	Y	128	0	63
-def					@arg20	253	8192	0	Y	0	31	8
-def					@arg21	253	8192	0	Y	0	31	8
-def					@arg22	253	8192	0	Y	0	31	8
-def					@arg23	253	8192	0	Y	128	31	63
-def					@arg24	253	8192	0	Y	0	31	8
-def					@arg25	253	8192	0	Y	128	31	63
-def					@arg26	253	8192	0	Y	0	31	8
-def					@arg27	253	8192	0	Y	128	31	63
-def					@arg28	253	8192	0	Y	0	31	8
-def					@arg29	253	8192	0	Y	128	31	63
-def					@arg30	253	8192	0	Y	0	31	8
-def					@arg31	253	8192	0	Y	0	31	8
-def					@arg32	253	8192	0	Y	0	31	8
+def					@arg20	253	16777216	0	Y	0	31	8
+def					@arg21	253	16777216	0	Y	0	31	8
+def					@arg22	253	16777216	0	Y	0	31	8
+def					@arg23	253	16777216	0	Y	128	31	63
+def					@arg24	253	16777216	0	Y	0	31	8
+def					@arg25	253	16777216	0	Y	128	31	63
+def					@arg26	253	16777216	0	Y	0	31	8
+def					@arg27	253	16777216	0	Y	128	31	63
+def					@arg28	253	16777216	0	Y	0	31	8
+def					@arg29	253	16777216	0	Y	128	31	63
+def					@arg30	253	16777216	0	Y	0	31	8
+def					@arg31	253	16777216	0	Y	0	31	8
+def					@arg32	253	16777216	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2204,26 +2204,26 @@ def					@arg09	253	23	1	Y	128	31	63
 def					@arg10	253	23	1	Y	128	31	63
 def					@arg11	253	67	6	Y	128	30	63
 def					@arg12	253	67	6	Y	128	30	63
-def					@arg13	253	8192	10	Y	128	31	63
-def					@arg14	253	8192	19	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	8	Y	128	31	63
+def					@arg13	253	16777216	10	Y	128	31	63
+def					@arg14	253	16777216	19	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	8	Y	128	31	63
 def					@arg17	253	20	4	Y	128	0	63
 def					@arg18	253	20	1	Y	128	0	63
 def					@arg19	253	20	1	Y	128	0	63
-def					@arg20	253	8192	1	Y	0	31	8
-def					@arg21	253	8192	10	Y	0	31	8
-def					@arg22	253	8192	30	Y	0	31	8
-def					@arg23	253	8192	8	Y	128	31	63
-def					@arg24	253	8192	8	Y	0	31	8
-def					@arg25	253	8192	4	Y	128	31	63
-def					@arg26	253	8192	4	Y	0	31	8
-def					@arg27	253	8192	10	Y	128	31	63
-def					@arg28	253	8192	10	Y	0	31	8
-def					@arg29	253	8192	8	Y	128	31	63
-def					@arg30	253	8192	8	Y	0	31	8
-def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	0	31	8
+def					@arg20	253	16777216	1	Y	0	31	8
+def					@arg21	253	16777216	10	Y	0	31	8
+def					@arg22	253	16777216	30	Y	0	31	8
+def					@arg23	253	16777216	8	Y	128	31	63
+def					@arg24	253	16777216	8	Y	0	31	8
+def					@arg25	253	16777216	4	Y	128	31	63
+def					@arg26	253	16777216	4	Y	0	31	8
+def					@arg27	253	16777216	10	Y	128	31	63
+def					@arg28	253	16777216	10	Y	0	31	8
+def					@arg29	253	16777216	8	Y	128	31	63
+def					@arg30	253	16777216	8	Y	0	31	8
+def					@arg31	253	16777216	3	Y	0	31	8
+def					@arg32	253	16777216	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1.0000	1.0000	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2242,26 +2242,26 @@ def					@arg09	253	23	0	Y	128	31	63
 def					@arg10	253	23	0	Y	128	31	63
 def					@arg11	253	67	0	Y	128	30	63
 def					@arg12	253	67	0	Y	128	30	63
-def					@arg13	253	8192	0	Y	128	31	63
-def					@arg14	253	8192	0	Y	128	31	63
-def					@arg15	253	8192	19	Y	128	31	63
-def					@arg16	253	8192	0	Y	128	31	63
+def					@arg13	253	16777216	0	Y	128	31	63
+def					@arg14	253	16777216	0	Y	128	31	63
+def					@arg15	253	16777216	19	Y	128	31	63
+def					@arg16	253	16777216	0	Y	128	31	63
 def					@arg17	253	20	0	Y	128	0	63
 def					@arg18	253	20	0	Y	128	0	63
 def					@arg19	253	20	0	Y	128	0	63
-def					@arg20	253	8192	0	Y	0	31	8
-def					@arg21	253	8192	0	Y	0	31	8
-def					@arg22	253	8192	0	Y	0	31	8
-def					@arg23	253	8192	0	Y	128	31	63
-def					@arg24	253	8192	0	Y	0	31	8
-def					@arg25	253	8192	0	Y	128	31	63
-def					@arg26	253	8192	0	Y	0	31	8
-def					@arg27	253	8192	0	Y	128	31	63
-def					@arg28	253	8192	0	Y	0	31	8
-def					@arg29	253	8192	0	Y	128	31	63
-def					@arg30	253	8192	0	Y	0	31	8
-def					@arg31	253	8192	0	Y	0	31	8
-def					@arg32	253	8192	0	Y	0	31	8
+def					@arg20	253	16777216	0	Y	0	31	8
+def					@arg21	253	16777216	0	Y	0	31	8
+def					@arg22	253	16777216	0	Y	0	31	8
+def					@arg23	253	16777216	0	Y	128	31	63
+def					@arg24	253	16777216	0	Y	0	31	8
+def					@arg25	253	16777216	0	Y	128	31	63
+def					@arg26	253	16777216	0	Y	0	31	8
+def					@arg27	253	16777216	0	Y	128	31	63
+def					@arg28	253	16777216	0	Y	0	31	8
+def					@arg29	253	16777216	0	Y	128	31	63
+def					@arg30	253	16777216	0	Y	0	31	8
+def					@arg31	253	16777216	0	Y	0	31	8
+def					@arg32	253	16777216	0	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1991-01-01 01:01:01	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 prepare stmt1 from "select c1 into ? from t9 where c1= 1" ;
@@ -2689,21 +2689,21 @@ set @arg00= '1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1265	Data truncated for column 'c1' at row 1
-Warning	1265	Data truncated for column 'c2' at row 1
-Warning	1265	Data truncated for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1265	Data truncated for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
-c1	1
-c2	1
-c3	1
-c4	1
-c5	1
-c6	1
+c1	127
+c2	32767
+c3	8388607
+c4	2147483647
+c5	2147483647
+c6	9223372036854775807
 c7	3.40282e+38
 c8	1.11111111111111e+50
 c9	1.11111111111111e+50
@@ -2739,21 +2739,21 @@ set @arg00= '-1.11111111111111111111e+50' ;
 execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,
 @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
-Warning	1265	Data truncated for column 'c1' at row 1
-Warning	1265	Data truncated for column 'c2' at row 1
-Warning	1265	Data truncated for column 'c3' at row 1
-Warning	1265	Data truncated for column 'c4' at row 1
-Warning	1265	Data truncated for column 'c5' at row 1
-Warning	1265	Data truncated for column 'c6' at row 1
+Warning	1264	Out of range value for column 'c1' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c3' at row 1
+Warning	1264	Out of range value for column 'c4' at row 1
+Warning	1264	Out of range value for column 'c5' at row 1
+Warning	1264	Out of range value for column 'c6' at row 1
 Warning	1264	Out of range value for column 'c7' at row 1
 Warning	1264	Out of range value for column 'c12' at row 1
 execute my_select ;
-c1	-1
-c2	-1
-c3	-1
-c4	-1
-c5	-1
-c6	-1
+c1	-128
+c2	-32768
+c3	-8388608
+c4	-2147483648
+c5	-2147483648
+c6	-9223372036854775808
 c7	-3.40282e+38
 c8	-1.11111111111111e+50
 c9	-1.11111111111111e+50
diff --git a/mysql-test/t/maria.test b/mysql-test/t/maria.test
index 1a44775277b..fa9983690cb 100644
--- a/mysql-test/t/maria.test
+++ b/mysql-test/t/maria.test
@@ -494,6 +494,42 @@ select c1 from t1 order by c1 limit 1;
 drop table t1;
 
 #
+# Bug #14400  Join could miss concurrently inserted row
+#
+# Partial key.
+create table t1 (a int not null, primary key(a));
+create table t2 (a int not null, b int not null, primary key(a,b));
+insert into t1 values (1),(2),(3),(4),(5),(6);
+insert into t2 values (1,1),(2,1);
+lock tables t1 read local, t2 read local;
+select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
+connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+insert into t2 values(2,0);
+disconnect root;
+connection default;
+select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
+drop table t1,t2;
+#
+# Full key.
+CREATE TABLE t1 (c1 varchar(250) NOT NULL);
+CREATE TABLE t2 (c1 varchar(250) NOT NULL, PRIMARY KEY (c1));
+INSERT INTO t1 VALUES ('test000001'), ('test000002'), ('test000003');
+INSERT INTO t2 VALUES ('test000002'), ('test000003'), ('test000004');
+LOCK TABLES t1 READ LOCAL, t2 READ LOCAL;
+SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
+  WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
+connect (con1,localhost,root,,);
+connection con1;
+INSERT INTO t2 VALUES ('test000001'), ('test000005');
+disconnect con1;
+connection default;
+SELECT t1.c1 AS t1c1, t2.c1 AS t2c1 FROM t1, t2
+  WHERE t1.c1 = t2.c1 HAVING t1c1 != t2c1;
+DROP TABLE t1,t2;
+
+# End of 4.0 tests
+
+#
 # Test RTREE index
 #
 --error 1235, 1289