merge

2025-11-08 00:28:29 +03:00 · 2004-12-31 06:36:32 +01:00
parent 91a04d182b dd32940b50
commit 8f2d0ec1a1
387 changed files with 9925 additions and 30371 deletions
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -39,7 +39,7 @@ CLEANFILES = 		$(test_SCRIPTS) $(test_DATA)
 INCLUDES =			-I$(srcdir)/../include -I../include -I..
 EXTRA_PROGRAMS =		mysql_test_run_new
 noinst_HEADERS =	my_manage.h
-mysql_test_run_new_SOURCES=		mysql_test_run_new.c my_manage.c
+mysql_test_run_new_SOURCES=		mysql_test_run_new.c my_manage.c my_create_tables.c


 dist-hook:
--- a/mysql-test/include/ctype_common.inc
+++ b/mysql-test/include/ctype_common.inc
@@ -25,6 +25,7 @@ USE d1;
 CREATE TABLE t1 (c CHAR(10), KEY(c));
 --enable_warnings
 # check the column was created with the expected charset/collation
+--replace_result select,insert,update,references ""
 SHOW FULL COLUMNS FROM t1;
 INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');
 SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';
@@ -37,6 +38,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));
 --enable_warnings
 # check the column was created with the expected charset/collation
+--replace_result select,insert,update,references ""
 SHOW FULL COLUMNS FROM t1;
 INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');
 SELECT c1 as want3results from t1 where c1 like 'l%';
--- a/mysql-test/include/ps_modify1.inc
+++ b/mysql-test/include/ps_modify1.inc
@@ -65,6 +65,9 @@ execute stmt1 using @1000, @duplicate, @5;
 select a,b from t1 where a >= 1000 order by a ;
 delete from t1 where a >= 1000 ;

+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 --disable_warnings
--- a/mysql-test/my_create_tables.c
+++ b/mysql-test/my_create_tables.c
@@ -0,0 +1,646 @@
+#include <stdio.h>
+#include <errno.h>
+#ifndef __WIN__
+#include <dirent.h>
+#endif
+#include <string.h>
+#ifdef __NETWARE__
+#include <screen.h>
+#include <proc.h>
+#else
+#include <sys/types.h>
+#ifndef __WIN__
+#include <sys/wait.h>
+#include <unistd.h>
+#else
+#include <direct.h>
+#include <stdlib.h>
+#include <stdio.h>
+#endif
+#endif
+#include <ctype.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <assert.h>
+#include "my_manage.h"
+
+/*
+ Synopsis:
+  This function testes a exist file 
+
+Arguments:
+  mdata:       path to data
+  file_name:   name of file
+Output:
+  A zero value indicates that file is exist. 
+*/
+bool test_sys_file(const char *mdata,const char *file_name)
+{
+  struct stat file;
+  char path_file_name[PATH_MAX];
+  snprintf(path_file_name, PATH_MAX, "%s/%s", mdata, file_name);
+  return(stat(path_file_name,&file));
+}
+
+/*
+ Synopsis:
+  This function creates a file with sql requstes for creating 
+  system data files.
+
+Arguments:
+  mdata:         path to data
+  output_file:   file name for output file
+  test:          to create system files with test data
+Output:
+  A zero value indicates a success. 
+*/
+bool create_system_files(const char *mdata,const char *output_file, bool test)
+{
+  FILE *out;
+
+  out = fopen(output_file, "w+");
+
+  if (!out)
+    return 1;
+  
+  if (test_sys_file(mdata,"mysql"))
+  {
+    fprintf(out,"CREATE DATABASE mysql;\n");
+  }
+
+  if (test && test_sys_file(mdata,"test"))
+  {
+    fprintf(out,"CREATE DATABASE test;\n");
+  }
+
+  fprintf(out,"USE mysql;\n");
+
+  if (test_sys_file(mdata,"mysql/db.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE db ("
+      "Host char(60) binary DEFAULT '' NOT NULL,"
+      "Db char(64) binary DEFAULT '' NOT NULL,"
+      "User char(16) binary DEFAULT '' NOT NULL,"
+      "Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "References_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Index_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "PRIMARY KEY Host (Host,Db,User),"
+      "KEY User (User))"
+      "comment='Database privileges';\n");
+
+    if (test)
+    {
+      fprintf(out,"INSERT INTO db VALUES ('%%','test','','Y','Y','Y','Y'"
+                  ",'Y','Y','N','Y','Y','Y','Y','Y');\n");
+      fprintf(out,"INSERT INTO db VALUES ('%%','test\\_%%','','Y','Y','Y'"
+                  ",'Y','Y','Y','N','Y','Y','Y','Y','Y');\n");
+    }
+  }
+
+  if (test_sys_file(mdata,"mysql/host.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE host ("
+      "Host char(60) binary DEFAULT '' NOT NULL,"
+      "Db char(64) binary DEFAULT '' NOT NULL,"
+      "Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "References_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Index_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "PRIMARY KEY Host (Host,Db))"
+      "comment='Host privileges;"
+      " Merged with database privileges';\n");
+  }
+
+  if (test_sys_file(mdata,"mysql/user.frm"))
+  {
+#ifdef __WIN__
+    WSADATA wsa_data;
+#endif
+    char hostname[FN_REFLEN];
+
+#ifdef __WIN__
+    if (WSAStartup(MAKEWORD( 2, 2 ),&wsa_data))
+      return 1;
+#endif
+    if (gethostname(hostname, FN_REFLEN))
+      return 1;
+#ifdef __WIN__
+    WSACleanup( );
+#endif
+
+    if (strchr(hostname, '.') == NULL)
+      strcat(hostname, "%");  
+
+    fprintf(out,
+      "CREATE TABLE user ("
+      "Host char(60) binary DEFAULT '' NOT NULL,"
+      "User char(16) binary DEFAULT '' NOT NULL,"
+      "Password char(41) binary DEFAULT '' NOT NULL,"
+      "Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Reload_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Shutdown_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Process_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "File_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "References_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Index_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Show_db_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Super_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Repl_slave_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+      "ssl_type enum('','ANY','X509', 'SPECIFIED') DEFAULT '' NOT NULL,"
+      "ssl_cipher BLOB NOT NULL,"
+      "x509_issuer BLOB NOT NULL,"
+      "x509_subject BLOB NOT NULL,"
+      "max_questions int(11) unsigned DEFAULT 0  NOT NULL,"
+      "max_updates int(11) unsigned DEFAULT 0  NOT NULL,"
+      "max_connections int(11) unsigned DEFAULT 0  NOT NULL,"
+      "PRIMARY KEY Host (Host,User)"
+      ") comment='Users and global privileges';\n");
+
+    if (test)
+    {
+      fprintf(out,
+        "INSERT INTO user VALUES ('localhost','root',''"
+        ",'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'"
+        ",'Y','Y','Y','Y','Y','','','','',0,0,0);\n");
+      fprintf(out,
+        "INSERT INTO user VALUES ('%s','root','','Y','Y',"
+        "'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y',"
+        "'Y','Y','Y','Y','','','','',0,0,0);\n",hostname);
+      fprintf(out,
+        "REPLACE INTO user VALUES ('127.0.0.1','root','',"
+        "'Y','Y','Y','Y','Y','Y',"
+        "'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'"
+        ",'Y','','','','',0,0,0);\n");
+      fprintf(out,"INSERT INTO user (host,user) values ('localhost','');\n");
+      fprintf(out,"INSERT INTO user (host,user) values ('%s','');\n",hostname);
+    }
+    else
+    {
+      fprintf(out,
+        "INSERT INTO user VALUES ('localhost','root','',"
+        "'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y',"
+        "'Y','Y','Y','Y','','','','',0,0,0);\n");
+#ifndef __WIN__    
+      fprintf(out,
+        "INSERT INTO user VALUES ('%s','root','','Y','Y',"
+        "'Y','Y','Y','Y','Y','Y'"
+        "'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','',''"
+        ",'','',0,0,0);\n",hostname);
+      fprintf(out,"INSERT INTO user (host,user) values ('%s','');\n",hostname);
+      fprintf(out,"INSERT INTO user (host,user) values ('localhost','');\n");
+#else
+      fprintf(out,
+        "INSERT INTO user VALUES ('localhost','','','Y','Y','Y'"
+        ",'Y','Y','Y','Y','Y','Y'"
+        ",'Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','',"
+        "'','',0,0,0);\n");
+#endif
+    }
+  }
+  
+  
+  if (test_sys_file(mdata,"mysql/func.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE func ("
+      "name char(64) binary DEFAULT '' NOT NULL,"
+      "ret tinyint(1) DEFAULT '0' NOT NULL,"
+      "dl char(128) DEFAULT '' NOT NULL,"
+      "type enum ('function','aggregate') NOT NULL,"
+      "PRIMARY KEY (name)"
+      ") comment='User defined functions';\n");
+  }
+
+  if (test_sys_file(mdata,"mysql/tables_priv.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE tables_priv ("
+      "Host char(60) binary DEFAULT '' NOT NULL,"
+      "Db char(64) binary DEFAULT '' NOT NULL,"
+      "User char(16) binary DEFAULT '' NOT NULL,"
+      "Table_name char(64) binary DEFAULT '' NOT NULL,"
+      "Grantor char(77) DEFAULT '' NOT NULL,"
+      "Timestamp timestamp(14),"
+      "Table_priv set('Select','Insert','Update','Delete',"
+      "'Create','Drop','Grant','References','Index','Alter')"
+      " DEFAULT '' NOT NULL,"
+      "Column_priv set('Select','Insert','Update','References')"
+      "  DEFAULT '' NOT NULL,"
+      "PRIMARY KEY (Host,Db,User,Table_name),"
+      "KEY Grantor (Grantor)"
+      ") comment='Table privileges';\n");
+  }
+
+  if (test_sys_file(mdata,"mysql/columns_priv.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE columns_priv ("
+      "Host char(60) binary DEFAULT '' NOT NULL,"
+      "Db char(64) binary DEFAULT '' NOT NULL,"
+      "User char(16) binary DEFAULT '' NOT NULL,"
+      "Table_name char(64) binary DEFAULT '' NOT NULL,"
+      "Column_name char(64) binary DEFAULT '' NOT NULL,"
+      "Timestamp timestamp(14),"
+      "Column_priv set('Select','Insert','Update','References')"
+      " DEFAULT '' NOT NULL,"
+      "PRIMARY KEY (Host,Db,User,Table_name,Column_name)"
+      ") comment='Column privileges';\n");
+  }
+
+  if (test_sys_file(mdata,"mysql/help_topic.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE help_topic ("
+      "help_topic_id    int unsigned not null,"
+      "name             varchar(64) not null,"
+      "help_category_id smallint unsigned not null,"
+      "description      text not null,"
+      "example          text not null,"
+      "url              varchar(128) not null,"
+      "primary key      (help_topic_id),"
+      "unique index     (name)"
+      ") comment='help topics';\n");
+  }
+
+  if (test_sys_file(mdata,"mysql/help_category.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE help_category ("
+      "help_category_id   smallint unsigned not null,"
+      "name               varchar(64) not null,"
+      "parent_category_id smallint unsigned null,"
+      "url                varchar(128) not null,"
+      "primary key        (help_category_id),"
+      "unique index       (name)"
+      ") comment='help categories';\n");
+  }
+
+  if (test_sys_file(mdata,"mysql/help_keyword.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE help_keyword ("
+      "help_keyword_id  int unsigned not null,"
+      "name             varchar(64) not null,"
+      "primary key      (help_keyword_id),"
+      "unique index     (name)"
+      ") comment='help keywords';\n");
+  }
+				    
+  if (test_sys_file(mdata,"mysql/help_relation.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE help_relation ("
+      "help_topic_id int unsigned not null references help_topic,"
+      "help_keyword_id int unsigned not null references help_keyword,"
+      "primary key      (help_keyword_id, help_topic_id)"
+      ") comment='keyword-topic relation';\n");
+  }
+
+  if (test_sys_file(mdata,"mysql/time_zone_name.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE time_zone_name ("
+      "Name char(64) NOT NULL,"
+      "Time_zone_id int unsigned NOT NULL,"
+      "PRIMARY KEY Name (Name)"
+      ") DEFAULT CHARACTER SET latin1 "
+      "comment='Time zone names';\n");
+  
+    if (test)
+    {
+      fprintf(out,
+        "INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES"
+        "('MET', 1), ('UTC', 2), ('Universal', 2), "
+        "('Europe/Moscow',3), ('leap/Europe/Moscow',4);\n");
+    }
+  }
+
+
+  if (test_sys_file(mdata,"mysql/time_zone.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE time_zone ("
+      "Time_zone_id int unsigned NOT NULL auto_increment,"
+      "Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL,"
+      "PRIMARY KEY TzId (Time_zone_id)"
+      ") DEFAULT CHARACTER SET latin1 "
+      "comment='Time zones';\n");
+  
+    if (test)
+    {
+      fprintf(out,"INSERT INTO time_zone (Time_zone_id, Use_leap_seconds)"
+                  "VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y');\n");
+    }
+  }
+
+  if (test_sys_file(mdata,"mysql/time_zone_transition.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE time_zone_transition ("
+      "Time_zone_id int unsigned NOT NULL,"
+      "Transition_time bigint signed NOT NULL,"
+      "Transition_type_id int unsigned NOT NULL,"
+      "PRIMARY KEY TzIdTranTime (Time_zone_id, Transition_time)"
+      ") DEFAULT CHARACTER SET latin1 "
+      "comment='Time zone transitions';\n");
+  
+    if (test)
+    {
+      fprintf(out,
+       "INSERT INTO time_zone_transition"
+       "(Time_zone_id, Transition_time, Transition_type_id)"
+       "VALUES"
+       " (1, -1693706400, 0) ,(1, -1680483600, 1)"
+       ",(1, -1663455600, 2) ,(1, -1650150000, 3)"
+       ",(1, -1632006000, 2) ,(1, -1618700400, 3)"
+       ",(1, -938905200, 2) ,(1, -857257200, 3)"
+       ",(1, -844556400, 2) ,(1, -828226800, 3)"
+       ",(1, -812502000, 2) ,(1, -796777200, 3)"
+       ",(1, 228877200, 2) ,(1, 243997200, 3)"
+       ",(1, 260326800, 2) ,(1, 276051600, 3)"
+       ",(1, 291776400, 2) ,(1, 307501200, 3)"
+       ",(1, 323830800, 2) ,(1, 338950800, 3)"
+       ",(1, 354675600, 2) ,(1, 370400400, 3)"
+       ",(1, 386125200, 2) ,(1, 401850000, 3)"
+       ",(1, 417574800, 2) ,(1, 433299600, 3)"
+       ",(1, 449024400, 2) ,(1, 465354000, 3)"
+       ",(1, 481078800, 2) ,(1, 496803600, 3)"
+       ",(1, 512528400, 2) ,(1, 528253200, 3)"
+       ",(1, 543978000, 2) ,(1, 559702800, 3)"
+       ",(1, 575427600, 2) ,(1, 591152400, 3)"
+       ",(1, 606877200, 2) ,(1, 622602000, 3)"
+       ",(1, 638326800, 2) ,(1, 654656400, 3)"
+       ",(1, 670381200, 2) ,(1, 686106000, 3)"
+       ",(1, 701830800, 2) ,(1, 717555600, 3)"
+       ",(1, 733280400, 2) ,(1, 749005200, 3)"
+       ",(1, 764730000, 2) ,(1, 780454800, 3)"
+       ",(1, 796179600, 2) ,(1, 811904400, 3)"
+       ",(1, 828234000, 2) ,(1, 846378000, 3)"
+       ",(1, 859683600, 2) ,(1, 877827600, 3)"
+       ",(1, 891133200, 2) ,(1, 909277200, 3)"
+       ",(1, 922582800, 2) ,(1, 941331600, 3)"
+       ",(1, 954032400, 2) ,(1, 972781200, 3)"
+       ",(1, 985482000, 2) ,(1, 1004230800, 3)"
+       ",(1, 1017536400, 2) ,(1, 1035680400, 3)"
+       ",(1, 1048986000, 2) ,(1, 1067130000, 3)"
+       ",(1, 1080435600, 2) ,(1, 1099184400, 3)"
+       ",(1, 1111885200, 2) ,(1, 1130634000, 3)"
+       ",(1, 1143334800, 2) ,(1, 1162083600, 3)"
+       ",(1, 1174784400, 2) ,(1, 1193533200, 3)"
+       ",(1, 1206838800, 2) ,(1, 1224982800, 3)"
+       ",(1, 1238288400, 2) ,(1, 1256432400, 3)"
+       ",(1, 1269738000, 2) ,(1, 1288486800, 3)"
+       ",(1, 1301187600, 2) ,(1, 1319936400, 3)"
+       ",(1, 1332637200, 2) ,(1, 1351386000, 3)"
+       ",(1, 1364691600, 2) ,(1, 1382835600, 3)"
+       ",(1, 1396141200, 2) ,(1, 1414285200, 3)"
+       ",(1, 1427590800, 2) ,(1, 1445734800, 3)"
+       ",(1, 1459040400, 2) ,(1, 1477789200, 3)"
+       ",(1, 1490490000, 2) ,(1, 1509238800, 3)"
+       ",(1, 1521939600, 2) ,(1, 1540688400, 3)"
+       ",(1, 1553994000, 2) ,(1, 1572138000, 3)"
+       ",(1, 1585443600, 2) ,(1, 1603587600, 3)"
+       ",(1, 1616893200, 2) ,(1, 1635642000, 3)"
+       ",(1, 1648342800, 2) ,(1, 1667091600, 3)"
+       ",(1, 1679792400, 2) ,(1, 1698541200, 3)"
+       ",(1, 1711846800, 2) ,(1, 1729990800, 3)"
+       ",(1, 1743296400, 2) ,(1, 1761440400, 3)"
+       ",(1, 1774746000, 2) ,(1, 1792890000, 3)"
+       ",(1, 1806195600, 2) ,(1, 1824944400, 3)"
+       ",(1, 1837645200, 2) ,(1, 1856394000, 3)"
+       ",(1, 1869094800, 2) ,(1, 1887843600, 3)"
+       ",(1, 1901149200, 2) ,(1, 1919293200, 3)"
+       ",(1, 1932598800, 2) ,(1, 1950742800, 3)"
+       ",(1, 1964048400, 2) ,(1, 1982797200, 3)"
+       ",(1, 1995498000, 2) ,(1, 2014246800, 3)"
+       ",(1, 2026947600, 2) ,(1, 2045696400, 3)"
+       ",(1, 2058397200, 2) ,(1, 2077146000, 3)"
+       ",(1, 2090451600, 2) ,(1, 2108595600, 3)"
+       ",(1, 2121901200, 2) ,(1, 2140045200, 3)"
+       ",(3, -1688265000, 2) ,(3, -1656819048, 1)"
+       ",(3, -1641353448, 2) ,(3, -1627965048, 3)"
+       ",(3, -1618716648, 1) ,(3, -1596429048, 3)"
+       ",(3, -1593829848, 5) ,(3, -1589860800, 4)"
+       ",(3, -1542427200, 5) ,(3, -1539493200, 6)"
+       ",(3, -1525323600, 5) ,(3, -1522728000, 4)"
+       ",(3, -1491188400, 7) ,(3, -1247536800, 4)"
+       ",(3, 354920400, 5) ,(3, 370728000, 4)"
+       ",(3, 386456400, 5) ,(3, 402264000, 4)"
+       ",(3, 417992400, 5) ,(3, 433800000, 4)"
+       ",(3, 449614800, 5) ,(3, 465346800, 8)"
+       ",(3, 481071600, 9) ,(3, 496796400, 8)"
+       ",(3, 512521200, 9) ,(3, 528246000, 8)"
+       ",(3, 543970800, 9) ,(3, 559695600, 8)"
+       ",(3, 575420400, 9) ,(3, 591145200, 8)"
+       ",(3, 606870000, 9) ,(3, 622594800, 8)"
+       ",(3, 638319600, 9) ,(3, 654649200, 8)"
+       ",(3, 670374000, 10) ,(3, 686102400, 11)"
+       ",(3, 695779200, 8) ,(3, 701812800, 5)"
+       ",(3, 717534000, 4) ,(3, 733273200, 9)"
+       ",(3, 748998000, 8) ,(3, 764722800, 9)"
+       ",(3, 780447600, 8) ,(3, 796172400, 9)"
+       ",(3, 811897200, 8) ,(3, 828226800, 9)"
+       ",(3, 846370800, 8) ,(3, 859676400, 9)"
+       ",(3, 877820400, 8) ,(3, 891126000, 9)"
+       ",(3, 909270000, 8) ,(3, 922575600, 9)"
+       ",(3, 941324400, 8) ,(3, 954025200, 9)"
+       ",(3, 972774000, 8) ,(3, 985474800, 9)"
+       ",(3, 1004223600, 8) ,(3, 1017529200, 9)"
+       ",(3, 1035673200, 8) ,(3, 1048978800, 9)"
+       ",(3, 1067122800, 8) ,(3, 1080428400, 9)"
+       ",(3, 1099177200, 8) ,(3, 1111878000, 9)"
+       ",(3, 1130626800, 8) ,(3, 1143327600, 9)"
+       ",(3, 1162076400, 8) ,(3, 1174777200, 9)"
+       ",(3, 1193526000, 8) ,(3, 1206831600, 9)"
+       ",(3, 1224975600, 8) ,(3, 1238281200, 9)"
+       ",(3, 1256425200, 8) ,(3, 1269730800, 9)"
+       ",(3, 1288479600, 8) ,(3, 1301180400, 9)"
+       ",(3, 1319929200, 8) ,(3, 1332630000, 9)"
+       ",(3, 1351378800, 8) ,(3, 1364684400, 9)"
+       ",(3, 1382828400, 8) ,(3, 1396134000, 9)"
+       ",(3, 1414278000, 8) ,(3, 1427583600, 9)"
+       ",(3, 1445727600, 8) ,(3, 1459033200, 9)"
+       ",(3, 1477782000, 8) ,(3, 1490482800, 9)"
+       ",(3, 1509231600, 8) ,(3, 1521932400, 9)"
+       ",(3, 1540681200, 8) ,(3, 1553986800, 9)"
+       ",(3, 1572130800, 8) ,(3, 1585436400, 9)"
+       ",(3, 1603580400, 8) ,(3, 1616886000, 9)"
+       ",(3, 1635634800, 8) ,(3, 1648335600, 9)"
+       ",(3, 1667084400, 8) ,(3, 1679785200, 9)"
+       ",(3, 1698534000, 8) ,(3, 1711839600, 9)"
+       ",(3, 1729983600, 8) ,(3, 1743289200, 9)"
+       ",(3, 1761433200, 8) ,(3, 1774738800, 9)"
+       ",(3, 1792882800, 8) ,(3, 1806188400, 9)"
+       ",(3, 1824937200, 8) ,(3, 1837638000, 9)"
+       ",(3, 1856386800, 8) ,(3, 1869087600, 9)"
+       ",(3, 1887836400, 8) ,(3, 1901142000, 9)"
+       ",(3, 1919286000, 8) ,(3, 1932591600, 9)"
+       ",(3, 1950735600, 8) ,(3, 1964041200, 9)"
+       ",(3, 1982790000, 8) ,(3, 1995490800, 9)"
+       ",(3, 2014239600, 8) ,(3, 2026940400, 9)"
+       ",(3, 2045689200, 8) ,(3, 2058390000, 9)"
+       ",(3, 2077138800, 8) ,(3, 2090444400, 9)"
+       ",(3, 2108588400, 8) ,(3, 2121894000, 9)"
+       ",(3, 2140038000, 8)"
+       ",(4, -1688265000, 2) ,(4, -1656819048, 1)"
+       ",(4, -1641353448, 2) ,(4, -1627965048, 3)"
+       ",(4, -1618716648, 1) ,(4, -1596429048, 3)"
+       ",(4, -1593829848, 5) ,(4, -1589860800, 4)"
+       ",(4, -1542427200, 5) ,(4, -1539493200, 6)"
+       ",(4, -1525323600, 5) ,(4, -1522728000, 4)"
+       ",(4, -1491188400, 7) ,(4, -1247536800, 4)"
+       ",(4, 354920409, 5) ,(4, 370728010, 4)"
+       ",(4, 386456410, 5) ,(4, 402264011, 4)"
+       ",(4, 417992411, 5) ,(4, 433800012, 4)"
+       ",(4, 449614812, 5) ,(4, 465346812, 8)"
+       ",(4, 481071612, 9) ,(4, 496796413, 8)"
+       ",(4, 512521213, 9) ,(4, 528246013, 8)"
+       ",(4, 543970813, 9) ,(4, 559695613, 8)"
+       ",(4, 575420414, 9) ,(4, 591145214, 8)"
+       ",(4, 606870014, 9) ,(4, 622594814, 8)"
+       ",(4, 638319615, 9) ,(4, 654649215, 8)"
+       ",(4, 670374016, 10) ,(4, 686102416, 11)"
+       ",(4, 695779216, 8) ,(4, 701812816, 5)"
+       ",(4, 717534017, 4) ,(4, 733273217, 9)"
+       ",(4, 748998018, 8) ,(4, 764722818, 9)"
+       ",(4, 780447619, 8) ,(4, 796172419, 9)"
+       ",(4, 811897219, 8) ,(4, 828226820, 9)"
+       ",(4, 846370820, 8) ,(4, 859676420, 9)"
+       ",(4, 877820421, 8) ,(4, 891126021, 9)"
+       ",(4, 909270021, 8) ,(4, 922575622, 9)"
+       ",(4, 941324422, 8) ,(4, 954025222, 9)"
+       ",(4, 972774022, 8) ,(4, 985474822, 9)"
+       ",(4, 1004223622, 8) ,(4, 1017529222, 9)"
+       ",(4, 1035673222, 8) ,(4, 1048978822, 9)"
+       ",(4, 1067122822, 8) ,(4, 1080428422, 9)"
+       ",(4, 1099177222, 8) ,(4, 1111878022, 9)"
+       ",(4, 1130626822, 8) ,(4, 1143327622, 9)"
+       ",(4, 1162076422, 8) ,(4, 1174777222, 9)"
+       ",(4, 1193526022, 8) ,(4, 1206831622, 9)"
+       ",(4, 1224975622, 8) ,(4, 1238281222, 9)"
+       ",(4, 1256425222, 8) ,(4, 1269730822, 9)"
+       ",(4, 1288479622, 8) ,(4, 1301180422, 9)"
+       ",(4, 1319929222, 8) ,(4, 1332630022, 9)"
+       ",(4, 1351378822, 8) ,(4, 1364684422, 9)"
+       ",(4, 1382828422, 8) ,(4, 1396134022, 9)"
+       ",(4, 1414278022, 8) ,(4, 1427583622, 9)"
+       ",(4, 1445727622, 8) ,(4, 1459033222, 9)"
+       ",(4, 1477782022, 8) ,(4, 1490482822, 9)"
+       ",(4, 1509231622, 8) ,(4, 1521932422, 9)"
+       ",(4, 1540681222, 8) ,(4, 1553986822, 9)"
+       ",(4, 1572130822, 8) ,(4, 1585436422, 9)"
+       ",(4, 1603580422, 8) ,(4, 1616886022, 9)"
+       ",(4, 1635634822, 8) ,(4, 1648335622, 9)"
+       ",(4, 1667084422, 8) ,(4, 1679785222, 9)"
+       ",(4, 1698534022, 8) ,(4, 1711839622, 9)"
+       ",(4, 1729983622, 8) ,(4, 1743289222, 9)"
+       ",(4, 1761433222, 8) ,(4, 1774738822, 9)"
+       ",(4, 1792882822, 8) ,(4, 1806188422, 9)"
+       ",(4, 1824937222, 8) ,(4, 1837638022, 9)"
+       ",(4, 1856386822, 8) ,(4, 1869087622, 9)"
+       ",(4, 1887836422, 8) ,(4, 1901142022, 9)"
+       ",(4, 1919286022, 8) ,(4, 1932591622, 9)"
+       ",(4, 1950735622, 8) ,(4, 1964041222, 9)"
+       ",(4, 1982790022, 8) ,(4, 1995490822, 9)"
+       ",(4, 2014239622, 8) ,(4, 2026940422, 9)"
+       ",(4, 2045689222, 8) ,(4, 2058390022, 9)"
+       ",(4, 2077138822, 8) ,(4, 2090444422, 9)"
+       ",(4, 2108588422, 8) ,(4, 2121894022, 9)"
+       ",(4, 2140038022, 8);\n");
+    }
+  }
+
+  if (test_sys_file(mdata,"mysql/time_zone_transition_type.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE time_zone_transition_type ("
+      "Time_zone_id int unsigned NOT NULL,"
+      "Transition_type_id int unsigned NOT NULL,"
+      "Offset int signed DEFAULT 0 NOT NULL,"
+      "Is_DST tinyint unsigned DEFAULT 0 NOT NULL,"
+      "Abbreviation char(8) DEFAULT '' NOT NULL,"
+      "PRIMARY KEY TzIdTrTId (Time_zone_id, Transition_type_id)"
+      ") DEFAULT CHARACTER SET latin1 "
+      "comment='Time zone transition types';\n");
+  
+    if (test)
+    {
+      fprintf(out,
+        "INSERT INTO time_zone_transition_type (Time_zone_id,"
+        "Transition_type_id, Offset, Is_DST, Abbreviation) VALUES"
+        "(1, 0, 7200, 1, 'MEST') ,(1, 1, 3600, 0, 'MET')"
+        ",(1, 2, 7200, 1, 'MEST') ,(1, 3, 3600, 0, 'MET')"
+        ",(2, 0, 0, 0, 'UTC')"
+        ",(3, 0, 9000, 0, 'MMT') ,(3, 1, 12648, 1, 'MST')"
+        ",(3, 2, 9048, 0, 'MMT') ,(3, 3, 16248, 1, 'MDST')"
+        ",(3, 4, 10800, 0, 'MSK') ,(3, 5, 14400, 1, 'MSD')"
+        ",(3, 6, 18000, 1, 'MSD') ,(3, 7, 7200, 0, 'EET')"
+        ",(3, 8, 10800, 0, 'MSK') ,(3, 9, 14400, 1, 'MSD')"
+        ",(3, 10, 10800, 1, 'EEST') ,(3, 11, 7200, 0, 'EET')"
+        ",(4, 0, 9000, 0, 'MMT') ,(4, 1, 12648, 1, 'MST')"
+        ",(4, 2, 9048, 0, 'MMT') ,(4, 3, 16248, 1, 'MDST')"
+        ",(4, 4, 10800, 0, 'MSK') ,(4, 5, 14400, 1, 'MSD')"
+        ",(4, 6, 18000, 1, 'MSD') ,(4, 7, 7200, 0, 'EET')"
+        ",(4, 8, 10800, 0, 'MSK') ,(4, 9, 14400, 1, 'MSD')"
+        ",(4, 10, 10800, 1, 'EEST') ,(4, 11, 7200, 0, 'EET');\n");
+    }
+  }
+
+  if (test_sys_file(mdata,"mysql/time_zone_leap_second.frm"))
+  {
+    fprintf(out,
+      "CREATE TABLE time_zone_leap_second ("
+      "Transition_time bigint signed NOT NULL,"
+      "Correction int signed NOT NULL,"
+      "PRIMARY KEY TranTime (Transition_time)"
+      ") DEFAULT CHARACTER SET latin1 "
+      "comment='Leap seconds information for time zones';\n");
+  
+    if (test)
+    {
+      fprintf(out,
+        "INSERT INTO time_zone_leap_second "
+        "(Transition_time, Correction) VALUES "
+        "(78796800, 1) ,(94694401, 2) ,(126230402, 3)"
+        ",(157766403, 4) ,(189302404, 5) ,(220924805, 6)"
+        ",(252460806, 7) ,(283996807, 8) ,(315532808, 9)"
+        ",(362793609, 10) ,(394329610, 11) ,(425865611, 12)"
+        ",(489024012, 13) ,(567993613, 14) ,(631152014, 15)"
+        ",(662688015, 16) ,(709948816, 17) ,(741484817, 18)"
+        ",(773020818, 19) ,(820454419, 20) ,(867715220, 21)"
+        ",(915148821, 22);\n");
+    }
+  }
+
+  return fclose(out);
+}
--- a/mysql-test/my_manage.c
+++ b/mysql-test/my_manage.c
@@ -333,7 +333,6 @@ int spawn(char *path, arg_list_t *al, int join, char *input,
  PROCESS_INFORMATION process_information;
  DWORD exit_code;
  char win_args[1024]= "";
-  char command_line[1024]= "";

  /* Skip the first parameter */
  for (i= 1; i < al->argc; i++)
@@ -724,7 +723,7 @@ int removef(const char *format, ...)
  va_end(ap);
  return remove(path);

-#eldef __WIN__
+#elif __WIN__
  {
    va_list ap;
    char path[FN_REFLEN];
--- a/mysql-test/my_manage.h
+++ b/mysql-test/my_manage.h
@@ -52,6 +52,8 @@ int my_vsnprintf_(char *to, size_t n, const char* value, ...);
 #define TRY_MAX                 5

 #ifdef __WIN__
+#define PATH_MAX _MAX_PATH
+#define NAME_MAX _MAX_FNAME
 #define kill(A,B) TerminateProcess((HANDLE)A,0)
 #define NOT_NEED_PID 0
 #define MASTER_PID   1
@@ -130,4 +132,6 @@ int removef(const char *, ...);
 void get_basedir(char *, char *);
 void remove_empty_file(const char *file_name);

+bool create_system_files(const char *mdata,const char *output_file, bool test);
+
 #endif /* _MY_MANAGE */
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -4,6 +4,7 @@
 # Slightly updated by Monty
 # Cleaned up again by Matt
 # Fixed by Sergei
+# List of failed cases (--force) backported from 4.1 by Joerg
 # :-)

 #++
@@ -490,6 +491,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
     echo "Fatal error: Cannot find embedded server 'mysqltest'" 1>&2
     exit 1
   fi
+   TESTS_BINDIR="$BASEDIR/libmysqld/examples"
 else
   MYSQLD="$VALGRIND $BASEDIR/sql/mysqld"
   if [ -f "$BASEDIR/client/.libs/lt-mysqltest" ] ; then
@@ -499,6 +501,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
   else
     MYSQL_TEST="$BASEDIR/client/mysqltest"
   fi
+   TESTS_BINDIR="$BASEDIR/tests"
 fi
 if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then
   MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump"
@@ -515,7 +518,6 @@ if [ x$SOURCE_DIST = x1 ] ; then
 fi

 CLIENT_BINDIR="$BASEDIR/client"
- TESTS_BINDIR="$BASEDIR/tests"
 MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"
 WAIT_PID="$BASEDIR/extra/mysql_waitpid"
 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"
@@ -948,7 +950,7 @@ start_ndbcluster()
    else
      NDBCLUSTER_EXTRA_OPTS="--small"
    fi
-    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --diskless --initial || exit 1
+    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || exit 1
    NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"
  else
    NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"
@@ -1352,7 +1354,7 @@ run_testcase ()
   result_file="$result_file$RESULT_EXT"
 fi
 if [ "$USE_MANAGER" = 1 ] ; then
-   many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)`
+  many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)`
 fi
 if $EXPR "$tname" '<' "$START_FROM" > /dev/null ; then
   #skip_test $tname
--- a/mysql-test/mysql_test_run_new.c
+++ b/mysql-test/mysql_test_run_new.c
@@ -267,6 +267,8 @@ void install_db(char *datadir)
  snprintf(output, FN_REFLEN, "%s/install.out", datadir);
  snprintf(error, FN_REFLEN, "%s/install.err", datadir);

+  if (create_system_files(datadir,input, TRUE))
+    die("Unable to create init_db.sql.");
  /* args */
  init_args(&al);
  add_arg(&al, mysqld_file);
@@ -307,9 +309,6 @@ void mysql_install_db()
  /* var directory */
  snprintf(temp, FN_REFLEN, "%s/var", mysql_test_dir);

-  /* clean up old direcotry */
-  del_tree(temp);
-
  /* create var directory */
 #ifndef __WIN__
  mkdir(temp, S_IRWXU);
@@ -1435,6 +1434,17 @@ void setup(char *file __attribute__((unused)))

 }

