Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  linux.site:/home/reggie/work/mysql-5.1

.bzrignore

@@ -134,6 +134,137 @@ autom4te.cache/*
 autom4te.cache/output.0
 autom4te.cache/requests
 autom4te.cache/traces.0
+bdb/*.ds?
+bdb/*.vcproj
+bdb/README
+bdb/btree/btree_auto.c
+bdb/build_unix/*
+bdb/build_vxworks/db.h
+bdb/build_vxworks/db_int.h
+bdb/build_win32/db.h
+bdb/build_win32/db_archive.dsp
+bdb/build_win32/db_checkpoint.dsp
+bdb/build_win32/db_config.h
+bdb/build_win32/db_cxx.h
+bdb/build_win32/db_deadlock.dsp
+bdb/build_win32/db_dll.dsp
+bdb/build_win32/db_dump.dsp
+bdb/build_win32/db_int.h
+bdb/build_win32/db_java.dsp
+bdb/build_win32/db_load.dsp
+bdb/build_win32/db_perf.dsp
+bdb/build_win32/db_printlog.dsp
+bdb/build_win32/db_recover.dsp
+bdb/build_win32/db_stat.dsp
+bdb/build_win32/db_static.dsp
+bdb/build_win32/db_tcl.dsp
+bdb/build_win32/db_test.dsp
+bdb/build_win32/db_upgrade.dsp
+bdb/build_win32/db_verify.dsp
+bdb/build_win32/ex_access.dsp
+bdb/build_win32/ex_btrec.dsp
+bdb/build_win32/ex_env.dsp
+bdb/build_win32/ex_lock.dsp
+bdb/build_win32/ex_mpool.dsp
+bdb/build_win32/ex_tpcb.dsp
+bdb/build_win32/excxx_access.dsp
+bdb/build_win32/excxx_btrec.dsp
+bdb/build_win32/excxx_env.dsp
+bdb/build_win32/excxx_lock.dsp
+bdb/build_win32/excxx_mpool.dsp
+bdb/build_win32/excxx_tpcb.dsp
+bdb/build_win32/include.tcl
+bdb/build_win32/libdb.def
+bdb/build_win32/libdb.rc
+bdb/db/crdel_auto.c
+bdb/db/db_auto.c
+bdb/dbinc_auto/*.*
+bdb/dbreg/dbreg_auto.c
+bdb/dist/autom4te-2.53.cache/*
+bdb/dist/autom4te-2.53.cache/output.0
+bdb/dist/autom4te-2.53.cache/requests
+bdb/dist/autom4te-2.53.cache/traces.0
+bdb/dist/autom4te.cache/*
+bdb/dist/autom4te.cache/output.0
+bdb/dist/autom4te.cache/requests
+bdb/dist/autom4te.cache/traces.0
+bdb/dist/config.hin
+bdb/dist/configure
+bdb/dist/tags
+bdb/dist/template/db_server_proc
+bdb/dist/template/gen_client_ret
+bdb/dist/template/rec_btree
+bdb/dist/template/rec_crdel
+bdb/dist/template/rec_db
+bdb/dist/template/rec_dbreg
+bdb/dist/template/rec_fileops
+bdb/dist/template/rec_hash
+bdb/dist/template/rec_log
+bdb/dist/template/rec_qam
+bdb/dist/template/rec_txn
+bdb/examples_c/ex_apprec/ex_apprec_auto.c
+bdb/examples_c/ex_apprec/ex_apprec_auto.h
+bdb/examples_c/ex_apprec/ex_apprec_template
+bdb/examples_java
+bdb/fileops/fileops_auto.c
+bdb/hash/hash_auto.c
+bdb/include/btree_auto.h
+bdb/include/btree_ext.h
+bdb/include/clib_ext.h
+bdb/include/common_ext.h
+bdb/include/crdel_auto.h
+bdb/include/db_auto.h
+bdb/include/db_ext.h
+bdb/include/db_server.h
+bdb/include/env_ext.h
+bdb/include/gen_client_ext.h
+bdb/include/gen_server_ext.h
+bdb/include/hash_auto.h
+bdb/include/hash_ext.h
+bdb/include/lock_ext.h
+bdb/include/log_auto.h
+bdb/include/log_ext.h
+bdb/include/mp_ext.h
+bdb/include/mutex_ext.h
+bdb/include/os_ext.h
+bdb/include/qam_auto.h
+bdb/include/qam_ext.h
+bdb/include/rpc_client_ext.h
+bdb/include/rpc_server_ext.h
+bdb/include/tcl_ext.h
+bdb/include/txn_auto.h
+bdb/include/txn_ext.h
+bdb/include/xa_ext.h
+bdb/java/src/com/sleepycat/db/Db.java
+bdb/java/src/com/sleepycat/db/DbBtreeStat.java
+bdb/java/src/com/sleepycat/db/DbConstants.java
+bdb/java/src/com/sleepycat/db/DbHashStat.java
+bdb/java/src/com/sleepycat/db/DbLockStat.java
+bdb/java/src/com/sleepycat/db/DbLogStat.java
+bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
+bdb/java/src/com/sleepycat/db/DbQueueStat.java
+bdb/java/src/com/sleepycat/db/DbRepStat.java
+bdb/java/src/com/sleepycat/db/DbTxnStat.java
+bdb/libdb_java/java_stat_auto.c
+bdb/libdb_java/java_stat_auto.h
+bdb/log/log_auto.c
+bdb/qam/qam_auto.c
+bdb/rpc_client/db_server_clnt.c
+bdb/rpc_client/gen_client.c
+bdb/rpc_server/c/db_server_proc.c
+bdb/rpc_server/c/db_server_proc.sed
+bdb/rpc_server/c/db_server_svc.c
+bdb/rpc_server/c/db_server_xdr.c
+bdb/rpc_server/c/gen_db_server.c
+bdb/rpc_server/db_server.x
+bdb/rpc_server/db_server_proc.sed
+bdb/rpc_server/db_server_svc.c
+bdb/rpc_server/db_server_xdr.c
+bdb/rpc_server/gen_db_server.c
+bdb/test/TESTS
+bdb/test/include.tcl
+bdb/test/logtrack.list
+bdb/txn/txn_auto.c
 binary/*
 bkpull.log
 bkpull.log*
@@ -253,6 +384,7 @@ include/my_global.h
 include/mysql_version.h
 include/mysqld_ername.h
 include/mysqld_error.h
+include/openssl
 include/readline
 include/readline/*.h
 include/readline/readline.h
@@ -396,6 +528,7 @@ libmysqld/opt_range.cc
 libmysqld/opt_sum.cc
 libmysqld/pack.c
 libmysqld/parse_file.cc
+libmysqld/partition_info.cc
 libmysqld/password.c
 libmysqld/procedure.cc
 libmysqld/protocol.cc
@@ -1383,6 +1516,7 @@ storage/ndb/src/common/mgmcommon/printConfig/*.d
 storage/ndb/src/common/portlib/libportlib.dsp
 storage/ndb/src/common/transporter/libtransporter.dsp
 storage/ndb/src/common/util/libgeneral.dsp
+storage/ndb/src/common/util/testBitmask.cpp
 storage/ndb/src/cw/cpcd/ndb_cpcd
 storage/ndb/src/dummy.cpp
 storage/ndb/src/kernel/blocks/backup/libbackup.dsp
@@ -1614,6 +1748,3 @@ vio/viotest-sslconnect.cpp
 vio/viotest.cpp
 zlib/*.ds?
 zlib/*.vcproj
-libmysqld/partition_info.cc
-storage/ndb/src/common/util/testBitmask.cpp
-include/openssl

client/mysql.cc

@@ -185,6 +185,7 @@ void tee_fprintf(FILE *file, const char *fmt, ...);
 void tee_fputs(const char *s, FILE *file);
 void tee_puts(const char *s, FILE *file);
 void tee_putc(int c, FILE *file);
+static void tee_print_sized_data(const char *data, unsigned int length, unsigned int width);
 /* The names of functions that actually do the manipulation. */
 static int get_options(int argc,char **argv);
 static int com_quit(String *str,char*),
@@ -2308,20 +2309,29 @@ print_table_data(MYSQL_RES *result)
     for (uint off= 0; off < mysql_num_fields(result); off++)
     {
       const char *str= cur[off] ? cur[off] : "NULL";
+      uint currlength;
+      uint maxlength;
+      uint numcells;
+
       field= mysql_fetch_field(result);
-      uint maxlength= field->max_length;
+      maxlength= field->max_length;
+      currlength= (uint) lengths[off];
+      numcells= charset_info->cset->numcells(charset_info, 
+                                                    str, str + currlength);
       if (maxlength > MAX_COLUMN_LENGTH)
       {
-	tee_fputs(str, PAGER);
+        tee_print_sized_data(str, currlength, maxlength);
         tee_fputs(" |", PAGER);
       }
       else
       {
-        uint currlength= (uint) lengths[off];
-        uint numcells= charset_info->cset->numcells(charset_info, 
-                                                    str, str + currlength);
-        tee_fprintf(PAGER, num_flag[off] ? "%*s |" : " %-*s|",
-                    maxlength + currlength - numcells, str);
+        if (num_flag[off] != 0)
+          tee_fprintf(PAGER, " %-*s|", maxlength + currlength - numcells, str);
+        else 
+        {
+          tee_print_sized_data(str, currlength, maxlength);
+          tee_fputs(" |", PAGER);
+        }
       }
     }
     (void) tee_fputs("\n", PAGER);
@@ -2331,6 +2341,35 @@ print_table_data(MYSQL_RES *result)
 }
 
 
+static void
+tee_print_sized_data(const char *data, unsigned int length, unsigned int width)
+{
+  /* 
+    It is not a number, so print each character justified to the left.
+    For '\0's print ASCII spaces instead, as '\0' is eaten by (at
+    least my) console driver, and that messes up the pretty table
+    grid.  (The \0 is also the reason we can't use fprintf() .) 
+  */
+  unsigned int i;
+  const char *p;
+
+  tee_putc(' ', PAGER);
+
+  for (i= 0, p= data; i < length; i+= 1, p+= 1)
+  {
+    if (*p == '\0')
+      tee_putc((int)' ', PAGER);
+    else
+      tee_putc((int)*p, PAGER);
+  }
+
+  i+= 1; 
+  for (   ; i < width; i+= 1)
+    tee_putc((int)' ', PAGER);
+}
+
+
+
 static void
 print_table_data_html(MYSQL_RES *result)
 {

configure.in

@@ -1591,8 +1591,8 @@ if test "$with_debug" = "no"
 then
   AC_ARG_WITH([fast-mutexes],
               AC_HELP_STRING([--with-fast-mutexes], 
-              [compile with fast mutexes (default is enabled)]),
-              [with_fast_mutexes=$withval], [with_fast_mutexes=yes])
+              [Compile with fast mutexes (default is disabled)]),
+              [with_fast_mutexes=$withval], [with_fast_mutexes=no])
 fi
 
 if test "$with_fast_mutexes" = "yes"

libmysqld/lib_sql.cc

@@ -38,6 +38,7 @@ int check_user(THD *thd, enum enum_server_command command,
 	       const char *passwd, uint passwd_len, const char *db,
 	       bool check_count);
 C_MODE_START
+
 #include <mysql.h>
 #undef ER
 #include "errmsg.h"
@@ -46,22 +47,6 @@ C_MODE_START
 
 static my_bool emb_read_query_result(MYSQL *mysql);
 
-C_MODE_END
-
-void THD::clear_data_list()
-{
-  while (first_data)
-  {
-    MYSQL_DATA *data= first_data;
-    first_data= data->embedded_info->next;
-    free_rows(data);
-  }
-  data_tail= &first_data;
-  free_rows(cur_data);
-  cur_data= 0;
-}
-
-C_MODE_START
 
 /*
   Reads error information from the MYSQL_DATA and puts
@@ -426,15 +411,6 @@ MYSQL_METHODS embedded_methods=
   emb_read_rows_from_cursor
 };
 
-C_MODE_END
-
-void THD::clear_error()
-{
-  net.last_error[0]= 0;
-  net.last_errno= 0;
-  net.report_error= 0;
-}
-
 /*
   Make a copy of array and the strings array points to
 */
@@ -461,10 +437,6 @@ char **copy_arguments(int argc, char **argv)
   return res;
 }
 
-
-extern "C"
-{
-
 char **		copy_arguments_ptr= 0;
 
 int init_embedded_server(int argc, char **argv, char **groups)
@@ -580,9 +552,7 @@ void end_embedded_server()
   clean_up(0);
 }
 
-} /* extern "C" */
 