+/*
+  Compare names of testes for right order
+*/
+#ifdef __WIN__
+int compare( const void *arg1, const void *arg2 )
+{
+  return _stricmp( * ( char** ) arg1, * ( char** ) arg2 );
+}
+#endif
+
+
 /******************************************************************************

  main()
--- a/mysql-test/ndb/basic.result
+++ b/mysql-test/ndb/basic.result
@@ -0,0 +1,69 @@
+-- NDB Cluster -- Management Client --
+---------------------------------------------------------------------------
+ NDB Cluster -- Management Client -- Help
+---------------------------------------------------------------------------
+HELP                                   Print help text
+HELP SHOW                              Help for SHOW command
+HELP DEBUG                             Help for debug compiled version
+SHOW                                   Print information about cluster
+START BACKUP [NOWAIT | WAIT STARTED | WAIT COMPLETED]
+                                       Start backup (default WAIT COMPLETED)
+ABORT BACKUP <backup id>               Abort backup
+SHUTDOWN                               Shutdown all processes in cluster
+CLUSTERLOG ON [<severity>] ...         Enable Cluster logging
+CLUSTERLOG OFF [<severity>] ...        Disable Cluster logging
+CLUSTERLOG TOGGLE [<severity>] ...     Toggle severity filter on/off
+CLUSTERLOG INFO                        Print cluster log information
+<id> START                             Start DB node (started with -n)
+<id> RESTART [-n] [-i]                 Restart DB node
+<id> STOP                              Stop DB node
+ENTER SINGLE USER MODE <api-node>      Enter single user mode
+EXIT SINGLE USER MODE                  Exit single user mode
+<id> STATUS                            Print status
+<id> CLUSTERLOG {<category>=<level>}+  Set log level for cluster log
+PURGE STALE SESSIONS                   Reset reserved nodeid's in the mgmt server
+CONNECT [<connectstring>]              Connect to management server (reconnect if already connected)
+QUIT                                   Quit management client
+
+<severity> = ALERT | CRITICAL | ERROR | WARNING | INFO | DEBUG
+<category> = STARTUP | SHUTDOWN | STATISTICS | CHECKPOINT | NODERESTART | CONNECTION | INFO | ERROR | GREP | DEBUG | BACKUP
+<level>    = 0 - 15
+<id>       = ALL | Any database node id
+
+Connected to Management Server at: localhost:1186
+Node 1: started (Version 4.1.8)
+Node 2: started (Version 4.1.8)
+
+Node 1: started (Version 4.1.8)
+
+Node 2: started (Version 4.1.8)
+
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Cluster logging is disabled
+Cluster logging is enabled.
+Cluster logging is disabled
+ALL disabled
+ALL enabled
--- a/mysql-test/ndb/basic.test
+++ b/mysql-test/ndb/basic.test
@@ -0,0 +1,17 @@
+help
+all status
+1 status
+2 status
+all clusterlog connection=8
+all clusterlog startup=7
+all clusterlog checkpoint=7
+all clusterlog noderestart=15
+all clusterlog statistics=7
+all clusterlog error=7
+all clusterlog info=7
+all clusterlog backup=15
+clusterlog off
+clusterlog toggle
+clusterlog off
+clusterlog off all
+clusterlog on all
--- a/mysql-test/ndb/basic_log.result
+++ b/mysql-test/ndb/basic_log.result
--- a/mysql-test/ndb/ndbcluster.sh
+++ b/mysql-test/ndb/ndbcluster.sh
@@ -47,6 +47,7 @@ fi

 pidfile=ndbcluster.pid
 cfgfile=Ndb.cfg
+test_ndb=
 stop_ndb=
 initial_ndb=
 status_ndb=
@@ -59,6 +60,9 @@ ndb_imem=24M

 while test $# -gt 0; do
  case "$1" in
+    --test)
+     test_ndb=1
+     ;;
    --stop)
     stop_ndb=1
     ;;
@@ -67,8 +71,7 @@ while test $# -gt 0; do
     initial_ndb=1
     ;;
    --debug*)
-     f=`echo "$1" | sed -e "s;--debug=;;"`
-     flags_ndb="$flags_ndb $f"
+     flags_ndb="$flags_ndb $1"
     ;;
    --status)
     status_ndb=1
@@ -232,7 +235,7 @@ status_ndbcluster

 status_ndbcluster() {
  # Start management client
-  echo "show" | $exec_mgmtclient
+  $exec_mgmtclient -e show
 }

 stop_default_ndbcluster() {
@@ -241,7 +244,7 @@ stop_default_ndbcluster() {

 exec_mgmtclient="$exec_mgmtclient --try-reconnect=1"

-echo "shutdown" | $exec_mgmtclient 2>&1 | cat > /dev/null
+$exec_mgmtclient -e shutdown 2>&1 | cat > /dev/null

 if [ -f "$fs_ndb/$pidfile" ] ; then
  kill_pids=`cat "$fs_ndb/$pidfile"`
@@ -276,6 +279,44 @@ if [ -f "$fs_ndb/$pidfile" ] ; then
 fi
 }

+initialize_ndb_test ()
+{
+  fs_result=$fs_ndb/r
+  rm -rf $fs_result
+  mkdir $fs_result
+  echo ------------------
+  echo starting ndb tests
+  echo ------------------
+}
+
+do_ndb_test ()
+{
+  test_name=$1
+
+  clusterlog=$fs_ndb/ndb_3_cluster.log
+
+  test_log_result=$fs_result/${test_name}_log.result
+  test_log_reject=$fs_result/${test_name}_log.reject
+  test_result=$fs_result/${test_name}.result
+  test_reject=$fs_result/${test_name}.reject
+
+  clean_log='s/.*\[MgmSrvr\]//'
+
+  cat $clusterlog ndb/${test_name}_log.result | sed -e $clean_log > $test_log_result
+
+  cp ndb/${test_name}.result $test_result
+
+  cat ndb/${test_name}.test | $exec_mgmtclient > $test_reject
+  cat $clusterlog | sed -e $clean_log > $test_log_reject
+
+  t="pass"
+  diff -C 5 $test_result $test_reject || t="fail"
+  printf "ndb_mgm output    %20s [%s]\n" $test_name $t
+  t="pass"
+  diff -C 5 $test_log_result $test_log_reject || t="fail"
+  printf "clusterlog output %20s [%s]\n" $test_name $t
+}
+
 if [ $status_ndb ] ; then
  status_ndbcluster
  exit 0
@@ -287,4 +328,15 @@ else
  start_default_ndbcluster
 fi

+if [ $test_ndb ] ; then
+  initialize_ndb_test
+  all_tests=`ls ndb/*.test | sed "s#ndb/##" | sed "s#.test##"`  
+  for a in $all_tests ; do
+    do_ndb_test $a
+  done
+  echo ------------------
+  echo shutting down cluster
+  stop_default_ndbcluster
+fi
+
 exit 0
--- a/mysql-test/ndb/restart.result
+++ b/mysql-test/ndb/restart.result
@@ -0,0 +1,16 @@
+-- NDB Cluster -- Management Client --
+Connected to Management Server at: localhost:1186
+ALL disabled
+Cluster logging is enabled.
+ALERT enabled
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Node 1 is being restarted.
+
+Executing CLUSTERLOG on node 1 OK!
+Executing CLUSTERLOG on node 2 OK!
+
+Node 1 is being restarted.
+
+ALL enabled
--- a/mysql-test/ndb/restart.test
+++ b/mysql-test/ndb/restart.test
@@ -0,0 +1,12 @@
+clusterlog off all
+clusterlog on
+clusterlog on alert
+all clusterlog connection=0
+sleep 1
+1 restart
+sleep 5
+all clusterlog connection=8
+sleep 1
+1 restart
+sleep 5
+clusterlog on all
--- a/mysql-test/ndb/restart_log.result
+++ b/mysql-test/ndb/restart_log.result
@@ -0,0 +1,20 @@
+ ALERT    -- Node 2: Network partitioning - arbitration required
+ ALERT    -- Node 2: Arbitration won - positive reply from node 3
+ ALERT    -- Node 2: Node 1 has failed. The Node state at failure was 0
+ ALERT    -- Node 2: Node failure of 1 DBLQH completed
+ ALERT    -- Node 2: Node failure of 1 DBDICT completed
+ ALERT    -- Node 2: Node failure of 1 DBDIH completed
+ ALERT    -- Node 2: Node failure of 1 DBTC completed
+ ALERT    -- Node 2: Node 2 completed failure of Node 1
+ ALERT    -- Node 2: All nodes completed failure of Node 1
+ ALERT    -- Node 3: Node 1 Disconnected
+ ALERT    -- Node 2: Node 1 Disconnected
+ ALERT    -- Node 2: Network partitioning - arbitration required
+ ALERT    -- Node 2: Arbitration won - positive reply from node 3
+ ALERT    -- Node 2: Node 1 has failed. The Node state at failure was 0
+ ALERT    -- Node 2: Node failure of 1 DBLQH completed
+ ALERT    -- Node 2: Node failure of 1 DBDICT completed
+ ALERT    -- Node 2: Node failure of 1 DBDIH completed
+ ALERT    -- Node 2: Node failure of 1 DBTC completed
+ ALERT    -- Node 2: Node 2 completed failure of Node 1
+ ALERT    -- Node 2: All nodes completed failure of Node 1
--- a/mysql-test/r/count_distinct2.result
+++ b/mysql-test/r/count_distinct2.result
@@ -116,7 +116,7 @@ count(distinct n)
 5000
 show status like 'Created_tmp_disk_tables';
 Variable_name	Value
-Created_tmp_disk_tables	1
+Created_tmp_disk_tables	2
 drop table t1;
 create table t1 (s text);
 flush status;
@@ -125,5 +125,5 @@ count(distinct s)
 5000
 show status like 'Created_tmp_disk_tables';
 Variable_name	Value
-Created_tmp_disk_tables	1
+Created_tmp_disk_tables	2
 drop table t1;
--- a/mysql-test/r/ctype_big5.result
+++ b/mysql-test/r/ctype_big5.result
@@ -10,7 +10,7 @@ USE d1;
 CREATE TABLE t1 (c CHAR(10), KEY(c));
 SHOW FULL COLUMNS FROM t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-c	char(10)	big5_chinese_ci	YES	MUL	NULL		select,insert,update,references	
+c	char(10)	big5_chinese_ci	YES	MUL	NULL			
 INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');
 SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';
 want3results
@@ -21,7 +21,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));
 SHOW FULL COLUMNS FROM t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-c1	varchar(15)	big5_chinese_ci	YES	MUL	NULL		select,insert,update,references	
+c1	varchar(15)	big5_chinese_ci	YES	MUL	NULL			
 INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');
 SELECT c1 as want3results from t1 where c1 like 'l%';
 want3results
--- a/mysql-test/r/ctype_big5.result.es
+++ b/mysql-test/r/ctype_big5.result.es
@@ -1,58 +0,0 @@
-drop table if exists t1;
-SET @test_character_set= 'big5';
-SET @test_collation= 'big5_chinese_ci';
-SET @safe_character_set_server= @@character_set_server;
-SET @safe_collation_server= @@collation_server;
-SET character_set_server= @test_character_set;
-SET collation_server= @test_collation;
-CREATE DATABASE d1;
-USE d1;
-CREATE TABLE t1 (c CHAR(10), KEY(c));
-SHOW FULL COLUMNS FROM t1;
-Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-c	char(10)	big5_chinese_ci	YES	MUL	NULL			
-INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');
-SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';
-want3results
-aaa
-aaaa
-aaaaa
-DROP TABLE t1;
-CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));
-SHOW FULL COLUMNS FROM t1;
-Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-c1	varchar(15)	big5_chinese_ci	YES	MUL	NULL			
-INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');
-SELECT c1 as want3results from t1 where c1 like 'l%';
-want3results
-location
-loberge
-lotre
-SELECT c1 as want3results from t1 where c1 like 'lo%';
-want3results
-location
-loberge
-lotre
-SELECT c1 as want1result  from t1 where c1 like 'loc%';
-want1result
-location
-SELECT c1 as want1result  from t1 where c1 like 'loca%';
-want1result
-location
-SELECT c1 as want1result  from t1 where c1 like 'locat%';
-want1result
-location
-SELECT c1 as want1result  from t1 where c1 like 'locati%';
-want1result
-location
-SELECT c1 as want1result  from t1 where c1 like 'locatio%';
-want1result
-location
-SELECT c1 as want1result  from t1 where c1 like 'location%';
-want1result
-location
-DROP TABLE t1;
-DROP DATABASE d1;
-USE test;
-SET character_set_server= @safe_character_set_server;
-SET collation_server= @safe_collation_server;
--- a/mysql-test/r/ctype_create.result
+++ b/mysql-test/r/ctype_create.result
@@ -63,3 +63,12 @@ ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET
 create database d1 default character set latin1 collate latin2_bin;
 ERROR 42000: COLLATION 'latin2_bin' is not valid for CHARACTER SET 'latin1'
 DROP DATABASE mysqltest1;
+CREATE DATABASE mysqltest2 DEFAULT CHARACTER SET latin7;
+use mysqltest2;
+ALTER DATABASE DEFAULT CHARACTER SET latin2;
+show create database mysqltest2;
+Database	Create Database
+mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
+drop database mysqltest2;
+ALTER DATABASE DEFAULT CHARACTER SET latin2;
+ERROR 3D000: No database selected
--- a/mysql-test/r/ctype_recoding.result.es
+++ b/mysql-test/r/ctype_recoding.result.es
@@ -1,242 +0,0 @@
-SET CHARACTER SET koi8r;
-DROP TABLE IF EXISTS <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, t1, t2;
-SET CHARACTER SET koi8r;
-CREATE TABLE t1 (a CHAR(10) CHARACTER SET cp1251) SELECT _koi8r'<27><><EFBFBD><EFBFBD><EFBFBD>' AS a;
-CREATE TABLE t2 (a CHAR(10) CHARACTER SET utf8);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` char(10) character set cp1251 default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SELECT a FROM t1;
-a
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-SELECT HEX(a) FROM t1;
-HEX(a)
-EFF0EEE1E0
-INSERT t2 SELECT * FROM t1;
-SELECT HEX(a) FROM t2;
-HEX(a)
-D0BFD180D0BED0B1D0B0
-DROP TABLE t1, t2;
-CREATE TABLE t1 (description text character set cp1250 NOT NULL);
-INSERT INTO t1 (description) VALUES (_latin2'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasssssssssssaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddde');
-SELECT description FROM t1;
-description
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasssssssssssaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddde
-DROP TABLE t1;
-CREATE TABLE t1 (a TEXT CHARACTER SET cp1251) SELECT _koi8r'<27><><EFBFBD><EFBFBD><EFBFBD>' AS a;
-CREATE TABLE t2 (a TEXT CHARACTER SET utf8);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` text character set cp1251
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SELECT HEX(a) FROM t1;
-HEX(a)
-EFF0EEE1E0
-INSERT t2 SELECT * FROM t1;
-SELECT HEX(a) FROM t2;
-HEX(a)
-D0BFD180D0BED0B1D0B0
-DROP TABLE t1, t2;
-CREATE TABLE `<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`
-(
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD> CHAR(32) CHARACTER SET koi8r NOT NULL COMMENT "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-) COMMENT "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
-SHOW TABLES;
-Tables_in_test
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-SHOW CREATE TABLE <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
-Table	Create Table
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
-  `<EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(32) character set koi8r NOT NULL default '' COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
-SHOW FIELDS FROM <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
-Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(32)				
-SET CHARACTER SET cp1251;
-SHOW TABLES;
-Tables_in_test
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-SHOW CREATE TABLE <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
-Table	Create Table
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	CREATE TABLE `<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (
-  `<EFBFBD><EFBFBD><EFBFBD><EFBFBD>` char(32) character set koi8r NOT NULL default '' COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
-SHOW FIELDS FROM <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
-Field	Type	Null	Key	Default	Extra
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>	char(32)				
-SET CHARACTER SET utf8;
-SHOW TABLES;
-Tables_in_test
-таблица
-SHOW CREATE TABLE таблица;
-Table	Create Table
-таблица	CREATE TABLE `таблица` (
-  `поле` char(32) character set koi8r NOT NULL default '' COMMENT 'комментарий поля'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='комментарий таблицы'
-SHOW FIELDS FROM таблица;
-Field	Type	Null	Key	Default	Extra
-поле	char(32)				
-SET CHARACTER SET koi8r;
-DROP TABLE <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
-SET CHARACTER SET default;
-SET NAMES UTF8;
-CREATE TABLE t1 (t text) DEFAULT CHARSET UTF8;
-INSERT INTO t1 (t) VALUES ('x');
-SELECT 1 FROM t1 WHERE CONCAT(_latin1'x') = t;
-1
-1
-DROP TABLE t1;
-SET CHARACTER SET koi8r;
-CREATE DATABASE <EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
-USE <EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
-SHOW TABLES;
-Tables_in_тест
-SHOW TABLES IN <EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
-Tables_in_тест
-SET CHARACTER SET cp1251;
-SHOW TABLES;
-Tables_in_тест
-SHOW TABLES IN <EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
-Tables_in_тест
-SET CHARACTER SET koi8r;
-DROP DATABASE <EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
-SET NAMES koi8r;
-SELECT hex('<27><><EFBFBD><EFBFBD>');
-hex('тест')
-D4C5D3D4
-SET character_set_connection=cp1251;
-SELECT hex('<27><><EFBFBD><EFBFBD>');
-hex('тест')
-F2E5F1F2
-USE test;
-SET NAMES binary;
-CREATE TABLE `тест` (`тест` int);
-SHOW CREATE TABLE `тест`;
-Table	Create Table
-тест	CREATE TABLE `тест` (
-  `тест` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SET NAMES utf8;
-SHOW CREATE TABLE `тест`;
-Table	Create Table
-тест	CREATE TABLE `тест` (
-  `тест` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-DROP TABLE `тест`;
-SET NAMES binary;
-SET character_set_connection=utf8;
-SELECT 'тест' as s;
-s
-тест
-SET NAMES utf8;
-SET character_set_connection=binary;
-SELECT 'тест' as s;
-s
-тест
-SET NAMES latin1;
-CREATE TABLE t1 (`<EFBFBD>` CHAR(128) DEFAULT '<27>', `<EFBFBD>1` ENUM('<27>1','<27>2') DEFAULT '<27>2');
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `<EFBFBD>` char(128) default '<27>',
-  `<EFBFBD>1` enum('<27>1','<27>2') default '<27>2'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SHOW COLUMNS FROM t1;
-Field	Type	Null	Key	Default	Extra
-<EFBFBD>	char(128)	YES		<EFBFBD>	
-<EFBFBD>1	enum('<27>1','<27>2')	YES		<EFBFBD>2	
-SET NAMES binary;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `ä` char(128) default 'ä',
-  `ä1` enum('ä1','ä2') default 'ä2'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SHOW COLUMNS FROM t1;
-Field	Type	Null	Key	Default	Extra
-ä	char(128)	YES		ä	
-ä1	enum('ä1','ä2')	YES		ä2	
-DROP TABLE t1;
-SET NAMES binary;
-CREATE TABLE `good<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (a int);
-ERROR HY000: Invalid utf8 character string: '<27><><EFBFBD><EFBFBD><EFBFBD>'
-SET NAMES utf8;
-CREATE TABLE `good<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>` (a int);
-ERROR HY000: Invalid utf8 character string: '<27><><EFBFBD><EFBFBD><EFBFBD>` (a int)'
-set names latin1;
-create table t1 (a char(10) character set koi8r, b text character set koi8r);
-insert into t1 values ('test','test');
-insert into t1 values ('<27><><EFBFBD><EFBFBD>','<27><><EFBFBD><EFBFBD>');
-Warnings:
-Warning	1265	Data truncated for column 'a' at row 1
-Warning	1265	Data truncated for column 'b' at row 1
-drop table t1;
-set names koi8r;
-create table t1 (a char(10) character set cp1251);
-insert into t1 values (_koi8r'<27><><EFBFBD><EFBFBD>');
-select * from t1 where a=_koi8r'<27><><EFBFBD><EFBFBD>';
-a
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-select * from t1 where a=concat(_koi8r'<27><><EFBFBD><EFBFBD>');
-ERROR HY000: Illegal mix of collations (cp1251_general_ci,IMPLICIT) and (koi8r_general_ci,COERCIBLE) for operation '='
-select * from t1 where a=_latin1'<27><><EFBFBD><EFBFBD>';
-ERROR HY000: Illegal mix of collations (cp1251_general_ci,IMPLICIT) and (latin1_swedish_ci,COERCIBLE) for operation '='
-drop table t1;
-set names latin1;
-set names koi8r;
-create table t1 (c1 char(10) character set cp1251);
-insert into t1 values ('<27>');
-select c1 from t1 where c1 between '<27>' and '<27>';
-c1
-<EFBFBD>
-select ifnull(c1,'<27>'), ifnull(null,c1) from t1;
-ifnull(c1,'ъ')	ifnull(null,c1)
-<EFBFBD>	<EFBFBD>
-select if(1,c1,'<27>'), if(0,c1,'<27>') from t1;
-if(1,c1,'Ж')	if(0,c1,'Ж')
-<EFBFBD>	<EFBFBD>
-select coalesce('<27>',c1), coalesce(null,c1) from t1;
-coalesce('Ж',c1)	coalesce(null,c1)
-<EFBFBD>	<EFBFBD>
-select least(c1,'<27>'), greatest(c1,'<27>') from t1;
-least(c1,'Ж')	greatest(c1,'Ж')
-<EFBFBD>	<EFBFBD>
-select locate(c1,'<27>'), locate('<27>',c1) from t1;
-locate(c1,'ъ')	locate('ъ',c1)
-1	1
-select field(c1,'<27>'),field('<27>',c1) from t1;
-field(c1,'ъ')	field('ъ',c1)
-1	1
-select concat(c1,'<27>'), concat('<27>',c1) from t1;
-concat(c1,'Ж')	concat('Ж',c1)
-<EFBFBD><EFBFBD>	<EFBFBD><EFBFBD>
-select concat_ws(c1,'<27>','<27>'), concat_ws('<27>',c1,'<27>') from t1;
-concat_ws(c1,'Ж','ъ')	concat_ws('Ж',c1,'ъ')
-<EFBFBD><EFBFBD><EFBFBD>	<EFBFBD><EFBFBD><EFBFBD>
-select replace(c1,'<27>','<27>'), replace('<27>',c1,'<27>') from t1;
-replace(c1,'ъ','Ж')	replace('ъ',c1,'Ж')
-<EFBFBD>	<EFBFBD>
-select substring_index(c1,'<27><><EFBFBD><EFBFBD>',2) from t1;
-substring_index(c1,'ЖЖъъ',2)
-<EFBFBD>
-select elt(1,c1,'<27>'),elt(1,'<27>',c1) from t1;
-elt(1,c1,'Ж')	elt(1,'Ж',c1)
-<EFBFBD>	<EFBFBD>
-select make_set(3,c1,'<27>'), make_set(3,'<27>',c1) from t1;
-make_set(3,c1,'Ж')	make_set(3,'Ж',c1)
-<EFBFBD>,<EFBFBD>	<EFBFBD>,<EFBFBD>
-select insert(c1,1,2,'<27>'),insert('<27>',1,2,c1) from t1;
-insert(c1,1,2,'Ж')	insert('Ж',1,2,c1)
-<EFBFBD>	<EFBFBD>
-select trim(c1 from '<27>'),trim('<27>' from c1) from t1;
-trim(c1 from 'ъ')	trim('ъ' from c1)
-	
-select lpad(c1,3,'<27>'), lpad('<27>',3,c1) from t1;
-lpad(c1,3,'Ж')	lpad('Ж',3,c1)
-<EFBFBD><EFBFBD><EFBFBD>	<EFBFBD><EFBFBD><EFBFBD>
-select rpad(c1,3,'<27>'), rpad('<27>',3,c1) from t1;
-rpad(c1,3,'Ж')	rpad('Ж',3,c1)
-<EFBFBD><EFBFBD><EFBFBD>	<EFBFBD><EFBFBD><EFBFBD>
--- a/mysql-test/r/ctype_uca.result
+++ b/mysql-test/r/ctype_uca.result
@@ -2329,7 +2329,7 @@ USE d1;
 CREATE TABLE t1 (c CHAR(10), KEY(c));
 SHOW FULL COLUMNS FROM t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-c	char(10)	utf8_swedish_ci	YES	MUL	NULL		select,insert,update,references	
+c	char(10)	utf8_swedish_ci	YES	MUL	NULL			
 INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');
 SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';
 want3results
@@ -2340,7 +2340,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));
 SHOW FULL COLUMNS FROM t1;
 Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
-c1	varchar(15)	utf8_swedish_ci	YES	MUL	NULL		select,insert,update,references	
+c1	varchar(15)	utf8_swedish_ci	YES	MUL	NULL			
 INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');
 SELECT c1 as want3results from t1 where c1 like 'l%';
 want3results
@@ -2375,3 +2375,14 @@ DROP DATABASE d1;
 USE test;
 SET character_set_server= @safe_character_set_server;
 SET collation_server= @safe_collation_server;
+create table t1 (a varchar(1)) character set utf8 collate utf8_estonian_ci;
+insert into t1 values ('A'),('B'),('C'),('a'),('b'),('c');
+select a, a regexp '[a]' from t1 order by binary a;
+a	a regexp '[a]'
+A	1
+B	0
+C	0
+a	1
+b	0
+c	0
+drop table t1;
--- a/mysql-test/r/ctype_uca.result.es
+++ b/mysql-test/r/ctype_uca.result.es
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@@ -535,3 +535,59 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0;
 insert into t2 values (@v);
 drop table t2;
+set names latin1;
+create table t1 (a enum('x','y','z') character set ucs2);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` enum('x','y','z') character set ucs2 default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+insert into t1 values ('x');
+insert into t1 values ('y');
+insert into t1 values ('z');
+select a, hex(a) from t1 order by a;
+a	hex(a)
+x	0078
+y	0079
+z	007A
+alter table t1 change a a enum('x','y','z','d','e','<27>','<27>','<27>') character set ucs2;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` enum('x','y','z','d','e','<27>','<27>','<27>') character set ucs2 default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+insert into t1 values ('D');
+insert into t1 values ('E ');
+insert into t1 values ('<27>');
+insert into t1 values ('<27>');
+insert into t1 values ('<27>');
+select a, hex(a) from t1 order by a;
+a	hex(a)
+x	0078
+y	0079
+z	007A
+d	0064
+e	0065
+<EFBFBD>	00E4
+<EFBFBD>	00F6
+<EFBFBD>	00FC
+drop table t1;
+create table t1 (a set ('x','y','z','<27>','<27>','<27>') character set ucs2);
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` set('x','y','z','<27>','<27>','<27>') character set ucs2 default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+insert into t1 values ('x');
+insert into t1 values ('y');
+insert into t1 values ('z');
+insert into t1 values ('x,y');
+insert into t1 values ('x,y,z,<2C>,<2C>,<2C>');
+select a, hex(a) from t1 order by a;
+a	hex(a)
+x	0078
+y	0079
+x,y	0078002C0079
+z	007A
+x,y,z,<2C>,<2C>,<2C>	0078002C0079002C007A002C00E4002C00F6002C00FC
+drop table t1;
--- a/mysql-test/r/ctype_ujis.result
+++ b/mysql-test/r/ctype_ujis.result
--- a/mysql-test/r/flush_block_commit.result
+++ b/mysql-test/r/flush_block_commit.result
@@ -28,4 +28,12 @@ commit;
 unlock tables;
 flush tables with read lock;
 unlock tables;
+begin;
+select * from t1;
+a
+1
+10
+show create database test;
+Database	Create Database
+test	CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET latin1 */
 drop table t1;
--- a/mysql-test/r/func_concat.result
+++ b/mysql-test/r/func_concat.result
@@ -32,3 +32,39 @@ select * from t1 where concat(A,C,B,D) = 'AAAA2003-03-011051';
 a	b	c	d
 AAAA	105	2003-03-01	1
 drop table t1;
+select 'a' union select concat('a', -4);
+a
+a
+a-4
+select 'a' union select concat('a', -4.5);
+a
+a
+a-4.5
+select 'a' union select concat('a', -(4 + 1));
+a
+a
+a-5
+select 'a' union select concat('a', 4 - 5);
+a
+a
+a-1
+select 'a' union select concat('a', -'3');
+a
+a
+a-3
+select 'a' union select concat('a', -concat('3',4));
+a
+a
+a-34
+select 'a' union select concat('a', -0);
+a
+a
+a0
+select 'a' union select concat('a', -0.0);
+a
+a
+a-0.0
+select 'a' union select concat('a', -0.0000);
+a
+a
+a-0.0000
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -685,3 +685,9 @@ drop table t1;
 select left(1234, 3) + 0;
 left(1234, 3) + 0
 123
+create table t1 (a int not null primary key, b varchar(40), c datetime);
+insert into t1 (a,b,c) values (1,'Tom','2004-12-10 12:13:14'),(2,'ball games','2004-12-10 12:13:14'), (3,'Basil','2004-12-10 12:13:14'), (4,'Dean','2004-12-10 12:13:14'),(5,'Ellis','2004-12-10 12:13:14'), (6,'Serg','2004-12-10 12:13:14'), (7,'Sergei','2004-12-10 12:13:14'),(8,'Georg','2004-12-10 12:13:14'),(9,'Salle','2004-12-10 12:13:14'),(10,'Sinisa','2004-12-10 12:13:14');
+select count(*) as total, left(c,10) as reg from t1 group by reg order by reg desc limit 0,12;
+total	reg
+10	2004-12-10
+drop table t1;
--- a/mysql-test/r/func_test.result.es
+++ b/mysql-test/r/func_test.result.es
@@ -1,185 +0,0 @@
-drop table if exists t1,t2;
-select 0=0,1>0,1>=1,1<0,1<=0,1!=0,strcmp("abc","abcd"),strcmp("b","a"),strcmp("a","a") ;
-0=0	1>0	1>=1	1<0	1<=0	1!=0	strcmp("abc","abcd")	strcmp("b","a")	strcmp("a","a")
-1	1	1	0	0	1	-1	1	0
-select "a"<"b","a"<="b","b">="a","b">"a","a"="A","a"<>"b";
-"a"<"b"	"a"<="b"	"b">="a"	"b">"a"	"a"="A"	"a"<>"b"
-1	1	1	1	1	1
-select "a "="A", "A "="a", "a  " <= "A b";
-"a "="A"	"A "="a"	"a  " <= "A b"
-1	1	1
-select "abc" like "a%", "abc" not like "%d%", "a%" like "a\%","abc%" like "a%\%","abcd" like "a%b_%d", "a" like "%%a","abcde" like "a%_e","abc" like "abc%";
-"abc" like "a%"	"abc" not like "%d%"	"a%" like "a\%"	"abc%" like "a%\%"	"abcd" like "a%b_%d"	"a" like "%%a"	"abcde" like "a%_e"	"abc" like "abc%"
-1	1	1	1	1	1	1	1
-select "a" like "%%b","a" like "%%ab","ab" like "a\%", "ab" like "_", "ab" like "ab_", "abc" like "%_d", "abc" like "abc%d";
-"a" like "%%b"	"a" like "%%ab"	"ab" like "a\%"	"ab" like "_"	"ab" like "ab_"	"abc" like "%_d"	"abc" like "abc%d"
-0	0	0	0	0	0	0
-select '?' like '|%', '?' like '|%' ESCAPE '|', '%' like '|%', '%' like '|%' ESCAPE '|', '%' like '%';
-'?' like '|%'	'?' like '|%' ESCAPE '|'	'%' like '|%'	'%' like '|%' ESCAPE '|'	'%' like '%'
-0	0	0	1	1
-select 'abc' like '%c','abcabc' like '%c',  "ab" like "", "ab" like "a", "ab" like "ab";
-'abc' like '%c'	'abcabc' like '%c'	"ab" like ""	"ab" like "a"	"ab" like "ab"
-1	1	0	0	1
-select "Det h<>r <20>r svenska" regexp "h[[:alpha:]]+r", "aba" regexp "^(a|b)*$";
-"Det här är svenska" regexp "h[[:alpha:]]+r"	"aba" regexp "^(a|b)*$"
-1	1
-select "aba" regexp concat("^","a");
-"aba" regexp concat("^","a")
-1
-select !0,NOT 0=1,!(0=0),1 AND 1,1 && 0,0 OR 1,1 || NULL, 1=1 or 1=1 and 1=0;
-!0	NOT 0=1	!(0=0)	1 AND 1	1 && 0	0 OR 1	1 || NULL	1=1 or 1=1 and 1=0
-1	1	0	1	0	1	1	1
-select 2 between 1 and 3, "monty" between "max" and "my",2=2 and "monty" between "max" and "my" and 3=3;
-2 between 1 and 3	"monty" between "max" and "my"	2=2 and "monty" between "max" and "my" and 3=3
-1	1	1
-select 'b' between 'a' and 'c', 'B' between 'a' and 'c';
-'b' between 'a' and 'c'	'B' between 'a' and 'c'
-1	1
-select 2 in (3,2,5,9,5,1),"monty" in ("david","monty","allan"), 1.2 in (1.4,1.2,1.0);
-2 in (3,2,5,9,5,1)	"monty" in ("david","monty","allan")	1.2 in (1.4,1.2,1.0)
-1	1	1
-select -1.49 or -1.49,0.6 or 0.6;
-1.49 or -1.49	0.6 or 0.6
-1	1
-select 3 ^ 11, 1 ^ 1, 1 ^ 0, 1 ^ NULL, NULL ^ 1;
-3 ^ 11	1 ^ 1	1 ^ 0	1 ^ NULL	NULL ^ 1
-8	0	1	NULL	NULL
-explain extended select 3 ^ 11, 1 ^ 1, 1 ^ 0, 1 ^ NULL, NULL ^ 1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-Warnings:
-Note	1003	select (3 ^ 11) AS `3 ^ 11`,(1 ^ 1) AS `1 ^ 1`,(1 ^ 0) AS `1 ^ 0`,(1 ^ NULL) AS `1 ^ NULL`,(NULL ^ 1) AS `NULL ^ 1`
-select 1 XOR 1, 1 XOR 0, 0 XOR 1, 0 XOR 0, NULL XOR 1, 1 XOR NULL, 0 XOR NULL;
-1 XOR 1	1 XOR 0	0 XOR 1	0 XOR 0	NULL XOR 1	1 XOR NULL	0 XOR NULL
-0	1	1	0	NULL	NULL	NULL
-select 1 like 2 xor 2 like 1;
-1 like 2 xor 2 like 1
-0
-select 10 % 7, 10 mod 7, 10 div 3;
-10 % 7	10 mod 7	10 div 3
-3	3	3
-explain extended select 10 % 7, 10 mod 7, 10 div 3;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-Warnings:
-Note	1003	select (10 % 7) AS `10 % 7`,(10 % 7) AS `10 mod 7`,(10 DIV 3) AS `10 div 3`
-select (1 << 64)-1, ((1 << 64)-1) DIV 1, ((1 << 64)-1) DIV 2;
-(1 << 64)-1	((1 << 64)-1) DIV 1	((1 << 64)-1) DIV 2
-18446744073709551615	18446744073709551615	9223372036854775807
-explain extended select (1 << 64)-1, ((1 << 64)-1) DIV 1, ((1 << 64)-1) DIV 2;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-Warnings:
-Note	1003	select ((1 << 64) - 1) AS `(1 << 64)-1`,(((1 << 64) - 1) DIV 1) AS `((1 << 64)-1) DIV 1`,(((1 << 64) - 1) DIV 2) AS `((1 << 64)-1) DIV 2`
-create table t1 (a int);
-insert t1 values (1);
-select * from t1 where 1 xor 1;
-a
-explain extended select * from t1 where 1 xor 1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
-Warnings:
-Note	1003	select test.t1.a AS `a` from test.t1 where (1 xor 1)
-select - a from t1;
- a
-1
-explain extended select - a from t1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	system	NULL	NULL	NULL	NULL	1	
-Warnings:
-Note	1003	select -(test.t1.a) AS `- a` from test.t1
-drop table t1;
-select 5 between 0 and 10 between 0 and 1,(5 between 0 and 10) between 0 and 1;
-5 between 0 and 10 between 0 and 1	(5 between 0 and 10) between 0 and 1
-0	1
-select 1 and 2 between 2 and 10, 2 between 2 and 10 and 1;
-1 and 2 between 2 and 10	2 between 2 and 10 and 1
-1	1
-select 1 and 0 or 2, 2 or 1 and 0;
-1 and 0 or 2	2 or 1 and 0
-1	1
-select _koi8r'a' = _koi8r'A';
-_koi8r'a' = _koi8r'A'
-1
-select _koi8r'a' = _koi8r'A' COLLATE koi8r_general_ci;
-_koi8r'a' = _koi8r'A' COLLATE koi8r_general_ci
-1
-explain extended select _koi8r'a' = _koi8r'A' COLLATE koi8r_general_ci;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-Warnings:
-Note	1003	select (_koi8r'a' = (_koi8r'A' collate _latin1'koi8r_general_ci')) AS `_koi8r'a' = _koi8r'A' COLLATE koi8r_general_ci`
-select _koi8r'a' = _koi8r'A' COLLATE koi8r_bin;
-_koi8r'a' = _koi8r'A' COLLATE koi8r_bin
-0
-select _koi8r'a' COLLATE koi8r_general_ci = _koi8r'A';
-_koi8r'a' COLLATE koi8r_general_ci = _koi8r'A'
-1
-select _koi8r'a' COLLATE koi8r_bin = _koi8r'A';
-_koi8r'a' COLLATE koi8r_bin = _koi8r'A'
-0
-select _koi8r'a' COLLATE koi8r_bin = _koi8r'A' COLLATE koi8r_general_ci;
-ERROR HY000: Illegal mix of collations (koi8r_bin,EXPLICIT) and (koi8r_general_ci,EXPLICIT) for operation '='
-select _koi8r'a' = _latin1'A';
-ERROR HY000: Illegal mix of collations (koi8r_general_ci,COERCIBLE) and (latin1_swedish_ci,COERCIBLE) for operation '='
-select strcmp(_koi8r'a', _koi8r'A');
-strcmp(_koi8r'a', _koi8r'A')
-0
-select strcmp(_koi8r'a', _koi8r'A' COLLATE koi8r_general_ci);
-strcmp(_koi8r'a', _koi8r'A' COLLATE koi8r_general_ci)
-0
-select strcmp(_koi8r'a', _koi8r'A' COLLATE koi8r_bin);
-strcmp(_koi8r'a', _koi8r'A' COLLATE koi8r_bin)
-1
-select strcmp(_koi8r'a' COLLATE koi8r_general_ci, _koi8r'A');
-strcmp(_koi8r'a' COLLATE koi8r_general_ci, _koi8r'A')
-0
-select strcmp(_koi8r'a' COLLATE koi8r_bin, _koi8r'A');
-strcmp(_koi8r'a' COLLATE koi8r_bin, _koi8r'A')
-1
-select strcmp(_koi8r'a' COLLATE koi8r_general_ci, _koi8r'A' COLLATE koi8r_bin);
-ERROR HY000: Illegal mix of collations (koi8r_general_ci,EXPLICIT) and (koi8r_bin,EXPLICIT) for operation 'strcmp'
-select strcmp(_koi8r'a', _latin1'A');
-ERROR HY000: Illegal mix of collations (koi8r_general_ci,COERCIBLE) and (latin1_swedish_ci,COERCIBLE) for operation 'strcmp'
-select _koi8r'a' LIKE _koi8r'A';
-_koi8r'a' LIKE _koi8r'A'
-1
-select _koi8r'a' LIKE _koi8r'A' COLLATE koi8r_general_ci;
-_koi8r'a' LIKE _koi8r'A' COLLATE koi8r_general_ci
-1
-select _koi8r'a' LIKE _koi8r'A' COLLATE koi8r_bin;
-_koi8r'a' LIKE _koi8r'A' COLLATE koi8r_bin
-0
-select _koi8r'a' COLLATE koi8r_general_ci LIKE _koi8r'A';
-_koi8r'a' COLLATE koi8r_general_ci LIKE _koi8r'A'
-1
-select _koi8r'a' COLLATE koi8r_bin LIKE _koi8r'A';
-_koi8r'a' COLLATE koi8r_bin LIKE _koi8r'A'
-0
-select _koi8r'a' COLLATE koi8r_general_ci LIKE _koi8r'A' COLLATE koi8r_bin;
-ERROR HY000: Illegal mix of collations (koi8r_general_ci,EXPLICIT) and (koi8r_bin,EXPLICIT) for operation 'like'
-select _koi8r'a' LIKE _latin1'A';
-ERROR HY000: Illegal mix of collations (koi8r_general_ci,COERCIBLE) and (latin1_swedish_ci,COERCIBLE) for operation 'like'
-CREATE TABLE t1 (   faq_group_id int(11) NOT NULL default '0',   faq_id int(11) NOT NULL default '0',   title varchar(240) default NULL,   keywords text,   description longblob,   solution longblob,   status tinyint(4) NOT NULL default '0',   access_id smallint(6) default NULL,   lang_id smallint(6) NOT NULL default '0',   created datetime NOT NULL default '0000-00-00 00:00:00',   updated datetime default NULL,   last_access datetime default NULL,   last_notify datetime default NULL,   solved_count int(11) NOT NULL default '0',   static_solved int(11) default NULL,   solved_1 int(11) default NULL,   solved_2 int(11) default NULL,   solved_3 int(11) default NULL,   solved_4 int(11) default NULL,   solved_5 int(11) default NULL,   expires datetime default NULL,   notes text,   assigned_to smallint(6) default NULL,   assigned_group smallint(6) default NULL,   last_edited_by smallint(6) default NULL,   orig_ref_no varchar(15) binary default NULL,   c$fundstate smallint(6) default NULL,   c$contributor smallint(6) default NULL,   UNIQUE KEY t1$faq_id (faq_id),   KEY t1$group_id$faq_id (faq_group_id,faq_id),   KEY t1$c$fundstate (c$fundstate) ) ENGINE=MyISAM;
-INSERT INTO t1 VALUES (82,82,'How to use the DynaVox Usage Counts Feature','usages count, number, corner, white, box, button','<as-html>\r\n<table width=\"100%\" border=\"0\">\r\n  <tr>\r\n    <td width=\"3%\"><3E></td>\r\n    <td width=\"97%\">\r\n       <h3><font face=\"Verdana, Arial, Helvetica, sans-serif\" color=\"#000000\">How \r\n        To</font><!-- #BeginEditable \"CS_troubleshoot_question\" --><font face=\"Verdana, Arial, Helvetica, sans-serif\" color=\"#000099\"><font color=\"#000000\">: \r\n        Display or Hide the Usage Counts to find out how many times each button is being selected. </font></font><!-- #EndEditable --></h3>\r\n    </td>\r\n  </tr>\r\n</table>','<as-html>\r\n <table width=\"100%\" border=\"0\">\r\n  <tr>\r\n    <td width=\"3%\"><3E></td>\r\n    \r\n<td width=\"97%\"><!-- #BeginEditable \"CS_troubleshoot_answer\" --> \r\n      \r\n<p><font color=\"#000000\" face=\"Verdana, Arial, Helvetica, sans-serif\">1. Select \r\n  the <i>On/Setup</i> button to access the DynaVox Setup Menu.<br>\r\n  2. Select <b>Button Features.</b><br>\r\n  3. Below the <b>OK</b> button is the <b>Usage Counts</b> button.<br>\r\n  a. If it says \"Hidden\" then the Usage Counts will not be displayed.<br>\r\n  b. If it says \"Displayed\" then the Usage Counts will be shown.<br>\r\n        c. Select the <b>Usage Counts</b> Option Ring once and it will toggle \r\n        to the alternative option.<br>\r\n  4. Once the correct setting has been chosen, select <b>OK</b> to leave the <i>Button \r\n  Features</i> menu.<br>\r\n  5. Select <b>OK</b> out of the <i>Setup</i> menu and return to the communication \r\n  page.</font></p>\r\n      <p><font color=\"#000000\" face=\"Verdana, Arial, Helvetica, sans-serif\">For \r\n        further information on <i>Usage Counts,</i> see the <i>Button Features \r\n        Menu Entry</i> in the DynaVox/DynaMyte Reference Manual.</font></p>\r\n<!-- #EndEditable --></td>\r\n  </tr>\r\n</table>',4,1,1,'2001-11-16 16:43:34','2002-11-25 12:09:43','2003-07-24 01:04:48',NULL,11,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,11,NULL,NULL,NULL);
-CREATE TABLE t2 (  access_id smallint(6) NOT NULL default '0',   name varchar(20) binary default NULL,   rank smallint(6) NOT NULL default '0',   KEY t2$access_id (access_id) ) ENGINE=MyISAM;
-INSERT INTO t2 VALUES (1,'Everyone',2),(2,'Help',3),(3,'Customer Support',1);
-SELECT f_acc.rank, a1.rank, a2.rank  FROM t1 LEFT JOIN t1 f1 ON  (f1.access_id=1 AND f1.faq_group_id = t1.faq_group_id) LEFT JOIN t2 a1 ON (a1.access_id =  f1.access_id) LEFT JOIN t1 f2 ON (f2.access_id=3 AND  f2.faq_group_id = t1.faq_group_id) LEFT  JOIN t2 a2 ON (a2.access_id = f2.access_id), t2 f_acc WHERE LEAST(a1.rank,a2.rank) =  f_acc.rank;
-rank	rank	rank
-2	2	NULL
-DROP TABLE t1,t2;
-CREATE TABLE t1 (d varchar(6), k int);
-INSERT INTO t1 VALUES (NULL, 2);
-SELECT GREATEST(d,d) FROM t1 WHERE k=2;
-GREATEST(d,d)
-NULL
-DROP TABLE t1;
-select 1197.90 mod 50;
-1197.90 mod 50
-47.90
-select 5.1 mod 3, 5.1 mod -3, -5.1 mod 3, -5.1 mod -3;
-5.1 mod 3	5.1 mod -3	-5.1 mod 3	-5.1 mod -3
-2.1	2.1	-2.1	-2.1
-select 5 mod 3, 5 mod -3, -5 mod 3, -5 mod -3;
-5 mod 3	5 mod -3	-5 mod 3	-5 mod -3
-2	2	-2	-2
--- a/mysql-test/r/gis-rtree.result
+++ b/mysql-test/r/gis-rtree.result
@@ -757,3 +757,50 @@ SPATIAL KEY(g)
 ) ENGINE=MyISAM;
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(1 2, 2 3)')),(GeomFromText('LineString(1 2, 2 4)'));
 drop table t1;