-C_MODE_START
 void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db)
 {
   THD *thd = (THD *)mysql->thd;
@@ -701,6 +671,26 @@ int check_embedded_connection(MYSQL *mysql)
 
 C_MODE_END
 
+void THD::clear_data_list()
+{
+  while (first_data)
+  {
+    MYSQL_DATA *data= first_data;
+    first_data= data->embedded_info->next;
+    free_rows(data);
+  }
+  data_tail= &first_data;
+  free_rows(cur_data);
+  cur_data= 0;
+}
+
+void THD::clear_error()
+{
+  net.last_error[0]= 0;
+  net.last_errno= 0;
+  net.report_error= 0;
+}
+
 static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length,
 			 CHARSET_INFO *fromcs, CHARSET_INFO *tocs)
 {

mysql-test/README.stress

@@ -2,114 +2,118 @@
 Overview
 --------
 
-Stress script is designed to perform testsing of mysql server in 
-multi-thread environment. 
-
-Stress script allows:
- 
- - to use for stress testing mysqltest binary as test engine
- - to use for stress testing both regular test suite and any
-   additional test suites (e.g. mysql-test-extra-5.0)
- - to specify files with lists of tests both for initialization of
-   stress db and for further testing itself
- - to define number of threads that will be concurrently used in testing
- - to define limitations for test run. e.g. number of tests or loops
-   for execution or duration of testing, delay between test executions, etc.
- - to get readable log file which can be used for identification of
-   errors arose during testing
-
-All functionality regarding stress testing was implemeted in 
-mysql-stress-test.pl script and there are two ways to run stress test:
-
- - for most cases it is enough to use options below for starting of
-   stress test from mysql-test-run wrapper. In this case server will 
-   be run automatically, all preparation steps will be performed
-   and after that stress test will be started.
-
- - in advanced case one can run mysql-stress-test.pl script directly. 
-   But it requires to perform some preparation steps and to specify a 
-   bunch of options as well so this way may look a bit complicate.
+The stress script is designed to perform testing of the MySQL server in 
+a multi-threaded environment. 
+
+All functionality regarding stress testing is implemented in the
+mysql-stress-test.pl script.
+
+The stress script allows:
+ 
+ - To stress test the mysqltest binary test engine.
+ - To stress test the regular test suite and any additional test suites
+   (such as mysql-test-extra-5.0).
+ - To specify files with lists of tests both for initialization of
+   stress db and for further testing itself.
+ - To define the number of threads to be concurrently used in testing.
+ - To define limitations for the test run. such as the number of tests or
+   loops for execution or duration of testing, delay between test
+   executions, and so forth.
+ - To get a readable log file that can be used for identification of
+   errors that occur during testing.
+
+There are two ways to run the mysql-stress-test.pl script:
+
+ - For most cases, it is enough to use the options below for starting
+   the stress test from the mysql-test-run wrapper. In this case, the
+   server is run automatically, all preparation steps are performed,
+   and after that the stress test is started.
+
+ - In advanced case, you can run the mysql-stress-test.pl script directly. 
+   But this requires that you perform some preparation steps and to specify
+   a bunch of options as well, so this invocation method may be a bit
+   complicated.
 
 Usage
 -----
 
-Below is list of stress test specific options for mysql-test-run:
+The following mysql-test-run options are specific to stress-testing:
 
 --stress 
   Enable stress mode
 
 --stress-suite=<suite name>
-  Test suite name that will be used in stress testing.
-  We assume that all suites are located in mysql-test/suite directory
+  Test suite name to use in stress testing.  We assume that all suites
+  are located in the mysql-test/suite directory.
   There is one special suite name - <main|default> that corresponds
-  to regular test suite located in mysql-test directory. 
+  to the regular test suite located in the mysql-test directory. 
   
 --stress-threads=<number of threads>
-  Number of threads that will be used in stress testing
+  The number of threads to use in stress testing.
   
 --stress-tests-file=<filename with list of tests>
-  Filename with list of tests(without .test suffix) that will be used in 
-  stress testing. Default filename is stress_tests.txt and default 
+  The file that contains the list of tests (without .test suffix) to use in 
+  stress testing. The default filename is stress_tests.txt and the default 
   location of this file is suite/<suite name>/stress_tests.txt
 
 --stress-init-file=<filename with list of tests>
-  Filename with list of tests(without .test suffix) that will be used in 
-  stress testing for initialization of stress db. These tests will be 
-  executed only once before starting of test itself. Default filename 
-  is stress_init.txt and default location of this file is 
+  The file that contains list of tests (without .test suffix) to use in 
+  stress testing for initialization of the stress db. These tests will be 
+  executed only once before starting the test itself. The default filename 
+  is stress_init.txt and the default location of this file is 
   suite/<suite name>/stress_init.txt
 
 --stress-mode=<method which will be used for choosing tests from the list>
   Possible values are: random(default), seq 
 
-  There are two possible modes which affect order of selecting of tests
+  There are two possible modes that affect the order of test selection
   from the list:
-    - in random mode tests will be selected in random order
-    - in seq mode each thread will execute tests in the loop one by one as
-      they specified in the list file.
+    - In random mode, tests are selected in random order
+    - In seq mode, each thread executes tests in a loop one by one in
+	  the order specified in the list file.
 
---stress-test-count= <number>
+--stress-test-count=<number>
   Total number of tests that will be executed concurrently by all threads
 
---stress-loop-count= <number>
+--stress-loop-count=<number>
   Total number of loops in seq mode that will be executed concurrently 
   by all threads
 
---stress-test-duration= <number>
+--stress-test-duration=<number>
   Duration of stress testing in seconds
 
 Examples
 -------- 
 
-1. Example of simple command line to start stress test:
+1. Example of a simple command line to start a stress test:
 
  mysql-test-run --stress alias
 
-Runs stress test with default values for number of threads and number of tests,
-with test 'alias' from suite 'main'.
+Runs a stress test with default values for number of threads and number
+of tests, with test 'alias' from suite 'main'.
 
 2. Using in stress testing tests from other suites:
 
  - mysql-test-run --stress --stress-threads=10 --stress-test-count=1000 \
                  --stress-suite=example  --stress-tests-file=testslist.txt
 
-   Will run stress test with 10 threads, will execute 1000 tests by all 
-   threads, test will be used from suite 'example', list of test will be 
+   Runs a stress test with 10 threads, executes 1000 tests by all 
+   threads, tests are used from suite 'example', the list of tests is
    taken from file 'testslist.txt'
 
  - mysql-test-run --stress --stress-threads=10 --stress-test-count=1000 \
                   --stress-suite=example sum_distinct
 
-   Will run stress test with 10 threads, will execute 1000 tests by all 
-   threads, test will be used from suite 'example', list of test contains 
-   only one test 'sum_distinct'
+   Runs stress test with 10 threads, executes 1000 tests by all 
+   threads, tests are used from suite 'example', the list of tests
+   contains only one test 'sum_distinct'
 
 3. Debugging of issues found with stress test
 
- Right now stress test is not fully integrated in mysql-test-run
- and does not support --gdb option so to debug issue found with stress 
- test you have to start separately mysql server under debuger and then 
- run stress test as:
+ Right now, the stress test is not fully integrated in mysql-test-run
+ and does not support the --gdb option. To debug issues found with the
+ stress test, you must start the MySQL server separately under a debugger
+ and then run the stress test like this:
  
  - mysql-test-run --extern --stress --stress-threads=10 \
                   --stress-test-count=1000 --stress-suite=example \

mysql-test/include/gis_generic.inc

@@ -8,14 +8,14 @@
 DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 --enable_warnings
 
-CREATE TABLE gis_point  (fid INTEGER, g POINT);
-CREATE TABLE gis_line  (fid INTEGER, g LINESTRING);
-CREATE TABLE gis_polygon   (fid INTEGER, g POLYGON);
-CREATE TABLE gis_multi_point (fid INTEGER, g MULTIPOINT);
-CREATE TABLE gis_multi_line (fid INTEGER, g MULTILINESTRING);
-CREATE TABLE gis_multi_polygon  (fid INTEGER, g MULTIPOLYGON);
-CREATE TABLE gis_geometrycollection  (fid INTEGER, g GEOMETRYCOLLECTION);
-CREATE TABLE gis_geometry (fid INTEGER, g GEOMETRY);
+CREATE TABLE gis_point  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT);
+CREATE TABLE gis_line  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING);
+CREATE TABLE gis_polygon   (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POLYGON);
+CREATE TABLE gis_multi_point (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOINT);
+CREATE TABLE gis_multi_line (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTILINESTRING);
+CREATE TABLE gis_multi_polygon  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOLYGON);
+CREATE TABLE gis_geometrycollection  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRYCOLLECTION);
+CREATE TABLE gis_geometry (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRY);
 
 SHOW CREATE TABLE gis_point;
 SHOW FIELDS FROM gis_point;
@@ -141,6 +141,7 @@ DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gi
 # Check that ALTER TABLE doesn't loose geometry type
 #
 CREATE TABLE t1 (
+  a INTEGER PRIMARY KEY AUTO_INCREMENT,
   gp  point,
   ln  linestring,
   pg  polygon,
@@ -156,24 +157,24 @@ ALTER TABLE t1 ADD fid INT;
 SHOW FIELDS FROM t1;
 DROP TABLE t1;
 
-create table t1 (a geometry not null);
-insert into t1 values (GeomFromText('Point(1 2)'));
+create table t1 (pk integer primary key auto_increment, a geometry not null);
+insert into t1 (a) values (GeomFromText('Point(1 2)'));
 -- error 1416
-insert into t1 values ('Garbage');
+insert into t1 (a) values ('Garbage');
 -- error 1416
-insert IGNORE into t1 values ('Garbage');
+insert IGNORE into t1 (a) values ('Garbage');
 
 drop table t1;
 
-create table t1 (fl geometry);
+create table t1 (pk integer primary key auto_increment, fl geometry);
 --error 1416
-insert into t1 values (1);
+insert into t1 (fl) values (1);
 --error 1416
-insert into t1 values (1.11);
+insert into t1 (fl) values (1.11);
 --error 1416
-insert into t1 values ("qwerty");
+insert into t1 (fl) values ("qwerty");
 --error 1416
-insert into t1 values (pointfromtext('point(1,1)'));
+insert into t1 (fl) values (pointfromtext('point(1,1)'));
 
 drop table t1;
 

mysql-test/mysql-stress-test.pl

@@ -14,16 +14,17 @@
 # 
 # Design of stress script should allow one:
 # 
-#   - to use for stress testing mysqltest binary as test engine
-#   - to use for stress testing both regular test suite and any
-#     additional test suites (e.g. mysql-test-extra-5.0)
-#   - to specify files with lists of tests both for initialization of
-#     stress db and for further testing itself
-#   - to define number of threads that will be concurrently used in testing
-#   - to define limitations for test run. e.g. number of tests or loops
-#     for execution or duration of testing, delay between test executions, etc.
-#   - to get readable log file which can be used for identification of
-#     errors arose during testing
+#   - To stress test the mysqltest binary test engine.
+#   - To stress test the regular test suite and any additional test suites
+#     (such as mysql-test-extra-5.0).
+#   - To specify files with lists of tests both for initialization of
+#     stress db and for further testing itself.
+#   - To define the number of threads to be concurrently used in testing.
+#   - To define limitations for the test run. such as the number of tests or
+#     loops for execution or duration of testing, delay between test
+#     executions, and so forth.
+#   - To get a readable log file that can be used for identification of
+#     errors that occur during testing.
 # 
 # Basic scenarios:
 # 

mysql-test/mysql-test-run.pl

@@ -703,6 +703,9 @@ sub command_line_setup () {
     $opt_vardir= "$glob_mysql_test_dir/var";
   }
   $opt_vardir_trace= $opt_vardir;
+  # Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/...
+  $opt_vardir_trace=~ s/^\w://;
+
   # We make the path absolute, as the server will do a chdir() before usage
   unless ( $opt_vardir =~ m,^/, or
            ($glob_win32 and $opt_vardir =~ m,^[a-z]:/,i) )

mysql-test/r/alter_table.result

@@ -468,25 +468,25 @@ delete from t1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) character set koi8r default NULL
+  `a` char(10) CHARACTER SET koi8r DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 DEFAULT CHARACTER SET latin1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) character set koi8r default NULL
+  `a` char(10) CHARACTER SET koi8r DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 CONVERT TO CHARACTER SET latin1;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) default NULL
+  `a` char(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 DEFAULT CHARACTER SET cp1251;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) character set latin1 default NULL
+  `a` char(10) CHARACTER SET latin1 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=cp1251
 drop table t1;
 create table t1 (myblob longblob,mytext longtext) 
@@ -495,14 +495,14 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `myblob` longblob,
-  `mytext` longtext collate latin1_general_cs
+  `mytext` longtext COLLATE latin1_general_cs
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs
 alter table t1 character set latin2;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `myblob` longblob,
-  `mytext` longtext character set latin1 collate latin1_general_cs
+  `mytext` longtext CHARACTER SET latin1 COLLATE latin1_general_cs
 ) ENGINE=MyISAM DEFAULT CHARSET=latin2
 drop table t1;
 CREATE TABLE t1 (a int PRIMARY KEY, b INT UNIQUE);
@@ -511,7 +511,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
-  `b` int(11) default NULL,
+  `b` int(11) DEFAULT NULL,
   UNIQUE KEY `b` (`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 ALTER TABLE t1 DROP PRIMARY KEY;

mysql-test/r/analyse.result

@@ -36,16 +36,16 @@ create table t2 select * from t1 where 0=1 procedure analyse();
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `Field_name` varbinary(255) NOT NULL default '',
-  `Min_value` varbinary(255) default NULL,
-  `Max_value` varbinary(255) default NULL,
-  `Min_length` bigint(11) NOT NULL default '0',
-  `Max_length` bigint(11) NOT NULL default '0',
-  `Empties_or_zeros` bigint(11) NOT NULL default '0',
-  `Nulls` bigint(11) NOT NULL default '0',
-  `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',
-  `Std` varbinary(255) default NULL,
-  `Optimal_fieldtype` varbinary(64) NOT NULL default ''
+  `Field_name` varbinary(255) NOT NULL DEFAULT '',
+  `Min_value` varbinary(255) DEFAULT NULL,
+  `Max_value` varbinary(255) DEFAULT NULL,
+  `Min_length` bigint(11) NOT NULL DEFAULT '0',
+  `Max_length` bigint(11) NOT NULL DEFAULT '0',
+  `Empties_or_zeros` bigint(11) NOT NULL DEFAULT '0',
+  `Nulls` bigint(11) NOT NULL DEFAULT '0',
+  `Avg_value_or_avg_length` varbinary(255) NOT NULL DEFAULT '',
+  `Std` varbinary(255) DEFAULT NULL,
+  `Optimal_fieldtype` varbinary(64) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1 where 0=1 procedure analyse();
 Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
@@ -55,16 +55,16 @@ create table t2 select * from t1 where 0=1 procedure analyse();
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `Field_name` varbinary(255) NOT NULL default '',
-  `Min_value` varbinary(255) default NULL,
-  `Max_value` varbinary(255) default NULL,
-  `Min_length` bigint(11) NOT NULL default '0',
-  `Max_length` bigint(11) NOT NULL default '0',
-  `Empties_or_zeros` bigint(11) NOT NULL default '0',
-  `Nulls` bigint(11) NOT NULL default '0',
-  `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',
-  `Std` varbinary(255) default NULL,
-  `Optimal_fieldtype` varbinary(64) NOT NULL default ''
+  `Field_name` varbinary(255) NOT NULL DEFAULT '',
+  `Min_value` varbinary(255) DEFAULT NULL,
+  `Max_value` varbinary(255) DEFAULT NULL,
+  `Min_length` bigint(11) NOT NULL DEFAULT '0',
+  `Max_length` bigint(11) NOT NULL DEFAULT '0',
+  `Empties_or_zeros` bigint(11) NOT NULL DEFAULT '0',
+  `Nulls` bigint(11) NOT NULL DEFAULT '0',
+  `Avg_value_or_avg_length` varbinary(255) NOT NULL DEFAULT '',
+  `Std` varbinary(255) DEFAULT NULL,
+  `Optimal_fieldtype` varbinary(64) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t2;
 Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
@@ -78,16 +78,16 @@ create table t2 select * from t1 where 0=1 procedure analyse();
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `Field_name` varbinary(255) NOT NULL default '',
-  `Min_value` varbinary(255) default NULL,
-  `Max_value` varbinary(255) default NULL,
-  `Min_length` bigint(11) NOT NULL default '0',
-  `Max_length` bigint(11) NOT NULL default '0',
-  `Empties_or_zeros` bigint(11) NOT NULL default '0',
-  `Nulls` bigint(11) NOT NULL default '0',
-  `Avg_value_or_avg_length` varbinary(255) NOT NULL default '',
-  `Std` varbinary(255) default NULL,
-  `Optimal_fieldtype` varbinary(64) NOT NULL default ''
+  `Field_name` varbinary(255) NOT NULL DEFAULT '',
+  `Min_value` varbinary(255) DEFAULT NULL,
+  `Max_value` varbinary(255) DEFAULT NULL,
+  `Min_length` bigint(11) NOT NULL DEFAULT '0',
+  `Max_length` bigint(11) NOT NULL DEFAULT '0',
+  `Empties_or_zeros` bigint(11) NOT NULL DEFAULT '0',
+  `Nulls` bigint(11) NOT NULL DEFAULT '0',
+  `Avg_value_or_avg_length` varbinary(255) NOT NULL DEFAULT '',
+  `Std` varbinary(255) DEFAULT NULL,
+  `Optimal_fieldtype` varbinary(64) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t2;
 Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

mysql-test/r/archive.result

@@ -12340,12 +12340,12 @@ ALTER TABLE t2 DROP COLUMN fld6;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `auto` int(11) default NULL,
-  `fld1` int(6) unsigned zerofill NOT NULL default '000000',
-  `companynr` tinyint(2) unsigned zerofill NOT NULL default '00',
-  `fld3` char(30) NOT NULL default '',
-  `fld4` char(35) NOT NULL default '',
-  `fld5` char(35) NOT NULL default ''
+  `auto` int(11) DEFAULT NULL,
+  `fld1` int(6) unsigned zerofill NOT NULL DEFAULT '000000',
+  `companynr` tinyint(2) unsigned zerofill NOT NULL DEFAULT '00',
+  `fld3` char(30) NOT NULL DEFAULT '',
+  `fld4` char(35) NOT NULL DEFAULT '',
+  `fld5` char(35) NOT NULL DEFAULT ''
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
 SELECT * FROM t2;
 auto	fld1	companynr	fld3	fld4	fld5

mysql-test/r/archive_bitfield.result

@@ -6,8 +6,8 @@ b bit(64)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `pk1` int(11) NOT NULL auto_increment,
-  `b` bit(64) default NULL,
+  `pk1` int(11) NOT NULL AUTO_INCREMENT,
+  `b` bit(64) DEFAULT NULL,
   PRIMARY KEY (`pk1`)
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
 insert into t1 values 

mysql-test/r/archive_gis.result

 SET storage_engine=archive;
 DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
-CREATE TABLE gis_point  (fid INTEGER, g POINT);
-CREATE TABLE gis_line  (fid INTEGER, g LINESTRING);
-CREATE TABLE gis_polygon   (fid INTEGER, g POLYGON);
-CREATE TABLE gis_multi_point (fid INTEGER, g MULTIPOINT);
-CREATE TABLE gis_multi_line (fid INTEGER, g MULTILINESTRING);
-CREATE TABLE gis_multi_polygon  (fid INTEGER, g MULTIPOLYGON);
-CREATE TABLE gis_geometrycollection  (fid INTEGER, g GEOMETRYCOLLECTION);
-CREATE TABLE gis_geometry (fid INTEGER, g GEOMETRY);
+CREATE TABLE gis_point  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT);
+CREATE TABLE gis_line  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING);
+CREATE TABLE gis_polygon   (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POLYGON);
+CREATE TABLE gis_multi_point (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOINT);
+CREATE TABLE gis_multi_line (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTILINESTRING);
+CREATE TABLE gis_multi_polygon  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOLYGON);
+CREATE TABLE gis_geometrycollection  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRYCOLLECTION);
+CREATE TABLE gis_geometry (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRY);
 SHOW CREATE TABLE gis_point;
 Table	Create Table
 gis_point	CREATE TABLE `gis_point` (
-  `fid` int(11) default NULL,
-  `g` point default NULL
+  `fid` int(11) NOT NULL AUTO_INCREMENT,
+  `g` point DEFAULT NULL,
+  PRIMARY KEY (`fid`)
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
 SHOW FIELDS FROM gis_point;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	point	YES		NULL	
 SHOW FIELDS FROM gis_line;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	linestring	YES		NULL	
 SHOW FIELDS FROM gis_polygon;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	polygon	YES		NULL	
 SHOW FIELDS FROM gis_multi_point;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	multipoint	YES		NULL	
 SHOW FIELDS FROM gis_multi_line;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	multilinestring	YES		NULL	
 SHOW FIELDS FROM gis_multi_polygon;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	multipolygon	YES		NULL	
 SHOW FIELDS FROM gis_geometrycollection;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	geometrycollection	YES		NULL	
 SHOW FIELDS FROM gis_geometry;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	geometry	YES		NULL	
 INSERT INTO gis_point VALUES 
 (101, PointFromText('POINT(10 10)')),
@@ -407,6 +408,7 @@ Warnings:
 Note	1003	select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`
 DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 CREATE TABLE t1 (
+a INTEGER PRIMARY KEY AUTO_INCREMENT,
 gp  point,
 ln  linestring,
 pg  polygon,
@@ -418,6 +420,7 @@ gm  geometry
 );
 SHOW FIELDS FROM t1;
 Field	Type	Null	Key	Default	Extra
+a	int(11)	NO	PRI	NULL	auto_increment
 gp	point	YES		NULL	
 ln	linestring	YES		NULL	
 pg	polygon	YES		NULL	
@@ -429,6 +432,7 @@ gm	geometry	YES		NULL
 ALTER TABLE t1 ADD fid INT;
 SHOW FIELDS FROM t1;
 Field	Type	Null	Key	Default	Extra
+a	int(11)	NO	PRI	NULL	auto_increment
 gp	point	YES		NULL	
 ln	linestring	YES		NULL	
 pg	polygon	YES		NULL	
@@ -439,20 +443,20 @@ gc	geometrycollection	YES		NULL
 gm	geometry	YES		NULL	
 fid	int(11)	YES		NULL	
 DROP TABLE t1;
-create table t1 (a geometry not null);
-insert into t1 values (GeomFromText('Point(1 2)'));
-insert into t1 values ('Garbage');
+create table t1 (pk integer primary key auto_increment, a geometry not null);
+insert into t1 (a) values (GeomFromText('Point(1 2)'));
+insert into t1 (a) values ('Garbage');
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert IGNORE into t1 values ('Garbage');
+insert IGNORE into t1 (a) values ('Garbage');
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 drop table t1;
-create table t1 (fl geometry);
-insert into t1 values (1);
+create table t1 (pk integer primary key auto_increment, fl geometry);
+insert into t1 (fl) values (1);
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert into t1 values (1.11);
+insert into t1 (fl) values (1.11);
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert into t1 values ("qwerty");
+insert into t1 (fl) values ("qwerty");
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert into t1 values (pointfromtext('point(1,1)'));
+insert into t1 (fl) values (pointfromtext('point(1,1)'));
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 drop table t1;

mysql-test/r/bdb.result

@@ -1366,40 +1366,40 @@ concat('*',v,'*',c,'*',t,'*')
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 create table t2 like t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 create table t3 select * from t1;
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 alter table t1 modify c varchar(10);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` varchar(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
   `t` text
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 alter table t1 modify v char(10);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) default NULL,
-  `c` varchar(10) default NULL,
+  `v` char(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
   `t` text
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
@@ -1408,9 +1408,9 @@ Note	1265	Data truncated for column 't' at row 2
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) default NULL,
-  `c` varchar(10) default NULL,
-  `t` varchar(10) default NULL
+  `v` char(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
+  `t` varchar(10) DEFAULT NULL
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
@@ -1421,8 +1421,8 @@ create table t1 (v varchar(10), c char(10), t text, key(v), key(c), key(t(10)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `v` (`v`),
   KEY `c` (`c`),
@@ -1640,8 +1640,8 @@ alter table t1 modify v varchar(300), drop key v, drop key v_2, add key v (v);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(300) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(300) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
@@ -1720,8 +1720,8 @@ alter table t1 drop key v, add key v (v(30));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(300) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(300) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
@@ -1800,8 +1800,8 @@ alter table t1 modify v varchar(600), drop key v, add key v (v);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(600) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(600) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
@@ -1878,8 +1878,8 @@ create table t1 (v varchar(10), c char(10), t text, key(v(5)), key(c(5)), key(t(
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
@@ -1890,15 +1890,15 @@ create table t1 (v char(10) character set utf8);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) character set utf8 default NULL
+  `v` char(10) CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(10), c char(10)) row_format=fixed;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED
 insert into t1 values('a','a'),('a ','a ');
 select concat('*',v,'*',c,'*') from t1;
@@ -1940,7 +1940,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext character set utf8
+  `v` mediumtext CHARACTER SET utf8
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 drop table t1;
 set storage_engine=MyISAM;

mysql-test/r/bdb_gis.result

 SET storage_engine=bdb;
 DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
-CREATE TABLE gis_point  (fid INTEGER, g POINT);
-CREATE TABLE gis_line  (fid INTEGER, g LINESTRING);
-CREATE TABLE gis_polygon   (fid INTEGER, g POLYGON);
-CREATE TABLE gis_multi_point (fid INTEGER, g MULTIPOINT);
-CREATE TABLE gis_multi_line (fid INTEGER, g MULTILINESTRING);
-CREATE TABLE gis_multi_polygon  (fid INTEGER, g MULTIPOLYGON);
-CREATE TABLE gis_geometrycollection  (fid INTEGER, g GEOMETRYCOLLECTION);
-CREATE TABLE gis_geometry (fid INTEGER, g GEOMETRY);
+CREATE TABLE gis_point  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT);
+CREATE TABLE gis_line  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING);
+CREATE TABLE gis_polygon   (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POLYGON);
+CREATE TABLE gis_multi_point (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOINT);
+CREATE TABLE gis_multi_line (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTILINESTRING);
+CREATE TABLE gis_multi_polygon  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOLYGON);
+CREATE TABLE gis_geometrycollection  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRYCOLLECTION);
+CREATE TABLE gis_geometry (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRY);
 SHOW CREATE TABLE gis_point;
 Table	Create Table
 gis_point	CREATE TABLE `gis_point` (
-  `fid` int(11) default NULL,
-  `g` point default NULL
+  `fid` int(11) NOT NULL AUTO_INCREMENT,
+  `g` point DEFAULT NULL,
+  PRIMARY KEY (`fid`)
 ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1
 SHOW FIELDS FROM gis_point;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	point	YES		NULL	
 SHOW FIELDS FROM gis_line;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	linestring	YES		NULL	
 SHOW FIELDS FROM gis_polygon;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	polygon	YES		NULL	
 SHOW FIELDS FROM gis_multi_point;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	multipoint	YES		NULL	
 SHOW FIELDS FROM gis_multi_line;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	multilinestring	YES		NULL	
 SHOW FIELDS FROM gis_multi_polygon;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	multipolygon	YES		NULL	
 SHOW FIELDS FROM gis_geometrycollection;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	geometrycollection	YES		NULL	
 SHOW FIELDS FROM gis_geometry;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	geometry	YES		NULL	
 INSERT INTO gis_point VALUES 
 (101, PointFromText('POINT(10 10)')),
@@ -407,6 +408,7 @@ Warnings:
 Note	1003	select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`
 DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 CREATE TABLE t1 (
+a INTEGER PRIMARY KEY AUTO_INCREMENT,
 gp  point,
 ln  linestring,
 pg  polygon,
@@ -418,6 +420,7 @@ gm  geometry
 );
 SHOW FIELDS FROM t1;
 Field	Type	Null	Key	Default	Extra
+a	int(11)	NO	PRI	NULL	auto_increment
 gp	point	YES		NULL	
 ln	linestring	YES		NULL	
 pg	polygon	YES		NULL	
@@ -429,6 +432,7 @@ gm	geometry	YES		NULL
 ALTER TABLE t1 ADD fid INT;
 SHOW FIELDS FROM t1;
 Field	Type	Null	Key	Default	Extra
+a	int(11)	NO	PRI	NULL	auto_increment
 gp	point	YES		NULL	
 ln	linestring	YES		NULL	
 pg	polygon	YES		NULL	
@@ -439,20 +443,20 @@ gc	geometrycollection	YES		NULL
 gm	geometry	YES		NULL	
 fid	int(11)	YES		NULL	
 DROP TABLE t1;
-create table t1 (a geometry not null);
-insert into t1 values (GeomFromText('Point(1 2)'));
-insert into t1 values ('Garbage');
+create table t1 (pk integer primary key auto_increment, a geometry not null);
+insert into t1 (a) values (GeomFromText('Point(1 2)'));
+insert into t1 (a) values ('Garbage');
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert IGNORE into t1 values ('Garbage');
+insert IGNORE into t1 (a) values ('Garbage');
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 drop table t1;
-create table t1 (fl geometry);
-insert into t1 values (1);
+create table t1 (pk integer primary key auto_increment, fl geometry);
+insert into t1 (fl) values (1);
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert into t1 values (1.11);
+insert into t1 (fl) values (1.11);
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert into t1 values ("qwerty");
+insert into t1 (fl) values ("qwerty");
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert into t1 values (pointfromtext('point(1,1)'));
+insert into t1 (fl) values (pointfromtext('point(1,1)'));
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 drop table t1;

mysql-test/r/bigint.result

@@ -174,14 +174,14 @@ create table t1 select 1 as 'a';
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` bigint(1) NOT NULL default '0'
+  `a` bigint(1) NOT NULL DEFAULT '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 select 9223372036854775809 as 'a';
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` bigint(19) unsigned NOT NULL default '0'
+  `a` bigint(19) unsigned NOT NULL DEFAULT '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 a

mysql-test/r/binary.result

@@ -138,7 +138,7 @@ create table t1 (a binary);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` binary(1) default NULL
+  `a` binary(1) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (col1 binary(4));

mysql-test/r/case.result

@@ -99,18 +99,18 @@ CASE WHEN 1 THEN 0.1e1 else '1' END AS c12
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '',
-  `c2` varchar(1) character set latin1 collate latin1_danish_ci NOT NULL default '',
-  `c3` varbinary(1) NOT NULL default '',
-  `c4` varbinary(1) NOT NULL default '',
-  `c5` varbinary(3) NOT NULL default '',
-  `c6` varbinary(3) NOT NULL default '',
-  `c7` decimal(2,1) NOT NULL default '0.0',
-  `c8` decimal(2,1) NOT NULL default '0.0',
-  `c9` decimal(2,1) default NULL,
-  `c10` double NOT NULL default '0',
-  `c11` double NOT NULL default '0',
-  `c12` varbinary(5) NOT NULL default ''
+  `c1` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL DEFAULT '',
+  `c2` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL DEFAULT '',
+  `c3` varbinary(1) NOT NULL DEFAULT '',
+  `c4` varbinary(1) NOT NULL DEFAULT '',
+  `c5` varbinary(3) NOT NULL DEFAULT '',
+  `c6` varbinary(3) NOT NULL DEFAULT '',
+  `c7` decimal(2,1) NOT NULL DEFAULT '0.0',
+  `c8` decimal(2,1) NOT NULL DEFAULT '0.0',
+  `c9` decimal(2,1) DEFAULT NULL,
+  `c10` double NOT NULL DEFAULT '0',
+  `c11` double NOT NULL DEFAULT '0',
+  `c12` varbinary(5) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SELECT CASE 
@@ -151,13 +151,13 @@ Note	1003	select coalesce(1) AS `COALESCE(1)`,coalesce(1.0) AS `COALESCE(1.0)`,c
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `COALESCE(1)` int(1) NOT NULL default '0',
-  `COALESCE(1.0)` decimal(2,1) unsigned NOT NULL default '0.0',
-  `COALESCE('a')` varchar(1) NOT NULL default '',
-  `COALESCE(1,1.0)` decimal(2,1) NOT NULL default '0.0',
-  `COALESCE(1,'1')` varbinary(1) NOT NULL default '',
-  `COALESCE(1.1,'1')` varbinary(3) NOT NULL default '',
-  `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default ''
+  `COALESCE(1)` int(1) NOT NULL DEFAULT '0',
+  `COALESCE(1.0)` decimal(2,1) unsigned NOT NULL DEFAULT '0.0',
+  `COALESCE('a')` varchar(1) NOT NULL DEFAULT '',
+  `COALESCE(1,1.0)` decimal(2,1) NOT NULL DEFAULT '0.0',
+  `COALESCE(1,'1')` varbinary(1) NOT NULL DEFAULT '',
+  `COALESCE(1.1,'1')` varbinary(3) NOT NULL DEFAULT '',
+  `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SELECT 'case+union+test'

mysql-test/r/cast.result

@@ -157,7 +157,7 @@ create table t1 select cast(_koi8r'
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `t` varchar(4) character set cp1251 NOT NULL default ''
+  `t` varchar(4) CHARACTER SET cp1251 NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select
@@ -191,11 +191,11 @@ ab	a 	ab	a 	6100
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varbinary(2) NOT NULL default '',
-  `c2` varbinary(2) NOT NULL default '',
-  `c3` varbinary(2) NOT NULL default '',
-  `c4` varbinary(2) NOT NULL default '',
-  `c5` varbinary(2) NOT NULL default ''
+  `c1` varbinary(2) NOT NULL DEFAULT '',
+  `c2` varbinary(2) NOT NULL DEFAULT '',
+  `c3` varbinary(2) NOT NULL DEFAULT '',
+  `c4` varbinary(2) NOT NULL DEFAULT '',
+  `c5` varbinary(2) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select
@@ -224,11 +224,11 @@ c1	c2	c3	c4	c5
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(2) character set utf8 NOT NULL default '',
-  `c2` varchar(2) character set utf8 NOT NULL default '',
-  `c3` varchar(2) character set utf8 NOT NULL default '',
-  `c4` varchar(2) character set utf8 NOT NULL default '',
-  `c5` varchar(2) character set utf8 NOT NULL default ''
+  `c1` varchar(2) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `c2` varchar(2) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `c3` varchar(2) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `c4` varchar(2) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `c5` varchar(2) CHARACTER SET utf8 NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a binary(4), b char(4) character set koi8r);

mysql-test/r/constraints.result

@@ -21,7 +21,7 @@ alter table t1 add constraint constraint_2 unique key_2(a);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` int(11) default NULL,
+  `a` int(11) DEFAULT NULL,
   UNIQUE KEY `constraint_1` (`a`),
   UNIQUE KEY `key_1` (`a`),
   UNIQUE KEY `key_2` (`a`)

mysql-test/r/create.result

@@ -44,7 +44,7 @@ create table `a/a` (a int);
 show create table `a/a`;
 Table	Create Table
 a/a	CREATE TABLE `a/a` (
-  `a` int(11) default NULL
+  `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t1 like `a/a`;
 drop table `a/a`;
@@ -174,7 +174,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL,
-  `b` int(11) default NULL,
+  `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   KEY `b` (`b`),
   KEY `b_2` (`b`),
@@ -311,7 +311,7 @@ show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
   `id` int(11) NOT NULL,
-  `name` char(20) default NULL
+  `name` char(20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t3;
 id	name
@@ -334,7 +334,7 @@ show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
   `id` int(11) NOT NULL,
-  `name` char(20) default NULL
+  `name` char(20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t3;
 id	name
@@ -346,14 +346,14 @@ show create table t3;
 Table	Create Table
 t3	CREATE TEMPORARY TABLE `t3` (
   `id` int(11) NOT NULL,
-  `name` char(20) default NULL
+  `name` char(20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t2 like t3;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `id` int(11) NOT NULL,
-  `name` char(20) default NULL
+  `name` char(20) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t2;
 id	name
@@ -447,21 +447,21 @@ create table t2 select ifnull(a,a), ifnull(b,b), ifnull(c,c), ifnull(d,d), ifnul
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `ifnull(a,a)` tinyint(4) default NULL,
-  `ifnull(b,b)` smallint(6) default NULL,
-  `ifnull(c,c)` mediumint(8) default NULL,
-  `ifnull(d,d)` int(11) default NULL,
-  `ifnull(e,e)` bigint(20) default NULL,
-  `ifnull(f,f)` float(24,2) default NULL,
-  `ifnull(g,g)` double(53,3) default NULL,
-  `ifnull(h,h)` decimal(5,4) default NULL,
-  `ifnull(i,i)` year(4) default NULL,
-  `ifnull(j,j)` date default NULL,
-  `ifnull(k,k)` datetime NOT NULL default '0000-00-00 00:00:00',
-  `ifnull(l,l)` datetime default NULL,
-  `ifnull(m,m)` varchar(1) default NULL,
-  `ifnull(n,n)` varchar(3) default NULL,
-  `ifnull(o,o)` varchar(10) default NULL
+  `ifnull(a,a)` tinyint(4) DEFAULT NULL,
+  `ifnull(b,b)` smallint(6) DEFAULT NULL,
+  `ifnull(c,c)` mediumint(8) DEFAULT NULL,
+  `ifnull(d,d)` int(11) DEFAULT NULL,
+  `ifnull(e,e)` bigint(20) DEFAULT NULL,
+  `ifnull(f,f)` float(24,2) DEFAULT NULL,
+  `ifnull(g,g)` double(53,3) DEFAULT NULL,
+  `ifnull(h,h)` decimal(5,4) DEFAULT NULL,
+  `ifnull(i,i)` year(4) DEFAULT NULL,
+  `ifnull(j,j)` date DEFAULT NULL,
+  `ifnull(k,k)` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ifnull(l,l)` datetime DEFAULT NULL,
+  `ifnull(m,m)` varchar(1) DEFAULT NULL,
+  `ifnull(n,n)` varchar(3) DEFAULT NULL,
+  `ifnull(o,o)` varchar(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1,t2;
 create table t1(str varchar(10) default 'def',strnull varchar(10),intg int default '10',rel double default '3.14');
@@ -526,14 +526,14 @@ create table t1 (`primary` int, index(`primary`));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `primary` int(11) default NULL,
+  `primary` int(11) DEFAULT NULL,
   KEY `primary_2` (`primary`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t2 (`PRIMARY` int, index(`PRIMARY`));
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `PRIMARY` int(11) default NULL,
+  `PRIMARY` int(11) DEFAULT NULL,
   KEY `PRIMARY_2` (`PRIMARY`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t3 (a int);
@@ -546,7 +546,7 @@ alter table t4 add index(`primary`);
 show create table t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `primary` int(11) default NULL,
+  `primary` int(11) DEFAULT NULL,
   KEY `primary_2` (`primary`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t5 (`PRIMARY` int);
@@ -554,7 +554,7 @@ alter table t5 add index(`PRIMARY`);
 show create table t5;
 Table	Create Table
 t5	CREATE TABLE `t5` (
-  `PRIMARY` int(11) default NULL,
+  `PRIMARY` int(11) DEFAULT NULL,
   KEY `PRIMARY_2` (`PRIMARY`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2, t3, t4, t5;
@@ -642,7 +642,7 @@ primary key (a)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(112) character set utf8 collate utf8_bin NOT NULL,
+  `a` varchar(112) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -657,7 +657,7 @@ b int not null, primary key (a)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,
+  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
   `b` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -672,8 +672,8 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `b` int(11) NOT NULL,
-  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,
-  `c` bigint(1) NOT NULL default '0',
+  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `c` bigint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -684,9 +684,9 @@ b int null, primary key (a)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `b` int(11) default NULL,
-  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,
-  `c` bigint(1) NOT NULL default '0',
+  `b` int(11) DEFAULT NULL,
+  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `c` bigint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -697,7 +697,7 @@ b int not null, primary key (a)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,
+  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
   `b` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -709,7 +709,7 @@ b int not null, primary key (a)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL default '',
+  `a` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
   `b` int(11) NOT NULL,
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -745,29 +745,29 @@ select a1,a2 from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `a` int(11) default '3',
-  `b` int(11) default '3',
-  `a1` int(11) default NULL,
-  `a2` int(11) default NULL
+  `a` int(11) DEFAULT '3',
+  `b` int(11) DEFAULT '3',
+  `a1` int(11) DEFAULT NULL,
+  `a2` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1 (i int) engine=myisam max_rows=100000000000;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL
+  `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295
 alter table t1 max_rows=100;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL
+  `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=100
 alter table t1 max_rows=100000000000;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `i` int(11) default NULL
+  `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295
 drop table t1;
 create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

mysql-test/r/ctype_collate.result

@@ -494,7 +494,7 @@ latin1_f CHAR(32) CHARACTER SET latin1 COLLATE latin1_bin;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `latin1_f` char(32) character set latin1 collate latin1_bin default NULL
+  `latin1_f` char(32) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SHOW FIELDS FROM  t1;
 Field	Type	Null	Key	Default	Extra
@@ -503,7 +503,7 @@ ALTER TABLE t1 CHARACTER SET latin1 COLLATE latin1_bin;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `latin1_f` char(32) collate latin1_bin default NULL
+  `latin1_f` char(32) COLLATE latin1_bin DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
 SHOW FIELDS FROM  t1;
 Field	Type	Null	Key	Default	Extra

mysql-test/r/ctype_create.result

@@ -12,7 +12,7 @@ CREATE TABLE mysqltest2.t1 (a char(10));
 SHOW CREATE TABLE mysqltest2.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) default NULL
+  `a` char(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin5
 DROP TABLE mysqltest2.t1;
 ALTER DATABASE mysqltest2 DEFAULT CHARACTER SET latin7;
@@ -20,7 +20,7 @@ CREATE TABLE mysqltest2.t1 (a char(10));
 SHOW CREATE TABLE mysqltest2.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) default NULL
+  `a` char(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin7
 DROP DATABASE mysqltest2;
 CREATE DATABASE mysqltest2 CHARACTER SET latin2;
@@ -28,7 +28,7 @@ CREATE TABLE mysqltest2.t1 (a char(10));
 SHOW CREATE TABLE mysqltest2.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) default NULL
+  `a` char(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin2
 DROP DATABASE mysqltest2;
 USE mysqltest1;
@@ -36,14 +36,14 @@ CREATE TABLE t1 (a char(10));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) default NULL
+  `a` char(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=cp1251
 DROP TABLE t1;
 CREATE TABLE t1 (a char(10)) DEFAULT CHARACTER SET latin1;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) default NULL
+  `a` char(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (a char(10)) 
@@ -51,7 +51,7 @@ DEFAULT CHARACTER SET latin1 COLLATE latin1_german1_ci;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(10) collate latin1_german1_ci default NULL
+  `a` char(10) COLLATE latin1_german1_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_german1_ci
 DROP TABLE t1;
 create table t1 (a char) character set latin1 character set latin2;

mysql-test/r/ctype_latin1_de.result

@@ -224,8 +224,8 @@ create table t1 (word varchar(255) not null, word2 varchar(255) not null default
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `word` varchar(255) collate latin1_german2_ci NOT NULL,
-  `word2` varchar(255) collate latin1_german2_ci NOT NULL default '',
+  `word` varchar(255) COLLATE latin1_german2_ci NOT NULL,
+  `word2` varchar(255) COLLATE latin1_german2_ci NOT NULL DEFAULT '',
   KEY `word` (`word`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci
 insert into t1 (word) values ('ss'),(0xDF),(0xE4),('ae');
@@ -299,7 +299,7 @@ s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `s1` char(5) collate latin1_german2_ci default NULL
+  `s1` char(5) COLLATE latin1_german2_ci DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_german2_ci
 INSERT INTO t1 VALUES ('');
 INSERT INTO t1 VALUES ('ue');

mysql-test/r/ctype_mb.result

@@ -3,17 +3,17 @@ CREATE TABLE t1 SELECT _utf8'test' as c1, _utf8'тест' as c2;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) character set utf8 NOT NULL default '',
-  `c2` varchar(4) character set utf8 NOT NULL default ''
+  `c1` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `c2` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DELETE FROM t1;
 ALTER TABLE t1 ADD c3 CHAR(4) CHARACTER SET utf8;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` varchar(4) character set utf8 NOT NULL default '',
-  `c2` varchar(4) character set utf8 NOT NULL default '',
-  `c3` char(4) character set utf8 default NULL
+  `c1` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `c2` varchar(4) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `c3` char(4) CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 INSERT INTO t1 VALUES ('aaaabbbbccccdddd','aaaabbbbccccdddd','aaaabbbbccccdddd');
 Warnings:
@@ -28,7 +28,7 @@ CREATE TABLE t1 (a CHAR(4) CHARACTER SET utf8, KEY key_a(a(3)));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(4) character set utf8 default NULL,
+  `a` char(4) CHARACTER SET utf8 DEFAULT NULL,
   KEY `key_a` (`a`(3))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SHOW KEYS FROM t1;
@@ -38,7 +38,7 @@ ALTER TABLE t1 CHANGE a a CHAR(4);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(4) default NULL,
+  `a` char(4) DEFAULT NULL,
   KEY `key_a` (`a`(3))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SHOW KEYS FROM t1;
@@ -48,7 +48,7 @@ ALTER TABLE t1 CHANGE a a CHAR(4) CHARACTER SET utf8;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(4) character set utf8 default NULL,
+  `a` char(4) CHARACTER SET utf8 DEFAULT NULL,
   KEY `key_a` (`a`(3))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SHOW KEYS FROM t1;

mysql-test/r/ctype_recoding.result

@@ -6,7 +6,7 @@ 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
+  `a` char(10) CHARACTER SET cp1251 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT a FROM t1;
 a
@@ -30,7 +30,7 @@ CREATE TABLE t2 (a TEXT CHARACTER SET utf8);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` text character set cp1251
+  `a` text CHARACTER SET cp1251
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SELECT HEX(a) FROM t1;
 HEX(a)
@@ -50,7 +50,7 @@ Tables_in_test
 SHOW CREATE TABLE ;
 Table	Create Table
 	CREATE TABLE `` (
-  `` char(32) character set koi8r NOT NULL COMMENT ' '
+  `` char(32) CHARACTER SET koi8r NOT NULL COMMENT ' '
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' '
 SHOW FIELDS FROM ;
 Field	Type	Null	Key	Default	Extra
@@ -62,7 +62,7 @@ Tables_in_test
 SHOW CREATE TABLE ;
 Table	Create Table
 	CREATE TABLE `` (
-  `` char(32) character set koi8r NOT NULL COMMENT ' '
+  `` char(32) CHARACTER SET koi8r NOT NULL COMMENT ' '
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' '
 SHOW FIELDS FROM ;
 Field	Type	Null	Key	Default	Extra
@@ -74,7 +74,7 @@ Tables_in_test
 SHOW CREATE TABLE таблица;
 Table	Create Table
 таблица	CREATE TABLE `таблица` (
-  `поле` char(32) character set koi8r NOT NULL COMMENT 'комментарий поля'
+  `поле` char(32) CHARACTER SET koi8r NOT NULL COMMENT 'комментарий поля'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='комментарий таблицы'
 SHOW FIELDS FROM таблица;
 Field	Type	Null	Key	Default	Extra
@@ -117,13 +117,13 @@ CREATE TABLE `тест` (`тест` int);
 SHOW CREATE TABLE `тест`;
 Table	Create Table
 тест	CREATE TABLE `тест` (
-  `тест` int(11) default NULL
+  `тест` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SET NAMES utf8;
 SHOW CREATE TABLE `тест`;
 Table	Create Table
 тест	CREATE TABLE `тест` (
-  `тест` int(11) default NULL
+  `тест` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE `тест`;
 SET NAMES binary;
@@ -141,8 +141,8 @@ CREATE TABLE t1 (`
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `` char(128) default '',
-  `1` enum('1','2') default '2'
+  `` char(128) DEFAULT '',
+  `1` enum('1','2') DEFAULT '2'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SHOW COLUMNS FROM t1;
 Field	Type	Null	Key	Default	Extra
@@ -152,8 +152,8 @@ SET NAMES binary;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `ä` char(128) default 'ä',
-  `ä1` enum('ä1','ä2') default 'ä2'
+  `ä` char(128) DEFAULT 'ä',
+  `ä1` enum('ä1','ä2') DEFAULT 'ä2'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 SHOW COLUMNS FROM t1;
 Field	Type	Null	Key	Default	Extra

mysql-test/r/ctype_sjis.result

@@ -51,7 +51,7 @@ create table t1(c enum(0x9353,0x9373) character set sjis);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` enum('鉄','都') character set sjis default NULL
+  `c` enum('鉄','都') CHARACTER SET sjis DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values (0x9353);
 insert into t1 values (0x9373);

mysql-test/r/ctype_tis620.result

@@ -120,7 +120,7 @@ PRIMARY KEY  (recid)
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `recid` int(11) NOT NULL auto_increment,
+  `recid` int(11) NOT NULL AUTO_INCREMENT,
   `dyninfo` text,
   PRIMARY KEY (`recid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=tis620

mysql-test/r/ctype_ucs.result

@@ -74,8 +74,8 @@ RPAD(_ucs2 X'0420',10,_ucs2 X'0421') r;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `l` varchar(10) character set ucs2 NOT NULL default '',
-  `r` varchar(10) character set ucs2 NOT NULL default ''
+  `l` varchar(10) CHARACTER SET ucs2 NOT NULL DEFAULT '',
+  `r` varchar(10) CHARACTER SET ucs2 NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 create table t2(f1 Char(30));
@@ -523,7 +523,7 @@ 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
+  `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');
@@ -537,7 +537,7 @@ alter table t1 change a a enum('x','y','z','d','e','
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` enum('x','y','z','d','e','','','') character set ucs2 default NULL
+  `a` enum('x','y','z','d','e','','','') CHARACTER SET ucs2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values ('D');
 insert into t1 values ('E ');
@@ -559,7 +559,7 @@ create table t1 (a set ('x','y','z','
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` set('x','y','z','','','') character set ucs2 default NULL
+  `a` set('x','y','z','','','') CHARACTER SET ucs2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values ('x');
 insert into t1 values ('y');

mysql-test/r/ctype_ujis.result

@@ -118,8 +118,8 @@ b enum('
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(1) NOT NULL default '',
-  `b` enum('あ','い') default NULL
+  `a` char(1) NOT NULL DEFAULT '',
+  `b` enum('あ','い') DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=ujis
 SHOW COLUMNS FROM t1;
 Field	Type	Null	Key	Default	Extra

mysql-test/r/ctype_utf8.result

@@ -124,7 +124,7 @@ create table t1 select date_format("2004-01-19 10:10:10", "%Y-%m-%d");
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varbinary(10) default NULL
+  `date_format("2004-01-19 10:10:10", "%Y-%m-%d")` varbinary(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 date_format("2004-01-19 10:10:10", "%Y-%m-%d")
@@ -275,7 +275,7 @@ create table t1 (a enum('aaaa','проба') character set utf8);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` enum('aaaa','проба') character set utf8 default NULL
+  `a` enum('aaaa','проба') CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 insert into t1 values ('проба');
 select * from t1;
@@ -285,7 +285,7 @@ create table t2 select ifnull(a,a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `ifnull(a,a)` varchar(5) character set utf8 default NULL
+  `ifnull(a,a)` varchar(5) CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t2;
 ifnull(a,a)
@@ -411,7 +411,7 @@ unique key a using hash (c(1))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(10) character set utf8 default NULL,
+  `c` char(10) CHARACTER SET utf8 DEFAULT NULL,
   UNIQUE KEY `a` USING HASH (`c`(1))
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
@@ -447,7 +447,7 @@ unique key a using btree (c(1))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(10) character set utf8 default NULL,
+  `c` char(10) CHARACTER SET utf8 DEFAULT NULL,
   UNIQUE KEY `a` USING BTREE (`c`(1))
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
@@ -569,7 +569,7 @@ unique key a using hash (c(1))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(10) character set utf8 collate utf8_bin default NULL,
+  `c` char(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   UNIQUE KEY `a` USING HASH (`c`(1))
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
@@ -605,7 +605,7 @@ unique key a using btree (c(1))
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` char(10) character set utf8 collate utf8_bin default NULL,
+  `c` char(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   UNIQUE KEY `a` USING BTREE (`c`(1))
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
@@ -809,8 +809,8 @@ create table t2 select concat(a,_utf8'') as a, concat(b,_utf8'')as b from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `a` varchar(5) character set utf8 NOT NULL default '',
-  `b` varchar(15) character set utf8 NOT NULL default ''
+  `a` varchar(5) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `b` varchar(15) CHARACTER SET utf8 NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t2;
 drop table t1;

mysql-test/r/default.result

@@ -67,9 +67,9 @@ ENGINE=MyISAM DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `a` varchar(30) collate latin1_bin NOT NULL default ' ',
-  `b` varchar(1) collate latin1_bin NOT NULL default ' ',
-  `c` varchar(4) collate latin1_bin NOT NULL default '0000',
+  `a` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
+  `b` varchar(1) COLLATE latin1_bin NOT NULL DEFAULT ' ',
+  `c` varchar(4) COLLATE latin1_bin NOT NULL DEFAULT '0000',
   `d` tinyblob,
   `e` tinyblob,
   `f` tinyblob,
@@ -83,17 +83,17 @@ t2	CREATE TABLE `t2` (
   `n` tinyblob,
   `o` tinyblob,
   `p` tinyblob,
-  `q` varchar(30) collate latin1_bin NOT NULL default ' ',
-  `r` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `q` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
+  `r` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `s` tinyblob,
-  `t` varchar(4) collate latin1_bin NOT NULL default ' ',
-  `u` varchar(1) collate latin1_bin NOT NULL default ' ',
-  `v` varchar(30) collate latin1_bin NOT NULL default ' ',
-  `w` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `t` varchar(4) COLLATE latin1_bin NOT NULL DEFAULT ' ',
+  `u` varchar(1) COLLATE latin1_bin NOT NULL DEFAULT ' ',
+  `v` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
+  `w` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `x` tinyblob,
-  `y` varchar(5) collate latin1_bin NOT NULL default ' ',
-  `z` varchar(20) collate latin1_bin NOT NULL default ' ',
-  `a1` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `y` varchar(5) COLLATE latin1_bin NOT NULL DEFAULT ' ',
+  `z` varchar(20) COLLATE latin1_bin NOT NULL DEFAULT ' ',
+  `a1` varchar(30) COLLATE latin1_bin NOT NULL DEFAULT ' ',
   `b1` tinyblob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
 INSERT into t2 (b) values ('1');

mysql-test/r/events.result

@@ -236,22 +236,22 @@ ALTER TABLE mysql.event MODIFY db char(20) character set utf8 collate utf8_bin d
 SHOW CREATE TABLE mysql.event;
 Table	Create Table
 event	CREATE TABLE `event` (
-  `db` char(20) character set utf8 collate utf8_bin NOT NULL default '',
-  `name` char(64) character set utf8 collate utf8_bin NOT NULL default '',
+  `db` char(20) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `name` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
   `body` longblob NOT NULL,
-  `definer` char(77) character set utf8 collate utf8_bin NOT NULL default '',
-  `execute_at` datetime default NULL,
-  `interval_value` int(11) default NULL,
-  `interval_field` enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL,
-  `created` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  `modified` timestamp NOT NULL default '0000-00-00 00:00:00',
-  `last_executed` datetime default NULL,
-  `starts` datetime default NULL,
-  `ends` datetime default NULL,
-  `status` enum('ENABLED','DISABLED') NOT NULL default 'ENABLED',
-  `on_completion` enum('DROP','PRESERVE') NOT NULL default 'DROP',
-  `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') NOT NULL default '',
-  `comment` char(64) character set utf8 collate utf8_bin NOT NULL default '',
+  `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `execute_at` datetime DEFAULT NULL,
+  `interval_value` int(11) DEFAULT NULL,
+  `interval_field` enum('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `last_executed` datetime DEFAULT NULL,
+  `starts` datetime DEFAULT NULL,
+  `ends` datetime DEFAULT NULL,
+  `status` enum('ENABLED','DISABLED') NOT NULL DEFAULT 'ENABLED',
+  `on_completion` enum('DROP','PRESERVE') NOT NULL DEFAULT 'DROP',
+  `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') NOT NULL DEFAULT '',
+  `comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
   PRIMARY KEY (`definer`,`db`,`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
 SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

mysql-test/r/federated.result

@@ -78,7 +78,7 @@ SHOW CREATE TABLE federated.t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `id` int(20) NOT NULL,
-  `name` varchar(32) NOT NULL default ''
+  `name` varchar(32) NOT NULL DEFAULT ''
 ) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'
 INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');
 INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');
@@ -1558,6 +1558,49 @@ id
 3
 4
 5
+DROP TABLE IF EXISTS federated.bug_17377_table;
+CREATE TABLE federated.bug_17377_table (
+`fld_cid` bigint(20) NOT NULL auto_increment,
+`fld_name` varchar(255) NOT NULL default '',
+`fld_parentid` bigint(20) NOT NULL default '0',
+`fld_delt` int(1) NOT NULL default '0',
+PRIMARY KEY (`fld_cid`),
+KEY `fld_parentid` (`fld_parentid`),
+KEY `fld_delt` (`fld_delt`),
+KEY `fld_cid` (`fld_cid`)
+) ENGINE=MyISAM;
+insert into federated.bug_17377_table( fld_name )
+values
+("Mats"), ("Sivert"), ("Sigvard"), ("Torgny"), ("Torkel");
+DROP TABLE IF EXISTS federated.t1;
+CREATE TABLE federated.t1 (
+`fld_cid` bigint(20) NOT NULL auto_increment,
+`fld_name` varchar(255) NOT NULL default '',
+`fld_parentid` bigint(20) NOT NULL default '0',
+`fld_delt` int(1) NOT NULL default '0',
+PRIMARY KEY (`fld_cid`),
+KEY `fld_parentid` (`fld_parentid`),
+KEY `fld_delt` (`fld_delt`),
+KEY `fld_cid` (`fld_cid`)
+) ENGINE=FEDERATED
+CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/bug_17377_table';
+select * from federated.t1 where fld_parentid=0 and fld_delt=0
+order by fld_name;
+fld_cid	fld_name	fld_parentid	fld_delt
+1	Mats	0	0
+3	Sigvard	0	0
+2	Sivert	0	0
+4	Torgny	0	0
+5	Torkel	0	0
+select * from federated.t1 where fld_parentid=0 and fld_delt=0;
+fld_cid	fld_name	fld_parentid	fld_delt
+1	Mats	0	0
+2	Sivert	0	0
+3	Sigvard	0	0
+4	Torgny	0	0
+5	Torkel	0	0
+DROP TABLE federated.t1;
+DROP TABLE federated.bug_17377_table;
 DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
 DROP TABLE IF EXISTS federated.t1;

mysql-test/r/fulltext.result

@@ -248,7 +248,7 @@ t2	1	tix	1	inhalt	NULL	NULL	NULL	NULL	YES	FULLTEXT
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `ticket` int(11) default NULL,
+  `ticket` int(11) DEFAULT NULL,
   `inhalt` text,
   KEY `tig` (`ticket`),
   FULLTEXT KEY `tix` (`inhalt`)
@@ -454,7 +454,7 @@ CREATE TABLE t1 (a VARCHAR(10000), FULLTEXT(a));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10000) default NULL,
+  `a` varchar(10000) DEFAULT NULL,
   FULLTEXT KEY `a` (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;

mysql-test/r/func_gconcat.result

@@ -458,7 +458,7 @@ create table t2 select group_concat(a) as a from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `a` varchar(400) character set cp1250 default NULL
+  `a` varchar(400) CHARACTER SET cp1250 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select collation(group_concat(a,_koi8r'test')) from t1;
 collation(group_concat(a,_koi8r'test'))

mysql-test/r/func_group.result

@@ -677,21 +677,21 @@ latin2	2	latin2	2
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(1) character set latin2 default NULL
+  `a` char(1) CHARACTER SET latin2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t2 select max(a),min(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `max(a)` char(1) character set latin2 default NULL,
-  `min(a)` char(1) character set latin2 default NULL
+  `max(a)` char(1) CHARACTER SET latin2 DEFAULT NULL,
+  `min(a)` char(1) CHARACTER SET latin2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t2;
 create table t2 select concat(a) from t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `concat(a)` varchar(1) character set latin2 default NULL
+  `concat(a)` varchar(1) CHARACTER SET latin2 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t2,t1;
 create table t1 (a int);
@@ -780,7 +780,7 @@ create table t2 select MAX(b) from t1 group by a;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `MAX(b)` datetime default NULL
+  `MAX(b)` datetime DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1, t2;
 create table t1(f1 datetime);

mysql-test/r/func_math.result

@@ -156,7 +156,7 @@ create table t1 select round(1, 6);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `round(1, 6)` decimal(7,6) NOT NULL default '0.000000'
+  `round(1, 6)` decimal(7,6) NOT NULL DEFAULT '0.000000'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select * from t1;
 round(1, 6)
@@ -218,3 +218,23 @@ truncate(-5000111000111000155,-1)
 select truncate(15000111000111000155,-1);
 truncate(15000111000111000155,-1)
 15000111000111000150
+set names utf8;
+create table t1
+(f1 varchar(32) not null,
+f2 smallint(5) unsigned not null,
+f3 int(10) unsigned not null default '0')
+engine=myisam default charset=utf8;
+insert into t1 values ('zombie',0,0),('gold',1,10000),('silver',2,10000);
+create table t2
+(f1 int(10) unsigned not null,
+f2 int(10) unsigned not null,
+f3 smallint(5) unsigned not null)
+engine=myisam default charset=utf8;
+insert into t2 values (16777216,16787215,1),(33554432,33564431,2);
+select format(t2.f2-t2.f1+1,0) from t1,t2
+where t1.f2 = t2.f3 order by t1.f1;
+format(t2.f2-t2.f1+1,0)
+10,000
+10,000
+drop table t1, t2;
+set names default;

mysql-test/r/func_misc.result

@@ -55,8 +55,8 @@ create table t1 as select uuid(), length(uuid());
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `uuid()` varchar(36) character set utf8 NOT NULL default '',
-  `length(uuid())` int(10) NOT NULL default '0'
+  `uuid()` varchar(36) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `length(uuid())` int(10) NOT NULL DEFAULT '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a timestamp default '2005-05-05 01:01:01',

mysql-test/r/func_str.result

@@ -719,37 +719,37 @@ Warning	1265	Data truncated for column 'format(130,10)' at row 1
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `bin(130)` varchar(64) NOT NULL default '',
-  `oct(130)` varchar(64) NOT NULL default '',
-  `conv(130,16,10)` varchar(64) NOT NULL default '',
-  `hex(130)` varchar(6) NOT NULL default '',
-  `char(130)` varbinary(1) NOT NULL default '',
-  `format(130,10)` varchar(4) NOT NULL default '',
-  `left(_latin2'a',1)` varchar(1) character set latin2 NOT NULL default '',
-  `right(_latin2'a',1)` varchar(1) character set latin2 NOT NULL default '',
-  `lcase(_latin2'a')` varchar(1) character set latin2 NOT NULL default '',
-  `ucase(_latin2'a')` varchar(1) character set latin2 NOT NULL default '',
-  `substring(_latin2'a',1,1)` varchar(1) character set latin2 NOT NULL default '',
-  `concat(_latin2'a',_latin2'b')` varchar(2) character set latin2 NOT NULL default '',
-  `lpad(_latin2'a',4,_latin2'b')` varchar(4) character set latin2 NOT NULL default '',
-  `rpad(_latin2'a',4,_latin2'b')` varchar(4) character set latin2 NOT NULL default '',
-  `concat_ws(_latin2'a',_latin2'b')` varchar(1) character set latin2 NOT NULL default '',
-  `make_set(255,_latin2'a',_latin2'b',_latin2'c')` varchar(5) character set latin2 NOT NULL default '',
-  `export_set(255,_latin2'y',_latin2'n',_latin2' ')` varchar(127) character set latin2 NOT NULL default '',
-  `trim(_latin2' a ')` varchar(3) character set latin2 NOT NULL default '',
-  `ltrim(_latin2' a ')` varchar(3) character set latin2 NOT NULL default '',
-  `rtrim(_latin2' a ')` varchar(3) character set latin2 NOT NULL default '',
-  `trim(LEADING _latin2' ' FROM _latin2' a ')` varchar(3) character set latin2 NOT NULL default '',
-  `trim(TRAILING _latin2' ' FROM _latin2' a ')` varchar(3) character set latin2 NOT NULL default '',
-  `trim(BOTH _latin2' ' FROM _latin2' a ')` varchar(3) character set latin2 NOT NULL default '',
-  `repeat(_latin2'a',10)` varchar(10) character set latin2 NOT NULL default '',
-  `reverse(_latin2'ab')` varchar(2) character set latin2 NOT NULL default '',
-  `quote(_latin2'ab')` varchar(6) character set latin2 NOT NULL default '',
-  `soundex(_latin2'ab')` varchar(4) character set latin2 NOT NULL default '',
-  `substring(_latin2'ab',1)` varchar(2) character set latin2 NOT NULL default '',
-  `insert(_latin2'abcd',2,3,_latin2'ef')` varchar(6) character set latin2 NOT NULL default '',
-  `replace(_latin2'abcd',_latin2'b',_latin2'B')` varchar(4) character set latin2 NOT NULL default '',
-  `encode('abcd','ab')` varbinary(4) NOT NULL default ''
+  `bin(130)` varchar(64) NOT NULL DEFAULT '',
+  `oct(130)` varchar(64) NOT NULL DEFAULT '',
+  `conv(130,16,10)` varchar(64) NOT NULL DEFAULT '',
+  `hex(130)` varchar(6) NOT NULL DEFAULT '',
+  `char(130)` varbinary(1) NOT NULL DEFAULT '',
+  `format(130,10)` varchar(4) NOT NULL DEFAULT '',
+  `left(_latin2'a',1)` varchar(1) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `right(_latin2'a',1)` varchar(1) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `lcase(_latin2'a')` varchar(1) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `ucase(_latin2'a')` varchar(1) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `substring(_latin2'a',1,1)` varchar(1) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `concat(_latin2'a',_latin2'b')` varchar(2) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `lpad(_latin2'a',4,_latin2'b')` varchar(4) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `rpad(_latin2'a',4,_latin2'b')` varchar(4) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `concat_ws(_latin2'a',_latin2'b')` varchar(1) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `make_set(255,_latin2'a',_latin2'b',_latin2'c')` varchar(5) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `export_set(255,_latin2'y',_latin2'n',_latin2' ')` varchar(127) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `trim(_latin2' a ')` varchar(3) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `ltrim(_latin2' a ')` varchar(3) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `rtrim(_latin2' a ')` varchar(3) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `trim(LEADING _latin2' ' FROM _latin2' a ')` varchar(3) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `trim(TRAILING _latin2' ' FROM _latin2' a ')` varchar(3) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `trim(BOTH _latin2' ' FROM _latin2' a ')` varchar(3) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `repeat(_latin2'a',10)` varchar(10) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `reverse(_latin2'ab')` varchar(2) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `quote(_latin2'ab')` varchar(6) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `soundex(_latin2'ab')` varchar(4) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `substring(_latin2'ab',1)` varchar(2) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `insert(_latin2'abcd',2,3,_latin2'ef')` varchar(6) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `replace(_latin2'abcd',_latin2'b',_latin2'B')` varchar(4) CHARACTER SET latin2 NOT NULL DEFAULT '',
+  `encode('abcd','ab')` varbinary(4) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (a char character set latin2);

mysql-test/r/func_system.result

@@ -46,9 +46,9 @@ create table t1 (version char(60)) select database(), user(), version() as 'vers
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `database()` varchar(34) character set utf8 default NULL,
-  `user()` varchar(77) character set utf8 NOT NULL default '',
-  `version` char(60) default NULL
+  `database()` varchar(34) CHARACTER SET utf8 DEFAULT NULL,
+  `user()` varchar(77) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `version` char(60) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select charset(charset(_utf8'a')), charset(collation(_utf8'a'));
@@ -61,8 +61,8 @@ create table t1 select charset(_utf8'a'), collation(_utf8'a');
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `charset(_utf8'a')` varchar(64) character set utf8 NOT NULL default '',
-  `collation(_utf8'a')` varchar(64) character set utf8 NOT NULL default ''
+  `charset(_utf8'a')` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `collation(_utf8'a')` varchar(64) CHARACTER SET utf8 NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 select TRUE,FALSE,NULL;

mysql-test/r/gis-rtree.result

@@ -7,7 +7,7 @@ SPATIAL KEY(g)
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `fid` int(11) NOT NULL auto_increment,
+  `fid` int(11) NOT NULL AUTO_INCREMENT,
   `g` geometry NOT NULL,
   PRIMARY KEY (`fid`),
   SPATIAL KEY `g` (`g`(32))
@@ -290,7 +290,7 @@ ALTER TABLE t2 ADD SPATIAL KEY(g);
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `fid` int(11) NOT NULL auto_increment,
+  `fid` int(11) NOT NULL AUTO_INCREMENT,
   `g` geometry NOT NULL,
   PRIMARY KEY (`fid`),
   SPATIAL KEY `g` (`g`(32))

mysql-test/r/grant.result

@@ -626,3 +626,21 @@ drop user mysqltest_7@;
 flush privileges;
 show grants for mysqltest_7@;
 ERROR 42000: There is no such grant defined for user 'mysqltest_7' on host ''
+create database mysqltest;
+use mysqltest;
+create table t1(f1 int);
+GRANT DELETE ON mysqltest.t1 TO mysqltest1@'%';
+GRANT SELECT ON mysqltest.t1 TO mysqltest1@'192.%';
+show grants for mysqltest1@'192.%';
+Grants for mysqltest1@192.%
+GRANT USAGE ON *.* TO 'mysqltest1'@'192.%'
+GRANT SELECT ON `mysqltest`.`t1` TO 'mysqltest1'@'192.%'
+show grants for mysqltest1@'%';
+Grants for mysqltest1@%
+GRANT USAGE ON *.* TO 'mysqltest1'@'%'
+GRANT DELETE ON `mysqltest`.`t1` TO 'mysqltest1'@'%'
+delete from mysql.user where user='mysqltest1';
+delete from mysql.db where user='mysqltest1';
+delete from mysql.tables_priv where user='mysqltest1';
+flush privileges;
+drop database mysqltest;

mysql-test/r/heap.result

@@ -263,41 +263,41 @@ concat('*',v,'*',c,'*',t,'*')
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
-  `t` varchar(50) default NULL
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
+  `t` varchar(50) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 create table t2 like t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
-  `t` varchar(50) default NULL
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
+  `t` varchar(50) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 create table t3 select * from t1;
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
-  `t` varchar(50) default NULL
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
+  `t` varchar(50) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 alter table t1 modify c varchar(10);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` varchar(10) default NULL,
-  `t` varchar(50) default NULL
+  `v` varchar(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
+  `t` varchar(50) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 alter table t1 modify v char(10);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) default NULL,
-  `c` varchar(10) default NULL,
-  `t` varchar(50) default NULL
+  `v` char(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
+  `t` varchar(50) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
 Warnings:
@@ -305,9 +305,9 @@ Warning	1265	Data truncated for column 't' at row 2
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) default NULL,
-  `c` varchar(10) default NULL,
-  `t` varchar(10) default NULL
+  `v` char(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
+  `t` varchar(10) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
@@ -318,9 +318,9 @@ create table t1 (v varchar(10), c char(10), t varchar(50), key(v), key(c), key(t
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
-  `t` varchar(50) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
+  `t` varchar(50) DEFAULT NULL,
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
@@ -553,9 +553,9 @@ create table t1 (v varchar(10), c char(10), t varchar(50), key using btree (v),
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
-  `t` varchar(50) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
+  `t` varchar(50) DEFAULT NULL,
   KEY `v` USING BTREE (`v`),
   KEY `c` USING BTREE (`c`),
   KEY `t` USING BTREE (`t`(10))
@@ -644,9 +644,9 @@ create table t1 (v varchar(10), c char(10), t varchar(50), key(v(5)), key(c(5)),
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
-  `t` varchar(50) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
+  `t` varchar(50) DEFAULT NULL,
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
@@ -656,7 +656,7 @@ create table t1 (v varchar(65530), key(v(10)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(65530) default NULL,
+  `v` varchar(65530) DEFAULT NULL,
   KEY `v` (`v`(10))
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values(repeat('a',65530));

mysql-test/r/index_merge_innodb.result

@@ -244,8 +244,8 @@ t1	CREATE TABLE `t1` (
   `t_vers` varchar(4) NOT NULL,
   `t_rele` varchar(2) NOT NULL,
   `t_cust` varchar(4) NOT NULL,
-  `filler1` char(250) default NULL,
-  `filler2` char(250) default NULL,
+  `filler1` char(250) DEFAULT NULL,
+  `filler2` char(250) DEFAULT NULL,
   PRIMARY KEY (`t_cpac`,`t_vers`,`t_rele`,`t_cust`),
   UNIQUE KEY `IX_4` (`t_cust`,`t_cpac`,`t_vers`,`t_rele`),
   KEY `IX_5` (`t_vers`,`t_rele`,`t_cust`)

mysql-test/r/information_schema.result

@@ -433,7 +433,7 @@ alter table t1 add constraint constraint_2 unique key_2(a);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` int(11) NOT NULL default '0',
+  `a` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`a`),
   UNIQUE KEY `constraint_1` (`a`),
   UNIQUE KEY `key_1` (`a`),
@@ -506,19 +506,19 @@ drop table t1;
 SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
-  `DESCRIPTION` varchar(60) NOT NULL default '',
-  `MAXLEN` bigint(3) NOT NULL default '0'
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
+  `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 set names latin2;
 SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;
 Table	Create Table
 CHARACTER_SETS	CREATE TEMPORARY TABLE `CHARACTER_SETS` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
-  `DESCRIPTION` varchar(60) NOT NULL default '',
-  `MAXLEN` bigint(3) NOT NULL default '0'
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
+  `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MEMORY DEFAULT CHARSET=utf8
 set names latin1;
 create table t1 select * from information_schema.CHARACTER_SETS
@@ -530,10 +530,10 @@ alter table t1 default character set utf8;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `CHARACTER_SET_NAME` varchar(64) NOT NULL default '',
-  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL default '',
-  `DESCRIPTION` varchar(60) NOT NULL default '',
-  `MAXLEN` bigint(3) NOT NULL default '0'
+  `CHARACTER_SET_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL DEFAULT '',
+  `DESCRIPTION` varchar(60) NOT NULL DEFAULT '',
+  `MAXLEN` bigint(3) NOT NULL DEFAULT '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 drop table t1;
 create view v1 as select * from information_schema.TABLES;

mysql-test/r/innodb.result

@@ -856,7 +856,7 @@ create table t1 (a char(20), index (a(5))) engine=innodb;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` char(20) default NULL,
+  `a` char(20) DEFAULT NULL,
   KEY `a` (`a`(5))
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t1;
@@ -1587,7 +1587,7 @@ create table t2 (id int(11) not null auto_increment, id2 int(11) not null, const
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `id2` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `id` (`id`,`id2`),
@@ -1598,7 +1598,7 @@ create table t2 (id int(11) not null auto_increment, id2 int(11) not null, const
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `id2` int(11) NOT NULL,
   KEY `t1_id_fk` (`id`),
   CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
@@ -1607,7 +1607,7 @@ alter table t2 add index id_test (id), add index id_test2 (id,id2);
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `id` int(11) NOT NULL auto_increment,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `id2` int(11) NOT NULL,
   KEY `id_test` (`id`),
   KEY `id_test2` (`id`,`id2`),
@@ -1620,8 +1620,8 @@ create table t2 (a int auto_increment primary key, b int, index(b), foreign key
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `a` int(11) NOT NULL auto_increment,
-  `b` int(11) default NULL,
+  `a` int(11) NOT NULL AUTO_INCREMENT,
+  `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   UNIQUE KEY `b_2` (`b`),
   KEY `b` (`b`),
@@ -1632,8 +1632,8 @@ create table t2 (a int auto_increment primary key, b int, foreign key (b) refere
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `a` int(11) NOT NULL auto_increment,
-  `b` int(11) default NULL,
+  `a` int(11) NOT NULL AUTO_INCREMENT,
+  `b` int(11) DEFAULT NULL,
   PRIMARY KEY (`a`),
   UNIQUE KEY `b` (`b`),
   CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`b`) REFERENCES `t1` (`id`),
@@ -1843,40 +1843,40 @@ concat('*',v,'*',c,'*',t,'*')
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 create table t2 like t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 create table t3 select * from t1;
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 alter table t1 modify c varchar(10);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` varchar(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
   `t` text
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 alter table t1 modify v char(10);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) default NULL,
-  `c` varchar(10) default NULL,
+  `v` char(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
   `t` text
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
@@ -1885,9 +1885,9 @@ Note	1265	Data truncated for column 't' at row 2
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) default NULL,
-  `c` varchar(10) default NULL,
-  `t` varchar(10) default NULL
+  `v` char(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
+  `t` varchar(10) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
@@ -1898,8 +1898,8 @@ create table t1 (v varchar(10), c char(10), t text, key(v), key(c), key(t(10)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `v` (`v`),
   KEY `c` (`c`),
@@ -2117,8 +2117,8 @@ alter table t1 modify v varchar(300), drop key v, drop key v_2, add key v (v);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(300) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(300) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
@@ -2197,8 +2197,8 @@ alter table t1 drop key v, add key v (v(30));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(300) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(300) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
@@ -2277,8 +2277,8 @@ alter table t1 modify v varchar(600), drop key v, add key v (v);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(600) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(600) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
@@ -2355,8 +2355,8 @@ create table t1 (v varchar(10), c char(10), t text, key(v(5)), key(c(5)), key(t(
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
@@ -2367,15 +2367,15 @@ create table t1 (v char(10) character set utf8);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) character set utf8 default NULL
+  `v` char(10) CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(10), c char(10)) row_format=fixed;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED
 insert into t1 values('a','a'),('a ','a ');
 select concat('*',v,'*',c,'*') from t1;
@@ -2417,7 +2417,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext character set utf8
+  `v` mediumtext CHARACTER SET utf8
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t1;
 set storage_engine=MyISAM;
@@ -2544,8 +2544,8 @@ character set = latin1 engine = innodb;
 show create table t9;
 Table	Create Table
 t9	CREATE TABLE `t9` (
-  `col1` varchar(512) default NULL,
-  `col2` varchar(512) default NULL,
+  `col1` varchar(512) DEFAULT NULL,
+  `col2` varchar(512) DEFAULT NULL,
   KEY `col1` (`col1`,`col2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t1, t2, t3, t4, t5, t6, t7, t8, t9;
@@ -2568,7 +2568,7 @@ Warning	1071	Specified key was too long; max key length is 767 bytes
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `col1` varchar(768) default NULL,
+  `col1` varchar(768) DEFAULT NULL,
   KEY `col1` (`col1`(767))
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t1, t2, t3, t4;

mysql-test/r/innodb_gis.result

 SET storage_engine=innodb;
 DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
-CREATE TABLE gis_point  (fid INTEGER, g POINT);
-CREATE TABLE gis_line  (fid INTEGER, g LINESTRING);
-CREATE TABLE gis_polygon   (fid INTEGER, g POLYGON);
-CREATE TABLE gis_multi_point (fid INTEGER, g MULTIPOINT);
-CREATE TABLE gis_multi_line (fid INTEGER, g MULTILINESTRING);
-CREATE TABLE gis_multi_polygon  (fid INTEGER, g MULTIPOLYGON);
-CREATE TABLE gis_geometrycollection  (fid INTEGER, g GEOMETRYCOLLECTION);
-CREATE TABLE gis_geometry (fid INTEGER, g GEOMETRY);
+CREATE TABLE gis_point  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POINT);
+CREATE TABLE gis_line  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g LINESTRING);
+CREATE TABLE gis_polygon   (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g POLYGON);
+CREATE TABLE gis_multi_point (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOINT);
+CREATE TABLE gis_multi_line (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTILINESTRING);
+CREATE TABLE gis_multi_polygon  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g MULTIPOLYGON);
+CREATE TABLE gis_geometrycollection  (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRYCOLLECTION);
+CREATE TABLE gis_geometry (fid INTEGER PRIMARY KEY AUTO_INCREMENT, g GEOMETRY);
 SHOW CREATE TABLE gis_point;
 Table	Create Table
 gis_point	CREATE TABLE `gis_point` (
-  `fid` int(11) default NULL,
-  `g` point default NULL
+  `fid` int(11) NOT NULL AUTO_INCREMENT,
+  `g` point DEFAULT NULL,
+  PRIMARY KEY (`fid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SHOW FIELDS FROM gis_point;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	point	YES		NULL	
 SHOW FIELDS FROM gis_line;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	linestring	YES		NULL	
 SHOW FIELDS FROM gis_polygon;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	polygon	YES		NULL	
 SHOW FIELDS FROM gis_multi_point;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	multipoint	YES		NULL	
 SHOW FIELDS FROM gis_multi_line;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	multilinestring	YES		NULL	
 SHOW FIELDS FROM gis_multi_polygon;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	multipolygon	YES		NULL	
 SHOW FIELDS FROM gis_geometrycollection;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	geometrycollection	YES		NULL	
 SHOW FIELDS FROM gis_geometry;
 Field	Type	Null	Key	Default	Extra
-fid	int(11)	YES		NULL	
+fid	int(11)	NO	PRI	NULL	auto_increment
 g	geometry	YES		NULL	
 INSERT INTO gis_point VALUES 
 (101, PointFromText('POINT(10 10)')),
@@ -407,6 +408,7 @@ Warnings:
 Note	1003	select `test`.`g1`.`fid` AS `first`,`test`.`g2`.`fid` AS `second`,within(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `w`,contains(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `c`,overlaps(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `o`,equals(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `e`,disjoint(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `d`,touches(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `t`,intersects(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `i`,crosses(`test`.`g1`.`g`,`test`.`g2`.`g`) AS `r` from `test`.`gis_geometrycollection` `g1` join `test`.`gis_geometrycollection` `g2` order by `test`.`g1`.`fid`,`test`.`g2`.`fid`
 DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
 CREATE TABLE t1 (
+a INTEGER PRIMARY KEY AUTO_INCREMENT,
 gp  point,
 ln  linestring,
 pg  polygon,
@@ -418,6 +420,7 @@ gm  geometry
 );
 SHOW FIELDS FROM t1;
 Field	Type	Null	Key	Default	Extra
+a	int(11)	NO	PRI	NULL	auto_increment
 gp	point	YES		NULL	
 ln	linestring	YES		NULL	
 pg	polygon	YES		NULL	
@@ -429,6 +432,7 @@ gm	geometry	YES		NULL
 ALTER TABLE t1 ADD fid INT;
 SHOW FIELDS FROM t1;
 Field	Type	Null	Key	Default	Extra
+a	int(11)	NO	PRI	NULL	auto_increment
 gp	point	YES		NULL	
 ln	linestring	YES		NULL	
 pg	polygon	YES		NULL	
@@ -439,20 +443,20 @@ gc	geometrycollection	YES		NULL
 gm	geometry	YES		NULL	
 fid	int(11)	YES		NULL	
 DROP TABLE t1;
-create table t1 (a geometry not null);
-insert into t1 values (GeomFromText('Point(1 2)'));
-insert into t1 values ('Garbage');
+create table t1 (pk integer primary key auto_increment, a geometry not null);
+insert into t1 (a) values (GeomFromText('Point(1 2)'));
+insert into t1 (a) values ('Garbage');
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert IGNORE into t1 values ('Garbage');
+insert IGNORE into t1 (a) values ('Garbage');
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 drop table t1;
-create table t1 (fl geometry);
-insert into t1 values (1);
+create table t1 (pk integer primary key auto_increment, fl geometry);
+insert into t1 (fl) values (1);
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert into t1 values (1.11);
+insert into t1 (fl) values (1.11);
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert into t1 values ("qwerty");
+insert into t1 (fl) values ("qwerty");
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
-insert into t1 values (pointfromtext('point(1,1)'));
+insert into t1 (fl) values (pointfromtext('point(1,1)'));
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 drop table t1;

mysql-test/r/join.result

@@ -475,6 +475,22 @@ b	c	a	c	b	y
 1	10	2	3	1	2
 1	3	2	3	1	11
 1	3	2	3	1	2
+select * from t5 natural join ((t1 natural join t2), (t3 natural join t4));
+y	z	b	c	a	c	b
+11	4	1	10	2	3	1
+11	4	1	3	2	3	1
+select * from  ((t1 natural join t2),  (t3 natural join t4)) natural join t5;
+y	b	c	a	c	b	z
+11	1	10	2	3	1	4
+11	1	3	2	3	1	4
+select * from t5 natural join ((t1 natural join t2) cross join (t3 natural join t4));
+y	z	b	c	a	c	b
+11	4	1	10	2	3	1
+11	4	1	3	2	3	1
+select * from  ((t1 natural join t2) cross join (t3 natural join t4)) natural join t5;
+y	b	c	a	c	b	z
+11	1	10	2	3	1	4
+11	1	3	2	3	1	4
 select * from (t1 join t2 using (b)) join (t3 join t4 using (c)) using (c);
 c	b	a	b	y
 3	1	2	1	11
@@ -665,6 +681,8 @@ select * from ((t1 natural join t2), (t3 natural join t4)) natural join t6;
 ERROR 23000: Column 'c' in from clause is ambiguous
 select * from ((t1 natural join t2), (t3 natural join t4)) natural join t6;
 ERROR 23000: Column 'c' in from clause is ambiguous
+select * from t6 natural join ((t1 natural join t2),  (t3 natural join t4));
+ERROR 23000: Column 'c' in from clause is ambiguous
 select * from (t1 join t2 on t1.b=t2.b) natural join (t3 natural join t4);
 ERROR 23000: Column 'b' in from clause is ambiguous
 select * from  (t3 natural join t4) natural join (t1 join t2 on t1.b=t2.b);
@@ -673,6 +691,8 @@ select * from (t3 join (t4 natural join t5) on (b < z))
 natural join
 (t1 natural join t2);
 ERROR 23000: Column 'c' in from clause is ambiguous
+select * from (t1 natural join t2) natural join (t3 join (t4 natural join t5) on (b < z));
+ERROR 23000: Column 'c' in from clause is ambiguous
 select t1.b from v1a;
 ERROR 42S22: Unknown column 't1.b' in 'field list'
 select * from v1a join v1b on t1.b = t2.b;
@@ -697,3 +717,30 @@ drop view v2b;
 drop view v3a;
 drop view v3b;
 drop view v4;
+create table t1 (a1 int, a2 int);
+create table t2 (a1 int, b int);
+create table t3 (c1 int, c2 int);
+create table t4 (c2 int);
+insert into t1 values (1,1);
+insert into t2 values (1,1);
+insert into t3 values (1,1);
+insert into t4 values (1);
+select * from t1 join t2 using (a1) join t3 on b=c1 join t4 using (c2);
+c2	a1	a2	b	c1
+1	1	1	1	1
+select * from t3 join (t1 join t2 using (a1)) on b=c1 join t4 using (c2);
+c2	c1	a1	a2	b
+1	1	1	1	1
+select a2 from t1 join t2 using (a1) join t3 on b=c1 join t4 using (c2);
+a2
+1
+select a2 from t3 join (t1 join t2 using (a1)) on b=c1 join t4 using (c2);
+a2
+1
+select a2 from ((t1 join t2 using (a1)) join t3 on b=c1) join t4 using (c2);
+a2
+1
+select a2 from ((t1 natural join t2) join t3 on b=c1) natural join t4;
+a2
+1
+drop table t1,t2,t3,t4;

mysql-test/r/key.result

@@ -242,8 +242,8 @@ create table t1 (c varchar(30) character set utf8, t text character set utf8, un
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` varchar(30) character set utf8 default NULL,
-  `t` text character set utf8,
+  `c` varchar(30) CHARACTER SET utf8 DEFAULT NULL,
+  `t` text CHARACTER SET utf8,
   UNIQUE KEY `c` (`c`(2)),
   UNIQUE KEY `t` (`t`(3))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -350,24 +350,24 @@ create table t1 (a varchar(10), b varchar(10), key(a(10),b(10)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) default NULL,
-  `b` varchar(10) default NULL,
+  `a` varchar(10) DEFAULT NULL,
+  `b` varchar(10) DEFAULT NULL,
   KEY `a` (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify b varchar(20);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(10) default NULL,
-  `b` varchar(20) default NULL,
+  `a` varchar(10) DEFAULT NULL,
+  `b` varchar(20) DEFAULT NULL,
   KEY `a` (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify a varchar(20);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` varchar(20) default NULL,
-  `b` varchar(20) default NULL,
+  `a` varchar(20) DEFAULT NULL,
+  `b` varchar(20) DEFAULT NULL,
   KEY `a` (`a`,`b`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
@@ -412,10 +412,10 @@ index (c2, c4));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` int(11) default NULL,
-  `c2` char(12) NOT NULL default '',
-  `c3` varchar(123) NOT NULL default '',
-  `c4` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `c1` int(11) DEFAULT NULL,
+  `c2` char(12) NOT NULL DEFAULT '',
+  `c3` varchar(123) NOT NULL DEFAULT '',
+  `c4` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`c2`,`c3`),
   UNIQUE KEY `i4` (`c4`),
   KEY `c1` (`c1`),
@@ -445,10 +445,10 @@ ERROR 42000: Can't DROP 'PRIMARY'; check that column/key exists
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` int(11) NOT NULL default '0',
-  `c2` char(12) NOT NULL default '',
-  `c3` varchar(123) NOT NULL default '',
-  `c4` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `c1` int(11) NOT NULL DEFAULT '0',
+  `c2` char(12) NOT NULL DEFAULT '',
+  `c3` varchar(123) NOT NULL DEFAULT '',
+  `c4` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   KEY `i1` (`c1`),
   KEY `i5` (`c1`,`c2`,`c3`,`c4`),
   KEY `c1` (`c1`),

mysql-test/r/kill.result

@@ -15,6 +15,8 @@ select 4;
 4
 4
 drop table t1;
+kill (select count(*) from mysql.user);
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'select count(*) from mysql.user)' at line 1
 create table t1 (id int primary key);
 create table t2 (id int unsigned not null);
 insert into t2 select id from t1;

mysql-test/r/lowercase_table2.result

@@ -13,7 +13,7 @@ T1
 SHOW CREATE TABLE T1;
 Table	Create Table
 T1	CREATE TABLE `T1` (
-  `a` int(11) default NULL
+  `a` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 RENAME TABLE T1 TO T2;
 SHOW TABLES LIKE "T2";
@@ -68,7 +68,7 @@ T1
 SHOW CREATE TABLE T1;
 Table	Create Table
 T1	CREATE TABLE `T1` (
-  `a` int(11) default NULL
+  `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 RENAME TABLE T1 TO T2;
 SHOW TABLES LIKE "T2";

mysql-test/r/merge.result

@@ -173,7 +173,7 @@ show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
   `a` int(11) NOT NULL,
-  `b` char(20) default NULL,
+  `b` char(20) DEFAULT NULL,
   KEY `a` (`a`)
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`t2`)
 create table t4 (a int not null, b char(10), key(a)) engine=MERGE UNION=(t1,t2);
@@ -191,7 +191,7 @@ show create table t5;
 Table	Create Table
 t5	CREATE TABLE `t5` (
   `a` int(11) NOT NULL,
-  `b` char(20) default NULL,
+  `b` char(20) DEFAULT NULL,
   KEY `a` (`a`)
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`mysqltest`.`t6`)
 alter table t5 engine=myisam;
@@ -314,14 +314,14 @@ show create table t5;
 Table	Create Table
 t5	CREATE TABLE `t5` (
   `a` int(11) NOT NULL,
-  `b` int(11) NOT NULL auto_increment,
+  `b` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`a`,`b`)
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=FIRST UNION=(`t1`,`t2`)
 show create table t6;
 Table	Create Table
 t6	CREATE TABLE `t6` (
   `a` int(11) NOT NULL,
-  `b` int(11) NOT NULL auto_increment,
+  `b` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`a`,`b`)
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
 insert into t1 values (1,NULL),(1,NULL),(1,NULL),(1,NULL);

mysql-test/r/myisam.result

@@ -746,40 +746,40 @@ concat('*',v,'*',c,'*',t,'*')
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t2 like t1;
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 create table t3 select * from t1;
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify c varchar(10);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` varchar(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
   `t` text
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify v char(10);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) default NULL,
-  `c` varchar(10) default NULL,
+  `v` char(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
   `t` text
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
@@ -788,9 +788,9 @@ Note	1265	Data truncated for column 't' at row 2
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) default NULL,
-  `c` varchar(10) default NULL,
-  `t` varchar(10) default NULL
+  `v` char(10) DEFAULT NULL,
+  `c` varchar(10) DEFAULT NULL,
+  `t` varchar(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
@@ -801,8 +801,8 @@ create table t1 (v varchar(10), c char(10), t text, key(v), key(c), key(t(10)));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `v` (`v`),
   KEY `c` (`c`),
@@ -1020,8 +1020,8 @@ alter table t1 modify v varchar(300), drop key v, drop key v_2, add key v (v);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(300) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(300) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
@@ -1100,8 +1100,8 @@ alter table t1 drop key v, add key v (v(30));
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(300) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(300) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
@@ -1180,8 +1180,8 @@ alter table t1 modify v varchar(600), drop key v, add key v (v);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(600) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(600) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `c` (`c`),
   KEY `t` (`t`(10)),
@@ -1258,8 +1258,8 @@ create table t1 (v varchar(10), c char(10), t text, key(v(5)), key(c(5)), key(t(
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL,
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL,
   `t` text,
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
@@ -1270,15 +1270,15 @@ create table t1 (v char(10) character set utf8);
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` char(10) character set utf8 default NULL
+  `v` char(10) CHARACTER SET utf8 DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(10), c char(10)) row_format=fixed;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` varchar(10) default NULL,
-  `c` char(10) default NULL
+  `v` varchar(10) DEFAULT NULL,
+  `c` char(10) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED
 insert into t1 values('a','a'),('a ','a ');
 select concat('*',v,'*',c,'*') from t1;
@@ -1320,7 +1320,7 @@ Note	1246	Converting column 'v' from VARCHAR to TEXT
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `v` mediumtext character set utf8
+  `v` mediumtext CHARACTER SET utf8
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(65535));

mysql-test/r/mysql.result

@@ -69,3 +69,10 @@ c_cp932
 ソ
 ソ
 ソ
++----------------------+------------+--------+
+| concat('>',col1,'<') | col2       | col3   |
++----------------------+------------+--------+
+| >a   <               | b          | 123421 |
+| >a   <               | 0123456789 | 4      |
+| >abcd<               |            | 4      |
++----------------------+------------+--------+

mysql-test/r/mysqldump-max.result

@@ -111,8 +111,8 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 
@@ -121,8 +121,8 @@ INSERT  DELAYED IGNORE INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t2`;
 CREATE TABLE `t2` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 
@@ -131,8 +131,8 @@ INSERT  DELAYED IGNORE INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t3`;
 CREATE TABLE `t3` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
 
 
@@ -141,8 +141,8 @@ INSERT  DELAYED IGNORE INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'
 /*!40000 ALTER TABLE `t3` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t4`;
 CREATE TABLE `t4` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
 
 
@@ -151,8 +151,8 @@ INSERT  DELAYED IGNORE INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'
 /*!40000 ALTER TABLE `t4` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t5`;
 CREATE TABLE `t5` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
 
 
@@ -161,8 +161,8 @@ INSERT  DELAYED IGNORE INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'
 /*!40000 ALTER TABLE `t5` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t6`;
 CREATE TABLE `t6` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
@@ -196,8 +196,8 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET l
 USE `test`;
 DROP TABLE IF EXISTS `t1`;
 CREATE TABLE `t1` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 
@@ -206,8 +206,8 @@ INSERT  DELAYED INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first v
 /*!40000 ALTER TABLE `t1` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t2`;
 CREATE TABLE `t2` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 
@@ -216,8 +216,8 @@ INSERT  DELAYED INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first v
 /*!40000 ALTER TABLE `t2` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t3`;
 CREATE TABLE `t3` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
 
 
@@ -226,8 +226,8 @@ INSERT  DELAYED INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first v
 /*!40000 ALTER TABLE `t3` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t4`;
 CREATE TABLE `t4` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1;
 
 
@@ -236,8 +236,8 @@ INSERT  DELAYED INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first v
 /*!40000 ALTER TABLE `t4` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t5`;
 CREATE TABLE `t5` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
 
 
@@ -246,8 +246,8 @@ INSERT  DELAYED INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first v
 /*!40000 ALTER TABLE `t5` ENABLE KEYS */;
 DROP TABLE IF EXISTS `t6`;
 CREATE TABLE `t6` (
-  `id` int(8) default NULL,
-  `name` varchar(32) default NULL
+  `id` int(8) DEFAULT NULL,
+  `name` varchar(32) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 

mysql-test/r/mysqltest.result

@@ -304,8 +304,8 @@ mysqltest: At line 1: Invalid argument to real_sleep "abc"
 101
 hej
 1
-mysqltest: At line 1: Missing arguments to inc
-mysqltest: At line 1: First argument to inc must be a variable (start with $)
+mysqltest: At line 1: Missing argument to inc
+mysqltest: At line 1: The argument to inc must be a variable (start with $)
 mysqltest: At line 1: End of line junk detected: "1000"
 4
 4
@@ -314,8 +314,8 @@ mysqltest: At line 1: End of line junk detected: "1000"
 99
 hej
 -1
-mysqltest: At line 1: Missing arguments to dec
-mysqltest: At line 1: First argument to dec must be a variable (start with $)
+mysqltest: At line 1: Missing argument to dec
+mysqltest: At line 1: The argument to dec must be a variable (start with $)
 mysqltest: At line 1: End of line junk detected: "1000"
 mysqltest: At line 1: Missing arguments to system, nothing to do!
 mysqltest: At line 1: Missing arguments to system, nothing to do!
@@ -378,9 +378,9 @@ mysqltest: At line 1: Could not open connection 'con2': 1049 Unknown database 'i
 mysqltest: At line 1: Illegal argument for port: 'illegal_port'
 mysqltest: At line 1: Illegal option to connect: SMTP
 OK
-mysqltest: In included file "MYSQLTEST_VARDIR/tmp/con.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c
-mysqltest: In included file "MYSQLTEST_VARDIR/tmp/con.sql": At line 3: connection 'test_con1' not found in connection pool
-mysqltest: In included file "MYSQLTEST_VARDIR/tmp/con.sql": At line 2: Connection test_con1 already exists
+mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c
+mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool
+mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists
 connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
 Output from mysqltest-x.inc
 Output from mysqltest-x.inc

mysql-test/r/ndb_bitfield.result

@@ -7,7 +7,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `pk1` int(11) NOT NULL,
-  `b` bit(64) default NULL,
+  `b` bit(64) DEFAULT NULL,
   PRIMARY KEY (`pk1`)
 ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 insert into t1 values 

mysql-test/r/ndb_dd_backuprestore.result

@@ -170,7 +170,7 @@ CREATE TABLE test.t6 (pk1 MEDIUMINT NOT NULL AUTO_INCREMENT, c2 VARCHAR(220) NOT
 SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` varchar(150) NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -179,7 +179,7 @@ t1	CREATE TABLE `t1` (
 SHOW CREATE TABLE test.t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` text NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -188,7 +188,7 @@ t2	CREATE TABLE `t2` (
 SHOW CREATE TABLE test.t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` varchar(202) NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -197,7 +197,7 @@ t3	CREATE TABLE `t3` (
 SHOW CREATE TABLE test.t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` varchar(180) NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -206,7 +206,7 @@ t4	CREATE TABLE `t4` (
 SHOW CREATE TABLE test.t5;
 Table	Create Table
 t5	CREATE TABLE `t5` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` text NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -215,7 +215,7 @@ t5	CREATE TABLE `t5` (
 SHOW CREATE TABLE test.t6;
 Table	Create Table
 t6	CREATE TABLE `t6` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` varchar(220) NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -336,7 +336,7 @@ ENGINE =NDB;
 SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` varchar(150) NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -345,7 +345,7 @@ t1	CREATE TABLE `t1` (
 SHOW CREATE TABLE test.t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` text NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -354,7 +354,7 @@ t2	CREATE TABLE `t2` (
 SHOW CREATE TABLE test.t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` varchar(202) NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -363,7 +363,7 @@ t3	CREATE TABLE `t3` (
 SHOW CREATE TABLE test.t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` varchar(180) NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -372,7 +372,7 @@ t4	CREATE TABLE `t4` (
 SHOW CREATE TABLE test.t5;
 Table	Create Table
 t5	CREATE TABLE `t5` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` text NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
@@ -381,7 +381,7 @@ t5	CREATE TABLE `t5` (
 SHOW CREATE TABLE test.t6;
 Table	Create Table
 t6	CREATE TABLE `t6` (
-  `pk1` mediumint(9) NOT NULL auto_increment,
+  `pk1` mediumint(9) NOT NULL AUTO_INCREMENT,
   `c2` varchar(220) NOT NULL,
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,

mysql-test/r/ndb_dd_ddl.result

@@ -175,7 +175,8 @@ CREATE TABLE t1
 (pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
 TABLESPACE ts1 STORAGE DISK
 ENGINE NDB;
-CREATE INDEX c on t1(c);
+CREATE INDEX b_i on t1(b);
+CREATE INDEX bc_i on t1(b, c);
 DROP TABLE t1;
 ALTER TABLESPACE ts1
 DROP DATAFILE 'datafile2.dat'

mysql-test/r/ndb_multi_row.result

@@ -60,4 +60,6 @@ t2
 t3
 t4
 drop table t1, t2, t3, t4;
-drop table t1, t3, t4;
+drop table if exists t1, t3, t4;
+Warnings:
+Error	155	Table 'test.t3' doesn't exist

mysql-test/r/ndb_partition_error.result

@@ -36,3 +36,12 @@ INSERT INTO t1 VALUES (2);
 UPDATE t1 SET id=5 WHERE id=2;
 ERROR HY000: Table has no partition for value 5
 DROP TABLE t1;
+create table t1 (a int,b int, c int)
+engine = ndb
+partition by list(a)
+partitions 2
+(partition x123 values in (11, 12),
+partition x234 values in (5, 1));
+insert into t1 values (NULL,1,1);
+ERROR HY000: Table has no partition for value NULL
+drop table t1;