+CREATE TABLE t1 (
+geoobjid INT NOT NULL,
+line LINESTRING NOT NULL,
+kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po',
+name VARCHAR(32),
+SPATIAL KEY (line)
+) engine=myisam;
+ALTER TABLE t1 DISABLE KEYS;
+INSERT INTO t1 (name, kind, line) VALUES 
+("Aadaouane", "pp", GeomFromText("POINT(32.816667 35.983333)")),
+("Aadassiye", "pp", GeomFromText("POINT(35.816667 36.216667)")),
+("Aadbel", "pp", GeomFromText("POINT(34.533333 36.100000)")),
+("Aadchit", "pp", GeomFromText("POINT(33.347222 35.423611)")),
+("Aadchite", "pp", GeomFromText("POINT(33.347222 35.423611)")),
+("Aadchit el Qoussair", "pp", GeomFromText("POINT(33.283333 35.483333)")),
+("Aaddaye", "pp", GeomFromText("POINT(36.716667 40.833333)")),
+("'Aadeissa", "pp", GeomFromText("POINT(32.823889 35.698889)")),
+("Aaderup", "pp", GeomFromText("POINT(55.216667 11.766667)")),
+("Qalaat Aades", "pp", GeomFromText("POINT(33.503333 35.377500)")),
+("A ad'ino", "pp", GeomFromText("POINT(54.812222 38.209167)")),
+("Aadi Noia", "pp", GeomFromText("POINT(13.800000 39.833333)")),
+("Aad La Macta", "pp", GeomFromText("POINT(35.779444 -0.129167)")),
+("Aadland", "pp", GeomFromText("POINT(60.366667 5.483333)")),
+("Aadliye", "pp", GeomFromText("POINT(33.366667 36.333333)")),
+("Aadloun", "pp", GeomFromText("POINT(33.403889 35.273889)")),
+("Aadma", "pp", GeomFromText("POINT(58.798333 22.663889)")),
+("Aadma Asundus", "pp", GeomFromText("POINT(58.798333 22.663889)")),
+("Aadmoun", "pp", GeomFromText("POINT(34.150000 35.650000)")),
+("Aadneram", "pp", GeomFromText("POINT(59.016667 6.933333)")),
+("Aadneskaar", "pp", GeomFromText("POINT(58.083333 6.983333)")),
+("Aadorf", "pp", GeomFromText("POINT(47.483333 8.900000)")),
+("Aadorp", "pp", GeomFromText("POINT(52.366667 6.633333)")),
+("Aadouane", "pp", GeomFromText("POINT(32.816667 35.983333)")),
+("Aadoui", "pp", GeomFromText("POINT(34.450000 35.983333)")),
+("Aadouiye", "pp", GeomFromText("POINT(34.583333 36.183333)")),
+("Aadouss", "pp", GeomFromText("POINT(33.512500 35.601389)")),
+("Aadra", "pp", GeomFromText("POINT(33.616667 36.500000)")),
+("Aadzi", "pp", GeomFromText("POINT(38.100000 64.850000)"));
+ALTER TABLE t1 ENABLE KEYS;
+INSERT INTO t1 (name, kind, line) VALUES ("austria", "pp", GeomFromText('LINESTRING(14.9906 48.9887,14.9946 48.9904,14.9947 48.9916)'));
+drop table t1;
+CREATE TABLE t1 (st varchar(100));
+INSERT INTO t1 VALUES ("Fake string");
+CREATE TABLE t2 (geom GEOMETRY NOT NULL, SPATIAL KEY gk(geom));
+INSERT INTO t2 SELECT GeomFromText(st) FROM t1;
+ERROR HY000: Unknown error
+drop table t1, t2;
--- a/mysql-test/r/grant.result
+++ b/mysql-test/r/grant.result
@@ -344,6 +344,72 @@ select Host,Db,User,Table_name,Column_name,Column_priv from mysql.columns_priv;
 Host	Db	User	Table_name	Column_name	Column_priv
 drop user grant_user@localhost;
 drop table t1;
+create database mysqltest_1;
+create database mysqltest_2;
+create table mysqltest_1.t1 select 1 a, 2 q;
+create table mysqltest_1.t2 select 1 b, 2 r;
+create table mysqltest_2.t1 select 1 c, 2 s;
+create table mysqltest_2.t2 select 1 d, 2 t;
+grant update (a) on mysqltest_1.t1 to mysqltest_3@localhost;
+grant select (b) on mysqltest_1.t2 to mysqltest_3@localhost;
+grant select (c) on mysqltest_2.t1 to mysqltest_3@localhost;
+grant update (d) on mysqltest_2.t2 to mysqltest_3@localhost;
+show grants for mysqltest_3@localhost;
+Grants for mysqltest_3@localhost
+GRANT USAGE ON *.* TO 'mysqltest_3'@'localhost'
+GRANT SELECT (b) ON `mysqltest_1`.`t2` TO 'mysqltest_3'@'localhost'
+GRANT UPDATE (a) ON `mysqltest_1`.`t1` TO 'mysqltest_3'@'localhost'
+GRANT UPDATE (d) ON `mysqltest_2`.`t2` TO 'mysqltest_3'@'localhost'
+GRANT SELECT (c) ON `mysqltest_2`.`t1` TO 'mysqltest_3'@'localhost'
+update mysqltest_1.t1, mysqltest_1.t2 set q=10 where b=1;
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for column 'q' in table 't1'
+update mysqltest_1.t2, mysqltest_2.t2 set d=20 where d=1;
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'd' in table 't2'
+update mysqltest_1.t1, mysqltest_2.t2 set d=20 where d=1;
+ERROR 42000: select command denied to user 'mysqltest_3'@'localhost' for table 't1'
+update mysqltest_2.t1, mysqltest_1.t2 set c=20 where b=1;
+ERROR 42000: update command denied to user 'mysqltest_3'@'localhost' for table 't1'
+update mysqltest_2.t1, mysqltest_2.t2 set d=10 where s=2;
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 's' in table 't1'
+update mysqltest_1.t1, mysqltest_2.t2 set a=10,d=10;
+update mysqltest_1.t1, mysqltest_2.t1 set a=20 where c=20;
+select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
+a	q	b	r
+10	2	1	2
+select t1.*,t2.* from mysqltest_2.t1,mysqltest_2.t2;
+c	s	d	t
+1	2	10	2
+revoke all on mysqltest_1.t1 from mysqltest_3@localhost;
+revoke all on mysqltest_1.t2 from mysqltest_3@localhost;
+revoke all on mysqltest_2.t1 from mysqltest_3@localhost;
+revoke all on mysqltest_2.t2 from mysqltest_3@localhost;
+grant all on mysqltest_2.* to mysqltest_3@localhost;
+grant select on *.* to mysqltest_3@localhost;
+flush privileges;
+use mysqltest_1;
+update mysqltest_2.t1, mysqltest_2.t2 set c=500,d=600;
+update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
+ERROR 42000: update command denied to user 'mysqltest_3'@'localhost' for table 't1'
+use mysqltest_2;
+update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
+ERROR 42000: update command denied to user 'mysqltest_3'@'localhost' for table 't1'
+update mysqltest_2.t1, mysqltest_1.t2 set c=100,b=200;
+ERROR 42000: update command denied to user 'mysqltest_3'@'localhost' for table 't2'
+update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200;
+ERROR 42000: update command denied to user 'mysqltest_3'@'localhost' for table 't1'
+select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
+a	q	b	r
+10	2	1	2
+select t1.*,t2.* from mysqltest_2.t1,mysqltest_2.t2;
+c	s	d	t
+500	2	600	2
+delete from mysql.user where user='mysqltest_3';
+delete from mysql.db where user="mysqltest_3";
+delete from mysql.tables_priv where user="mysqltest_3";
+delete from mysql.columns_priv where user="mysqltest_3";
+flush privileges;
+drop database mysqltest_1;
+drop database mysqltest_2;
 SHOW PRIVILEGES;
 Privilege	Context	Comment
 Alter	Tables	To alter the table
--- a/mysql-test/r/grant_cache.result
+++ b/mysql-test/r/grant_cache.result
@@ -59,7 +59,7 @@ Variable_name	Value
 Qcache_hits	0
 show status like "Qcache_not_cached";
 Variable_name	Value
-Qcache_not_cached	0
+Qcache_not_cached	5
 select "user1";
 user1
 user1
@@ -71,7 +71,7 @@ Variable_name	Value
 Qcache_hits	0
 show status like "Qcache_not_cached";
 Variable_name	Value
-Qcache_not_cached	1
+Qcache_not_cached	9
 select * from t1;
 a	b	c
 1	1	1
@@ -84,7 +84,7 @@ Variable_name	Value
 Qcache_hits	1
 show status like "Qcache_not_cached";
 Variable_name	Value
-Qcache_not_cached	1
+Qcache_not_cached	12
 select a from t1 ;
 a
 1
@@ -97,7 +97,7 @@ Variable_name	Value
 Qcache_hits	2
 show status like "Qcache_not_cached";
 Variable_name	Value
-Qcache_not_cached	1
+Qcache_not_cached	15
 select c from t1;
 c
 1
@@ -110,7 +110,7 @@ Variable_name	Value
 Qcache_hits	3
 show status like "Qcache_not_cached";
 Variable_name	Value
-Qcache_not_cached	1
+Qcache_not_cached	18
 show grants for current_user();
 Grants for @localhost
 GRANT USAGE ON *.* TO ''@'localhost'
@@ -143,7 +143,7 @@ Variable_name	Value
 Qcache_hits	7
 show status like "Qcache_not_cached";
 Variable_name	Value
-Qcache_not_cached	2
+Qcache_not_cached	22
 select "user3";
 user3
 user3
@@ -167,7 +167,7 @@ Variable_name	Value
 Qcache_hits	7
 show status like "Qcache_not_cached";
 Variable_name	Value
-Qcache_not_cached	7
+Qcache_not_cached	30
 select "user4";
 user4
 user4
@@ -197,7 +197,7 @@ Variable_name	Value
 Qcache_hits	8
 show status like "Qcache_not_cached";
 Variable_name	Value
-Qcache_not_cached	8
+Qcache_not_cached	34
 set names binary;
 delete from mysql.user where user in ("mysqltest_1","mysqltest_2","mysqltest_3");
 delete from mysql.db where user in ("mysqltest_1","mysqltest_2","mysqltest_3");
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -638,3 +638,15 @@ alias
 1,2
 1
 drop table t1;
+create table t1 (a int);
+insert into t1 values(null);
+select min(a) is null from t1;
+min(a) is null
+1
+select min(a) is null or null from t1;
+min(a) is null or null
+1
+select 1 and min(a) is null from t1;
+1 and min(a) is null
+1
+drop table t1;
--- a/mysql-test/r/have_exampledb.require
+++ b/mysql-test/r/have_exampledb.require
@@ -1,2 +1,2 @@
 Variable_name	Value
-have_exampledb	YES
+have_example_engine	YES
--- a/mysql-test/r/index_merge.result
+++ b/mysql-test/r/index_merge.result
@@ -342,7 +342,7 @@ set @save_join_buffer_size=@@join_buffer_size;
 set join_buffer_size= 4000;
 show variables like 'join_buffer_size';
 Variable_name	Value
-join_buffer_size	8228
+join_buffer_size	8200
 explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) 
 from t0 as A force index(i1,i2), t0 as B force index (i1,i2) 
 where (A.key1 < 500000 or A.key2 < 3)
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -1,3 +1,6 @@
+show variables variable_name where variable_name like "skip_show_database";
+variable_name
+skip_show_database
 grant all privileges on test.* to mysqltest_1@localhost;
 select * from information_schema.SCHEMATA where schema_name > 'm';
 CATALOG_NAME	SCHEMA_NAME	DEFAULT_CHARACTER_SET_NAME	SQL_PATH
@@ -321,11 +324,11 @@ show keys from v4;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 select * from information_schema.views where TABLE_NAME like "v%";
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE
-NULL	test	v0	select `schemata`.`SCHEMA_NAME` AS `c` from `information_schema`.`schemata`	NONE	NO
-NULL	test	v1	select `tables`.`TABLE_NAME` AS `c` from `information_schema`.`tables` where (`tables`.`TABLE_NAME` = _utf8'v1')	NONE	NO
-NULL	test	v2	select `columns`.`COLUMN_NAME` AS `c` from `information_schema`.`columns` where (`columns`.`TABLE_NAME` = _utf8'v2')	NONE	NO
-NULL	test	v3	select `character_sets`.`CHARACTER_SET_NAME` AS `c` from `information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like _utf8'latin1%')	NONE	NO
-NULL	test	v4	select `collations`.`COLLATION_NAME` AS `c` from `information_schema`.`collations` where (`collations`.`COLLATION_NAME` like _utf8'latin1%')	NONE	NO
+NULL	test	v0	select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from `information_schema`.`schemata`	NONE	NO
+NULL	test	v1	select sql_no_cache `tables`.`TABLE_NAME` AS `c` from `information_schema`.`tables` where (`tables`.`TABLE_NAME` = _utf8'v1')	NONE	NO
+NULL	test	v2	select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from `information_schema`.`columns` where (`columns`.`TABLE_NAME` = _utf8'v2')	NONE	NO
+NULL	test	v3	select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from `information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like _utf8'latin1%')	NONE	NO
+NULL	test	v4	select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from `information_schema`.`collations` where (`collations`.`COLLATION_NAME` like _utf8'latin1%')	NONE	NO
 drop view v0, v1, v2, v3, v4;
 create table t1 (a int);
 grant select,update,insert on t1 to mysqltest_1@localhost;
@@ -661,3 +664,14 @@ select table_type from information_schema.tables
 where table_schema="mysql" and table_name="user";
 table_type
 BASE TABLE
+show open tables where `table` like "user";
+Database	Table	In_use	Name_locked
+mysql	user	0	0
+show status variable_name where variable_name like "%database%";
+variable_name
+Com_show_databases
+show variables variable_name where variable_name like "%database%";
+variable_name
+character_set_database
+collation_database
+skip_show_database
--- a/mysql-test/r/information_schema_inno.result
+++ b/mysql-test/r/information_schema_inno.result
@@ -1,3 +1,4 @@
+DROP TABLE IF EXISTS t1,t2;
 CREATE TABLE t1 (id INT NOT NULL, PRIMARY KEY (id)) ENGINE=INNODB;
 CREATE TABLE t2 (id INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id),
 FOREIGN KEY (t1_id) REFERENCES t1(id)  ON DELETE CASCADE,
--- a/mysql-test/r/insert_select.result.es
+++ b/mysql-test/r/insert_select.result.es
@@ -78,6 +78,13 @@ a
 1
 2
 drop table t1, t2;
+create table t1(a int);
+insert into t1 values(1),(1);
+reset master;
+create table t2(unique(a)) select a from t1;
+ERROR 23000: Duplicate entry '1' for key 1
+show binlog events;
+drop table t1;
 create table t1 (a int not null);
 create table t2 (a int not null);
 insert into t1 values (1);
--- a/mysql-test/r/insert_update.result
+++ b/mysql-test/r/insert_update.result
@@ -105,3 +105,65 @@ a	b
 8	28
 9	29
 drop table t1;
+CREATE TABLE t1 (a INT, b INT, c INT, UNIQUE (A), UNIQUE(B));
+INSERT t1 VALUES (1,2,10), (3,4,20);
+INSERT t1 SELECT 5,6,30 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100;
+SELECT * FROM t1;
+a	b	c
+1	2	10
+3	4	20
+5	6	30
+INSERT t1 SELECT 5,7,40 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100;
+SELECT * FROM t1;
+a	b	c
+1	2	10
+3	4	20
+5	6	130
+INSERT t1 SELECT 8,4,50 FROM DUAL ON DUPLICATE KEY UPDATE c=c+1000;
+SELECT * FROM t1;
+a	b	c
+1	2	10
+3	4	1020
+5	6	130
+INSERT t1 SELECT 1,4,60 FROM DUAL ON DUPLICATE KEY UPDATE c=c+10000;
+SELECT * FROM t1;
+a	b	c
+1	2	10010
+3	4	1020
+5	6	130
+INSERT t1 SELECT 1,9,70 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100000, b=4;
+ERROR 23000: Duplicate entry '4' for key 2
+SELECT * FROM t1;
+a	b	c
+1	2	10010
+3	4	1020
+5	6	130
+TRUNCATE TABLE t1;
+INSERT t1 VALUES (1,2,10), (3,4,20);
+CREATE TABLE t2 (x INT, y INT, z INT, d INT);
+INSERT t2 VALUES (5,6,30,1), (7,4,40,1), (8,9,60,1);
+INSERT t2 VALUES (2,1,11,2), (7,4,40,2);
+INSERT t1 SELECT x,y,z FROM t2 WHERE d=1 ON DUPLICATE KEY UPDATE c=c+100;
+SELECT * FROM t1;
+a	b	c
+1	2	10
+3	4	120
+5	6	30
+8	9	60
+INSERT t1 SET a=5 ON DUPLICATE KEY UPDATE b=0;
+SELECT * FROM t1;
+a	b	c
+1	2	10
+3	4	120
+5	0	30
+8	9	60
+INSERT t1 SELECT x,y,z FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=c+VALUES(a);
+SELECT *, VALUES(a) FROM t1;
+a	b	c	VALUES(a)
+1	2	10	NULL
+3	4	127	NULL
+5	0	30	NULL
+8	9	60	NULL
+2	1	11	NULL
+DROP TABLE t1;
+DROP TABLE t2;
--- a/mysql-test/r/lowercase_table.result
+++ b/mysql-test/r/lowercase_table.result
@@ -1,6 +1,7 @@
 drop table if exists t1,t2,t3,t4;
 drop table if exists t0,t5,t6,t7,t8,t9;
 drop database if exists mysqltest;
+drop view if exists v0, v1, v2, v3, v4;
 create table T1 (id int primary key, Word varchar(40) not null, Index(Word));
 create table t4 (id int primary key, Word varchar(40) not null);
 INSERT INTO T1 VALUES (1, 'a'), (2, 'b'), (3, 'c');
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -653,3 +653,28 @@ ERROR HY000: You can't specify target table 't2' for update in FROM clause
 create table t3 engine=merge union=(t1, t2) select (select max(a) from t2);
 ERROR HY000: You can't specify target table 't2' for update in FROM clause
 drop table t1, t2;
+create table t1 (a int,b int,c int, index (a,b,c));
+create table t2 (a int,b int,c int, index (a,b,c));
+create table t3 (a int,b int,c int, index (a,b,c))
+engine=merge union=(t1 ,t2);
+insert into t1 (a,b,c) values (1,1,0),(1,2,0);
+insert into t2 (a,b,c) values (1,1,1),(1,2,1);
+explain select a,b,c from t3 force index (a) where a=1 order by a,b,c;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t3	ref	a	a	5	const	2	Using where; Using index
+select a,b,c from t3 force index (a) where a=1 order by a,b,c;
+a	b	c
+1	1	0
+1	1	1
+1	2	0
+1	2	1
+explain select a,b,c from t3 force index (a) where a=1 order by a desc, b desc, c desc;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t3	ref	a	a	5	const	2	Using where; Using index
+select a,b,c from t3 force index (a) where a=1 order by a desc, b desc, c desc;
+a	b	c
+1	2	1
+1	2	0
+1	1	1
+1	1	0
+drop table t1, t2, t3;
--- a/mysql-test/r/metadata.result
+++ b/mysql-test/r/metadata.result
@@ -3,7 +3,7 @@ select 1, 1.0, -1, "hello", NULL;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def					1	8	1	1	N	32769	0	8
 def					1.0	5	3	3	N	32769	1	8
-def					-1	8	1	2	N	32769	0	8
+def					-1	8	2	2	N	32769	0	8
 def					hello	253	5	5	N	1	31	8
 def					NULL	6	0	0	Y	32896	0	63
 1	1.0	-1	hello	NULL
--- a/mysql-test/r/multi_update.result
+++ b/mysql-test/r/multi_update.result
@@ -1,5 +1,6 @@
 drop table if exists t1,t2,t3;
 drop database if exists mysqltest;
+drop view if exists v1;
 revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
 revoke all privileges on mysqltest.* from mysqltest_1@localhost;
 delete from mysql.user where user=_binary'mysqltest_1';
@@ -464,6 +465,17 @@ ERROR HY000: You can't specify target table 't1' for update in FROM clause
 delete t1 from t1,t2 where t1.col1 < (select max(col1) from t1) and t1.col1 = t2.col1;
 ERROR HY000: You can't specify target table 't1' for update in FROM clause
 drop table t1,t2;
+create table t1 (
+aclid bigint not null primary key, 
+status tinyint(1) not null 
+) engine = innodb;
+create table t2 (
+refid bigint not null primary key, 
+aclid bigint, index idx_acl(aclid) 
+) engine = innodb;
+insert into t2 values(1,null);
+delete t2, t1 from t2 left join t1 on (t2.aclid=t1.aclid) where t2.refid='1';
+drop table t1, t2;
 set @ttype_save=@@storage_engine;
 set @@storage_engine=innodb;
 create table t1 ( c char(8) not null );
--- a/mysql-test/r/ndb_alter_table.result
+++ b/mysql-test/r/ndb_alter_table.result
@@ -1,4 +1,5 @@
 DROP TABLE IF EXISTS t1;
+drop database if exists mysqltest;
 CREATE TABLE t1 (
 a INT NOT NULL,
 b INT NOT NULL
@@ -9,6 +10,21 @@ SELECT * FROM t1;
 a	b	c
 9410	9412	0
 DROP TABLE t1;
+CREATE DATABASE mysqltest;
+USE mysqltest;
+CREATE TABLE t1 (
+a INT NOT NULL,
+b INT NOT NULL
+) ENGINE=ndbcluster;
+RENAME TABLE t1 TO test.t1;
+SHOW TABLES;
+Tables_in_mysqltest
+DROP DATABASE mysqltest;
+USE test;
+SHOW TABLES;
+Tables_in_test
+t1
+DROP TABLE t1;
 create table t1 (
 col1 int not null auto_increment primary key,
 col2 varchar(30) not null,
--- a/mysql-test/r/ndb_update.result
+++ b/mysql-test/r/ndb_update.result
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (
+pk1 INT NOT NULL PRIMARY KEY,
+b INT NOT NULL,
+c INT NOT NULL
+) ENGINE=ndbcluster;
+INSERT INTO t1 VALUES (0, 0, 1),(1,1,2),(2,2,3);
+UPDATE t1 set b = c;
+select * from t1 order by pk1;
+pk1	b	c
+0	1	1
+1	2	2
+2	3	3
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -471,6 +471,17 @@ select @var is null, @var is not null, @var;
 execute stmt using @var, @var, @var;
 ? is null	? is not null	?
 1	0	NULL
+create table t1 (pnum char(3));
+create table t2 (pnum char(3));
+prepare stmt from "select pnum from t2 having pnum in (select 'p1' from t1)";
+execute stmt;
+pnum
+execute stmt;
+pnum
+execute stmt;
+pnum
+deallocate prepare stmt;
+drop table t1, t2;
 create table t1 (a varchar(20));
 insert into t1 values ('foo');
 prepare stmt FROM 'SELECT char_length (a) FROM t1';
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -1,5 +1,8 @@
 drop table if exists t5, t6, t7, t8;
 drop database if exists mysqltest ;
+drop database if exists testtets;
+drop table if exists t1Aa,t2Aa,v1Aa,v2Aa;
+drop view if exists t1Aa,t2Aa,v1Aa,v2Aa;
 test_sequence
 ------ basic tests ------
 drop table if exists t1, t9 ;
--- a/mysql-test/r/ps_2myisam.result
+++ b/mysql-test/r/ps_2myisam.result
@@ -1687,6 +1687,9 @@ a	b
 1003	duplicate three
 1004	duplicate four
 delete from t1 where a >= 1000 ;
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 drop table if exists t2;
@@ -1940,7 +1943,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -2037,7 +2040,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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 ;
@@ -2125,7 +2128,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -2215,7 +2218,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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 ;
--- a/mysql-test/r/ps_2myisam.result.es
+++ b/mysql-test/r/ps_2myisam.result.es
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -1670,6 +1670,9 @@ a	b
 1003	duplicate three
 1004	duplicate four
 delete from t1 where a >= 1000 ;
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 drop table if exists t2;
@@ -1923,7 +1926,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -2020,7 +2023,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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 ;
@@ -2108,7 +2111,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -2198,7 +2201,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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 ;
--- a/mysql-test/r/ps_3innodb.result.es
+++ b/mysql-test/r/ps_3innodb.result.es
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
@@ -1671,6 +1671,9 @@ a	b
 1003	duplicate three
 1004	duplicate four
 delete from t1 where a >= 1000 ;
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 drop table if exists t2;
@@ -1924,7 +1927,7 @@ def					@arg28	253	8192	10	Y	0	31	8
 def					@arg29	253	8192	8	Y	0	31	8
 def					@arg30	253	8192	8	Y	0	31	8
 def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -2021,7 +2024,7 @@ def					@arg28	253	8192	10	Y	0	31	8
 def					@arg29	253	8192	8	Y	0	31	8
 def					@arg30	253	8192	8	Y	0	31	8
 def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	128	31	63
+def					@arg32	253	8192	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	1	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 ;
@@ -2109,7 +2112,7 @@ def					@arg28	253	8192	10	Y	0	31	8
 def					@arg29	253	8192	8	Y	0	31	8
 def					@arg30	253	8192	8	Y	0	31	8
 def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -2199,7 +2202,7 @@ def					@arg28	253	8192	10	Y	0	31	8
 def					@arg29	253	8192	8	Y	0	31	8
 def					@arg30	253	8192	8	Y	0	31	8
 def					@arg31	253	8192	3	Y	0	31	8
-def					@arg32	253	8192	6	Y	128	31	63
+def					@arg32	253	8192	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	1	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 ;
--- a/mysql-test/r/ps_4heap.result.es
+++ b/mysql-test/r/ps_4heap.result.es
--- a/mysql-test/r/ps_5merge.result
+++ b/mysql-test/r/ps_5merge.result
@@ -1863,7 +1863,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -1960,7 +1960,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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 ;
@@ -2048,7 +2048,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -2138,7 +2138,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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 ;
@@ -4872,7 +4872,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -4969,7 +4969,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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 ;
@@ -5057,7 +5057,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -5147,7 +5147,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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 ;
--- a/mysql-test/r/ps_5merge.result.es
+++ b/mysql-test/r/ps_5merge.result.es
--- a/mysql-test/r/ps_6bdb.result
+++ b/mysql-test/r/ps_6bdb.result
@@ -1670,6 +1670,9 @@ a	b
 1003	duplicate three
 1004	duplicate four
 delete from t1 where a >= 1000 ;
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 drop table if exists t2;
@@ -1923,7 +1926,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -2020,7 +2023,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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 ;
@@ -2108,7 +2111,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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,
@@ -2198,7 +2201,7 @@ 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	128	31	63
+def					@arg32	253	8192	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	1	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 ;
--- a/mysql-test/r/ps_6bdb.result.es
+++ b/mysql-test/r/ps_6bdb.result.es
--- a/mysql-test/r/ps_7ndb.result
+++ b/mysql-test/r/ps_7ndb.result
@@ -1670,6 +1670,9 @@ a	b
 1003	duplicate three
 1004	duplicate four
 delete from t1 where a >= 1000 ;
+set @1=1 ;
+set @2=2 ;
+set @100=100 ;
 set @float=1.00;
 set @five='five' ;
 drop table if exists t2;
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -947,3 +947,13 @@ Variable_name	Value
 Qcache_hits	7
 DROP TABLE t1;
 SET GLOBAL query_cache_size=0;
+SET SESSION query_cache_type = 2;
+create table t1(a int);
+select table_name from information_schema.tables
+where table_schema="test";
+table_name
+t1
+drop table t1;
+select table_name from information_schema.tables
+where table_schema="test";
+table_name
--- a/mysql-test/r/query_cache.result.es
+++ b/mysql-test/r/query_cache.result.es
@@ -808,7 +808,7 @@ SET NAMES koi8r;
 CREATE TABLE t1 (a char(1) character set koi8r);
 INSERT INTO t1 VALUES (_koi8r'<27>'),(_koi8r'<27>');
 SELECT a,'<27>','<27>'='<27>' FROM t1;
-a	б	'Б'='б'
+a	<EFBFBD>	'<EFBFBD>'='<EFBFBD>'
 <EFBFBD>	<EFBFBD>	1
 <EFBFBD>	<EFBFBD>	1
 show status like "Qcache_hits";
@@ -819,7 +819,7 @@ Variable_name	Value
 Qcache_queries_in_cache	1
 set collation_connection=koi8r_bin;
 SELECT a,'<27>','<27>'='<27>' FROM t1;
-a	б	'Б'='б'
+a	<EFBFBD>	'<EFBFBD>'='<EFBFBD>'
 <EFBFBD>	<EFBFBD>	0
 <EFBFBD>	<EFBFBD>	0
 show status like "Qcache_hits";
@@ -830,7 +830,7 @@ Variable_name	Value
 Qcache_queries_in_cache	2
 set character_set_client=cp1251;
 SELECT a,'<27>','<27>'='<27>' FROM t1;
-a	В	'в'='В'
+a	<EFBFBD>	'<EFBFBD>'='<EFBFBD>'
 <EFBFBD>	<EFBFBD>	0
 <EFBFBD>	<EFBFBD>	0
 show status like "Qcache_hits";
@@ -841,7 +841,7 @@ Variable_name	Value
 Qcache_queries_in_cache	3
 set character_set_results=cp1251;
 SELECT a,'<27>','<27>'='<27>' FROM t1;
-a	В	'в'='В'
+a	<EFBFBD>	'<EFBFBD>'='<EFBFBD>'
 <EFBFBD>	<EFBFBD>	0
 <EFBFBD>	<EFBFBD>	0
 show status like "Qcache_hits";
--- a/mysql-test/r/rpl_insert_ignore.result
+++ b/mysql-test/r/rpl_insert_ignore.result
@@ -0,0 +1,70 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+CREATE TABLE t1 (
+a int unsigned not null auto_increment primary key,
+b int unsigned,
+unique (b)
+) ENGINE=innodb;
+CREATE TABLE t2 (
+a int unsigned, # to force INSERT SELECT to have a certain order
+b int unsigned
+) ENGINE=innodb;
+INSERT INTO t1 VALUES (NULL, 1);
+INSERT INTO t1 VALUES (NULL, 2);
+INSERT INTO t1 VALUES (NULL, 3);
+INSERT INTO t1 VALUES (NULL, 4);
+INSERT INTO t2 VALUES (1, 1);
+INSERT INTO t2 VALUES (2, 2);
+INSERT INTO t2 VALUES (3, 5);
+INSERT INTO t2 VALUES (4, 3);
+INSERT INTO t2 VALUES (5, 4);
+INSERT INTO t2 VALUES (6, 6);
+INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
+SELECT * FROM t1 ORDER BY a;
+a	b
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+SELECT * FROM t1 ORDER BY a;
+a	b
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+drop table t1;
+CREATE TABLE t1 (
+a int unsigned not null auto_increment primary key,
+b int unsigned,
+unique (b)
+) ENGINE=myisam;
+INSERT INTO t1 VALUES (1, 1);
+INSERT INTO t1 VALUES (2, 2);
+INSERT INTO t1 VALUES (3, 3);
+INSERT INTO t1 VALUES (4, 4);
+INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
+SELECT * FROM t1 ORDER BY a;
+a	b
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+SELECT * FROM t1 ORDER BY a;
+a	b
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+drop table t1, t2;
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -338,9 +338,9 @@ delete from t2 where b=3;
 delete from t3 where a=3;
 show table status;
 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	HEAP	9	Fixed	4	#	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t2	HEAP	9	Fixed	4	#	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	HEAP	9	Fixed	4	#	#	#	#	9	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t1	HEAP	9	Fixed	4	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	HEAP	9	Fixed	4	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	HEAP	9	Fixed	4	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 delete from t1;
 delete from t2;
 delete from t3;
@@ -362,9 +362,9 @@ delete from t2 where b=5;
 delete from t3 where a=5;
 show table status;
 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	HEAP	9	Fixed	0	#	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t2	HEAP	9	Fixed	0	#	#	#	#	5	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-t3	HEAP	9	Fixed	0	#	#	#	#	9	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t1	HEAP	9	Fixed	0	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t2	HEAP	9	Fixed	0	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+t3	HEAP	9	Fixed	0	#	#	#	#	#	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 drop table t1, t2, t3;
 create database mysqltest;
 show create database mysqltest;
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -269,7 +269,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	3	Using where
 2	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	3	
 Warnings:
-Note	1003	select `test`.`t3`.`a` AS `a` from `test`.`t3` where (`test`.`t3`.`a` >= (select min(`test`.`t2`.`b`) from `test`.`t2`))
+Note	1003	select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>((`test`.`t3`.`a` >= (select min(`test`.`t2`.`b`) from `test`.`t2`)))
 select * from t3 where a >= all (select b from t2);
 a
 7
@@ -1496,6 +1496,65 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
 Warnings:
 Note	1003	select `test`.`t3`.`a` AS `a` from `test`.`t3` where <not>((`test`.`t3`.`a` < (select max(`test`.`t2`.`b`) from `test`.`t2`)))
+select * from t3 where a >= some (select b from t2);
+a
+explain extended select * from t3 where a >= some (select b from t2);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	3	Using where
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+Warnings:
+Note	1003	select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>((`test`.`t3`.`a` >= (select min(`test`.`t2`.`b`) from `test`.`t2`)))
+select * from t3 where a >= all (select b from t2 group by 1);
+a
+6
+7
+3
+explain extended select * from t3 where a >= all (select b from t2 group by 1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	3	Using where
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+Warnings:
+Note	1003	select `test`.`t3`.`a` AS `a` from `test`.`t3` where <not>((`test`.`t3`.`a` < <max>(select `test`.`t2`.`b` AS `b` from `test`.`t2` group by 1)))
+select * from t3 where a >= some (select b from t2 group by 1);
+a
+explain extended select * from t3 where a >= some (select b from t2 group by 1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	3	Using where
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+Warnings:
+Note	1003	select `test`.`t3`.`a` AS `a` from `test`.`t3` where <nop>((`test`.`t3`.`a` >= <min>(select `test`.`t2`.`b` AS `b` from `test`.`t2` group by 1)))
+select * from t3 where NULL >= any (select b from t2);
+a
+explain extended select * from t3 where NULL >= any (select b from t2);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+Warnings:
+Note	1003	select `test`.`t3`.`a` AS `a` from `test`.`t3`
+select * from t3 where NULL >= any (select b from t2 group by 1);
+a
+explain extended select * from t3 where NULL >= any (select b from t2 group by 1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+Warnings:
+Note	1003	select `test`.`t3`.`a` AS `a` from `test`.`t3`
+select * from t3 where NULL >= some (select b from t2);
+a
+explain extended select * from t3 where NULL >= some (select b from t2);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+Warnings:
+Note	1003	select `test`.`t3`.`a` AS `a` from `test`.`t3`
+select * from t3 where NULL >= some (select b from t2 group by 1);
+a
+explain extended select * from t3 where NULL >= some (select b from t2 group by 1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE
+2	SUBQUERY	t2	system	NULL	NULL	NULL	NULL	0	const row not found
+Warnings:
+Note	1003	select `test`.`t3`.`a` AS `a` from `test`.`t3`
 insert into t2 values (2,2), (2,1), (3,3), (3,1);
 select * from t3 where a > all (select max(b) from t2 group by a);
 a
@@ -2039,3 +2098,38 @@ insert into t1 values (20,15);
 select * from t1 where  (('a',null) <=> (select 'a',s2 from t1 where s1 = 0));
 s1	s2
 drop table t1;
+create table t1 (s1 int);
+insert into t1 values (1),(null);
+select * from t1 where s1 < all (select s1 from t1);
+s1
+select s1, s1 < all (select s1 from t1) from t1;
+s1	s1 < all (select s1 from t1)
+1	0
+NULL	NULL
+drop table t1;
+CREATE TABLE t1 (
+Code char(3) NOT NULL default '',
+Name char(52) NOT NULL default '',
+Continent enum('Asia','Europe','North America','Africa','Oceania','Antarctica','South America') NOT NULL default 'Asia',
+Region char(26) NOT NULL default '',
+SurfaceArea float(10,2) NOT NULL default '0.00',
+IndepYear smallint(6) default NULL,
+Population int(11) NOT NULL default '0',
+LifeExpectancy float(3,1) default NULL,
+GNP float(10,2) default NULL,
+GNPOld float(10,2) default NULL,
+LocalName char(45) NOT NULL default '',
+GovernmentForm char(45) NOT NULL default '',
+HeadOfState char(60) default NULL,
+Capital int(11) default NULL,
+Code2 char(2) NOT NULL default ''
+) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('XXX','Xxxxx','Oceania','Xxxxxx',26.00,0,0,0,0,0,'Xxxxx','Xxxxx','Xxxxx',NULL,'XX');
+INSERT INTO t1 VALUES ('ASM','American Samoa','Oceania','Polynesia',199.00,0,68000,75.1,334.00,NULL,'Amerika Samoa','US Territory','George W. Bush',54,'AS');
+INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes fran<61>aises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');
+INSERT INTO t1 VALUES ('UMI','United States Minor Outlying Islands','Oceania','Micronesia/Caribbean',16.00,0,0,NULL,0.00,NULL,'United States Minor Outlying Islands','Dependent Territory of the US','George W. Bush',NULL,'UM');
+/*!40000 ALTER TABLE t1 ENABLE KEYS */;
+SELECT DISTINCT Continent AS c FROM t1 WHERE Code <> SOME ( SELECT Code FROM t1 WHERE Continent = c AND Population < 200);
+c
+Oceania
+drop table t1;
--- a/mysql-test/r/temp_table.result
+++ b/mysql-test/r/temp_table.result
@@ -94,6 +94,6 @@ d
 2002-10-24 14:50:40
 show status like "created_tmp%tables";
 Variable_name	Value
-Created_tmp_disk_tables	0
-Created_tmp_tables	1
+Created_tmp_disk_tables	1
+Created_tmp_tables	2
 drop table t1;
--- a/mysql-test/r/timezone2.result
+++ b/mysql-test/r/timezone2.result
@@ -1,4 +1,4 @@
-drop table if exists t1;
+drop table if exists t1, t2;
 create table t1 (ts timestamp);
 set time_zone='+00:00';
 select unix_timestamp(utc_timestamp())-unix_timestamp(current_timestamp());
@@ -256,18 +256,52 @@ delete from mysql.db where user like 'mysqltest\_%';
 delete from mysql.tables_priv where user like 'mysqltest\_%';
 delete from mysql.columns_priv where user like 'mysqltest\_%';
 flush privileges;
-grant usage on mysqltest.* to mysqltest_1@localhost;
+create table t1 (a int, b datetime);
+create table t2 (c int, d datetime);
+grant all privileges on test.* to mysqltest_1@localhost;
 show grants for current_user();
 Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
+GRANT ALL PRIVILEGES ON `test`.* TO 'mysqltest_1'@'localhost'
 set time_zone= '+00:00';
 set time_zone= 'Europe/Moscow';
 select convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC');
 convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')
 2004-10-21 15:00:00
+select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;
+convert_tz(b, 'Europe/Moscow', 'UTC')
+update t1, t2 set t1.b = convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')
+where t1.a = t2.c and t2.d = (select max(d) from t2);
 select * from mysql.time_zone_name;
-ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql'
+ERROR 42000: select command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
 select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name;
-ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysql'
-delete from mysql.user where user like 'mysqltest\_%';
+ERROR 42000: select command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+delete from mysql.db where user like 'mysqltest\_%';
 flush privileges;
+grant all privileges on test.t1 to mysqltest_1@localhost;
+grant all privileges on test.t2 to mysqltest_1@localhost;
+show grants for current_user();
+Grants for mysqltest_1@localhost
+GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
+GRANT ALL PRIVILEGES ON `test`.`t2` TO 'mysqltest_1'@'localhost'
+GRANT ALL PRIVILEGES ON `test`.`t1` TO 'mysqltest_1'@'localhost'
+set time_zone= '+00:00';
+set time_zone= 'Europe/Moscow';
+select convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC');
+convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC')
+NULL
+Warnings:
+Warning	1292	Truncated incorrect datetime value: '2004-11-31 12:00:00'
+select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;
+convert_tz(b, 'Europe/Moscow', 'UTC')
+update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')
+where t1.a = t2.c and t2.d = (select max(d) from t2);
+select * from mysql.time_zone_name;
+ERROR 42000: select command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;
+ERROR 42000: select command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+delete from mysql.user where user like 'mysqltest\_%';
+delete from mysql.db where user like 'mysqltest\_%';
+delete from mysql.tables_priv where user like 'mysqltest\_%';
+flush privileges;
+drop table t1, t2;
--- a/mysql-test/r/type_enum.result
+++ b/mysql-test/r/type_enum.result
@@ -1731,9 +1731,17 @@ alter table t1 add b set ('Y','N') CHARACTER SET utf8 COLLATE utf8_bin;
 alter table t1 add c enum ('Y','N') CHARACTER SET utf8 COLLATE utf8_bin;
 select * from t1;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def	test	t1	t1	a	a	254	3	1	Y	384	0	8
-def	test	t1	t1	b	b	254	9	0	Y	2176	0	8
-def	test	t1	t1	c	c	254	3	0	Y	384	0	8
+def	test	t1	t1	a	a	254	1	1	Y	384	0	8
+def	test	t1	t1	b	b	254	3	0	Y	2176	0	8
+def	test	t1	t1	c	c	254	1	0	Y	384	0	8
 a	b	c
 Y	NULL	NULL
 drop table t1;
+create table t1 (a enum('x','y') default 'x');
+alter table t1 alter a set default 'z';
+ERROR 42000: Invalid default value for 'a'
+drop table t1;
+create table t1 (a set('x','y') default 'x');
+alter table t1 alter a set default 'z';
+ERROR 42000: Invalid default value for 'a'
+drop table t1;
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -851,27 +851,27 @@ count(*)
 26
 show status like 'Slow_queries';
 Variable_name	Value
-Slow_queries	0
+Slow_queries	1
 select count(*) from t1 where b=13;
 count(*)
 10
 show status like 'Slow_queries';
 Variable_name	Value
-Slow_queries	1
+Slow_queries	3
 select count(*) from t1 where b=13 union select count(*) from t1 where a=7;
 count(*)
 10
 26
 show status like 'Slow_queries';
 Variable_name	Value
-Slow_queries	2
+Slow_queries	5
 select count(*) from t1 where a=7 union select count(*) from t1 where b=13;
 count(*)
 26
 10
 show status like 'Slow_queries';
 Variable_name	Value
-Slow_queries	3
+Slow_queries	7
 drop table t1;
 create table t1 (   RID int(11) not null default '0',   IID int(11) not null default '0',    nada varchar(50)  not null,NAME varchar(50) not null,PHONE varchar(50) not null) engine=MyISAM;
 insert into t1 ( RID,IID,nada,NAME,PHONE) values (1, 1, 'main', 'a', '111'), (2, 1, 'main', 'b', '222'), (3, 1, 'main', 'c', '333'), (4, 1, 'main', 'd', '444'), (5, 1, 'main', 'e', '555'), (6, 2, 'main', 'c', '333'), (7, 2, 'main', 'd', '454'), (8, 2, 'main', 'e', '555'), (9, 2, 'main', 'f', '666'), (10, 2, 'main', 'g', '777');
--- a/mysql-test/r/update.result
+++ b/mysql-test/r/update.result
@@ -206,3 +206,9 @@ colC	colA	colD	colE	colF
 3	4433	10005	492	500
 DROP TABLE t1;
 DROP TABLE t2;
+create table t1 (c1 int, c2 char(6), c3 int);
+create table t2 (c1 int, c2 char(6));
+insert into t1 values (1, "t1c2-1", 10), (2, "t1c2-2", 20);
+update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1";
+update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1" where t1.c3 = 10;
+drop table t1, t2;
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -502,3 +502,7 @@ t1	CREATE TABLE `t1` (
  `c3` longtext
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+SET GLOBAL MYISAM_DATA_POINTER_SIZE= 8;
+SHOW VARIABLES LIKE 'MYISAM_DATA_POINTER_SIZE';
+Variable_name	Value
+myisam_data_pointer_size	8
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -659,7 +659,7 @@ ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for column
 update v2 set c=a+c;
 ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for column 'c' in table 'v2'
 update t2,v3 set v3.a=v3.a+v3.c where t2.x=v3.c;
-ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for column 'a' in table 'v3'
+ERROR 42000: update command denied to user 'mysqltest_1'@'localhost' for table 'v3'
 update v3 set a=a+c;
 ERROR 42000: update command denied to user 'mysqltest_1'@'localhost' for table 'v3'
 use test;
@@ -1433,8 +1433,7 @@ insert into v1 values (1) on duplicate key update a=2;
 insert into v1 values (1) on duplicate key update a=2;
 ERROR HY000: CHECK OPTION failed 'test.v1'
 insert ignore into v1 values (1) on duplicate key update a=2;
-Warnings:
-Error	1369	CHECK OPTION failed 'test.v1'
+ERROR HY000: CHECK OPTION failed 'test.v1'
 select * from t1;
 a
 1
--- a/mysql-test/t/ctype_create.test
+++ b/mysql-test/t/ctype_create.test
@@ -86,3 +86,15 @@ create database d1 default character set latin1 collate latin2_bin;
 #
 #
 DROP DATABASE mysqltest1;
+
+
+#
+# Synatx: 'ALTER DATABASE' without db_name
+#
+CREATE DATABASE mysqltest2 DEFAULT CHARACTER SET latin7;
+use mysqltest2;
+ALTER DATABASE DEFAULT CHARACTER SET latin2;
+show create database mysqltest2;
+drop database mysqltest2;
+--error 1046
+ALTER DATABASE DEFAULT CHARACTER SET latin2;
--- a/mysql-test/t/ctype_uca.test
+++ b/mysql-test/t/ctype_uca.test
@@ -444,3 +444,11 @@ DROP TABLE t1;
 SET @test_character_set= 'utf8';
 SET @test_collation= 'utf8_swedish_ci';
 -- source include/ctype_common.inc
+
+#
+# Bug 7111 server crashes when regexp is used
+#
+create table t1 (a varchar(1)) character set utf8 collate utf8_estonian_ci;
+insert into t1 values ('A'),('B'),('C'),('a'),('b'),('c');
+select a, a regexp '[a]' from t1 order by binary a;
+drop table t1;
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
@@ -345,3 +345,34 @@ show binlog events from 95;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 
 drop table t2;
+
+
+#
+# Check that ucs2 works with ENUM and SET type
+#
+set names latin1;
+create table t1 (a enum('x','y','z') character set ucs2);
+show create table t1;
+insert into t1 values ('x');
+insert into t1 values ('y');
+insert into t1 values ('z');
+select a, hex(a) from t1 order by a;
+alter table t1 change a a enum('x','y','z','d','e','<27>','<27>','<27>') character set ucs2;
+show create table t1;
+insert into t1 values ('D');
+insert into t1 values ('E ');
+insert into t1 values ('<27>');
+insert into t1 values ('<27>');
+insert into t1 values ('<27>');
+select a, hex(a) from t1 order by a;
+drop table t1;
+
+create table t1 (a set ('x','y','z','<27>','<27>','<27>') character set ucs2);
+show create table t1;
+insert into t1 values ('x');
+insert into t1 values ('y');
+insert into t1 values ('z');
+insert into t1 values ('x,y');
+insert into t1 values ('x,y,z,<2C>,<2C>,<2C>');
+select a, hex(a) from t1 order by a;
+drop table t1;
--- a/mysql-test/t/ctype_ujis.test
+++ b/mysql-test/t/ctype_ujis.test
--- a/mysql-test/t/delayed.test
+++ b/mysql-test/t/delayed.test
@@ -14,7 +14,7 @@ insert delayed into t1 set a = 4;
 insert delayed into t1 set a = 5, tmsp = 19711006010203;
 insert delayed into t1 (a, tmsp) values (6, 19711006010203);
 insert delayed into t1 (a, tmsp) values (7, NULL);
--sleep 1
+--sleep 2
 insert into t1 set a = 8,tmsp=19711006010203;
 select * from t1 where tmsp=0;
 select * from t1 where tmsp=19711006010203;
--- a/mysql-test/t/derived.test
+++ b/mysql-test/t/derived.test
@@ -140,7 +140,6 @@ select * from ( select * from t1 union select * from t1) a,(select * from t1 uni
 explain select * from ( select * from t1 union select * from t1) a,(select * from t1 union select * from t1) b;
 drop table t1;

-
 #
 # multi-update & multi-delete with derived tables
 #
--- a/mysql-test/t/flush_block_commit.test
+++ b/mysql-test/t/flush_block_commit.test
@@ -1,6 +1,7 @@
 # Let's see if FLUSH TABLES WITH READ LOCK blocks COMMIT of existing
 # transactions.
 # We verify that we did not introduce a deadlock.
+# This is intended to mimick how mysqldump and innobackup work.

 -- source include/have_innodb.inc

@@ -63,4 +64,11 @@ unlock tables;
 connection con2;
 flush tables with read lock; # bug caused hang here
 unlock tables;
+
+# BUG#7358 SHOW CREATE DATABASE fails if open transaction
+
+begin;
+select * from t1;
+show create database test;
+
 drop table t1;
--- a/mysql-test/t/func_concat.test
+++ b/mysql-test/t/func_concat.test
@@ -34,3 +34,19 @@ create table t1 (a char(4), b double, c date, d tinyint(4));
 insert into t1 values ('AAAA', 105, '2003-03-01', 1);
 select * from t1 where concat(A,C,B,D) = 'AAAA2003-03-011051';
 drop table t1;
+
+# BUG#6825 
+select 'a' union select concat('a', -4);
+select 'a' union select concat('a', -4.5);
+
+select 'a' union select concat('a', -(4 + 1));
+select 'a' union select concat('a', 4 - 5);
+
+select 'a' union select concat('a', -'3');
+select 'a' union select concat('a', -concat('3',4));
+
+select 'a' union select concat('a', -0);
+select 'a' union select concat('a', -0.0);
+
+select 'a' union select concat('a', -0.0000);
+
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -421,3 +421,11 @@ drop table t1;
 #

 select left(1234, 3) + 0;
+
+#
+# Bug #7101: bug with LEFT() when used as a field in GROUP BY aggregation
+#
+create table t1 (a int not null primary key, b varchar(40), c datetime);
+insert into t1 (a,b,c) values (1,'Tom','2004-12-10 12:13:14'),(2,'ball games','2004-12-10 12:13:14'), (3,'Basil','2004-12-10 12:13:14'), (4,'Dean','2004-12-10 12:13:14'),(5,'Ellis','2004-12-10 12:13:14'), (6,'Serg','2004-12-10 12:13:14'), (7,'Sergei','2004-12-10 12:13:14'),(8,'Georg','2004-12-10 12:13:14'),(9,'Salle','2004-12-10 12:13:14'),(10,'Sinisa','2004-12-10 12:13:14'); 
+select count(*) as total, left(c,10) as reg from t1 group by reg order by reg desc limit 0,12;
+drop table t1;
--- a/mysql-test/t/gis-rtree.test
+++ b/mysql-test/t/gis-rtree.test
@@ -118,3 +118,57 @@ CREATE TABLE t1 (
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(1 2, 2 3)')),(GeomFromText('LineString(1 2, 2 4)'));
 #select * from t1 where g<GeomFromText('LineString(1 2, 2 3)');
 drop table t1;
+
+CREATE TABLE t1 (
+  geoobjid INT NOT NULL,
+  line LINESTRING NOT NULL,
+  kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po',
+  name VARCHAR(32),
+
+  SPATIAL KEY (line)
+
+
+) engine=myisam;
+
+ALTER TABLE t1 DISABLE KEYS;
+INSERT INTO t1 (name, kind, line) VALUES 
+  ("Aadaouane", "pp", GeomFromText("POINT(32.816667 35.983333)")),
+  ("Aadassiye", "pp", GeomFromText("POINT(35.816667 36.216667)")),
+  ("Aadbel", "pp", GeomFromText("POINT(34.533333 36.100000)")),
+  ("Aadchit", "pp", GeomFromText("POINT(33.347222 35.423611)")),
+  ("Aadchite", "pp", GeomFromText("POINT(33.347222 35.423611)")),
+  ("Aadchit el Qoussair", "pp", GeomFromText("POINT(33.283333 35.483333)")),
+  ("Aaddaye", "pp", GeomFromText("POINT(36.716667 40.833333)")),
+  ("'Aadeissa", "pp", GeomFromText("POINT(32.823889 35.698889)")),
+  ("Aaderup", "pp", GeomFromText("POINT(55.216667 11.766667)")),
+  ("Qalaat Aades", "pp", GeomFromText("POINT(33.503333 35.377500)")),
+  ("A ad'ino", "pp", GeomFromText("POINT(54.812222 38.209167)")),
+  ("Aadi Noia", "pp", GeomFromText("POINT(13.800000 39.833333)")),
+  ("Aad La Macta", "pp", GeomFromText("POINT(35.779444 -0.129167)")),
+  ("Aadland", "pp", GeomFromText("POINT(60.366667 5.483333)")),
+  ("Aadliye", "pp", GeomFromText("POINT(33.366667 36.333333)")),
+  ("Aadloun", "pp", GeomFromText("POINT(33.403889 35.273889)")),
+  ("Aadma", "pp", GeomFromText("POINT(58.798333 22.663889)")),
+  ("Aadma Asundus", "pp", GeomFromText("POINT(58.798333 22.663889)")),
+  ("Aadmoun", "pp", GeomFromText("POINT(34.150000 35.650000)")),
+  ("Aadneram", "pp", GeomFromText("POINT(59.016667 6.933333)")),
+  ("Aadneskaar", "pp", GeomFromText("POINT(58.083333 6.983333)")),
+  ("Aadorf", "pp", GeomFromText("POINT(47.483333 8.900000)")),
+  ("Aadorp", "pp", GeomFromText("POINT(52.366667 6.633333)")),
+  ("Aadouane", "pp", GeomFromText("POINT(32.816667 35.983333)")),
+  ("Aadoui", "pp", GeomFromText("POINT(34.450000 35.983333)")),
+  ("Aadouiye", "pp", GeomFromText("POINT(34.583333 36.183333)")),
+  ("Aadouss", "pp", GeomFromText("POINT(33.512500 35.601389)")),
+  ("Aadra", "pp", GeomFromText("POINT(33.616667 36.500000)")),
+  ("Aadzi", "pp", GeomFromText("POINT(38.100000 64.850000)"));
+
+ALTER TABLE t1 ENABLE KEYS;
+INSERT INTO t1 (name, kind, line) VALUES ("austria", "pp", GeomFromText('LINESTRING(14.9906 48.9887,14.9946 48.9904,14.9947 48.9916)'));
+drop table t1;
+
+CREATE TABLE t1 (st varchar(100));
+INSERT INTO t1 VALUES ("Fake string");
+CREATE TABLE t2 (geom GEOMETRY NOT NULL, SPATIAL KEY gk(geom));
+--error 1105
+INSERT INTO t2 SELECT GeomFromText(st) FROM t1;
+drop table t1, t2;
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -5,6 +5,8 @@
 drop table if exists t1;
 --enable_warnings

+connect (master,localhost,root,,);
+connection master;
 SET NAMES binary;

 #
@@ -286,6 +288,78 @@ select Host,Db,User,Table_name,Column_name,Column_priv from mysql.columns_priv;
 drop user grant_user@localhost;
 drop table t1;

+#
+# Bug#7391: Cross-database multi-table UPDATE security problem
+#
+create database mysqltest_1;
+create database mysqltest_2;
+create table mysqltest_1.t1 select 1 a, 2 q;
+create table mysqltest_1.t2 select 1 b, 2 r;
+create table mysqltest_2.t1 select 1 c, 2 s;
+create table mysqltest_2.t2 select 1 d, 2 t;
+
+#test the column privileges
+grant update (a) on mysqltest_1.t1 to mysqltest_3@localhost;
+grant select (b) on mysqltest_1.t2 to mysqltest_3@localhost;
+grant select (c) on mysqltest_2.t1 to mysqltest_3@localhost;
+grant update (d) on mysqltest_2.t2 to mysqltest_3@localhost;
+connect (conn1,localhost,mysqltest_3,,);
+connection conn1;
+show grants for mysqltest_3@localhost;
+--error 1143
+update mysqltest_1.t1, mysqltest_1.t2 set q=10 where b=1;
+--error 1143
+update mysqltest_1.t2, mysqltest_2.t2 set d=20 where d=1;
+--error 1142
+update mysqltest_1.t1, mysqltest_2.t2 set d=20 where d=1;
+--error 1142
+update mysqltest_2.t1, mysqltest_1.t2 set c=20 where b=1;
+--error 1143
+update mysqltest_2.t1, mysqltest_2.t2 set d=10 where s=2;
+#the following two should work
+update mysqltest_1.t1, mysqltest_2.t2 set a=10,d=10;
+update mysqltest_1.t1, mysqltest_2.t1 set a=20 where c=20;
+connection master;
+select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
+select t1.*,t2.* from mysqltest_2.t1,mysqltest_2.t2;
+revoke all on mysqltest_1.t1 from mysqltest_3@localhost;
+revoke all on mysqltest_1.t2 from mysqltest_3@localhost;
+revoke all on mysqltest_2.t1 from mysqltest_3@localhost;
+revoke all on mysqltest_2.t2 from mysqltest_3@localhost;
+
+#test the db/table level privileges
+grant all on mysqltest_2.* to mysqltest_3@localhost;
+grant select on *.* to mysqltest_3@localhost;
+flush privileges;
+disconnect conn1;
+connect (conn2,localhost,mysqltest_3,,);
+connection conn2;
+use mysqltest_1;
+update mysqltest_2.t1, mysqltest_2.t2 set c=500,d=600;
+# the following failed before, should fail now.
+--error 1142
+update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
+use mysqltest_2;
+#the following used to succeed, it must fail now.
+--error 1142
+update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
+--error 1142
+update mysqltest_2.t1, mysqltest_1.t2 set c=100,b=200;
+--error 1142
+update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200;
+#lets see the result
+connection master;
+select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
+select t1.*,t2.* from mysqltest_2.t1,mysqltest_2.t2;
+
+delete from mysql.user where user='mysqltest_3';
+delete from mysql.db where user="mysqltest_3";
+delete from mysql.tables_priv where user="mysqltest_3";
+delete from mysql.columns_priv where user="mysqltest_3";
+flush privileges;
+drop database mysqltest_1;
+drop database mysqltest_2;
+
 #
 # just SHOW PRIVILEGES test
 #
--- a/mysql-test/t/group_by.test
+++ b/mysql-test/t/group_by.test
@@ -465,3 +465,12 @@ select group_concat( distinct col1 ) as alias from t1

 drop table t1;

+
+#Test for BUG#6976: Aggregate functions have incorrect NULL-ness
+create table t1 (a int);
+insert into t1 values(null);
+select min(a) is null from t1;
+select min(a) is null or null from t1;
+select 1 and min(a) is null from t1;
+drop table t1;
+
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -2,6 +2,7 @@
 # Test for information_schema.schemata &
 # show databases

+show variables variable_name where variable_name like "skip_show_database";
 grant all privileges on test.* to mysqltest_1@localhost;

 select * from information_schema.SCHEMATA where schema_name > 'm';
@@ -346,3 +347,10 @@ select TABLE_ROWS from information_schema.tables where
 table_schema="information_schema" and table_name="COLUMNS";
 select table_type from information_schema.tables
 where table_schema="mysql" and table_name="user";
+
+# test for 'show open tables ... where'
+show open tables where `table` like "user";
+# test for 'show status ... where'
+show status variable_name where variable_name like "%database%";
+# test for 'show variables ... where'
+show variables variable_name where variable_name like "%database%";
--- a/mysql-test/t/information_schema_inno.test
+++ b/mysql-test/t/information_schema_inno.test
@@ -1,4 +1,7 @@
 -- source include/have_innodb.inc
+--disable_warnings
+DROP TABLE IF EXISTS t1,t2;
+--enable_warnings

 #
 # Test for KEY_COLUMN_USAGE & TABLE_CONSTRAINTS tables
--- a/mysql-test/t/insert_update.test
+++ b/mysql-test/t/insert_update.test
@@ -48,3 +48,34 @@ disable_info;

 select * from t1;
 drop table t1;
+
+# WorkLog #2274 - enable INSERT .. SELECT .. UPDATE syntax
+# Same tests as beginning of this test except that insert source
+# is a result from a select statement
+#
+CREATE TABLE t1 (a INT, b INT, c INT, UNIQUE (A), UNIQUE(B));
+INSERT t1 VALUES (1,2,10), (3,4,20);
+INSERT t1 SELECT 5,6,30 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100;
+SELECT * FROM t1;
+INSERT t1 SELECT 5,7,40 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100;
+SELECT * FROM t1;
+INSERT t1 SELECT 8,4,50 FROM DUAL ON DUPLICATE KEY UPDATE c=c+1000;
+SELECT * FROM t1;
+INSERT t1 SELECT 1,4,60 FROM DUAL ON DUPLICATE KEY UPDATE c=c+10000;
+SELECT * FROM t1;
+-- error 1062
+INSERT t1 SELECT 1,9,70 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100000, b=4;
+SELECT * FROM t1;
+TRUNCATE TABLE t1;
+INSERT t1 VALUES (1,2,10), (3,4,20);
+CREATE TABLE t2 (x INT, y INT, z INT, d INT);
+INSERT t2 VALUES (5,6,30,1), (7,4,40,1), (8,9,60,1);
+INSERT t2 VALUES (2,1,11,2), (7,4,40,2);
+INSERT t1 SELECT x,y,z FROM t2 WHERE d=1 ON DUPLICATE KEY UPDATE c=c+100;
+SELECT * FROM t1;
+INSERT t1 SET a=5 ON DUPLICATE KEY UPDATE b=0;
+SELECT * FROM t1;
+INSERT t1 SELECT x,y,z FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=c+VALUES(a);
+SELECT *, VALUES(a) FROM t1;
+DROP TABLE t1;
+DROP TABLE t2;
--- a/mysql-test/t/key_cache.test
+++ b/mysql-test/t/key_cache.test
@@ -71,7 +71,7 @@ show status like 'key_blocks_used';
 # Following results differs on 64 and 32 bit systems because of different
 # pointer sizes, which takes up different amount of space in key cache

--replace_result 1812 KEY_BLOCKS_UNUSED 1793 KEY_BLOCKS_UNUSED 1674 KEY_BLOCKS_UNUSED 1818 KEY_BLOCKS_UNUSED
+--replace_result 1812 KEY_BLOCKS_UNUSED 1793 KEY_BLOCKS_UNUSED 1674 KEY_BLOCKS_UNUSED 1818 KEY_BLOCKS_UNUSED 1824 KEY_BLOCKS_UNUSED
 show status like 'key_blocks_unused';

 insert into t1 values (1, 'qqqq'), (11, 'yyyy');
@@ -84,7 +84,7 @@ update t1 set p=2 where p=1;
 update t2 set i=2 where i=1;

 show status like 'key_blocks_used';
--replace_result 1808 KEY_BLOCKS_UNUSED 1789 KEY_BLOCKS_UNUSED 1670 KEY_BLOCKS_UNUSED 1814 KEY_BLOCKS_UNUSED
+--replace_result 1808 KEY_BLOCKS_UNUSED 1789 KEY_BLOCKS_UNUSED 1670 KEY_BLOCKS_UNUSED 1814 KEY_BLOCKS_UNUSED 1820 KEY_BLOCKS_UNUSED
 show status like 'key_blocks_unused';

 cache index t1 key (`primary`) in keycache1;
@@ -146,7 +146,7 @@ cache index t1,t2 in default;
 drop table t1,t2,t3;

 show status like 'key_blocks_used';
--replace_result 1812 KEY_BLOCKS_UNUSED 1793 KEY_BLOCKS_UNUSED 1674 KEY_BLOCKS_UNUSED 1818 KEY_BLOCKS_UNUSED
+--replace_result 1812 KEY_BLOCKS_UNUSED 1793 KEY_BLOCKS_UNUSED 1674 KEY_BLOCKS_UNUSED 1818 KEY_BLOCKS_UNUSED 1824 KEY_BLOCKS_UNUSED
 show status like 'key_blocks_unused';

 # Cleanup
--- a/mysql-test/t/lowercase_table.test
+++ b/mysql-test/t/lowercase_table.test
@@ -7,6 +7,7 @@ drop table if exists t1,t2,t3,t4;
 # Clear up from other tests (to ensure that SHOW TABLES below is right)
 drop table if exists t0,t5,t6,t7,t8,t9;
 drop database if exists mysqltest;
+drop view if exists v0, v1, v2, v3, v4;
 --enable_warnings

 create table T1 (id int primary key, Word varchar(40) not null, Index(Word));
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -287,3 +287,21 @@ create table t3 engine=merge union=(t1, t2) select * from t2;
 --error 1093
 create table t3 engine=merge union=(t1, t2) select (select max(a) from t2);
 drop table t1, t2;
+
+# BUG#6699 : no sorting on 'ref' retrieval 
+create table t1 (a int,b int,c int, index (a,b,c));
+create table t2 (a int,b int,c int, index (a,b,c));
+create table t3 (a int,b int,c int, index (a,b,c))
+  engine=merge union=(t1 ,t2);
+insert into t1 (a,b,c) values (1,1,0),(1,2,0);
+insert into t2 (a,b,c) values (1,1,1),(1,2,1);
+
+explain select a,b,c from t3 force index (a) where a=1 order by a,b,c;
+select a,b,c from t3 force index (a) where a=1 order by a,b,c;
+
+# this actually wasn't affected:
+explain select a,b,c from t3 force index (a) where a=1 order by a desc, b desc, c desc;
+select a,b,c from t3 force index (a) where a=1 order by a desc, b desc, c desc;
+
+drop table t1, t2, t3;
+
--- a/mysql-test/t/multi_update.test
+++ b/mysql-test/t/multi_update.test
@@ -5,6 +5,7 @@
 --disable_warnings
 drop table if exists t1,t2,t3;
 drop database if exists mysqltest;
+drop view if exists v1;
 --error 0,1141
 revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
 --error 0,1141
@@ -432,6 +433,20 @@ update t1,t2 set t1.col1 = (select max(col1) from t1) where t1.col1 = t2.col1;
 delete t1 from t1,t2 where t1.col1 < (select max(col1) from t1) and t1.col1 = t2.col1;
 drop table t1,t2;

+# Test for BUG#5837 - delete with outer join and const tables
+create table t1 (
+  aclid bigint not null primary key, 
+  status tinyint(1) not null 
+) engine = innodb;
+
+create table t2 (
+  refid bigint not null primary key, 
+  aclid bigint, index idx_acl(aclid) 
+) engine = innodb;
+insert into t2 values(1,null);
+delete t2, t1 from t2 left join t1 on (t2.aclid=t1.aclid) where t2.refid='1';
+drop table t1, t2;
+
 #
 # Test for bug #1980.
 #
--- a/mysql-test/t/ndb_alter_table.test
+++ b/mysql-test/t/ndb_alter_table.test
@@ -2,6 +2,7 @@

 --disable_warnings
 DROP TABLE IF EXISTS t1;
+drop database if exists mysqltest;
 --enable_warnings

 #
@@ -20,6 +21,22 @@ SELECT * FROM t1;

 DROP TABLE t1;

+#
+# Verfify changing table names between databases
+#
+CREATE DATABASE mysqltest;
+USE mysqltest;
+CREATE TABLE t1 (
+  a INT NOT NULL,
+  b INT NOT NULL
+) ENGINE=ndbcluster;
+RENAME TABLE t1 TO test.t1;
+SHOW TABLES;
+DROP DATABASE mysqltest;
+USE test;
+SHOW TABLES;
+DROP TABLE t1;
+
 #
 # More advanced test
 #
--- a/mysql-test/t/ndb_update.test
+++ b/mysql-test/t/ndb_update.test
@@ -0,0 +1,22 @@
+-- source include/have_ndb.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+#
+# Basic test of INSERT in NDB 
+#
+
+#
+# Create a normal table with primary key
+#
+CREATE TABLE t1 (
+  pk1 INT NOT NULL PRIMARY KEY,
+  b INT NOT NULL,
+  c INT NOT NULL
+) ENGINE=ndbcluster;
+
+INSERT INTO t1 VALUES (0, 0, 1),(1,1,2),(2,2,3);
+UPDATE t1 set b = c;
+select * from t1 order by pk1;
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -472,6 +472,19 @@ set @var=null;
 select @var is null, @var is not null, @var;
 execute stmt using @var, @var, @var;

+# 
+# Bug#6873 "PS, having with subquery, crash during execute"
+# check that if we modify having subtree, we update JOIN->having pointer
+#
+create table t1 (pnum char(3));
+create table t2 (pnum char(3));
+prepare stmt from "select pnum from t2 having pnum in (select 'p1' from t1)";
+execute stmt;
+execute stmt;
+execute stmt;
+deallocate prepare stmt;
+drop table t1, t2;
+
 #
 # Bug#6102 "Server crash with prepared statement and blank after
 # function name"
--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/t/ps_1general.test
@@ -11,6 +11,10 @@
 --disable_warnings
 drop table if exists t5, t6, t7, t8;
 drop database if exists mysqltest ;
+# Cleanup from other tests
+drop database if exists testtets;
+drop table if exists t1Aa,t2Aa,v1Aa,v2Aa;
+drop view if exists t1Aa,t2Aa,v1Aa,v2Aa;
 --enable_warnings

 --disable_query_log
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -686,3 +686,14 @@ show status like "Qcache_hits";
 #
 DROP TABLE t1;
 SET GLOBAL query_cache_size=0;
+
+#
+# Information schema & query cache test
+#
+SET SESSION query_cache_type = 2;
+create table t1(a int);
+select table_name from information_schema.tables
+where table_schema="test";
+drop table t1;
+select table_name from information_schema.tables
+where table_schema="test";
--- a/mysql-test/t/rpl_insert_ignore-slave.opt
+++ b/mysql-test/t/rpl_insert_ignore-slave.opt
@@ -0,0 +1 @@
+--innodb
--- a/mysql-test/t/rpl_insert_ignore.test
+++ b/mysql-test/t/rpl_insert_ignore.test
@@ -0,0 +1,71 @@
+# Testcase for BUG#6287 "Slave skips auto_increment values in Replication with InnoDB"
+# The bug was that if on master, INSERT IGNORE ignored some
+# rows, and the table was InnoDB with auto_inc column, then on slave
+# some rows received an auto_inc bigger than on master.
+# Slave needs to be started with --innodb to store table in InnoDB.
+# Same test for MyISAM (which had no bug).
+
+-- source include/have_innodb.inc
+
+-- source include/master-slave.inc
+
+CREATE TABLE t1 (
+ a int unsigned not null auto_increment primary key,
+ b int unsigned,
+ unique (b)
+) ENGINE=innodb;
+
+CREATE TABLE t2 (
+ a int unsigned, # to force INSERT SELECT to have a certain order
+ b int unsigned
+) ENGINE=innodb;
+
+
+INSERT INTO t1 VALUES (NULL, 1);
+INSERT INTO t1 VALUES (NULL, 2);
+INSERT INTO t1 VALUES (NULL, 3);
+INSERT INTO t1 VALUES (NULL, 4);
+
+# An alternation of values which will conflict in t1 and will not.
+
+INSERT INTO t2 VALUES (1, 1);
+INSERT INTO t2 VALUES (2, 2);
+INSERT INTO t2 VALUES (3, 5);
+INSERT INTO t2 VALUES (4, 3);
+INSERT INTO t2 VALUES (5, 4);
+INSERT INTO t2 VALUES (6, 6);
+
+INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
+
+# Compare results
+
+SELECT * FROM t1 ORDER BY a;
+
+sync_slave_with_master;
+SELECT * FROM t1 ORDER BY a;
+
+# Now do the same for MyISAM
+
+connection master;
+drop table t1;
+CREATE TABLE t1 (
+ a int unsigned not null auto_increment primary key,
+ b int unsigned,
+ unique (b)
+) ENGINE=myisam;
+
+INSERT INTO t1 VALUES (1, 1);
+INSERT INTO t1 VALUES (2, 2);
+INSERT INTO t1 VALUES (3, 3);
+INSERT INTO t1 VALUES (4, 4);
+
+INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a;
+
+SELECT * FROM t1 ORDER BY a;
+
+sync_slave_with_master;
+SELECT * FROM t1 ORDER BY a;
+
+connection master;
+drop table t1, t2;
+sync_slave_with_master;
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -251,7 +251,7 @@ show table status;
 delete from t1 where a=3;
 delete from t2 where b=3;
 delete from t3 where a=3;
--replace_column 6 # 7 # 8 # 9 #
+--replace_column 6 # 7 # 8 # 9 # 10 #
 show table status;
 delete from t1;
 delete from t2;
@@ -266,7 +266,7 @@ show table status;
 delete from t1 where a=5;
 delete from t2 where b=5;
 delete from t3 where a=5;
--replace_column 6 # 7 # 8 # 9 #
+--replace_column 6 # 7 # 8 # 9 # 10 #
 show table status;

 drop table t1, t2, t3;
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -916,7 +916,20 @@ create table t3 (a int);
 insert into t3 values (6),(7),(3);
 select * from t3 where a >= all (select b from t2);
 explain extended select * from t3 where a >= all (select b from t2);
-
+select * from t3 where a >= some (select b from t2);
+explain extended select * from t3 where a >= some (select b from t2);
+select * from t3 where a >= all (select b from t2 group by 1);
+explain extended select * from t3 where a >= all (select b from t2 group by 1);
+select * from t3 where a >= some (select b from t2 group by 1);
+explain extended select * from t3 where a >= some (select b from t2 group by 1);
+select * from t3 where NULL >= any (select b from t2);
+explain extended select * from t3 where NULL >= any (select b from t2);
+select * from t3 where NULL >= any (select b from t2 group by 1);
+explain extended select * from t3 where NULL >= any (select b from t2 group by 1);
+select * from t3 where NULL >= some (select b from t2);
+explain extended select * from t3 where NULL >= some (select b from t2);
+select * from t3 where NULL >= some (select b from t2 group by 1);
+explain extended select * from t3 where NULL >= some (select b from t2 group by 1);
 #
 # optimized static ALL/ANY with grouping
 #
@@ -1341,3 +1354,40 @@ create table t1 (s1 int,s2 int);
 insert into t1 values (20,15);
 select * from t1 where  (('a',null) <=> (select 'a',s2 from t1 where s1 = 0));
 drop table t1;
+
+#
+# ALL/ANY with NULL
+#
+create table t1 (s1 int);
+insert into t1 values (1),(null);
+select * from t1 where s1 < all (select s1 from t1);
+select s1, s1 < all (select s1 from t1) from t1;
+drop table t1;
+
+#
+# reference on changable fields from subquery
+#
+CREATE TABLE t1 (
+  Code char(3) NOT NULL default '',
+  Name char(52) NOT NULL default '',
+  Continent enum('Asia','Europe','North America','Africa','Oceania','Antarctica','South America') NOT NULL default 'Asia',
+  Region char(26) NOT NULL default '',
+  SurfaceArea float(10,2) NOT NULL default '0.00',
+  IndepYear smallint(6) default NULL,
+  Population int(11) NOT NULL default '0',
+  LifeExpectancy float(3,1) default NULL,
+  GNP float(10,2) default NULL,
+  GNPOld float(10,2) default NULL,
+  LocalName char(45) NOT NULL default '',
+  GovernmentForm char(45) NOT NULL default '',
+  HeadOfState char(60) default NULL,
+  Capital int(11) default NULL,
+  Code2 char(2) NOT NULL default ''
+) ENGINE=MyISAM;
+INSERT INTO t1 VALUES ('XXX','Xxxxx','Oceania','Xxxxxx',26.00,0,0,0,0,0,'Xxxxx','Xxxxx','Xxxxx',NULL,'XX');
+INSERT INTO t1 VALUES ('ASM','American Samoa','Oceania','Polynesia',199.00,0,68000,75.1,334.00,NULL,'Amerika Samoa','US Territory','George W. Bush',54,'AS');
+INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes fran<61>aises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');
+INSERT INTO t1 VALUES ('UMI','United States Minor Outlying Islands','Oceania','Micronesia/Caribbean',16.00,0,0,NULL,0.00,NULL,'United States Minor Outlying Islands','Dependent Territory of the US','George W. Bush',NULL,'UM');
+/*!40000 ALTER TABLE t1 ENABLE KEYS */;
+SELECT DISTINCT Continent AS c FROM t1 WHERE Code <> SOME ( SELECT Code FROM t1 WHERE Continent = c AND Population < 200);
+drop table t1;
--- a/mysql-test/t/timezone2.test
+++ b/mysql-test/t/timezone2.test
@@ -2,7 +2,7 @@

 # Preparing playground
 --disable_warnings
-drop table if exists t1;
+drop table if exists t1, t2;
 --enable_warnings


@@ -205,25 +205,64 @@ drop table t1;
 # even for unprivileged users.
 #

+# Let us prepare playground
 delete from mysql.user where user like 'mysqltest\_%';
 delete from mysql.db where user like 'mysqltest\_%';
 delete from mysql.tables_priv where user like 'mysqltest\_%';
 delete from mysql.columns_priv where user like 'mysqltest\_%';
 flush privileges;
+create table t1 (a int, b datetime);
+create table t2 (c int, d datetime);

-grant usage on mysqltest.* to mysqltest_1@localhost;
+grant all privileges on test.* to mysqltest_1@localhost;
 connect (tzuser, localhost, mysqltest_1,,);
 connection tzuser;
 show grants for current_user();
 set time_zone= '+00:00';
 set time_zone= 'Europe/Moscow';
 select convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC');
+select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;
+# Let us also check whenever multi-update works ok
+update t1, t2 set t1.b = convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')
+              where t1.a = t2.c and t2.d = (select max(d) from t2);
 # But still these two statements should not work:
--error 1044
+--error 1142
 select * from mysql.time_zone_name;
--error 1044
+--error 1142
 select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name;

+#
+# Test for bug #6765 "Implicit access to time zone description tables
+# requires privileges for them if some table or column level grants
+# present"
+#
+connection default;
+# Let use some table-level grants instead of db-level 
+# to make life more interesting
+delete from mysql.db where user like 'mysqltest\_%';
+flush privileges;
+grant all privileges on test.t1 to mysqltest_1@localhost;
+grant all privileges on test.t2 to mysqltest_1@localhost;
+# The test itself is almost the same as previous one
+connect (tzuser2, localhost, mysqltest_1,,);
+connection tzuser2;
+show grants for current_user();
+set time_zone= '+00:00';
+set time_zone= 'Europe/Moscow';
+select convert_tz('2004-11-31 12:00:00', 'Europe/Moscow', 'UTC');
+select convert_tz(b, 'Europe/Moscow', 'UTC') from t1;
+update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')
+              where t1.a = t2.c and t2.d = (select max(d) from t2);
+# Again these two statements should not work (but with different errors):
+--error 1142
+select * from mysql.time_zone_name;
+--error 1142
+select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;
+
+# Clean-up
 connection default;
 delete from mysql.user where user like 'mysqltest\_%';
+delete from mysql.db where user like 'mysqltest\_%';
+delete from mysql.tables_priv where user like 'mysqltest\_%';
 flush privileges;
+drop table t1, t2;
--- a/Show More
+++ b/Show More