| List: | Internals | « Previous MessageNext Message » | |
| From: | msvensson | Date: | June 10 2005 1:29pm |
| Subject: | bk commit into 5.0 tree (msvensson:1.1938) BUG#10460 | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.0 repository of msvensson. When msvensson does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet 1.1938 05/06/10 13:29:21 msvensson@neptunus.(none) +84 -0 Bug#10460 SHOW CREATE TABLE uses inconsistent upper/lower case - Change lowercase to uppercase in field::sql_type() and descendants. - Change lowercase to uppercase in output from SHOW CREATE TABLE - Update result files for mysql-test sql/sql_show.cc 1.248 05/06/10 13:29:16 msvensson@neptunus.(none) +6 -6 Changing lowercase to uppercase for reserved words and datatypes in the output from "SHOW CREATE TABLE" sql/field.cc 1.262 05/06/10 13:29:16 msvensson@neptunus.(none) +42 -42 Changing lowercase to uppercase in output from field::sql_type() and it's descendants. mysql-test/r/view_grant.result 1.2 05/06/10 13:29:16 msvensson@neptunus.(none) +4 -4 Update result file to use uppercase mysql-test/r/view.result 1.82 05/06/10 13:29:16 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/variables.result 1.65 05/06/10 13:29:16 msvensson@neptunus.(none) +9 -9 Update result file to use uppercase mysql-test/r/user_var.result 1.35 05/06/10 13:29:16 msvensson@neptunus.(none) +5 -5 Update result file to use uppercase mysql-test/r/union.result 1.75 05/06/10 13:29:16 msvensson@neptunus.(none) +45 -45 Update result file to use uppercase mysql-test/r/type_varchar.result 1.6 05/06/10 13:29:16 msvensson@neptunus.(none) +13 -13 Update result file to use uppercase mysql-test/r/type_timestamp.result 1.28 05/06/10 13:29:16 msvensson@neptunus.(none) +38 -38 Update result file to use uppercase mysql-test/r/type_set.result 1.14 05/06/10 13:29:16 msvensson@neptunus.(none) +3 -3 Update result file to use uppercase mysql-test/r/type_ranges.result 1.35 05/06/10 13:29:16 msvensson@neptunus.(none) +84 -84 Update result file to use uppercase mysql-test/r/type_newdecimal.result 1.15 05/06/10 13:29:16 msvensson@neptunus.(none) +18 -18 Update result file to use uppercase mysql-test/r/type_nchar.result 1.6 05/06/10 13:29:16 msvensson@neptunus.(none) +7 -7 Update result file to use uppercase mysql-test/r/type_float.result 1.38 05/06/10 13:29:16 msvensson@neptunus.(none) +20 -20 Update result file to use uppercase mysql-test/r/type_enum.result 1.28 05/06/10 13:29:16 msvensson@neptunus.(none) +10 -10 Update result file to use uppercase mysql-test/r/type_decimal.result 1.33 05/06/10 13:29:16 msvensson@neptunus.(none) +5 -5 Update result file to use uppercase mysql-test/r/type_blob.result 1.47 05/06/10 13:29:15 msvensson@neptunus.(none) +21 -21 Update result file to use uppercase mysql-test/r/type_bit_innodb.result 1.3 05/06/10 13:29:15 msvensson@neptunus.(none) +7 -7 Update result file to use uppercase mysql-test/r/type_bit.result 1.10 05/06/10 13:29:15 msvensson@neptunus.(none) +1 -1 Update result file to use uppercase mysql-test/r/temp_table.result 1.15 05/06/10 13:29:15 msvensson@neptunus.(none) +1 -1 Update result file to use uppercase mysql-test/r/system_mysql_db.result 1.25 05/06/10 13:29:15 msvensson@neptunus.(none) +119 -119 Update result file to use uppercase mysql-test/r/synchronization.result 1.4 05/06/10 13:29:15 msvensson@neptunus.(none) +20 -20 Update result file to use uppercase mysql-test/r/symlink.result 1.21 05/06/10 13:29:15 msvensson@neptunus.(none) +18 -18 Update result file to use uppercase mysql-test/r/subselect.result 1.116 05/06/10 13:29:15 msvensson@neptunus.(none) +7 -7 Update result file to use uppercase mysql-test/r/strict.result 1.19 05/06/10 13:29:15 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/sql_mode.result 1.19 05/06/10 13:29:15 msvensson@neptunus.(none) +30 -30 Update result file to use uppercase mysql-test/r/sp.result 1.125 05/06/10 13:29:15 msvensson@neptunus.(none) +13 -13 Update result file to use uppercase mysql-test/r/show_check.result 1.69 05/06/10 13:29:15 msvensson@neptunus.(none) +77 -77 Update result file to use uppercase mysql-test/r/select.result 1.64 05/06/10 13:29:15 msvensson@neptunus.(none) +12 -12 Update result file to use uppercase mysql-test/r/rpl_sp.result 1.4 05/06/10 13:29:15 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/rpl_deadlock.result 1.7 05/06/10 13:29:15 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/rpl_create_database.result 1.6 05/06/10 13:29:15 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/rpl000002.result 1.19 05/06/10 13:29:15 msvensson@neptunus.(none) +4 -4 Update result file to use uppercase mysql-test/r/ps_7ndb.result 1.26 05/06/10 13:29:15 msvensson@neptunus.(none) +27 -27 Update result file to use uppercase mysql-test/r/ps_6bdb.result 1.27 05/06/10 13:29:15 msvensson@neptunus.(none) +27 -27 Update result file to use uppercase mysql-test/r/ps_5merge.result 1.26 05/06/10 13:29:15 msvensson@neptunus.(none) +54 -54 Update result file to use uppercase mysql-test/r/ps_4heap.result 1.25 05/06/10 13:29:15 msvensson@neptunus.(none) +27 -27 Update result file to use uppercase mysql-test/r/ps_3innodb.result 1.29 05/06/10 13:29:15 msvensson@neptunus.(none) +27 -27 Update result file to use uppercase mysql-test/r/ps_2myisam.result 1.26 05/06/10 13:29:15 msvensson@neptunus.(none) +27 -27 Update result file to use uppercase mysql-test/r/ps_1general.result 1.41 05/06/10 13:29:15 msvensson@neptunus.(none) +5 -5 Update result file to use uppercase mysql-test/r/null.result 1.33 05/06/10 13:29:15 msvensson@neptunus.(none) +38 -38 Update result file to use uppercase mysql-test/r/ndb_bitfield.result 1.3 05/06/10 13:29:15 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/ndb_autodiscover.result 1.22 05/06/10 13:29:15 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/mysqldump.result 1.45 05/06/10 13:29:15 msvensson@neptunus.(none) +365 -365 Update result file to use uppercase mysql-test/r/myisam.result 1.63 05/06/10 13:29:15 msvensson@neptunus.(none) +38 -38 Update result file to use uppercase mysql-test/r/merge.result 1.41 05/06/10 13:29:15 msvensson@neptunus.(none) +20 -20 Update result file to use uppercase mysql-test/r/key.result 1.25 05/06/10 13:29:15 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/innodb.result 1.112 05/06/10 13:29:15 msvensson@neptunus.(none) +66 -66 Update result file to use uppercase mysql-test/r/information_schema.result 1.53 05/06/10 13:29:14 msvensson@neptunus.(none) +54 -54 Update result file to use uppercase mysql-test/r/heap.result 1.37 05/06/10 13:29:14 msvensson@neptunus.(none) +28 -28 Update result file to use uppercase mysql-test/r/gis.result 1.23 05/06/10 13:29:14 msvensson@neptunus.(none) +34 -34 Update result file to use uppercase mysql-test/r/gis-rtree.result 1.14 05/06/10 13:29:14 msvensson@neptunus.(none) +4 -4 Update result file to use uppercase mysql-test/r/func_time.result 1.39 05/06/10 13:29:14 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/func_system.result 1.22 05/06/10 13:29:14 msvensson@neptunus.(none) +5 -5 Update result file to use uppercase mysql-test/r/func_str.result 1.98 05/06/10 13:29:14 msvensson@neptunus.(none) +31 -31 Update result file to use uppercase mysql-test/r/func_sapdb.result 1.14 05/06/10 13:29:14 msvensson@neptunus.(none) +9 -9 Update result file to use uppercase mysql-test/r/func_misc.result 1.19 05/06/10 13:29:14 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/func_group.result 1.45 05/06/10 13:29:14 msvensson@neptunus.(none) +7 -7 Update result file to use uppercase mysql-test/r/fulltext.result 1.78 05/06/10 13:29:14 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/date_formats.result 1.17 05/06/10 13:29:14 msvensson@neptunus.(none) +6 -6 Update result file to use uppercase mysql-test/r/ctype_utf8.result 1.58 05/06/10 13:29:14 msvensson@neptunus.(none) +9 -9 Update result file to use uppercase mysql-test/r/ctype_ujis.result 1.13 05/06/10 13:29:14 msvensson@neptunus.(none) +4 -4 Update result file to use uppercase mysql-test/r/ctype_ucs.result 1.35 05/06/10 13:29:14 msvensson@neptunus.(none) +5 -5 Update result file to use uppercase mysql-test/r/ctype_uca.result 1.14 05/06/10 13:29:14 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/ctype_tis620.result 1.11 05/06/10 13:29:14 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/ctype_sjis.result 1.7 05/06/10 13:29:14 msvensson@neptunus.(none) +1 -1 Update result file to use uppercase mysql-test/r/ctype_recoding.result 1.29 05/06/10 13:29:14 msvensson@neptunus.(none) +18 -18 Update result file to use uppercase mysql-test/r/ctype_mb.result 1.11 05/06/10 13:29:14 msvensson@neptunus.(none) +8 -8 Update result file to use uppercase mysql-test/r/ctype_many.result 1.12 05/06/10 13:29:14 msvensson@neptunus.(none) +16 -16 Update result file to use uppercase mysql-test/r/ctype_latin1_de.result 1.25 05/06/10 13:29:14 msvensson@neptunus.(none) +3 -3 Update result file to use uppercase mysql-test/r/ctype_create.result 1.7 05/06/10 13:29:14 msvensson@neptunus.(none) +6 -6 Update result file to use uppercase mysql-test/r/ctype_collate.result 1.32 05/06/10 13:29:14 msvensson@neptunus.(none) +6 -6 Update result file to use uppercase mysql-test/r/ctype_big5.result 1.7 05/06/10 13:29:14 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/create.result 1.90 05/06/10 13:29:14 msvensson@neptunus.(none) +68 -68 Update result file to use uppercase mysql-test/r/constraints.result 1.7 05/06/10 13:29:14 msvensson@neptunus.(none) +1 -1 Update result file to use uppercase mysql-test/r/client_xml.result 1.3 05/06/10 13:29:14 msvensson@neptunus.(none) +3 -3 Update result file to use uppercase mysql-test/r/cast.result 1.30 05/06/10 13:29:14 msvensson@neptunus.(none) +11 -11 Update result file to use uppercase mysql-test/r/case.result 1.22 05/06/10 13:29:14 msvensson@neptunus.(none) +19 -19 Update result file to use uppercase mysql-test/r/bugs.result 1.2 05/06/10 13:29:14 msvensson@neptunus.(none) +56 -56 Update result file to use uppercase mysql-test/r/binary.result 1.20 05/06/10 13:29:14 msvensson@neptunus.(none) +1 -1 Update result file to use uppercase mysql-test/r/bigint.result 1.28 05/06/10 13:29:14 msvensson@neptunus.(none) +2 -2 Update result file to use uppercase mysql-test/r/bdb.result 1.42 05/06/10 13:29:14 msvensson@neptunus.(none) +38 -38 Update result file to use uppercase mysql-test/r/analyse.result 1.21 05/06/10 13:29:14 msvensson@neptunus.(none) +30 -30 Update result file to use uppercase mysql-test/r/alter_table.result 1.50 05/06/10 13:29:13 msvensson@neptunus.(none) +17 -17 Update result file to use uppercase # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: msvensson # Host: neptunus.(none) # Root: /home/msvensson/mysql/bug10460 --- 1.261/sql/field.cc 2005-05-26 19:54:23 +02:00 +++ 1.262/sql/field.cc 2005-06-10 13:29:16 +02:00 @@ -1237,9 +1237,9 @@ void Field_num::add_zerofill_and_unsigned(String &res) const { if (unsigned_flag) - res.append(" unsigned"); + res.append(" UNSIGNED"); if (zerofill) - res.append(" zerofill"); + res.append(" ZEROFILL"); } @@ -1612,7 +1612,7 @@ void Field_null::sql_type(String &res) const { - res.set_ascii("null", 4); + res.set_ascii("NULL", 4); } @@ -2220,7 +2220,7 @@ if (dec) tmp--; res.length(cs->cset->snprintf(cs,(char*) res.ptr(),res.alloced_length(), - "decimal(%d,%d)",tmp,dec)); + "DECIMAL(%d,%d)",tmp,dec)); add_zerofill_and_unsigned(res); } @@ -2525,7 +2525,7 @@ { CHARSET_INFO *cs= str.charset(); str.length(cs->cset->snprintf(cs, (char*) str.ptr(), str.alloced_length(), - "decimal(%d,%d)", precision, (int)dec)); + "DECIMAL(%d,%d)", precision, (int)dec)); add_zerofill_and_unsigned(str); } @@ -2724,7 +2724,7 @@ { CHARSET_INFO *cs=res.charset(); res.length(cs->cset->snprintf(cs,(char*) res.ptr(),res.alloced_length(), - "tinyint(%d)",(int) field_length)); + "TINYINT(%d)",(int) field_length)); add_zerofill_and_unsigned(res); } @@ -2992,7 +2992,7 @@ { CHARSET_INFO *cs=res.charset(); res.length(cs->cset->snprintf(cs,(char*) res.ptr(),res.alloced_length(), - "smallint(%d)",(int) field_length)); + "SMALLINT(%d)",(int) field_length)); add_zerofill_and_unsigned(res); } @@ -3205,7 +3205,7 @@ { CHARSET_INFO *cs=res.charset(); res.length(cs->cset->snprintf(cs,(char*) res.ptr(),res.alloced_length(), - "mediumint(%d)",(int) field_length)); + "MEDIUMINT(%d)",(int) field_length)); add_zerofill_and_unsigned(res); } @@ -3515,7 +3515,7 @@ { CHARSET_INFO *cs=res.charset(); res.length(cs->cset->snprintf(cs,(char*) res.ptr(),res.alloced_length(), - "int(%d)",(int) field_length)); + "INT(%d)",(int) field_length)); add_zerofill_and_unsigned(res); } @@ -3754,7 +3754,7 @@ { CHARSET_INFO *cs=res.charset(); res.length(cs->cset->snprintf(cs,(char*) res.ptr(),res.alloced_length(), - "bigint(%d)",(int) field_length)); + "BIGINT(%d)",(int) field_length)); add_zerofill_and_unsigned(res); } @@ -4034,13 +4034,13 @@ { if (dec == NOT_FIXED_DEC) { - res.set_ascii("float", 5); + res.set_ascii("FLOAT", 5); } else { CHARSET_INFO *cs= res.charset(); res.length(cs->cset->snprintf(cs,(char*) res.ptr(),res.alloced_length(), - "float(%d,%d)",(int) field_length,dec)); + "FLOAT(%d,%d)",(int) field_length,dec)); } add_zerofill_and_unsigned(res); } @@ -4304,12 +4304,12 @@ CHARSET_INFO *cs=res.charset(); if (dec == NOT_FIXED_DEC) { - res.set_ascii("double",6); + res.set_ascii("DOUBLE",6); } else { res.length(cs->cset->snprintf(cs,(char*) res.ptr(),res.alloced_length(), - "double(%d,%d)",(int) field_length,dec)); + "DOUBLE(%d,%d)",(int) field_length,dec)); } add_zerofill_and_unsigned(res); } @@ -4724,7 +4724,7 @@ void Field_timestamp::sql_type(String &res) const { - res.set_ascii("timestamp", 9); + res.set_ascii("TIMESTAMP", 9); } @@ -4991,7 +4991,7 @@ void Field_time::sql_type(String &res) const { - res.set_ascii("time", 4); + res.set_ascii("TIME", 4); } /**************************************************************************** @@ -5092,7 +5092,7 @@ { CHARSET_INFO *cs=res.charset(); res.length(cs->cset->snprintf(cs,(char*)res.ptr(),res.alloced_length(), - "year(%d)",(int) field_length)); + "YEAR(%d)",(int) field_length)); } @@ -5297,7 +5297,7 @@ void Field_date::sql_type(String &res) const { - res.set_ascii("date", 4); + res.set_ascii("DATE", 4); } @@ -5504,7 +5504,7 @@ void Field_newdate::sql_type(String &res) const { - res.set_ascii("date", 4); + res.set_ascii("DATE", 4); } @@ -5774,7 +5774,7 @@ void Field_datetime::sql_type(String &res) const { - res.set_ascii("datetime", 8); + res.set_ascii("DATETIME", 8); } /**************************************************************************** @@ -5988,13 +5988,13 @@ res.alloced_length(), "%s(%d)", ((type() == MYSQL_TYPE_VAR_STRING && !thd->variables.new_mode) ? - (has_charset() ? "varchar" : "varbinary") : - (has_charset() ? "char" : "binary")), + (has_charset() ? "VARCHAR" : "VARBINARY") : + (has_charset() ? "CHAR" : "BINARY")), (int) field_length / charset()->mbmaxlen); res.length(length); if ((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)) && has_charset() && (charset()->state & MY_CS_BINSORT)) - res.append(" binary"); + res.append(" BINARY"); } @@ -6353,12 +6353,12 @@ length= cs->cset->snprintf(cs,(char*) res.ptr(), res.alloced_length(), "%s(%d)", - (has_charset() ? "varchar" : "varbinary"), + (has_charset() ? "VARCHAR" : "VARBINARY"), (int) field_length / charset()->mbmaxlen); res.length(length); if ((thd->variables.sql_mode & (MODE_MYSQL323 | MODE_MYSQL40)) && has_charset() && (charset()->state & MY_CS_BINSORT)) - res.append(" binary"); + res.append(" BINARY"); } @@ -7019,17 +7019,17 @@ const char *str; uint length; switch (packlength) { - default: str="tiny"; length=4; break; + default: str="TINY"; length=4; break; case 2: str=""; length=0; break; - case 3: str="medium"; length= 6; break; - case 4: str="long"; length=4; break; + case 3: str="MEDIUM"; length= 6; break; + case 4: str="LONG"; length=4; break; } res.set_ascii(str,length); if (charset() == &my_charset_bin) - res.append("blob"); + res.append("BLOB"); else { - res.append("text"); + res.append("TEXT"); } } @@ -7250,28 +7250,28 @@ switch (geom_type) { case GEOM_POINT: - res.set("point", 5, cs); + res.set("POINT", 5, cs); break; case GEOM_LINESTRING: - res.set("linestring", 10, cs); + res.set("LINESTRING", 10, cs); break; case GEOM_POLYGON: - res.set("polygon", 7, cs); + res.set("POLYGON", 7, cs); break; case GEOM_MULTIPOINT: - res.set("multipoint", 10, cs); + res.set("MULTIPOINT", 10, cs); break; case GEOM_MULTILINESTRING: - res.set("multilinestring", 15, cs); + res.set("MULTILINESTRING", 15, cs); break; case GEOM_MULTIPOLYGON: - res.set("multipolygon", 12, cs); + res.set("MULTIPOLYGON", 12, cs); break; case GEOM_GEOMETRYCOLLECTION: - res.set("geometrycollection", 18, cs); + res.set("GEOMETRYCOLLECTIOn", 18, cs); break; default: - res.set("geometry", 8, cs); + res.set("GEOMETRY", 8, cs); } } @@ -7548,7 +7548,7 @@ String enum_item(buffer, sizeof(buffer), res.charset()); res.length(0); - res.append("enum("); + res.append("ENUM("); bool flag=0; uint *len= typelib->type_lengths; @@ -7662,7 +7662,7 @@ String set_item(buffer, sizeof(buffer), res.charset()); res.length(0); - res.append("set("); + res.append("SET("); bool flag=0; uint *len= typelib->type_lengths; @@ -7950,7 +7950,7 @@ { CHARSET_INFO *cs= res.charset(); ulong length= cs->cset->snprintf(cs, (char*) res.ptr(), res.alloced_length(), - "bit(%d)", + "BIT(%d)", (int) field_length * 8 + bit_len); res.length((uint) length); } @@ -8029,7 +8029,7 @@ { CHARSET_INFO *cs= res.charset(); ulong length= cs->cset->snprintf(cs, (char*) res.ptr(), res.alloced_length(), - "bit(%d)", (int) create_length); + "BIT(%d)", (int) create_length); res.length((uint) length); } --- 1.247/sql/sql_show.cc 2005-05-26 21:01:48 +02:00 +++ 1.248/sql/sql_show.cc 2005-06-10 13:29:16 +02:00 @@ -789,7 +789,7 @@ { if (field->charset() != share->table_charset) { - packet->append(" character set ", 15); + packet->append(" CHARACTER SET ", 15); packet->append(field->charset()->csname); } /* @@ -798,7 +798,7 @@ */ if (!(field->charset()->state & MY_CS_PRIMARY)) { - packet->append(" collate ", 9); + packet->append(" COLLATE ", 9); packet->append(field->charset()->name); } } @@ -829,7 +829,7 @@ if (has_default) { - packet->append(" default ", 9); + packet->append(" DEFAULT ", 9); if (has_now_default) packet->append("CURRENT_TIMESTAMP",17); else if (!field->is_null()) @@ -857,10 +857,10 @@ if (!foreign_db_mode && !limited_mysql_mode && table->timestamp_field == field && field->unireg_check != Field::TIMESTAMP_DN_FIELD) - packet->append(" on update CURRENT_TIMESTAMP",28); + packet->append(" ON UPDATE CURRENT_TIMESTAMP",28); if (field->unireg_check == Field::NEXT_NUMBER && !foreign_db_mode) - packet->append(" auto_increment", 15 ); + packet->append(" AUTO_INCREMENT", 15 ); if (field->comment.length) { @@ -2500,7 +2500,7 @@ strlen((const char*) pos), cs); end= tmp; if (field->unireg_check == Field::NEXT_NUMBER) - end=strmov(tmp,"auto_increment"); + end=strmov(tmp,"AUTO_INCREMENT"); table->field[16]->store(tmp, (uint) (end-tmp), cs); end=tmp; --- 1.74/mysql-test/r/union.result 2005-05-28 01:28:06 +02:00 +++ 1.75/mysql-test/r/union.result 2005-06-10 13:29:16 +02:00 @@ -543,7 +543,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(2) NOT NULL default '' + `a` VARCHAR(2) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT 12 as a UNION select "aa" as a; @@ -554,7 +554,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varbinary(20) NOT NULL default '' + `a` VARBINARY(20) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT 12 as a UNION select 12.2 as a; @@ -565,7 +565,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` decimal(3,1) NOT NULL default '0.0' + `a` DECIMAL(3,1) NOT NULL DEFAULT '0.0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t2 (it1 tinyint, it2 tinyint not null, i int not null, ib bigint, f float, d double, y year, da date, dt datetime, sc char(10), sv varchar(10), b blob, tx text); @@ -578,7 +578,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `it2` tinyint(4) default NULL + `it2` TINYINT(4) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT it2 from t2 UNION select i from t2; @@ -589,7 +589,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `it2` int(11) NOT NULL default '0' + `it2` INT(11) NOT NULL DEFAULT '0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT i from t2 UNION select f from t2; @@ -600,7 +600,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` double default NULL + `i` DOUBLE DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT f from t2 UNION select d from t2; @@ -611,7 +611,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f` double default NULL + `f` DOUBLE DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT ib from t2 UNION select f from t2; @@ -622,7 +622,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `ib` double default NULL + `ib` DOUBLE DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT ib from t2 UNION select d from t2; @@ -633,7 +633,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `ib` double default NULL + `ib` DOUBLE DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT f from t2 UNION select y from t2; @@ -644,7 +644,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f` float default NULL + `f` FLOAT DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT f from t2 UNION select da from t2; @@ -655,7 +655,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f` varbinary(24) default NULL + `f` VARBINARY(24) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT y from t2 UNION select da from t2; @@ -666,7 +666,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `y` varbinary(10) default NULL + `y` VARBINARY(10) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT y from t2 UNION select dt from t2; @@ -677,7 +677,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `y` varbinary(19) default NULL + `y` VARBINARY(19) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT da from t2 UNION select dt from t2; @@ -688,7 +688,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `da` datetime default NULL + `da` DATETIME DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT dt from t2 UNION select sc from t2; @@ -699,7 +699,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `dt` varbinary(19) default NULL + `dt` VARBINARY(19) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT dt from t2 UNION select sv from t2; @@ -710,7 +710,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `dt` varbinary(19) default NULL + `dt` VARBINARY(19) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT sc from t2 UNION select sv from t2; @@ -721,7 +721,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `sc` varchar(10) default NULL + `sc` VARCHAR(10) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT dt from t2 UNION select b from t2; @@ -732,7 +732,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `dt` longblob + `dt` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT sv from t2 UNION select b from t2; @@ -743,7 +743,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `sv` longblob + `sv` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT i from t2 UNION select d from t2 UNION select b from t2; @@ -755,7 +755,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` longblob + `i` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT sv from t2 UNION select tx from t2; @@ -766,7 +766,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `sv` longtext + `sv` LONGTEXT ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 SELECT b from t2 UNION select tx from t2; @@ -777,7 +777,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `b` longblob + `b` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1,t2; create table t1 (d decimal(10,1)); @@ -792,7 +792,7 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( - `d` decimal(18,9) default NULL + `d` DECIMAL(18,9) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1,t2,t3; create table t1 select 1 union select -1; @@ -803,7 +803,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `1` bigint(20) NOT NULL default '0' + `1` BIGINT(20) NOT NULL DEFAULT '0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 select _latin1"test" union select _latin2"testt" ; @@ -812,7 +812,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `test` varchar(5) character set latin2 NOT NULL default '' + `test` VARCHAR(5) CHARACTER SET latin2 NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (s char(200)); @@ -1056,7 +1056,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `test` varchar(4) NOT NULL default '' + `test` VARCHAR(4) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select count(*) from t1; count(*) @@ -1069,7 +1069,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `_latin1'test' collate latin1_bin` varchar(4) character set latin1 collate latin1_bin NOT NULL default '' + `_latin1'test' collate latin1_bin` VARCHAR(4) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select count(*) from t1; count(*) @@ -1082,7 +1082,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `test` varchar(4) character set latin1 collate latin1_bin NOT NULL default '' + `test` VARCHAR(4) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select count(*) from t1; count(*) @@ -1095,7 +1095,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `test` varchar(4) character set latin1 collate latin1_bin NOT NULL default '' + `test` VARCHAR(4) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select count(*) from t1; count(*) @@ -1114,7 +1114,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a collate latin1_german1_ci` varchar(1) character set latin1 collate latin1_german1_ci default NULL + `a collate latin1_german1_ci` VARCHAR(1) CHARACTER SET latin1 COLLATE latin1_german1_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 as @@ -1123,7 +1123,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(1) character set latin1 collate latin1_german1_ci default NULL + `a` VARCHAR(1) CHARACTER SET latin1 COLLATE latin1_german1_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 as @@ -1133,7 +1133,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` varchar(1) character set latin1 collate latin1_german1_ci default NULL + `a` VARCHAR(1) CHARACTER SET latin1 COLLATE latin1_german1_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; drop table t2; @@ -1145,8 +1145,8 @@ order by f2, a1; show columns from t2; Field Type Null Key Default Extra -f2 date YES NULL -a1 int(11) YES NULL +f2 DATE YES NULL +a1 INT(11) YES NULL drop table t1, t2; create table t1 (f1 int); create table t2 (f1 int, f2 int ,f3 date); @@ -1171,7 +1171,7 @@ order by sdate; show columns from t4; Field Type Null Key Default Extra -sdate date YES NULL +sdate DATE YES NULL drop table t1, t2, t3, t4; create table t1 (a int not null, b char (10) not null); insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c'); @@ -1208,39 +1208,39 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('','','') character set utf8 NOT NULL default '', - `b` enum('one','two') character set utf8 default NULL, - `c` enum('one','two') default NULL + `a` ENUM('','','') CHARACTER SET utf8 NOT NULL DEFAULT '', + `b` ENUM('one','two') CHARACTER SET utf8 DEFAULT NULL, + `c` ENUM('one','two') DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values ('', 'one', 'one'), ('', 'two', 'one'), ('', NULL, NULL); create table t2 select NULL union select a from t1; show columns from t2; Field Type Null Key Default Extra -NULL enum('','','') YES NULL +NULL ENUM('','','') YES NULL drop table t2; create table t2 select a from t1 union select NULL; show columns from t2; Field Type Null Key Default Extra -a enum('','','') YES NULL +a ENUM('','','') YES NULL drop table t2; create table t2 select a from t1 union select a from t1; show columns from t2; Field Type Null Key Default Extra -a varchar(1) NO +a VARCHAR(1) NO drop table t2; create table t2 select a from t1 union select c from t1; ERROR HY000: Illegal mix of collations (utf8_general_ci,IMPLICIT) and (latin1_swedish_ci,IMPLICIT) for operation 'UNION' create table t2 select a from t1 union select b from t1; show columns from t2; Field Type Null Key Default Extra -a varchar(3) YES NULL +a VARCHAR(3) YES NULL drop table t2, t1; create table t1 (a varchar(5)); create table t2 select * from t1 union select 'abcdefghijkl'; show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varchar(12) default NULL + `a` VARCHAR(12) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select row_format from information_schema.TABLES where table_schema="test" and table_name="t2"; row_format @@ -1249,7 +1249,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varchar(12) default NULL + `a` VARCHAR(12) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED drop table t1,t2; CREATE TABLE t1 (a mediumtext); @@ -1263,7 +1263,7 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( - `left(a,100000000)` longtext + `left(a,100000000)` LONGTEXT ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop tables t1,t2,t3; create table t1 ( id int not null auto_increment, primary key (id), col1 int); --- 1.6/mysql-test/r/ctype_big5.result 2005-03-25 13:08:38 +01:00 +++ 1.7/mysql-test/r/ctype_big5.result 2005-06-10 13:29:14 +02:00 @@ -10,7 +10,7 @@ CREATE TABLE t1 (c CHAR(10), KEY(c)); SHOW FULL COLUMNS FROM t1; Field Type Collation Null Key Default Extra Privileges Comment -c char(10) big5_chinese_ci YES MUL NULL +c CHAR(10) big5_chinese_ci YES MUL NULL INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa'); SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%'; want3results @@ -21,7 +21,7 @@ CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2))); SHOW FULL COLUMNS FROM t1; Field Type Collation Null Key Default Extra Privileges Comment -c1 varchar(15) big5_chinese_ci YES MUL NULL +c1 VARCHAR(15) big5_chinese_ci YES MUL NULL INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab'); SELECT c1 as want3results from t1 where c1 like 'l%'; want3results --- 1.6/mysql-test/r/ctype_create.result 2004-12-06 17:01:45 +01:00 +++ 1.7/mysql-test/r/ctype_create.result 2005-06-10 13:29:14 +02:00 @@ -12,7 +12,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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; --- 1.6/mysql-test/r/ctype_sjis.result 2005-02-04 01:05:10 +01:00 +++ 1.7/mysql-test/r/ctype_sjis.result 2005-06-10 13:29:14 +02:00 @@ -51,7 +51,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` enum('S','s') character set sjis default NULL + `c` ENUM('S','s') CHARACTER SET sjis DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values (0x9353); insert into t1 values (0x9373); --- 1.10/mysql-test/r/ctype_tis620.result 2005-01-15 13:37:04 +01:00 +++ 1.11/mysql-test/r/ctype_tis620.result 2005-06-10 13:29:14 +02:00 @@ -120,8 +120,8 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `recid` int(11) NOT NULL auto_increment, - `dyninfo` text, + `recid` INT(11) NOT NULL AUTO_INCREMENT, + `dyninfo` TEXT, PRIMARY KEY (`recid`) ) ENGINE=MyISAM DEFAULT CHARSET=tis620 INSERT INTO t1 VALUES (1,'color=\"STB,NPG\"\r\nengine=\"J30A13\"\r\nframe=\"MRHCG1640YP4\"\r\ngrade=\"V6\"\r\nmodel=\"ACCORD\"\r\nmodelcode=\"CG164YEN\"\r\ntype=\"VT6\"\r\n'); --- 1.31/mysql-test/r/ctype_collate.result 2005-04-11 12:08:58 +02:00 +++ 1.32/mysql-test/r/ctype_collate.result 2005-06-10 13:29:14 +02:00 @@ -484,30 +484,30 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `latin1_f` char(32) NOT NULL + `latin1_f` CHAR(32) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SHOW FIELDS FROM t1; Field Type Null Key Default Extra -latin1_f char(32) NO +latin1_f CHAR(32) NO ALTER TABLE t1 CHANGE latin1_f 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 -latin1_f char(32) YES NULL +latin1_f CHAR(32) YES NULL 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 -latin1_f char(32) YES NULL +latin1_f CHAR(32) YES NULL SET CHARACTER SET 'latin1'; SHOW VARIABLES LIKE 'character_set_client'; Variable_name Value --- 1.11/mysql-test/r/ctype_many.result 2005-01-14 20:28:58 +01:00 +++ 1.12/mysql-test/r/ctype_many.result 2005-06-10 13:29:14 +02:00 @@ -7,40 +7,40 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `comment` char(32) character set latin1 NOT NULL, - `koi8_ru_f` char(32) character set koi8r NOT NULL default '' + `comment` CHAR(32) CHARACTER SET latin1 NOT NULL, + `koi8_ru_f` CHAR(32) CHARACTER SET koi8r NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin5 ALTER TABLE t1 CHANGE comment comment CHAR(32) CHARACTER SET latin2 NOT NULL; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `comment` char(32) character set latin2 NOT NULL, - `koi8_ru_f` char(32) character set koi8r NOT NULL default '' + `comment` CHAR(32) CHARACTER SET latin2 NOT NULL, + `koi8_ru_f` CHAR(32) CHARACTER SET koi8r NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin5 ALTER TABLE t1 ADD latin5_f CHAR(32) NOT NULL; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `comment` char(32) character set latin2 NOT NULL, - `koi8_ru_f` char(32) character set koi8r NOT NULL default '', - `latin5_f` char(32) NOT NULL + `comment` CHAR(32) CHARACTER SET latin2 NOT NULL, + `koi8_ru_f` CHAR(32) CHARACTER SET koi8r NOT NULL DEFAULT '', + `latin5_f` CHAR(32) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin5 ALTER TABLE t1 DEFAULT CHARSET=latin2; ALTER TABLE t1 ADD latin2_f CHAR(32) NOT NULL; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `comment` char(32) NOT NULL, - `koi8_ru_f` char(32) character set koi8r NOT NULL default '', - `latin5_f` char(32) character set latin5 NOT NULL, - `latin2_f` char(32) NOT NULL + `comment` CHAR(32) NOT NULL, + `koi8_ru_f` CHAR(32) CHARACTER SET koi8r NOT NULL DEFAULT '', + `latin5_f` CHAR(32) CHARACTER SET latin5 NOT NULL, + `latin2_f` CHAR(32) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin2 ALTER TABLE t1 DROP latin2_f, DROP latin5_f; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `comment` char(32) NOT NULL, - `koi8_ru_f` char(32) character set koi8r NOT NULL default '' + `comment` CHAR(32) NOT NULL, + `koi8_ru_f` CHAR(32) CHARACTER SET koi8r NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin2 INSERT INTO t1 (koi8_ru_f,comment) VALUES ('a','LAT SMALL A'); INSERT INTO t1 (koi8_ru_f,comment) VALUES ('b','LAT SMALL B'); --- 1.10/mysql-test/r/ctype_mb.result 2005-01-21 13:53:56 +01:00 +++ 1.11/mysql-test/r/ctype_mb.result 2005-06-10 13:29:14 +02:00 @@ -3,17 +3,17 @@ 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 @@ 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 @@ 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 @@ 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; --- 1.28/mysql-test/r/ctype_recoding.result 2004-12-10 10:06:16 +01:00 +++ 1.29/mysql-test/r/ctype_recoding.result 2005-06-10 13:29:14 +02:00 @@ -6,7 +6,7 @@ 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 @@ 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,11 +50,11 @@ 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 - char(32) NO + CHAR(32) NO SET CHARACTER SET cp1251; SHOW TABLES; Tables_in_test @@ -62,11 +62,11 @@ 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 - char(32) NO + CHAR(32) NO SET CHARACTER SET utf8; SHOW TABLES; Tables_in_test @@ -74,11 +74,11 @@ 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 -поле char(32) NO +поле CHAR(32) NO SET CHARACTER SET koi8r; DROP TABLE ; SET CHARACTER SET default; @@ -117,13 +117,13 @@ 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,24 +141,24 @@ 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 - char(128) YES -1 enum('1','2') YES 2 + CHAR(128) YES +1 ENUM('1','2') YES 2 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 -ä char(128) YES ä -ä1 enum('ä1','ä2') YES ä2 +ä CHAR(128) YES ä +ä1 ENUM('ä1','ä2') YES ä2 DROP TABLE t1; SET NAMES binary; CREATE TABLE `good` (a int); --- 1.34/mysql-test/r/ctype_ucs.result 2005-05-14 10:36:56 +02:00 +++ 1.35/mysql-test/r/ctype_ucs.result 2005-06-10 13:29:14 +02:00 @@ -74,8 +74,8 @@ 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 @@ 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 @@ 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 @@ 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'); --- 1.57/mysql-test/r/ctype_utf8.result 2005-05-09 18:40:15 +02:00 +++ 1.58/mysql-test/r/ctype_utf8.result 2005-06-10 13:29:14 +02:00 @@ -124,7 +124,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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; --- 1.5/mysql-test/r/type_nchar.result 2004-03-20 11:31:16 +01:00 +++ 1.6/mysql-test/r/type_nchar.result 2005-06-10 13:29:16 +02:00 @@ -3,48 +3,48 @@ 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 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (c national char(10)); 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 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (c national varchar(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(10) character set utf8 default NULL + `c` VARCHAR(10) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (c nvarchar(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(10) character set utf8 default NULL + `c` VARCHAR(10) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (c nchar varchar(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(10) character set utf8 default NULL + `c` VARCHAR(10) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (c national character varying(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(10) character set utf8 default NULL + `c` VARCHAR(10) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (c nchar varying(10)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c` varchar(10) character set utf8 default NULL + `c` VARCHAR(10) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; --- 1.13/mysql-test/r/ctype_uca.result 2005-04-04 14:54:45 +02:00 +++ 1.14/mysql-test/r/ctype_uca.result 2005-06-10 13:29:14 +02:00 @@ -2329,7 +2329,7 @@ CREATE TABLE t1 (c CHAR(10), KEY(c)); SHOW FULL COLUMNS FROM t1; Field Type Collation Null Key Default Extra Privileges Comment -c char(10) utf8_swedish_ci YES MUL NULL +c CHAR(10) utf8_swedish_ci YES MUL NULL INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa'); SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%'; want3results @@ -2340,7 +2340,7 @@ CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2))); SHOW FULL COLUMNS FROM t1; Field Type Collation Null Key Default Extra Privileges Comment -c1 varchar(15) utf8_swedish_ci YES MUL NULL +c1 VARCHAR(15) utf8_swedish_ci YES MUL NULL INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab'); SELECT c1 as want3results from t1 where c1 like 'l%'; want3results --- 1.115/mysql-test/r/subselect.result 2005-05-20 15:31:43 +02:00 +++ 1.116/mysql-test/r/subselect.result 2005-06-10 13:29:15 +02:00 @@ -1087,24 +1087,24 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bigint(20) NOT NULL default '0', - `(SELECT 1)` bigint(20) NOT NULL default '0' + `a` BIGINT(20) NOT NULL DEFAULT '0', + `(SELECT 1)` BIGINT(20) NOT NULL DEFAULT '0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; CREATE TABLE t1 SELECT * FROM (SELECT 1 as a,(SELECT a)) a; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bigint(20) NOT NULL default '0', - `(SELECT a)` bigint(20) NOT NULL default '0' + `a` BIGINT(20) NOT NULL DEFAULT '0', + `(SELECT a)` BIGINT(20) NOT NULL DEFAULT '0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; CREATE TABLE t1 SELECT * FROM (SELECT 1 as a,(SELECT a+0)) a; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bigint(20) NOT NULL default '0', - `(SELECT a+0)` bigint(20) NOT NULL default '0' + `a` BIGINT(20) NOT NULL DEFAULT '0', + `(SELECT a+0)` BIGINT(20) NOT NULL DEFAULT '0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; CREATE TABLE t1 SELECT (SELECT 1 as a UNION SELECT 1+1 limit 1,1) as a; @@ -1114,7 +1114,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bigint(20) NOT NULL default '0' + `a` BIGINT(20) NOT NULL DEFAULT '0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (a int); --- 1.81/mysql-test/r/view.result 2005-05-17 17:05:06 +02:00 +++ 1.82/mysql-test/r/view.result 2005-06-10 13:29:16 +02:00 @@ -291,7 +291,7 @@ create table t2 select * from v1; show columns from t2; Field Type Null Key Default Extra -a+1 bigint(12) YES NULL +a+1 BIGINT(12) YES NULL select * from t2; a+1 2 @@ -566,7 +566,7 @@ col1 describe v1; Field Type Null Key Default Extra -col1 varchar(2) YES NULL +col1 VARCHAR(2) YES NULL drop view v1; drop table `t1a``b`; create table t1 (col1 char(5),col2 char(5)); --- 1.3/mysql-test/r/rpl_sp.result 2005-05-06 18:52:14 +02:00 +++ 1.4/mysql-test/r/rpl_sp.result 2005-06-10 13:29:15 +02:00 @@ -209,7 +209,7 @@ insert into t1 values(fn1()); select * from mysql.proc where db='mysqltest1'; db name type specific_name language sql_data_access is_deterministic security_type param_list returns body definer created modified sql_mode comment -mysqltest1 fn1 FUNCTION fn1 SQL CONTAINS_SQL YES DEFINER int(11) begin +mysqltest1 fn1 FUNCTION fn1 SQL CONTAINS_SQL YES DEFINER INT(11) begin return unix_timestamp(); end root@localhost # # select * from t1; @@ -221,7 +221,7 @@ 1000000000 select * from mysql.proc where db='mysqltest1'; db name type specific_name language sql_data_access is_deterministic security_type param_list returns body definer created modified sql_mode comment -mysqltest1 fn1 FUNCTION fn1 SQL CONTAINS_SQL YES DEFINER int(11) begin +mysqltest1 fn1 FUNCTION fn1 SQL CONTAINS_SQL YES DEFINER INT(11) begin return unix_timestamp(); end @ # # create trigger trg before insert on t1 for each row set new.a= 10; --- 1.16/mysql-test/r/date_formats.result 2005-03-30 15:00:27 +02:00 +++ 1.17/mysql-test/r/date_formats.result 2005-06-10 13:29:14 +02:00 @@ -451,11 +451,11 @@ str_to_date("02", "%d") as f4, str_to_date("02 10", "%d %H") as f5; describe t1; Field Type Null Key Default Extra -f1 datetime YES NULL -f2 time YES NULL -f3 date YES NULL -f4 date YES NULL -f5 time YES NULL +f1 DATETIME YES NULL +f2 TIME YES NULL +f3 DATE YES NULL +f4 DATE YES NULL +f5 TIME YES NULL select * from t1; f1 f2 f3 f4 f5 2003-01-02 10:11:12 10:11:12 2003-01-02 0000-00-02 58:00:00 @@ -467,7 +467,7 @@ create table t2 select str_to_date(a,b) from t1; describe t2; Field Type Null Key Default Extra -str_to_date(a,b) binary(29) YES NULL +str_to_date(a,b) BINARY(29) YES NULL select str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S.%f") as f1, str_to_date("2003-01-02 10:11:12.0012", "%Y-%m-%d %H:%i:%S") as f2, str_to_date("2003-01-02", "%Y-%m-%d") as f3, --- 1.13/mysql-test/r/func_sapdb.result 2005-04-18 13:58:53 +02:00 +++ 1.14/mysql-test/r/func_sapdb.result 2005-06-10 13:29:14 +02:00 @@ -177,15 +177,15 @@ time("1997-12-31 23:59:59.000001") as f9; describe t1; Field Type Null Key Default Extra -f1 date NO 0000-00-00 -f2 datetime YES NULL -f3 time YES NULL -f4 time NO 00:00:00 -f5 time NO 00:00:00 -f6 time NO 00:00:00 -f7 datetime YES NULL -f8 date YES NULL -f9 time YES NULL +f1 DATE NO 0000-00-00 +f2 DATETIME YES NULL +f3 TIME YES NULL +f4 TIME NO 00:00:00 +f5 TIME NO 00:00:00 +f6 TIME NO 00:00:00 +f7 DATETIME YES NULL +f8 DATE YES NULL +f9 TIME YES NULL select * from t1; f1 f2 f3 f4 f5 f6 f7 f8 f9 1997-01-01 1998-01-02 01:01:00 49:01:01 46:58:57 -24:00:00 10:11:12 2001-12-01 01:01:01 1997-12-31 23:59:59 --- 1.52/mysql-test/r/information_schema.result 2005-05-20 14:38:15 +02:00 +++ 1.53/mysql-test/r/information_schema.result 2005-06-10 13:29:14 +02:00 @@ -142,20 +142,20 @@ v1 NULL NULL NULL NULL NULL NULL # NULL NULL NULL # # NULL NULL NULL NULL view show full columns from t3 like "a%"; Field Type Collation Null Key Default Extra Privileges Comment -a int(11) NULL YES MUL NULL select,insert,update,references +a INT(11) NULL YES MUL NULL select,insert,update,references show full columns from mysql.db like "Insert%"; Field Type Collation Null Key Default Extra Privileges Comment -Insert_priv enum('N','Y') utf8_general_ci NO N select,insert,update,references +Insert_priv ENUM('N','Y') utf8_general_ci NO N select,insert,update,references show full columns from v1; Field Type Collation Null Key Default Extra Privileges Comment -c varchar(64) utf8_general_ci NO select,insert,update,references +c VARCHAR(64) utf8_general_ci NO select,insert,update,references select * from information_schema.COLUMNS where table_name="t1" and column_name= "a"; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT -NULL mysqltest t1 a 1 NULL YES int NULL NULL 11 0 NULL NULL int(11) select,insert,update,references +NULL mysqltest t1 a 1 NULL YES INT NULL NULL 11 0 NULL NULL INT(11) select,insert,update,references show columns from mysqltest.t1 where field like "%a%"; Field Type Null Key Default Extra -a int(11) YES NULL +a INT(11) YES NULL create view mysqltest.v1 (c) as select a from mysqltest.t1; grant select (a) on mysqltest.t1 to mysqltest_2@localhost; grant select on mysqltest.v1 to mysqltest_3; @@ -165,8 +165,8 @@ t1 a select show columns from mysqltest.t1; Field Type Null Key Default Extra -a int(11) YES NULL -b varchar(30) YES MUL NULL +a INT(11) YES NULL +b VARCHAR(30) YES MUL NULL select table_name, column_name, privileges from information_schema.columns where table_schema = 'mysqltest' and table_name = 'v1'; table_name column_name privileges @@ -237,7 +237,7 @@ from information_schema.routines; parameter_style sql_data_access dtd_identifier SQL CONTAINS SQL NULL -SQL CONTAINS SQL int(11) +SQL CONTAINS SQL INT(11) show procedure status; Db Name Type Definer Modified Created Security_type Comment test sel2 PROCEDURE root@localhost # # DEFINER @@ -292,7 +292,7 @@ sub1 show create function sub2; Function sql_mode Create Function -sub2 CREATE FUNCTION `test`.`sub2`(i int) RETURNS int(11) +sub2 CREATE FUNCTION `test`.`sub2`(i int) RETURNS INT(11) return i+1 drop function sub2; show create procedure sel2; @@ -397,7 +397,7 @@ 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`), @@ -471,19 +471,19 @@ 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 @@ -495,10 +495,10 @@ 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; @@ -510,36 +510,36 @@ CHARACTER_OCTET_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE from information_schema.columns where table_name= 't1'; COLUMN_NAME COLUMN_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE -a decimal(5,3) NULL NULL 5 3 -b decimal(5,1) NULL NULL 5 1 -c float(5,2) NULL NULL 5 2 -d decimal(6,4) NULL NULL 6 4 -e float NULL NULL 12 NULL -f decimal(6,3) NULL NULL 6 3 -g int(11) NULL NULL 11 0 -h double(10,3) NULL NULL 10 3 -i double NULL NULL 22 NULL +a DECIMAL(5,3) NULL NULL 5 3 +b DECIMAL(5,1) NULL NULL 5 1 +c FLOAT(5,2) NULL NULL 5 2 +d DECIMAL(6,4) NULL NULL 6 4 +e FLOAT NULL NULL 12 NULL +f DECIMAL(6,3) NULL NULL 6 3 +g INT(11) NULL NULL 11 0 +h DOUBLE(10,3) NULL NULL 10 3 +i DOUBLE NULL NULL 22 NULL drop table t1; create table t115 as select table_name, column_name, column_type from information_schema.columns where table_name = 'proc'; select * from t115; table_name column_name column_type -proc db char(64) -proc name char(64) -proc type enum('FUNCTION','PROCEDURE') -proc specific_name char(64) -proc language enum('SQL') -proc sql_data_access enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') -proc is_deterministic enum('YES','NO') -proc security_type enum('INVOKER','DEFINER') -proc param_list blob -proc returns char(64) -proc body blob -proc definer char(77) -proc created timestamp -proc modified timestamp -proc 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') -proc comment char(64) +proc db CHAR(64) +proc name CHAR(64) +proc type ENUM('FUNCTION','PROCEDURE') +proc specific_name CHAR(64) +proc language ENUM('SQL') +proc sql_data_access ENUM('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') +proc is_deterministic ENUM('YES','NO') +proc security_type ENUM('INVOKER','DEFINER') +proc param_list BLOB +proc returns CHAR(64) +proc body BLOB +proc definer CHAR(77) +proc created TIMESTAMP +proc modified TIMESTAMP +proc 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') +proc comment CHAR(64) drop table t115; create procedure p108 () begin declare c cursor for select data_type from information_schema.columns; open c; open c; end;// @@ -655,8 +655,8 @@ where table_schema="information_schema" and table_name="COLUMNS" and (column_name="character_set_name" or column_name="collation_name"); column_type -varchar(64) -varchar(64) +VARCHAR(64) +VARCHAR(64) select TABLE_ROWS from information_schema.tables where table_schema="information_schema" and table_name="COLUMNS"; TABLE_ROWS @@ -700,11 +700,11 @@ select table_name, column_name, data_type from information_schema.columns where data_type = 'datetime'; table_name column_name data_type -TABLES CREATE_TIME datetime -TABLES UPDATE_TIME datetime -TABLES CHECK_TIME datetime -ROUTINES CREATED datetime -ROUTINES LAST_ALTERED datetime +TABLES CREATE_TIME DATETIME +TABLES UPDATE_TIME DATETIME +TABLES CHECK_TIME DATETIME +ROUTINES CREATED DATETIME +ROUTINES LAST_ALTERED DATETIME SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES A WHERE NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.COLUMNS B --- 1.40/mysql-test/r/ps_1general.result 2005-05-13 11:08:03 +02:00 +++ 1.41/mysql-test/r/ps_1general.result 2005-06-10 13:29:15 +02:00 @@ -269,18 +269,18 @@ SET @arg00="a"; execute stmt4 using @arg00; Field Type Null Key Default Extra -a int(11) NO PRI +a INT(11) NO PRI SET @arg00="b"; execute stmt4 using @arg00; Field Type Null Key Default Extra -b char(10) YES NULL +b CHAR(10) YES NULL SET @arg00=1; execute stmt4 using @arg00; Field Type Null Key Default Extra prepare stmt4 from ' show columns from t2 from test like ''a%'' '; execute stmt4; Field Type Null Key Default Extra -a int(11) NO PRI +a INT(11) NO PRI create index t2_idx on t2(b); prepare stmt4 from ' show index from t2 from test '; execute stmt4; @@ -413,8 +413,8 @@ prepare stmt3 from ' describe t2 '; execute stmt3; Field Type Null Key Default Extra -a int(11) NO PRI -b char(10) YES MUL NULL +a INT(11) NO PRI +b CHAR(10) YES MUL NULL drop table t2 ; execute stmt3; ERROR 42S02: Table 'test.t2' doesn't exist --- 1.25/mysql-test/r/ps_2myisam.result 2005-05-05 22:01:35 +02:00 +++ 1.26/mysql-test/r/ps_2myisam.result 2005-06-10 13:29:15 +02:00 @@ -1774,33 +1774,33 @@ show create table t5 ; Table Create Table t5 CREATE TABLE `t5` ( - `const01` bigint(1) NOT NULL default '0', - `param01` bigint(20) default NULL, - `const02` decimal(2,1) NOT NULL default '0.0', - `param02` decimal(65,30) default NULL, - `const03` double NOT NULL default '0', - `param03` double default NULL, - `const04` varchar(3) NOT NULL default '', - `param04` longtext, - `const05` varbinary(3) NOT NULL default '', - `param05` longblob, - `const06` varchar(10) NOT NULL default '', - `param06` longtext, - `const07` date default NULL, - `param07` longblob, - `const08` varchar(19) NOT NULL default '', - `param08` longtext, - `const09` datetime default NULL, - `param09` longblob, - `const10` int(10) NOT NULL default '0', - `param10` bigint(20) default NULL, - `const11` int(4) default NULL, - `param11` bigint(20) default NULL, - `const12` binary(0) default NULL, - `param12` bigint(20) default NULL, - `param13` decimal(65,30) default NULL, - `param14` longtext, - `param15` longblob + `const01` BIGINT(1) NOT NULL DEFAULT '0', + `param01` BIGINT(20) DEFAULT NULL, + `const02` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `param02` DECIMAL(65,30) DEFAULT NULL, + `const03` DOUBLE NOT NULL DEFAULT '0', + `param03` DOUBLE DEFAULT NULL, + `const04` VARCHAR(3) NOT NULL DEFAULT '', + `param04` LONGTEXT, + `const05` VARBINARY(3) NOT NULL DEFAULT '', + `param05` LONGBLOB, + `const06` VARCHAR(10) NOT NULL DEFAULT '', + `param06` LONGTEXT, + `const07` DATE DEFAULT NULL, + `param07` LONGBLOB, + `const08` VARCHAR(19) NOT NULL DEFAULT '', + `param08` LONGTEXT, + `const09` DATETIME DEFAULT NULL, + `param09` LONGBLOB, + `const10` INT(10) NOT NULL DEFAULT '0', + `param10` BIGINT(20) DEFAULT NULL, + `const11` INT(4) DEFAULT NULL, + `param11` BIGINT(20) DEFAULT NULL, + `const12` BINARY(0) DEFAULT NULL, + `param12` BIGINT(20) DEFAULT NULL, + `param13` DECIMAL(65,30) DEFAULT NULL, + `param14` LONGTEXT, + `param15` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t5 ; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr --- 1.28/mysql-test/r/ps_3innodb.result 2005-05-05 22:01:35 +02:00 +++ 1.29/mysql-test/r/ps_3innodb.result 2005-06-10 13:29:15 +02:00 @@ -1757,33 +1757,33 @@ show create table t5 ; Table Create Table t5 CREATE TABLE `t5` ( - `const01` bigint(1) NOT NULL default '0', - `param01` bigint(20) default NULL, - `const02` decimal(2,1) NOT NULL default '0.0', - `param02` decimal(65,30) default NULL, - `const03` double NOT NULL default '0', - `param03` double default NULL, - `const04` varchar(3) NOT NULL default '', - `param04` longtext, - `const05` varbinary(3) NOT NULL default '', - `param05` longblob, - `const06` varchar(10) NOT NULL default '', - `param06` longtext, - `const07` date default NULL, - `param07` longblob, - `const08` varchar(19) NOT NULL default '', - `param08` longtext, - `const09` datetime default NULL, - `param09` longblob, - `const10` int(10) NOT NULL default '0', - `param10` bigint(20) default NULL, - `const11` int(4) default NULL, - `param11` bigint(20) default NULL, - `const12` binary(0) default NULL, - `param12` bigint(20) default NULL, - `param13` decimal(65,30) default NULL, - `param14` longtext, - `param15` longblob + `const01` BIGINT(1) NOT NULL DEFAULT '0', + `param01` BIGINT(20) DEFAULT NULL, + `const02` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `param02` DECIMAL(65,30) DEFAULT NULL, + `const03` DOUBLE NOT NULL DEFAULT '0', + `param03` DOUBLE DEFAULT NULL, + `const04` VARCHAR(3) NOT NULL DEFAULT '', + `param04` LONGTEXT, + `const05` VARBINARY(3) NOT NULL DEFAULT '', + `param05` LONGBLOB, + `const06` VARCHAR(10) NOT NULL DEFAULT '', + `param06` LONGTEXT, + `const07` DATE DEFAULT NULL, + `param07` LONGBLOB, + `const08` VARCHAR(19) NOT NULL DEFAULT '', + `param08` LONGTEXT, + `const09` DATETIME DEFAULT NULL, + `param09` LONGBLOB, + `const10` INT(10) NOT NULL DEFAULT '0', + `param10` BIGINT(20) DEFAULT NULL, + `const11` INT(4) DEFAULT NULL, + `param11` BIGINT(20) DEFAULT NULL, + `const12` BINARY(0) DEFAULT NULL, + `param12` BIGINT(20) DEFAULT NULL, + `param13` DECIMAL(65,30) DEFAULT NULL, + `param14` LONGTEXT, + `param15` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t5 ; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr --- 1.24/mysql-test/r/ps_4heap.result 2005-05-05 22:01:35 +02:00 +++ 1.25/mysql-test/r/ps_4heap.result 2005-06-10 13:29:15 +02:00 @@ -1758,33 +1758,33 @@ show create table t5 ; Table Create Table t5 CREATE TABLE `t5` ( - `const01` bigint(1) NOT NULL default '0', - `param01` bigint(20) default NULL, - `const02` decimal(2,1) NOT NULL default '0.0', - `param02` decimal(65,30) default NULL, - `const03` double NOT NULL default '0', - `param03` double default NULL, - `const04` varchar(3) NOT NULL default '', - `param04` longtext, - `const05` varbinary(3) NOT NULL default '', - `param05` longblob, - `const06` varchar(10) NOT NULL default '', - `param06` longtext, - `const07` date default NULL, - `param07` longblob, - `const08` varchar(19) NOT NULL default '', - `param08` longtext, - `const09` datetime default NULL, - `param09` longblob, - `const10` int(10) NOT NULL default '0', - `param10` bigint(20) default NULL, - `const11` int(4) default NULL, - `param11` bigint(20) default NULL, - `const12` binary(0) default NULL, - `param12` bigint(20) default NULL, - `param13` decimal(65,30) default NULL, - `param14` longtext, - `param15` longblob + `const01` BIGINT(1) NOT NULL DEFAULT '0', + `param01` BIGINT(20) DEFAULT NULL, + `const02` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `param02` DECIMAL(65,30) DEFAULT NULL, + `const03` DOUBLE NOT NULL DEFAULT '0', + `param03` DOUBLE DEFAULT NULL, + `const04` VARCHAR(3) NOT NULL DEFAULT '', + `param04` LONGTEXT, + `const05` VARBINARY(3) NOT NULL DEFAULT '', + `param05` LONGBLOB, + `const06` VARCHAR(10) NOT NULL DEFAULT '', + `param06` LONGTEXT, + `const07` DATE DEFAULT NULL, + `param07` LONGBLOB, + `const08` VARCHAR(19) NOT NULL DEFAULT '', + `param08` LONGTEXT, + `const09` DATETIME DEFAULT NULL, + `param09` LONGBLOB, + `const10` INT(10) NOT NULL DEFAULT '0', + `param10` BIGINT(20) DEFAULT NULL, + `const11` INT(4) DEFAULT NULL, + `param11` BIGINT(20) DEFAULT NULL, + `const12` BINARY(0) DEFAULT NULL, + `param12` BIGINT(20) DEFAULT NULL, + `param13` DECIMAL(65,30) DEFAULT NULL, + `param14` LONGTEXT, + `param15` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t5 ; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr --- 1.25/mysql-test/r/ps_5merge.result 2005-05-05 22:01:35 +02:00 +++ 1.26/mysql-test/r/ps_5merge.result 2005-06-10 13:29:15 +02:00 @@ -1694,33 +1694,33 @@ show create table t5 ; Table Create Table t5 CREATE TABLE `t5` ( - `const01` bigint(1) NOT NULL default '0', - `param01` bigint(20) default NULL, - `const02` decimal(2,1) NOT NULL default '0.0', - `param02` decimal(65,30) default NULL, - `const03` double NOT NULL default '0', - `param03` double default NULL, - `const04` varchar(3) NOT NULL default '', - `param04` longtext, - `const05` varbinary(3) NOT NULL default '', - `param05` longblob, - `const06` varchar(10) NOT NULL default '', - `param06` longtext, - `const07` date default NULL, - `param07` longblob, - `const08` varchar(19) NOT NULL default '', - `param08` longtext, - `const09` datetime default NULL, - `param09` longblob, - `const10` int(10) NOT NULL default '0', - `param10` bigint(20) default NULL, - `const11` int(4) default NULL, - `param11` bigint(20) default NULL, - `const12` binary(0) default NULL, - `param12` bigint(20) default NULL, - `param13` decimal(65,30) default NULL, - `param14` longtext, - `param15` longblob + `const01` BIGINT(1) NOT NULL DEFAULT '0', + `param01` BIGINT(20) DEFAULT NULL, + `const02` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `param02` DECIMAL(65,30) DEFAULT NULL, + `const03` DOUBLE NOT NULL DEFAULT '0', + `param03` DOUBLE DEFAULT NULL, + `const04` VARCHAR(3) NOT NULL DEFAULT '', + `param04` LONGTEXT, + `const05` VARBINARY(3) NOT NULL DEFAULT '', + `param05` LONGBLOB, + `const06` VARCHAR(10) NOT NULL DEFAULT '', + `param06` LONGTEXT, + `const07` DATE DEFAULT NULL, + `param07` LONGBLOB, + `const08` VARCHAR(19) NOT NULL DEFAULT '', + `param08` LONGTEXT, + `const09` DATETIME DEFAULT NULL, + `param09` LONGBLOB, + `const10` INT(10) NOT NULL DEFAULT '0', + `param10` BIGINT(20) DEFAULT NULL, + `const11` INT(4) DEFAULT NULL, + `param11` BIGINT(20) DEFAULT NULL, + `const12` BINARY(0) DEFAULT NULL, + `param12` BIGINT(20) DEFAULT NULL, + `param13` DECIMAL(65,30) DEFAULT NULL, + `param14` LONGTEXT, + `param15` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t5 ; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr @@ -4707,33 +4707,33 @@ show create table t5 ; Table Create Table t5 CREATE TABLE `t5` ( - `const01` bigint(1) NOT NULL default '0', - `param01` bigint(20) default NULL, - `const02` decimal(2,1) NOT NULL default '0.0', - `param02` decimal(65,30) default NULL, - `const03` double NOT NULL default '0', - `param03` double default NULL, - `const04` varchar(3) NOT NULL default '', - `param04` longtext, - `const05` varbinary(3) NOT NULL default '', - `param05` longblob, - `const06` varchar(10) NOT NULL default '', - `param06` longtext, - `const07` date default NULL, - `param07` longblob, - `const08` varchar(19) NOT NULL default '', - `param08` longtext, - `const09` datetime default NULL, - `param09` longblob, - `const10` int(10) NOT NULL default '0', - `param10` bigint(20) default NULL, - `const11` int(4) default NULL, - `param11` bigint(20) default NULL, - `const12` binary(0) default NULL, - `param12` bigint(20) default NULL, - `param13` decimal(65,30) default NULL, - `param14` longtext, - `param15` longblob + `const01` BIGINT(1) NOT NULL DEFAULT '0', + `param01` BIGINT(20) DEFAULT NULL, + `const02` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `param02` DECIMAL(65,30) DEFAULT NULL, + `const03` DOUBLE NOT NULL DEFAULT '0', + `param03` DOUBLE DEFAULT NULL, + `const04` VARCHAR(3) NOT NULL DEFAULT '', + `param04` LONGTEXT, + `const05` VARBINARY(3) NOT NULL DEFAULT '', + `param05` LONGBLOB, + `const06` VARCHAR(10) NOT NULL DEFAULT '', + `param06` LONGTEXT, + `const07` DATE DEFAULT NULL, + `param07` LONGBLOB, + `const08` VARCHAR(19) NOT NULL DEFAULT '', + `param08` LONGTEXT, + `const09` DATETIME DEFAULT NULL, + `param09` LONGBLOB, + `const10` INT(10) NOT NULL DEFAULT '0', + `param10` BIGINT(20) DEFAULT NULL, + `const11` INT(4) DEFAULT NULL, + `param11` BIGINT(20) DEFAULT NULL, + `const12` BINARY(0) DEFAULT NULL, + `param12` BIGINT(20) DEFAULT NULL, + `param13` DECIMAL(65,30) DEFAULT NULL, + `param14` LONGTEXT, + `param15` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t5 ; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr --- 1.26/mysql-test/r/ps_6bdb.result 2005-05-05 22:01:35 +02:00 +++ 1.27/mysql-test/r/ps_6bdb.result 2005-06-10 13:29:15 +02:00 @@ -1757,33 +1757,33 @@ show create table t5 ; Table Create Table t5 CREATE TABLE `t5` ( - `const01` bigint(1) NOT NULL default '0', - `param01` bigint(20) default NULL, - `const02` decimal(2,1) NOT NULL default '0.0', - `param02` decimal(65,30) default NULL, - `const03` double NOT NULL default '0', - `param03` double default NULL, - `const04` varchar(3) NOT NULL default '', - `param04` longtext, - `const05` varbinary(3) NOT NULL default '', - `param05` longblob, - `const06` varchar(10) NOT NULL default '', - `param06` longtext, - `const07` date default NULL, - `param07` longblob, - `const08` varchar(19) NOT NULL default '', - `param08` longtext, - `const09` datetime default NULL, - `param09` longblob, - `const10` int(10) NOT NULL default '0', - `param10` bigint(20) default NULL, - `const11` int(4) default NULL, - `param11` bigint(20) default NULL, - `const12` binary(0) default NULL, - `param12` bigint(20) default NULL, - `param13` decimal(65,30) default NULL, - `param14` longtext, - `param15` longblob + `const01` BIGINT(1) NOT NULL DEFAULT '0', + `param01` BIGINT(20) DEFAULT NULL, + `const02` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `param02` DECIMAL(65,30) DEFAULT NULL, + `const03` DOUBLE NOT NULL DEFAULT '0', + `param03` DOUBLE DEFAULT NULL, + `const04` VARCHAR(3) NOT NULL DEFAULT '', + `param04` LONGTEXT, + `const05` VARBINARY(3) NOT NULL DEFAULT '', + `param05` LONGBLOB, + `const06` VARCHAR(10) NOT NULL DEFAULT '', + `param06` LONGTEXT, + `const07` DATE DEFAULT NULL, + `param07` LONGBLOB, + `const08` VARCHAR(19) NOT NULL DEFAULT '', + `param08` LONGTEXT, + `const09` DATETIME DEFAULT NULL, + `param09` LONGBLOB, + `const10` INT(10) NOT NULL DEFAULT '0', + `param10` BIGINT(20) DEFAULT NULL, + `const11` INT(4) DEFAULT NULL, + `param11` BIGINT(20) DEFAULT NULL, + `const12` BINARY(0) DEFAULT NULL, + `param12` BIGINT(20) DEFAULT NULL, + `param13` DECIMAL(65,30) DEFAULT NULL, + `param14` LONGTEXT, + `param15` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t5 ; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr --- 1.6/mysql-test/r/rpl_deadlock.result 2005-03-25 14:51:01 +01:00 +++ 1.7/mysql-test/r/rpl_deadlock.result 2005-06-10 13:29:15 +02:00 @@ -14,13 +14,13 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL, + `a` INT(11) NOT NULL, KEY `a` (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` int(11) NOT NULL, + `a` INT(11) NOT NULL, KEY `a` (`a`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 show variables like 'slave_transaction_retries'; --- 1.14/mysql-test/r/type_newdecimal.result 2005-05-19 20:41:22 +02:00 +++ 1.15/mysql-test/r/type_newdecimal.result 2005-06-10 13:29:16 +02:00 @@ -52,13 +52,13 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `if(1, 1.1, 1.2)` decimal(2,1) NOT NULL default '0.0', - `if(0, 1.1, 1.2)` decimal(2,1) NOT NULL default '0.0', - `if(0.1, 1.1, 1.2)` decimal(2,1) NOT NULL default '0.0', - `if(0, 1, 1.1)` decimal(2,1) NOT NULL default '0.0', - `if(0, NULL, 1.2)` decimal(2,1) default NULL, - `if(1, 0.22e1, 1.1)` double NOT NULL default '0', - `if(1E0, 1.1, 1.2)` decimal(2,1) NOT NULL default '0.0' + `if(1, 1.1, 1.2)` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `if(0, 1.1, 1.2)` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `if(0.1, 1.1, 1.2)` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `if(0, 1, 1.1)` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `if(0, NULL, 1.2)` DECIMAL(2,1) DEFAULT NULL, + `if(1, 0.22e1, 1.1)` DOUBLE NOT NULL DEFAULT '0', + `if(1E0, 1.1, 1.2)` DECIMAL(2,1) NOT NULL DEFAULT '0.0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 select nullif(1.1, 1.1), nullif(1.1, 1.2), nullif(1.1, 0.11e1), nullif(1.0, 1), nullif(1, 1.0), nullif(1, 1.1); @@ -68,12 +68,12 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `nullif(1.1, 1.1)` decimal(2,1) default NULL, - `nullif(1.1, 1.2)` decimal(2,1) default NULL, - `nullif(1.1, 0.11e1)` decimal(2,1) default NULL, - `nullif(1.0, 1)` decimal(2,1) default NULL, - `nullif(1, 1.0)` int(1) default NULL, - `nullif(1, 1.1)` int(1) default NULL + `nullif(1.1, 1.1)` DECIMAL(2,1) DEFAULT NULL, + `nullif(1.1, 1.2)` DECIMAL(2,1) DEFAULT NULL, + `nullif(1.1, 0.11e1)` DECIMAL(2,1) DEFAULT NULL, + `nullif(1.0, 1)` DECIMAL(2,1) DEFAULT NULL, + `nullif(1, 1.0)` INT(1) DEFAULT NULL, + `nullif(1, 1.1)` INT(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (a decimal(4,2)); @@ -174,10 +174,10 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `round(15.4,-1)` decimal(3,0) NOT NULL default '0', - `truncate(-5678.123451,-3)` decimal(4,0) NOT NULL default '0', - `abs(-1.1)` decimal(3,1) NOT NULL default '0.0', - `-(-1.1)` decimal(2,1) NOT NULL default '0.0' + `round(15.4,-1)` DECIMAL(3,0) NOT NULL DEFAULT '0', + `truncate(-5678.123451,-3)` DECIMAL(4,0) NOT NULL DEFAULT '0', + `abs(-1.1)` DECIMAL(3,1) NOT NULL DEFAULT '0.0', + `-(-1.1)` DECIMAL(2,1) NOT NULL DEFAULT '0.0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; set session sql_mode='traditional'; @@ -783,7 +783,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `0.5` decimal(2,1) NOT NULL default '0.0' + `0.5` DECIMAL(2,1) NOT NULL DEFAULT '0.0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select round(1.5),round(2.5); --- 1.18/mysql-test/r/sql_mode.result 2005-02-04 01:11:38 +01:00 +++ 1.19/mysql-test/r/sql_mode.result 2005-06-10 13:29:15 +02:00 @@ -13,9 +13,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL auto_increment, - `pseudo` varchar(35) character set latin2 NOT NULL default '', - `email` varchar(60) character set latin2 NOT NULL default '', + `a` INT(11) NOT NULL AUTO_INCREMENT, + `pseudo` VARCHAR(35) CHARACTER SET latin2 NOT NULL DEFAULT '', + `email` VARCHAR(60) CHARACTER SET latin2 NOT NULL DEFAULT '', PRIMARY KEY (`a`), UNIQUE KEY `email` USING BTREE (`email`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC @@ -26,9 +26,9 @@ show create table t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" int(11) NOT NULL auto_increment, - "pseudo" varchar(35) character set latin2 NOT NULL default '', - "email" varchar(60) character set latin2 NOT NULL default '', + "a" INT(11) NOT NULL AUTO_INCREMENT, + "pseudo" VARCHAR(35) CHARACTER SET latin2 NOT NULL DEFAULT '', + "email" VARCHAR(60) CHARACTER SET latin2 NOT NULL DEFAULT '', PRIMARY KEY ("a"), UNIQUE KEY "email" USING BTREE ("email") ) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC @@ -39,9 +39,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL auto_increment, - `pseudo` varchar(35) character set latin2 NOT NULL default '', - `email` varchar(60) character set latin2 NOT NULL default '', + `a` INT(11) NOT NULL AUTO_INCREMENT, + `pseudo` VARCHAR(35) CHARACTER SET latin2 NOT NULL DEFAULT '', + `email` VARCHAR(60) CHARACTER SET latin2 NOT NULL DEFAULT '', PRIMARY KEY (`a`), UNIQUE KEY `email` USING BTREE (`email`) ) @@ -52,9 +52,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL auto_increment, - `pseudo` varchar(35) character set latin2 NOT NULL default '', - `email` varchar(60) character set latin2 NOT NULL default '', + `a` INT(11) NOT NULL AUTO_INCREMENT, + `pseudo` VARCHAR(35) CHARACTER SET latin2 NOT NULL DEFAULT '', + `email` VARCHAR(60) CHARACTER SET latin2 NOT NULL DEFAULT '', PRIMARY KEY (`a`), UNIQUE KEY `email` (`email`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC @@ -65,9 +65,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL auto_increment, - `pseudo` varchar(35) NOT NULL default '', - `email` varchar(60) NOT NULL default '', + `a` INT(11) NOT NULL AUTO_INCREMENT, + `pseudo` VARCHAR(35) NOT NULL DEFAULT '', + `email` VARCHAR(60) NOT NULL DEFAULT '', PRIMARY KEY (`a`), UNIQUE KEY `email` (`email`) ) TYPE=HEAP ROW_FORMAT=DYNAMIC @@ -78,9 +78,9 @@ show create table t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" int(11) NOT NULL, - "pseudo" varchar(35) NOT NULL default '', - "email" varchar(60) NOT NULL default '', + "a" INT(11) NOT NULL, + "pseudo" VARCHAR(35) NOT NULL DEFAULT '', + "email" VARCHAR(60) NOT NULL DEFAULT '', PRIMARY KEY ("a"), UNIQUE KEY "email" ("email") ) @@ -94,25 +94,25 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(10) default NULL, - `b` char(10) character set latin1 collate latin1_bin default NULL, - `c` binary(10) default NULL + `a` CHAR(10) DEFAULT NULL, + `b` CHAR(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL, + `c` BINARY(10) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 set @@sql_mode="mysql323"; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(10) default NULL, - `b` char(10) binary default NULL, - `c` binary(10) default NULL + `a` CHAR(10) DEFAULT NULL, + `b` CHAR(10) BINARY DEFAULT NULL, + `c` BINARY(10) DEFAULT NULL ) TYPE=MyISAM set @@sql_mode="mysql40"; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` char(10) default NULL, - `b` char(10) binary default NULL, - `c` binary(10) default NULL + `a` CHAR(10) DEFAULT NULL, + `b` CHAR(10) BINARY DEFAULT NULL, + `c` BINARY(10) DEFAULT NULL ) TYPE=MyISAM drop table t1; set session sql_mode = ''; @@ -120,7 +120,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `min_num` decimal(7,6) default '0.000001' + `min_num` DECIMAL(7,6) DEFAULT '0.000001' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1 ; set session sql_mode = 'IGNORE_SPACE'; @@ -128,14 +128,14 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `min_num` decimal(7,6) default '0.000001' + `min_num` DECIMAL(7,6) DEFAULT '0.000001' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1 ; create table t1 ( min_num dec(6,6) default .000001); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `min_num` decimal(7,6) default '0.000001' + `min_num` DECIMAL(7,6) DEFAULT '0.000001' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1 ; SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE=''; --- 1.2/mysql-test/r/client_xml.result 2005-02-01 03:47:05 +01:00 +++ 1.3/mysql-test/r/client_xml.result 2005-06-10 13:29:14 +02:00 @@ -18,9 +18,9 @@ <mysqldump> <database name="test"> <table_structure name="t1"> - <field Field="a&b" Type="int(11)" Null="YES" Key="" Extra="" /> - <field Field="a<b" Type="int(11)" Null="YES" Key="" Extra="" /> - <field Field="a>b" Type="text" Null="YES" Key="" Extra="" /> + <field Field="a&b" Type="INT(11)" Null="YES" Key="" Extra="" /> + <field Field="a<b" Type="INT(11)" Null="YES" Key="" Extra="" /> + <field Field="a>b" Type="TEXT" Null="YES" Key="" Extra="" /> </table_structure> <table_data name="t1"> <row> --- 1.1/mysql-test/r/view_grant.result 2005-04-04 21:43:55 +02:00 +++ 1.2/mysql-test/r/view_grant.result 2005-06-10 13:29:16 +02:00 @@ -72,12 +72,12 @@ c show columns from mysqltest.v1; Field Type Null Key Default Extra -c bigint(20) YES NULL -d bigint(20) YES NULL +c BIGINT(20) YES NULL +d BIGINT(20) YES NULL show columns from mysqltest.v2; Field Type Null Key Default Extra -c bigint(20) YES NULL -d bigint(20) YES NULL +c BIGINT(20) YES NULL +d BIGINT(20) YES NULL explain select c from mysqltest.v1; ERROR HY000: EXPLAIN/SHOW can not be issued; lacking privileges for underlying table show create view mysqltest.v1; --- 1.25/mysql-test/r/ps_7ndb.result 2005-05-05 22:01:35 +02:00 +++ 1.26/mysql-test/r/ps_7ndb.result 2005-06-10 13:29:15 +02:00 @@ -1757,33 +1757,33 @@ show create table t5 ; Table Create Table t5 CREATE TABLE `t5` ( - `const01` bigint(1) NOT NULL default '0', - `param01` bigint(20) default NULL, - `const02` decimal(2,1) NOT NULL default '0.0', - `param02` decimal(65,30) default NULL, - `const03` double NOT NULL default '0', - `param03` double default NULL, - `const04` varchar(3) NOT NULL default '', - `param04` longtext, - `const05` varbinary(3) NOT NULL default '', - `param05` longblob, - `const06` varchar(10) NOT NULL default '', - `param06` longtext, - `const07` date default NULL, - `param07` longblob, - `const08` varchar(19) NOT NULL default '', - `param08` longtext, - `const09` datetime default NULL, - `param09` longblob, - `const10` int(10) NOT NULL default '0', - `param10` bigint(20) default NULL, - `const11` int(4) default NULL, - `param11` bigint(20) default NULL, - `const12` binary(0) default NULL, - `param12` bigint(20) default NULL, - `param13` decimal(65,30) default NULL, - `param14` longtext, - `param15` longblob + `const01` BIGINT(1) NOT NULL DEFAULT '0', + `param01` BIGINT(20) DEFAULT NULL, + `const02` DECIMAL(2,1) NOT NULL DEFAULT '0.0', + `param02` DECIMAL(65,30) DEFAULT NULL, + `const03` DOUBLE NOT NULL DEFAULT '0', + `param03` DOUBLE DEFAULT NULL, + `const04` VARCHAR(3) NOT NULL DEFAULT '', + `param04` LONGTEXT, + `const05` VARBINARY(3) NOT NULL DEFAULT '', + `param05` LONGBLOB, + `const06` VARCHAR(10) NOT NULL DEFAULT '', + `param06` LONGTEXT, + `const07` DATE DEFAULT NULL, + `param07` LONGBLOB, + `const08` VARCHAR(19) NOT NULL DEFAULT '', + `param08` LONGTEXT, + `const09` DATETIME DEFAULT NULL, + `param09` LONGBLOB, + `const10` INT(10) NOT NULL DEFAULT '0', + `param10` BIGINT(20) DEFAULT NULL, + `const11` INT(4) DEFAULT NULL, + `param11` BIGINT(20) DEFAULT NULL, + `const12` BINARY(0) DEFAULT NULL, + `param12` BIGINT(20) DEFAULT NULL, + `param13` DECIMAL(65,30) DEFAULT NULL, + `param14` LONGTEXT, + `param15` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t5 ; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr --- 1.21/mysql-test/r/ndb_autodiscover.result 2005-03-23 09:32:40 +01:00 +++ 1.22/mysql-test/r/ndb_autodiscover.result 2005-06-10 13:29:15 +02:00 @@ -105,8 +105,8 @@ SHOW CREATE TABLE t3; Table Create Table t3 CREATE TABLE `t3` ( - `id` int(11) NOT NULL, - `name` char(255) default NULL, + `id` INT(11) NOT NULL, + `name` CHAR(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 select * from t3; --- 1.5/mysql-test/r/rpl_create_database.result 2004-12-19 20:22:53 +01:00 +++ 1.6/mysql-test/r/rpl_create_database.result 2005-06-10 13:29:15 +02:00 @@ -75,12 +75,12 @@ SHOW CREATE TABLE mysqltest_prometheus.t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SHOW CREATE TABLE mysqltest_sisyfos.t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP DATABASE IF EXISTS mysqltest_prometheus; DROP DATABASE IF EXISTS mysqltest_sisyfos; --- 1.49/mysql-test/r/alter_table.result 2005-05-16 14:21:31 +02:00 +++ 1.50/mysql-test/r/alter_table.result 2005-06-10 13:29:13 +02:00 @@ -52,9 +52,9 @@ ALTER TABLE t1 CHANGE NAME NAME CHAR(80) not null; SHOW FULL COLUMNS FROM t1; Field Type Collation Null Key Default Extra Privileges Comment -GROUP_ID int(10) unsigned NULL NO PRI 0 # -LANG_ID smallint(5) unsigned NULL NO PRI 0 # -NAME char(80) latin1_swedish_ci NO MUL # +GROUP_ID INT(10) UNSIGNED NULL NO PRI 0 # +LANG_ID SMALLINT(5) UNSIGNED NULL NO PRI 0 # +NAME CHAR(80) latin1_swedish_ci NO MUL # DROP TABLE t1; create table t1 (n int); insert into t1 values(9),(3),(12),(10); @@ -179,8 +179,8 @@ alter table t2 rename t1, add c char(10) comment "no comment"; show columns from t1; Field Type Null Key Default Extra -i int(10) unsigned NO PRI NULL auto_increment -c char(10) YES NULL +i INT(10) UNSIGNED NO PRI NULL AUTO_INCREMENT +c CHAR(10) YES NULL drop table t1; create table t1 (a int, b int); insert into t1 values(1,100), (2,100), (3, 100); @@ -389,7 +389,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varchar(10) NOT NULL, + `a` VARCHAR(10) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`) flush tables; @@ -397,7 +397,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` varchar(10) NOT NULL, + `a` VARCHAR(10) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`) drop table if exists t1, t2; @@ -468,25 +468,25 @@ 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) @@ -494,15 +494,15 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `myblob` longblob, - `mytext` longtext collate latin1_general_cs + `myblob` LONGBLOB, + `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 + `myblob` LONGBLOB, + `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); @@ -510,8 +510,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL, - `b` int(11) default NULL, + `a` INT(11) NOT NULL, + `b` INT(11) DEFAULT NULL, UNIQUE KEY `b` (`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ALTER TABLE t1 DROP PRIMARY KEY; --- 1.20/mysql-test/r/analyse.result 2005-02-21 16:19:12 +01:00 +++ 1.21/mysql-test/r/analyse.result 2005-06-10 13:29:14 +02:00 @@ -36,16 +36,16 @@ 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 @@ 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 @@ 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 --- 1.27/mysql-test/r/bigint.result 2005-04-30 02:14:38 +02:00 +++ 1.28/mysql-test/r/bigint.result 2005-06-10 13:29:14 +02:00 @@ -132,14 +132,14 @@ 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 --- 1.19/mysql-test/r/binary.result 2004-11-16 09:05:08 +01:00 +++ 1.20/mysql-test/r/binary.result 2005-06-10 13:29:14 +02:00 @@ -138,6 +138,6 @@ 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; --- 1.21/mysql-test/r/case.result 2005-05-05 22:01:34 +02:00 +++ 1.22/mysql-test/r/case.result 2005-06-10 13:29:14 +02:00 @@ -99,18 +99,18 @@ 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(4) NOT NULL default '', - `c6` varbinary(4) 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(4) NOT NULL DEFAULT '', + `c6` VARBINARY(4) 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,12 +151,12 @@ 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) 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(4) 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) 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(4) 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; --- 1.89/mysql-test/r/create.result 2005-05-07 17:34:52 +02:00 +++ 1.90/mysql-test/r/create.result 2005-06-10 13:29:14 +02:00 @@ -104,36 +104,36 @@ create table t2 select x from t1 where 1=2; describe t1; Field Type Null Key Default Extra -x varchar(50) YES NULL +x VARCHAR(50) YES NULL describe t2; Field Type Null Key Default Extra -x varchar(50) YES NULL +x VARCHAR(50) YES NULL drop table t2; create table t2 select now() as a , curtime() as b, curdate() as c , 1+1 as d , 1.0 + 1 as e , 33333333333333333 + 3 as f; describe t2; Field Type Null Key Default Extra -a datetime NO 0000-00-00 00:00:00 -b time NO 00:00:00 -c date NO 0000-00-00 -d int(3) NO 0 -e decimal(3,1) NO 0.0 -f bigint(19) NO 0 +a DATETIME NO 0000-00-00 00:00:00 +b TIME NO 00:00:00 +c DATE NO 0000-00-00 +d INT(3) NO 0 +e DECIMAL(3,1) NO 0.0 +f BIGINT(19) NO 0 drop table t2; create table t2 select CAST("2001-12-29" AS DATE) as d, CAST("20:45:11" AS TIME) as t, CAST("2001-12-29 20:45:11" AS DATETIME) as dt; describe t2; Field Type Null Key Default Extra -d date YES NULL -t time YES NULL -dt datetime YES NULL +d DATE YES NULL +t TIME YES NULL +dt DATETIME YES NULL drop table t1,t2; create table t1 (a tinyint); create table t2 (a int) select * from t1; describe t1; Field Type Null Key Default Extra -a tinyint(4) YES NULL +a TINYINT(4) YES NULL describe t2; Field Type Null Key Default Extra -a int(11) YES NULL +a INT(11) YES NULL drop table if exists t2; create table t2 (a int, a float) select * from t1; ERROR 42S21: Duplicate column name 'a' @@ -164,8 +164,8 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL, - `b` int(11) default NULL, + `a` INT(11) NOT NULL, + `b` INT(11) DEFAULT NULL, PRIMARY KEY (`a`), KEY `b` (`b`), KEY `b_2` (`b`), @@ -215,7 +215,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL + `a` INT(11) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 drop table t1; SET SESSION storage_engine="gemini"; @@ -227,7 +227,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL + `a` INT(11) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 SET SESSION storage_engine=default; drop table t1; @@ -307,8 +307,8 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( - `id` int(11) NOT NULL, - `name` char(20) default NULL + `id` INT(11) NOT NULL, + `name` CHAR(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t3; id name @@ -322,7 +322,7 @@ show create table t3; Table Create Table t3 CREATE TEMPORARY TABLE `t3` ( - `id` int(11) NOT NULL + `id` INT(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t3; id @@ -330,8 +330,8 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( - `id` int(11) NOT NULL, - `name` char(20) default NULL + `id` INT(11) NOT NULL, + `name` CHAR(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t3; id name @@ -342,15 +342,15 @@ show create table t3; Table Create Table t3 CREATE TEMPORARY TABLE `t3` ( - `id` int(11) NOT NULL, - `name` char(20) default NULL + `id` INT(11) NOT 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 + `id` INT(11) NOT NULL, + `name` CHAR(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t2; id name @@ -376,7 +376,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL + `a` INT(11) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 drop table t1; SET SESSION storage_engine="gemini"; @@ -388,7 +388,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL + `a` INT(11) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 SET SESSION storage_engine=default; drop table t1; @@ -427,15 +427,15 @@ from t1; explain t2; Field Type Null Key Default Extra -a int(11) YES NULL -b bigint(11) NO 0 -c bigint(11) NO 0 -d date YES NULL -e varchar(1) NO -f datetime YES NULL -g time YES NULL -h varbinary(23) NO -dd time YES NULL +a INT(11) YES NULL +b BIGINT(11) NO 0 +c BIGINT(11) NO 0 +d DATE YES NULL +e VARCHAR(1) NO +f DATETIME YES NULL +g TIME YES NULL +h VARBINARY(23) NO +dd TIME YES NULL select * from t2; a b c d e f g h dd 1 -7 7 2000-01-01 b 2000-01-01 00:00:00 05:04:03 yet another binary data 02:00:00 @@ -446,49 +446,49 @@ 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'); insert into t1 values ('','',0,0.0); describe t1; Field Type Null Key Default Extra -str varchar(10) YES def -strnull varchar(10) YES NULL -intg int(11) YES 10 -rel double YES 3.14 +str VARCHAR(10) YES def +strnull VARCHAR(10) YES NULL +intg INT(11) YES 10 +rel DOUBLE YES 3.14 create table t2 select default(str) as str, default(strnull) as strnull, default(intg) as intg, default(rel) as rel from t1; describe t2; Field Type Null Key Default Extra -str varchar(10) YES NULL -strnull varchar(10) YES NULL -intg int(11) YES NULL -rel double YES NULL +str VARCHAR(10) YES NULL +strnull VARCHAR(10) YES NULL +intg INT(11) YES NULL +rel DOUBLE YES NULL drop table t1, t2; create table t1(name varchar(10), age smallint default -1); describe t1; Field Type Null Key Default Extra -name varchar(10) YES NULL -age smallint(6) YES -1 +name VARCHAR(10) YES NULL +age SMALLINT(6) YES -1 create table t2(name varchar(10), age smallint default - 1); describe t2; Field Type Null Key Default Extra -name varchar(10) YES NULL -age smallint(6) YES -1 +name VARCHAR(10) YES NULL +age SMALLINT(6) YES -1 drop table t1, t2; create table t1(cenum enum('a'), cset set('b')); create table t2(cenum enum('a','a'), cset set('b','b')); @@ -525,14 +525,14 @@ 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); @@ -545,7 +545,7 @@ 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); @@ -553,7 +553,7 @@ 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; --- 1.77/mysql-test/r/fulltext.result 2005-03-09 19:22:21 +01:00 +++ 1.78/mysql-test/r/fulltext.result 2005-06-10 13:29:14 +02:00 @@ -239,8 +239,8 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `ticket` int(11) default NULL, - `inhalt` text, + `ticket` INT(11) DEFAULT NULL, + `inhalt` TEXT, KEY `tig` (`ticket`), FULLTEXT KEY `tix` (`inhalt`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 --- 1.44/mysql-test/r/func_group.result 2005-05-05 22:01:34 +02:00 +++ 1.45/mysql-test/r/func_group.result 2005-06-10 13:29:14 +02:00 @@ -677,21 +677,21 @@ 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 @@ 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); @@ -788,12 +788,12 @@ create table t2 select f2 from (select max(now()) f2 from t1) a; show columns from t2; Field Type Null Key Default Extra -f2 datetime YES NULL +f2 DATETIME YES NULL drop table t2; create table t2 select f2 from (select now() f2 from t1) a; show columns from t2; Field Type Null Key Default Extra -f2 datetime NO 0000-00-00 00:00:00 +f2 DATETIME NO 0000-00-00 00:00:00 drop table t2, t1; create table t2 (ff double); insert into t2 values (2.2); --- 1.18/mysql-test/r/func_misc.result 2005-05-17 09:51:07 +02:00 +++ 1.19/mysql-test/r/func_misc.result 2005-06-10 13:29:14 +02:00 @@ -55,7 +55,7 @@ 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; --- 1.21/mysql-test/r/func_system.result 2005-03-28 09:33:54 +02:00 +++ 1.22/mysql-test/r/func_system.result 2005-06-10 13:29:14 +02:00 @@ -46,9 +46,9 @@ 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(40) default NULL + `database()` VARCHAR(34) CHARACTER SET utf8 DEFAULT NULL, + `user()` VARCHAR(77) CHARACTER SET utf8 NOT NULL DEFAULT '', + `version` CHAR(40) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select charset(charset(_utf8'a')), charset(collation(_utf8'a')); @@ -61,8 +61,8 @@ 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; --- 1.38/mysql-test/r/func_time.result 2005-04-04 15:43:19 +02:00 +++ 1.39/mysql-test/r/func_time.result 2005-06-10 13:29:14 +02:00 @@ -628,8 +628,8 @@ from_days(to_days("960101")) as b; describe t1; Field Type Null Key Default Extra -a date NO 0000-00-00 -b date YES NULL +a DATE NO 0000-00-00 +b DATE YES NULL select * from t1; a b 2000-02-29 1996-01-01 --- 1.36/mysql-test/r/heap.result 2005-04-12 14:51:02 +02:00 +++ 1.37/mysql-test/r/heap.result 2005-06-10 13:29:14 +02:00 @@ -263,41 +263,41 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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)); --- 1.111/mysql-test/r/innodb.result 2005-05-14 17:19:31 +02:00 +++ 1.112/mysql-test/r/innodb.result 2005-06-10 13:29:15 +02:00 @@ -851,7 +851,7 @@ 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; @@ -967,7 +967,7 @@ create table t1 (t int not null default 1, key (t)) engine=innodb; desc t1; Field Type Null Key Default Extra -t int(11) NO MUL 1 +t INT(11) NO MUL 1 drop table t1; CREATE TABLE t1 ( number bigint(20) NOT NULL default '0', @@ -1484,14 +1484,14 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `id` int(11) NOT NULL, - `id2` int(11) NOT NULL, + `id` INT(11) NOT NULL, + `id2` INT(11) NOT NULL, UNIQUE KEY `id` (`id`,`id2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL, + `id` INT(11) NOT NULL, KEY `t1_id_fk` (`id`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 @@ -1499,7 +1499,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL, + `id` INT(11) NOT NULL, KEY `id` (`id`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 @@ -1507,7 +1507,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL, + `id` INT(11) NOT NULL, KEY `id` (`id`), KEY `id2` (`id`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`) @@ -1518,7 +1518,7 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL, + `id` INT(11) NOT NULL, KEY `id` (`id`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 @@ -1527,8 +1527,8 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL, - `id2` int(11) NOT NULL, + `id` INT(11) NOT NULL, + `id2` INT(11) NOT NULL, KEY `t1_id_fk` (`id`,`id2`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`, `id2`) REFERENCES `t1` (`id`, `id2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 @@ -1536,8 +1536,8 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL, - `id2` int(11) NOT NULL, + `id` INT(11) NOT NULL, + `id2` INT(11) NOT NULL, UNIQUE KEY `id` (`id`,`id2`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`, `id2`) REFERENCES `t1` (`id`, `id2`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 @@ -1546,8 +1546,8 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL, - `id2` int(11) NOT NULL, + `id` INT(11) NOT NULL, + `id2` INT(11) NOT NULL, UNIQUE KEY `id` (`id`,`id2`), KEY `t1_id_fk` (`id2`,`id`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id2`, `id`) REFERENCES `t1` (`id`, `id2`) @@ -1557,8 +1557,8 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL, - `id2` int(11) NOT NULL, + `id` INT(11) NOT NULL, + `id2` INT(11) NOT NULL, UNIQUE KEY `id` (`id`,`id2`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 @@ -1567,8 +1567,8 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL, - `id2` int(11) NOT NULL, + `id` INT(11) NOT NULL, + `id2` INT(11) NOT NULL, UNIQUE KEY `id` (`id`,`id2`), KEY `t1_id_fk` (`id2`,`id`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id2`, `id`) REFERENCES `t1` (`id`, `id2`) @@ -1578,8 +1578,8 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL auto_increment, - `id2` int(11) NOT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `id2` INT(11) NOT NULL, PRIMARY KEY (`id`), KEY `id` (`id`,`id2`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`) @@ -1589,8 +1589,8 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL auto_increment, - `id2` int(11) NOT NULL, + `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`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 @@ -1598,8 +1598,8 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `id` int(11) NOT NULL auto_increment, - `id2` int(11) NOT NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `id2` INT(11) NOT NULL, KEY `id_test` (`id`), KEY `id_test2` (`id`,`id2`), CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`) @@ -1611,8 +1611,8 @@ 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`), @@ -1623,8 +1623,8 @@ 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`), @@ -1813,41 +1813,41 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(10) default NULL, - `c` char(10) default NULL, - `t` text + `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, - `t` text + `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, - `t` text + `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, - `t` text + `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, - `t` text + `v` CHAR(10) DEFAULT NULL, + `c` VARCHAR(10) DEFAULT NULL, + `t` TEXT ) ENGINE=InnoDB DEFAULT CHARSET=latin1 alter table t1 modify t varchar(10); Warnings: @@ -1855,9 +1855,9 @@ 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,'*') @@ -1868,9 +1868,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(10) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(10) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `v` (`v`), KEY `c` (`c`), KEY `t` (`t`(10)) @@ -2087,9 +2087,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(300) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(300) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`) @@ -2167,9 +2167,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(300) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(300) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`(30)) @@ -2247,9 +2247,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(600) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(600) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`) @@ -2325,9 +2325,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(10) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(10) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `v` (`v`(5)), KEY `c` (`c`(5)), KEY `t` (`t`(5)) @@ -2337,15 +2337,15 @@ 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; @@ -2376,7 +2376,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` mediumtext + `v` MEDIUMTEXT ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop table t1; create table t1 (v varchar(65530) character set utf8); @@ -2385,7 +2385,7 @@ 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; --- 1.24/mysql-test/r/key.result 2004-11-22 20:54:41 +01:00 +++ 1.25/mysql-test/r/key.result 2005-06-10 13:29:15 +02:00 @@ -242,8 +242,8 @@ 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 --- 1.40/mysql-test/r/merge.result 2005-05-18 22:51:22 +02:00 +++ 1.41/mysql-test/r/merge.result 2005-06-10 13:29:15 +02:00 @@ -172,8 +172,8 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( - `a` int(11) NOT NULL, - `b` char(20) default NULL, + `a` INT(11) NOT 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); @@ -187,8 +187,8 @@ show create table t5; Table Create Table t5 CREATE TABLE `t5` ( - `a` int(11) NOT NULL, - `b` char(20) default NULL, + `a` INT(11) NOT NULL, + `b` CHAR(20) DEFAULT NULL, KEY `a` (`a`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`mysqltest`.`t6`) alter table t5 engine=myisam; @@ -260,16 +260,16 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( - `incr` int(11) NOT NULL, - `othr` int(11) NOT NULL, + `incr` INT(11) NOT NULL, + `othr` INT(11) NOT NULL, PRIMARY KEY (`incr`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`t2`) alter table t3 drop primary key; show create table t3; Table Create Table t3 CREATE TABLE `t3` ( - `incr` int(11) NOT NULL, - `othr` int(11) NOT NULL + `incr` INT(11) NOT NULL, + `othr` INT(11) NOT NULL ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`t2`) drop table t3,t2,t1; create table t1 (a int not null, key(a)) engine=merge; @@ -296,29 +296,29 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( - `a` int(11) NOT NULL, - `b` int(11) NOT NULL, + `a` INT(11) NOT NULL, + `b` INT(11) NOT NULL, KEY `a` (`a`,`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show create table t4; Table Create Table t4 CREATE TABLE `t4` ( - `a` int(11) NOT NULL, - `b` int(11) NOT NULL, + `a` INT(11) NOT NULL, + `b` INT(11) NOT NULL, KEY `a` (`a`,`b`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`t2`) show create table t5; Table Create Table t5 CREATE TABLE `t5` ( - `a` int(11) NOT NULL, - `b` int(11) NOT NULL auto_increment, + `a` INT(11) NOT NULL, + `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, + `a` INT(11) NOT NULL, + `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); @@ -382,8 +382,8 @@ show create table t4; Table Create Table t4 CREATE TABLE `t4` ( - `a` int(11) NOT NULL, - `b` int(11) NOT NULL, + `a` INT(11) NOT NULL, + `b` INT(11) NOT NULL, KEY `a` (`a`,`b`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`t2`,`t3`) select * from t4 order by a,b; @@ -408,8 +408,8 @@ show create table t4; Table Create Table t4 CREATE TABLE `t4` ( - `a` int(11) NOT NULL, - `b` int(11) NOT NULL, + `a` INT(11) NOT NULL, + `b` INT(11) NOT NULL, KEY `a` (`a`,`b`) ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=FIRST UNION=(`t1`,`t2`,`t3`) insert into t4 values (4,1),(4,2); --- 1.32/mysql-test/r/null.result 2005-05-13 11:08:03 +02:00 +++ 1.33/mysql-test/r/null.result 2005-06-10 13:29:15 +02:00 @@ -227,44 +227,44 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c00` binary(0) default NULL, - `c01` varchar(6) character set latin2 default NULL, - `c02` varchar(6) character set latin2 default NULL, - `c03` varchar(6) character set latin2 NOT NULL default '', - `c04` varchar(6) character set latin2 default NULL, - `c05` varchar(6) character set latin2 default NULL, - `c06` varchar(6) character set latin2 default NULL, - `c07` varchar(6) character set latin2 default NULL, - `c08` varchar(6) character set latin2 default NULL, - `c09` varchar(6) character set latin2 NOT NULL default '', - `c10` varchar(6) character set latin2 NOT NULL default '', - `c11` varchar(6) character set latin2 NOT NULL default '', - `c12` varchar(6) character set latin2 NOT NULL default '', - `c13` varchar(6) character set latin2 default NULL, - `c14` char(0) character set latin2 default NULL, - `c15` char(0) character set latin2 default NULL, - `c16` varchar(6) character set latin2 default NULL, - `c17` varchar(6) character set latin2 default NULL, - `c18` char(0) character set latin2 default NULL, - `c19` varchar(6) character set latin2 default NULL, - `c20` varchar(6) character set latin2 default NULL, - `c21` varchar(6) character set latin2 default NULL, - `c22` varchar(6) character set latin2 default NULL, - `c23` varchar(9) character set latin2 default NULL, - `c24` varchar(9) character set latin2 default NULL, - `c25` varchar(12) character set latin2 default NULL, - `c26` varchar(7) character set latin2 default NULL, - `c27` varchar(7) character set latin2 default NULL, - `c29` varchar(381) character set latin2 default NULL, - `c30` varchar(317) character set latin2 default NULL, - `c31` varchar(192) character set latin2 default NULL, - `c32` char(0) character set latin2 default NULL, - `c33` varchar(3) character set latin2 default NULL, - `c34` varchar(3) character set latin2 default NULL, - `c35` varchar(3) character set latin2 default NULL, - `c36` varchar(3) character set latin2 default NULL, - `c37` varchar(10) character set latin2 default NULL, - `c38` varchar(10) character set latin2 default NULL + `c00` BINARY(0) DEFAULT NULL, + `c01` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c02` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c03` VARCHAR(6) CHARACTER SET latin2 NOT NULL DEFAULT '', + `c04` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c05` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c06` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c07` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c08` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c09` VARCHAR(6) CHARACTER SET latin2 NOT NULL DEFAULT '', + `c10` VARCHAR(6) CHARACTER SET latin2 NOT NULL DEFAULT '', + `c11` VARCHAR(6) CHARACTER SET latin2 NOT NULL DEFAULT '', + `c12` VARCHAR(6) CHARACTER SET latin2 NOT NULL DEFAULT '', + `c13` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c14` CHAR(0) CHARACTER SET latin2 DEFAULT NULL, + `c15` CHAR(0) CHARACTER SET latin2 DEFAULT NULL, + `c16` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c17` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c18` CHAR(0) CHARACTER SET latin2 DEFAULT NULL, + `c19` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c20` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c21` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c22` VARCHAR(6) CHARACTER SET latin2 DEFAULT NULL, + `c23` VARCHAR(9) CHARACTER SET latin2 DEFAULT NULL, + `c24` VARCHAR(9) CHARACTER SET latin2 DEFAULT NULL, + `c25` VARCHAR(12) CHARACTER SET latin2 DEFAULT NULL, + `c26` VARCHAR(7) CHARACTER SET latin2 DEFAULT NULL, + `c27` VARCHAR(7) CHARACTER SET latin2 DEFAULT NULL, + `c29` VARCHAR(381) CHARACTER SET latin2 DEFAULT NULL, + `c30` VARCHAR(317) CHARACTER SET latin2 DEFAULT NULL, + `c31` VARCHAR(192) CHARACTER SET latin2 DEFAULT NULL, + `c32` CHAR(0) CHARACTER SET latin2 DEFAULT NULL, + `c33` VARCHAR(3) CHARACTER SET latin2 DEFAULT NULL, + `c34` VARCHAR(3) CHARACTER SET latin2 DEFAULT NULL, + `c35` VARCHAR(3) CHARACTER SET latin2 DEFAULT NULL, + `c36` VARCHAR(3) CHARACTER SET latin2 DEFAULT NULL, + `c37` VARCHAR(10) CHARACTER SET latin2 DEFAULT NULL, + `c38` VARCHAR(10) CHARACTER SET latin2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select --- 1.63/mysql-test/r/select.result 2005-05-26 16:47:38 +02:00 +++ 1.64/mysql-test/r/select.result 2005-06-10 13:29:15 +02:00 @@ -2034,20 +2034,20 @@ Tables_in_test (t?) show full columns from t2; Field Type Collation Null Key Default Extra Privileges Comment -auto int(11) NULL NO PRI NULL auto_increment # -fld1 int(6) unsigned zerofill NULL NO UNI 000000 # -companynr tinyint(2) unsigned zerofill NULL NO 00 # -fld3 char(30) latin1_swedish_ci NO MUL # -fld4 char(35) latin1_swedish_ci NO # -fld5 char(35) latin1_swedish_ci NO # -fld6 char(4) latin1_swedish_ci NO # +auto INT(11) NULL NO PRI NULL AUTO_INCREMENT # +fld1 INT(6) UNSIGNED ZEROFILL NULL NO UNI 000000 # +companynr TINYINT(2) UNSIGNED ZEROFILL NULL NO 00 # +fld3 CHAR(30) latin1_swedish_ci NO MUL # +fld4 CHAR(35) latin1_swedish_ci NO # +fld5 CHAR(35) latin1_swedish_ci NO # +fld6 CHAR(4) latin1_swedish_ci NO # show full columns from t2 from test like 'f%'; Field Type Collation Null Key Default Extra Privileges Comment -fld1 int(6) unsigned zerofill NULL NO UNI 000000 # -fld3 char(30) latin1_swedish_ci NO MUL # -fld4 char(35) latin1_swedish_ci NO # -fld5 char(35) latin1_swedish_ci NO # -fld6 char(4) latin1_swedish_ci NO # +fld1 INT(6) UNSIGNED ZEROFILL NULL NO UNI 000000 # +fld3 CHAR(30) latin1_swedish_ci NO MUL # +fld4 CHAR(35) latin1_swedish_ci NO # +fld5 CHAR(35) latin1_swedish_ci NO # +fld6 CHAR(4) latin1_swedish_ci NO # show full columns from t2 from test like 's%'; Field Type Collation Null Key Default Extra Privileges Comment show keys from t2; --- 1.68/mysql-test/r/show_check.result 2005-04-18 20:30:17 +02:00 +++ 1.69/mysql-test/r/show_check.result 2005-06-10 13:29:15 +02:00 @@ -82,13 +82,13 @@ show create table t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( - `a` int(11) NOT NULL + `a` INT(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 alter table t1 rename t2; show create table t2; Table Create Table t2 CREATE TEMPORARY TABLE `t2` ( - `a` int(11) NOT NULL + `a` INT(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t2; create table t1 ( @@ -101,36 +101,36 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `test_set` set('val1','val2','val3') NOT NULL default '', - `name` char(20) default 'O''Brien' COMMENT 'O''Brien as default', - `c` int(11) NOT NULL COMMENT 'int column', - `c-b` int(11) default NULL COMMENT 'name with a minus', - `space 2` int(11) default NULL COMMENT 'name with a space' + `test_set` SET('val1','val2','val3') NOT NULL DEFAULT '', + `name` CHAR(20) DEFAULT 'O''Brien' COMMENT 'O''Brien as default', + `c` INT(11) NOT NULL COMMENT 'int column', + `c-b` INT(11) DEFAULT NULL COMMENT 'name with a minus', + `space 2` INT(11) DEFAULT NULL COMMENT 'name with a space' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='it''s a table' set sql_quote_show_create=0; show create table t1; Table Create Table t1 CREATE TABLE t1 ( - test_set set('val1','val2','val3') NOT NULL default '', - `name` char(20) default 'O''Brien' COMMENT 'O''Brien as default', - c int(11) NOT NULL COMMENT 'int column', - `c-b` int(11) default NULL COMMENT 'name with a minus', - `space 2` int(11) default NULL COMMENT 'name with a space' + test_set SET('val1','val2','val3') NOT NULL DEFAULT '', + `name` CHAR(20) DEFAULT 'O''Brien' COMMENT 'O''Brien as default', + c INT(11) NOT NULL COMMENT 'int column', + `c-b` INT(11) DEFAULT NULL COMMENT 'name with a minus', + `space 2` INT(11) DEFAULT NULL COMMENT 'name with a space' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='it''s a table' set sql_quote_show_create=1; show full columns from t1; Field Type Collation Null Key Default Extra Privileges Comment -test_set set('val1','val2','val3') latin1_swedish_ci NO select,insert,update,references -name char(20) latin1_swedish_ci YES O'Brien select,insert,update,references O'Brien as default -c int(11) NULL NO select,insert,update,references int column -c-b int(11) NULL YES NULL select,insert,update,references name with a minus -space 2 int(11) NULL YES NULL select,insert,update,references name with a space +test_set SET('val1','val2','val3') latin1_swedish_ci NO select,insert,update,references +name CHAR(20) latin1_swedish_ci YES O'Brien select,insert,update,references O'Brien as default +c INT(11) NULL NO select,insert,update,references int column +c-b INT(11) NULL YES NULL select,insert,update,references name with a minus +space 2 INT(11) NULL YES NULL select,insert,update,references name with a space drop table t1; create table t1 (a int not null, unique aa (a)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL, + `a` INT(11) NOT NULL, UNIQUE KEY `aa` (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; @@ -138,7 +138,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL, + `a` INT(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; @@ -155,44 +155,44 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL, - `b` varchar(10) default NULL, + `a` INT(11) NOT NULL, + `b` VARCHAR(10) DEFAULT NULL, KEY `b` (`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MIN_ROWS=10 MAX_ROWS=100 AVG_ROW_LENGTH=10 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED COMMENT='test' alter table t1 MAX_ROWS=200 ROW_FORMAT=dynamic PACK_KEYS=0; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL, - `b` varchar(10) default NULL, + `a` INT(11) NOT NULL, + `b` VARCHAR(10) DEFAULT NULL, KEY `b` (`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MIN_ROWS=10 MAX_ROWS=200 AVG_ROW_LENGTH=10 PACK_KEYS=0 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC COMMENT='test' ALTER TABLE t1 AVG_ROW_LENGTH=0 CHECKSUM=0 COMMENT="" MIN_ROWS=0 MAX_ROWS=0 PACK_KEYS=DEFAULT DELAY_KEY_WRITE=0 ROW_FORMAT=default; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL, - `b` varchar(10) default NULL, + `a` INT(11) NOT NULL, + `b` VARCHAR(10) DEFAULT NULL, KEY `b` (`b`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (a decimal(9,2), b decimal (9,0), e double(9,2), f double(5,0), h float(3,2), i float(3,0)); show columns from t1; Field Type Null Key Default Extra -a decimal(9,2) YES NULL -b decimal(9,0) YES NULL -e double(9,2) YES NULL -f double(5,0) YES NULL -h float(3,2) YES NULL -i float(3,0) YES NULL +a DECIMAL(9,2) YES NULL +b DECIMAL(9,0) YES NULL +e DOUBLE(9,2) YES NULL +f DOUBLE(5,0) YES NULL +h FLOAT(3,2) YES NULL +i FLOAT(3,0) YES NULL show full columns from t1; Field Type Collation Null Key Default Extra Privileges Comment -a decimal(9,2) NULL YES NULL select,insert,update,references -b decimal(9,0) NULL YES NULL select,insert,update,references -e double(9,2) NULL YES NULL select,insert,update,references -f double(5,0) NULL YES NULL select,insert,update,references -h float(3,2) NULL YES NULL select,insert,update,references -i float(3,0) NULL YES NULL select,insert,update,references +a DECIMAL(9,2) NULL YES NULL select,insert,update,references +b DECIMAL(9,0) NULL YES NULL select,insert,update,references +e DOUBLE(9,2) NULL YES NULL select,insert,update,references +f DOUBLE(5,0) NULL YES NULL select,insert,update,references +h FLOAT(3,2) NULL YES NULL select,insert,update,references +i FLOAT(3,0) NULL YES NULL select,insert,update,references drop table t1; create table t1 ( type_bool bool not null default 0, @@ -221,27 +221,27 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `type_bool` tinyint(1) NOT NULL default '0', - `type_tiny` tinyint(4) NOT NULL auto_increment, - `type_short` smallint(3) default NULL, - `type_mediumint` mediumint(9) default NULL, - `type_bigint` bigint(20) default NULL, - `type_decimal` decimal(5,2) default NULL, - `type_numeric` decimal(5,2) default NULL, - `empty_char` char(0) default NULL, - `type_char` char(2) default NULL, - `type_varchar` varchar(10) default NULL, - `type_timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `type_date` date NOT NULL default '0000-00-00', - `type_time` time NOT NULL default '00:00:00', - `type_datetime` datetime NOT NULL default '0000-00-00 00:00:00', - `type_year` year(4) default NULL, - `type_enum` enum('red','green','blue') default NULL, - `type_set` enum('red','green','blue') default NULL, - `type_tinyblob` tinyblob, - `type_blob` blob, - `type_medium_blob` mediumblob, - `type_long_blob` longblob, + `type_bool` TINYINT(1) NOT NULL DEFAULT '0', + `type_tiny` TINYINT(4) NOT NULL AUTO_INCREMENT, + `type_short` SMALLINT(3) DEFAULT NULL, + `type_mediumint` MEDIUMINT(9) DEFAULT NULL, + `type_bigint` BIGINT(20) DEFAULT NULL, + `type_decimal` DECIMAL(5,2) DEFAULT NULL, + `type_numeric` DECIMAL(5,2) DEFAULT NULL, + `empty_char` CHAR(0) DEFAULT NULL, + `type_char` CHAR(2) DEFAULT NULL, + `type_varchar` VARCHAR(10) DEFAULT NULL, + `type_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `type_date` DATE NOT NULL DEFAULT '0000-00-00', + `type_time` TIME NOT NULL DEFAULT '00:00:00', + `type_datetime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', + `type_year` YEAR(4) DEFAULT NULL, + `type_enum` ENUM('red','green','blue') DEFAULT NULL, + `type_set` ENUM('red','green','blue') DEFAULT NULL, + `type_tinyblob` TINYBLOB, + `type_blob` BLOB, + `type_medium_blob` MEDIUMBLOB, + `type_long_blob` LONGBLOB, PRIMARY KEY (`type_tiny`), KEY `type_short` (`type_short`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MIN_ROWS=10 MAX_ROWS=100 AVG_ROW_LENGTH=10 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED COMMENT='test' @@ -254,22 +254,22 @@ create table t2 select max(a) from t1; show columns from t2; Field Type Null Key Default Extra -max(a) int(11) YES NULL +max(a) INT(11) YES NULL drop table t1,t2; create table t1 (c decimal, d double, f float, r real); show columns from t1; Field Type Null Key Default Extra -c decimal(10,0) YES NULL -d double YES NULL -f float YES NULL -r double YES NULL +c DECIMAL(10,0) YES NULL +d DOUBLE YES NULL +f FLOAT YES NULL +r DOUBLE YES NULL drop table t1; create table t1 (c decimal(3,3), d double(3,3), f float(3,3)); show columns from t1; Field Type Null Key Default Extra -c decimal(4,3) YES NULL -d double(4,3) YES NULL -f float(4,3) YES NULL +c DECIMAL(4,3) YES NULL +d DOUBLE(4,3) YES NULL +f FLOAT(4,3) YES NULL drop table t1; SET @old_sql_mode= @@sql_mode, sql_mode= ''; SET @old_sql_quote_show_create= @@sql_quote_show_create, sql_quote_show_create= OFF; @@ -281,14 +281,14 @@ 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 DROP TABLE t1; CREATE TABLE `table` (i INT); SHOW CREATE TABLE `table`; Table Create Table table CREATE TABLE `table` ( - i int(11) default NULL + i INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE `table`; SET sql_quote_show_create= @old_sql_quote_show_create; @@ -410,7 +410,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` int(11) default NULL, + `i` INT(11) DEFAULT NULL, KEY `i` (`i`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -418,7 +418,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` int(11) default NULL, + `i` INT(11) DEFAULT NULL, KEY `i` USING HASH (`i`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -426,7 +426,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` int(11) default NULL, + `i` INT(11) DEFAULT NULL, KEY `i` USING BTREE (`i`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -434,7 +434,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` int(11) default NULL, + `i` INT(11) DEFAULT NULL, KEY `i` (`i`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -442,7 +442,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` int(11) default NULL, + `i` INT(11) DEFAULT NULL, KEY `i` USING BTREE (`i`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -450,14 +450,14 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` int(11) default NULL, + `i` INT(11) DEFAULT NULL, KEY `i` (`i`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ALTER TABLE t1 ENGINE=MEMORY; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` int(11) default NULL, + `i` INT(11) DEFAULT NULL, KEY `i` (`i`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -465,14 +465,14 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` int(11) default NULL, + `i` INT(11) DEFAULT NULL, KEY `i` USING BTREE (`i`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ALTER TABLE t1 ENGINE=MEMORY; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `i` int(11) default NULL, + `i` INT(11) DEFAULT NULL, KEY `i` USING BTREE (`i`) ) ENGINE=MEMORY DEFAULT CHARSET=latin1 DROP TABLE t1; --- 1.14/mysql-test/r/temp_table.result 2005-05-07 14:00:58 +02:00 +++ 1.15/mysql-test/r/temp_table.result 2005-06-10 13:29:15 +02:00 @@ -105,7 +105,7 @@ show create table t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( - `A` varchar(19) NOT NULL default '' + `A` VARCHAR(19) NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show create view t1; View Create View --- 1.46/mysql-test/r/type_blob.result 2005-05-12 12:55:09 +02:00 +++ 1.47/mysql-test/r/type_blob.result 2005-06-10 13:29:15 +02:00 @@ -2,11 +2,11 @@ CREATE TABLE t1 (a blob, b text, c blob(250), d text(70000), e text(70000000)); show columns from t1; Field Type Null Key Default Extra -a blob YES NULL -b text YES NULL -c tinyblob YES NULL -d mediumtext YES NULL -e longtext YES NULL +a BLOB YES NULL +b TEXT YES NULL +c TINYBLOB YES NULL +d MEDIUMTEXT YES NULL +e LONGTEXT YES NULL CREATE TABLE t2 (a char(255), b varbinary(70000), c varchar(70000000)); Warnings: Note 1246 Converting column 'b' from VARBINARY to BLOB @@ -16,20 +16,20 @@ Note 1246 Converting column 'c' from VARCHAR to TEXT show columns from t2; Field Type Null Key Default Extra -a char(255) YES NULL -b mediumblob YES NULL -c longtext YES NULL +a CHAR(255) YES NULL +b MEDIUMBLOB YES NULL +c LONGTEXT YES NULL create table t3 (a long, b long byte); show create TABLE t3; Table Create Table t3 CREATE TABLE `t3` ( - `a` mediumtext, - `b` mediumblob + `a` MEDIUMTEXT, + `b` MEDIUMBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show create TABLE t4; Table Create Table t4 CREATE TABLE `t4` ( - `c` mediumtext character set utf8 NOT NULL + `c` MEDIUMTEXT CHARACTER SET utf8 NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1,t2,t3,t4; CREATE TABLE t1 (a char(257) default "hello"); @@ -80,17 +80,17 @@ lock tables t1 READ; show full fields from t1; Field Type Collation Null Key Default Extra Privileges Comment -t text latin1_swedish_ci YES NULL # -c char(10) latin1_swedish_ci YES NULL # -b blob NULL YES NULL # -d binary(10) NULL YES NULL # +t TEXT latin1_swedish_ci YES NULL # +c CHAR(10) latin1_swedish_ci YES NULL # +b BLOB NULL YES NULL # +d BINARY(10) NULL YES NULL # lock tables t1 WRITE; show full fields from t1; Field Type Collation Null Key Default Extra Privileges Comment -t text latin1_swedish_ci YES NULL # -c char(10) latin1_swedish_ci YES NULL # -b blob NULL YES NULL # -d binary(10) NULL YES NULL # +t TEXT latin1_swedish_ci YES NULL # +c CHAR(10) latin1_swedish_ci YES NULL # +b BLOB NULL YES NULL # +d BINARY(10) NULL YES NULL # unlock tables; select t from t1 where t like "hello"; t @@ -364,7 +364,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` text, + `a` TEXT, KEY `a` (`a`(1000)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; @@ -526,7 +526,7 @@ create table t1 select load_file('../../std_data/words.dat') l; show full fields from t1; Field Type Collation Null Key Default Extra Privileges Comment -l longblob NULL YES NULL # +l LONGBLOB NULL YES NULL # drop table t1; create table t1 (id integer primary key auto_increment, txt text not null, unique index txt_index (txt (20))); insert into t1 (txt) values ('Chevy'), ('Chevy '); --- 1.32/mysql-test/r/type_decimal.result 2005-05-05 22:01:35 +02:00 +++ 1.33/mysql-test/r/type_decimal.result 2005-06-10 13:29:16 +02:00 @@ -479,7 +479,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a_dec` decimal(11,11) default NULL + `a_dec` DECIMAL(11,11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; create table t1(a decimal(7,3)); @@ -703,7 +703,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `d` decimal(64,30) default NULL + `d` DECIMAL(64,30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values (1); select * from t1; @@ -714,21 +714,21 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `d` decimal(13,12) default NULL + `d` DECIMAL(13,12) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (d decimal(5)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `d` decimal(5,0) default NULL + `d` DECIMAL(5,0) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (d decimal); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `d` decimal(10,0) default NULL + `d` DECIMAL(10,0) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (d decimal(66,0)); --- 1.27/mysql-test/r/type_enum.result 2005-05-13 13:44:08 +02:00 +++ 1.28/mysql-test/r/type_enum.result 2005-06-10 13:29:16 +02:00 @@ -1626,14 +1626,14 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('','a','b') NOT NULL + `a` ENUM('','a','b') NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (a enum (' ','a','b ') not null default 'b '); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('','a','b') NOT NULL default 'b' + `a` ENUM('','a','b') NOT NULL DEFAULT 'b' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (a enum ('0','1')); @@ -1654,11 +1654,11 @@ create table t1 (a enum(0xE4, '1', '2') not null default 0xE4); show columns from t1; Field Type Null Key Default Extra -a enum('','1','2') NO +a ENUM('','1','2') NO show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('','1','2') NOT NULL default '' + `a` ENUM('','1','2') NOT NULL DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; set names latin1; @@ -1669,13 +1669,13 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) default '1', - `b` enum('value','_value','') NOT NULL + `a` INT(11) DEFAULT '1', + `b` ENUM('value','_value','') NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show columns from t1; Field Type Null Key Default Extra -a int(11) YES 1 -b enum('value','_value','') NO +a INT(11) YES 1 +b ENUM('value','_value','') NO drop table t1; CREATE TABLE t1 (c enum('a', 'A') BINARY); INSERT INTO t1 VALUES ('a'),('A'); @@ -1699,7 +1699,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('','','') character set utf8 default '' + `a` ENUM('','','') CHARACTER SET utf8 DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values (''), (''), (''); select a from t1 order by a; @@ -1717,7 +1717,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` enum('','','') default '' + `a` ENUM('','','') DEFAULT '' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select a from t1 order by a; a --- 1.37/mysql-test/r/type_float.result 2005-05-07 13:59:49 +02:00 +++ 1.38/mysql-test/r/type_float.result 2005-06-10 13:29:16 +02:00 @@ -20,8 +20,8 @@ create table t1 (f1 float(24),f2 float(52)); show full columns from t1; Field Type Collation Null Key Default Extra Privileges Comment -f1 float NULL YES NULL # -f2 double NULL YES NULL # +f1 FLOAT NULL YES NULL # +f2 DOUBLE NULL YES NULL # insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150); Warnings: Warning 1264 Out of range value adjusted for column 'f1' at row 7 @@ -91,10 +91,10 @@ show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `col1` double default NULL, - `col2` double(53,5) default NULL, - `col3` double default NULL, - `col4` double default NULL + `col1` DOUBLE DEFAULT NULL, + `col2` DOUBLE(53,5) DEFAULT NULL, + `col3` DOUBLE DEFAULT NULL, + `col4` DOUBLE DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1,t2; create table t1 (a float); @@ -106,18 +106,18 @@ create table t1 (f float, f2 float(24), f3 float(6,2), d double, d2 float(53), d3 double(10,3), de decimal, de2 decimal(6), de3 decimal(5,2), n numeric, n2 numeric(8), n3 numeric(5,6)); show full columns from t1; Field Type Collation Null Key Default Extra Privileges Comment -f float NULL YES NULL # -f2 float NULL YES NULL # -f3 float(6,2) NULL YES NULL # -d double NULL YES NULL # -d2 double NULL YES NULL # -d3 double(10,3) NULL YES NULL # -de decimal(10,0) NULL YES NULL # -de2 decimal(6,0) NULL YES NULL # -de3 decimal(5,2) NULL YES NULL # -n decimal(10,0) NULL YES NULL # -n2 decimal(8,0) NULL YES NULL # -n3 decimal(7,6) NULL YES NULL # +f FLOAT NULL YES NULL # +f2 FLOAT NULL YES NULL # +f3 FLOAT(6,2) NULL YES NULL # +d DOUBLE NULL YES NULL # +d2 DOUBLE NULL YES NULL # +d3 DOUBLE(10,3) NULL YES NULL # +de DECIMAL(10,0) NULL YES NULL # +de2 DECIMAL(6,0) NULL YES NULL # +de3 DECIMAL(5,2) NULL YES NULL # +n DECIMAL(10,0) NULL YES NULL # +n2 DECIMAL(8,0) NULL YES NULL # +n3 DECIMAL(7,6) NULL YES NULL # drop table t1; create table t1 (a decimal(7,3) not null, key (a)); insert into t1 values ("0"),("-0.00"),("-0.01"),("-0.002"),("1"); @@ -140,8 +140,8 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` float(200,30) default NULL, - `b` double(200,30) default NULL + `a` FLOAT(200,30) DEFAULT NULL, + `b` DOUBLE(200,30) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (c20 char); --- 1.34/mysql-test/r/type_ranges.result 2005-05-13 13:44:09 +02:00 +++ 1.35/mysql-test/r/type_ranges.result 2005-06-10 13:29:16 +02:00 @@ -40,30 +40,30 @@ ); show full fields from t1; Field Type Collation Null Key Default Extra Privileges Comment -auto int(5) unsigned NULL NO PRI NULL auto_increment # -string char(10) latin1_swedish_ci YES hello # -tiny tinyint(4) NULL NO MUL 0 # -short smallint(6) NULL NO MUL 1 # -medium mediumint(8) NULL NO MUL 0 # -long_int int(11) NULL NO 0 # -longlong bigint(13) NULL NO MUL 0 # -real_float float(13,1) NULL NO MUL 0.0 # -real_double double(16,4) NULL YES NULL # -utiny tinyint(3) unsigned NULL NO MUL 0 # -ushort smallint(5) unsigned zerofill NULL NO MUL 00000 # -umedium mediumint(8) unsigned NULL NO MUL 0 # -ulong int(11) unsigned NULL NO MUL 0 # -ulonglong bigint(13) unsigned NULL NO MUL 0 # -time_stamp timestamp NULL YES CURRENT_TIMESTAMP # -date_field date NULL YES NULL # -time_field time NULL YES NULL # -date_time datetime NULL YES NULL # -blob_col blob NULL YES NULL # -tinyblob_col tinyblob NULL YES NULL # -mediumblob_col mediumblob NULL NO # -longblob_col longblob NULL NO # -options enum('one','two','tree') latin1_swedish_ci NO MUL # -flags set('one','two','tree') latin1_swedish_ci NO # +auto INT(5) UNSIGNED NULL NO PRI NULL AUTO_INCREMENT # +string CHAR(10) latin1_swedish_ci YES hello # +tiny TINYINT(4) NULL NO MUL 0 # +short SMALLINT(6) NULL NO MUL 1 # +medium MEDIUMINT(8) NULL NO MUL 0 # +long_int INT(11) NULL NO 0 # +longlong BIGINT(13) NULL NO MUL 0 # +real_float FLOAT(13,1) NULL NO MUL 0.0 # +real_double DOUBLE(16,4) NULL YES NULL # +utiny TINYINT(3) UNSIGNED NULL NO MUL 0 # +ushort SMALLINT(5) UNSIGNED ZEROFILL NULL NO MUL 00000 # +umedium MEDIUMINT(8) UNSIGNED NULL NO MUL 0 # +ulong INT(11) UNSIGNED NULL NO MUL 0 # +ulonglong BIGINT(13) UNSIGNED NULL NO MUL 0 # +time_stamp TIMESTAMP NULL YES CURRENT_TIMESTAMP # +date_field DATE NULL YES NULL # +time_field TIME NULL YES NULL # +date_time DATETIME NULL YES NULL # +blob_col BLOB NULL YES NULL # +tinyblob_col TINYBLOB NULL YES NULL # +mediumblob_col MEDIUMBLOB NULL NO # +longblob_col LONGBLOB NULL NO # +options ENUM('one','two','tree') latin1_swedish_ci NO MUL # +flags SET('one','two','tree') latin1_swedish_ci NO # show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t1 0 PRIMARY 1 auto A 0 NULL NULL BTREE @@ -210,56 +210,56 @@ update t2 set string="changed" where auto=16; show full columns from t1; Field Type Collation Null Key Default Extra Privileges Comment -auto int(5) unsigned NULL NO MUL NULL auto_increment # -string char(10) latin1_swedish_ci YES newdefault # -tiny tinyint(4) NULL NO MUL 0 # -short smallint(6) NULL NO MUL 0 # -medium mediumint(8) NULL NO MUL 0 # -long_int int(11) NULL NO 0 # -longlong bigint(13) NULL NO MUL 0 # -real_float float(13,1) NULL NO MUL 0.0 # -real_double double(16,4) NULL YES NULL # -utiny tinyint(3) unsigned NULL NO 0 # -ushort smallint(5) unsigned zerofill NULL NO 00000 # -umedium mediumint(8) unsigned NULL NO MUL 0 # -ulong int(11) unsigned NULL NO MUL 0 # -ulonglong bigint(13) unsigned NULL NO MUL 0 # -time_stamp timestamp NULL YES CURRENT_TIMESTAMP # -date_field char(10) latin1_swedish_ci YES NULL # -time_field time NULL YES NULL # -date_time datetime NULL YES NULL # -new_blob_col varchar(20) latin1_swedish_ci YES NULL # -tinyblob_col tinyblob NULL YES NULL # -mediumblob_col mediumblob NULL NO # -options enum('one','two','tree') latin1_swedish_ci NO MUL # -flags set('one','two','tree') latin1_swedish_ci NO # -new_field char(10) latin1_swedish_ci NO new # +auto INT(5) UNSIGNED NULL NO MUL NULL AUTO_INCREMENT # +string CHAR(10) latin1_swedish_ci YES newdefault # +tiny TINYINT(4) NULL NO MUL 0 # +short SMALLINT(6) NULL NO MUL 0 # +medium MEDIUMINT(8) NULL NO MUL 0 # +long_int INT(11) NULL NO 0 # +longlong BIGINT(13) NULL NO MUL 0 # +real_float FLOAT(13,1) NULL NO MUL 0.0 # +real_double DOUBLE(16,4) NULL YES NULL # +utiny TINYINT(3) UNSIGNED NULL NO 0 # +ushort SMALLINT(5) UNSIGNED ZEROFILL NULL NO 00000 # +umedium MEDIUMINT(8) UNSIGNED NULL NO MUL 0 # +ulong INT(11) UNSIGNED NULL NO MUL 0 # +ulonglong BIGINT(13) UNSIGNED NULL NO MUL 0 # +time_stamp TIMESTAMP NULL YES CURRENT_TIMESTAMP # +date_field CHAR(10) latin1_swedish_ci YES NULL # +time_field TIME NULL YES NULL # +date_time DATETIME NULL YES NULL # +new_blob_col VARCHAR(20) latin1_swedish_ci YES NULL # +tinyblob_col TINYBLOB NULL YES NULL # +mediumblob_col MEDIUMBLOB NULL NO # +options ENUM('one','two','tree') latin1_swedish_ci NO MUL # +flags SET('one','two','tree') latin1_swedish_ci NO # +new_field CHAR(10) latin1_swedish_ci NO new # show full columns from t2; Field Type Collation Null Key Default Extra Privileges Comment -auto int(5) unsigned NULL NO 0 # -string char(10) latin1_swedish_ci YES newdefault # -tiny tinyint(4) NULL NO 0 # -short smallint(6) NULL NO 0 # -medium mediumint(8) NULL NO 0 # -long_int int(11) NULL NO 0 # -longlong bigint(13) NULL NO 0 # -real_float float(13,1) NULL NO 0.0 # -real_double double(16,4) NULL YES NULL # -utiny tinyint(3) unsigned NULL NO 0 # -ushort smallint(5) unsigned zerofill NULL NO 00000 # -umedium mediumint(8) unsigned NULL NO 0 # -ulong int(11) unsigned NULL NO 0 # -ulonglong bigint(13) unsigned NULL NO 0 # -time_stamp timestamp NULL YES 0000-00-00 00:00:00 # -date_field char(10) latin1_swedish_ci YES NULL # -time_field time NULL YES NULL # -date_time datetime NULL YES NULL # -new_blob_col varchar(20) latin1_swedish_ci YES NULL # -tinyblob_col tinyblob NULL YES NULL # -mediumblob_col mediumblob NULL NO # -options enum('one','two','tree') latin1_swedish_ci NO one # -flags set('one','two','tree') latin1_swedish_ci NO # -new_field char(10) latin1_swedish_ci NO new # +auto INT(5) UNSIGNED NULL NO 0 # +string CHAR(10) latin1_swedish_ci YES newdefault # +tiny TINYINT(4) NULL NO 0 # +short SMALLINT(6) NULL NO 0 # +medium MEDIUMINT(8) NULL NO 0 # +long_int INT(11) NULL NO 0 # +longlong BIGINT(13) NULL NO 0 # +real_float FLOAT(13,1) NULL NO 0.0 # +real_double DOUBLE(16,4) NULL YES NULL # +utiny TINYINT(3) UNSIGNED NULL NO 0 # +ushort SMALLINT(5) UNSIGNED ZEROFILL NULL NO 00000 # +umedium MEDIUMINT(8) UNSIGNED NULL NO 0 # +ulong INT(11) UNSIGNED NULL NO 0 # +ulonglong BIGINT(13) UNSIGNED NULL NO 0 # +time_stamp TIMESTAMP NULL YES 0000-00-00 00:00:00 # +date_field CHAR(10) latin1_swedish_ci YES NULL # +time_field TIME NULL YES NULL # +date_time DATETIME NULL YES NULL # +new_blob_col VARCHAR(20) latin1_swedish_ci YES NULL # +tinyblob_col TINYBLOB NULL YES NULL # +mediumblob_col MEDIUMBLOB NULL NO # +options ENUM('one','two','tree') latin1_swedish_ci NO one # +flags SET('one','two','tree') latin1_swedish_ci NO # +new_field CHAR(10) latin1_swedish_ci NO new # select t1.auto,t2.auto from t1,t2 where t1.auto=t2.auto and ((t1.string<>t2.string and (t1.string is not null or t2.string is not null)) or (t1.tiny<>t2.tiny and (t1.tiny is not null or t2.tiny is not null)) or (t1.short<>t2.short and (t1.short is not null or t2.short is not null)) or (t1.medium<>t2.medium and (t1.medium is not null or t2.medium is not null)) or (t1.long_int<>t2.long_int and (t1.long_int is not null or t2.long_int is not null)) or (t1.longlong<>t2.longlong and (t1.longlong is not null or t2.longlong is not null)) or (t1.real_float<>t2.real_float and (t1.real_float is not null or t2.real_float is not null)) or (t1.real_double<>t2.real_double and (t1.real_double is not null or t2.real_double is not null)) or (t1.utiny<>t2.utiny and (t1.utiny is not null or t2.utiny is not null)) or (t1.ushort<>t2.ushort and (t1.ushort is not null or t2.ushort is not null)) or (t1.umedium<>t2.umedium and (t1.umedium is not null or t2.umedium is not null)) or (t1.ulong<>t2.ulong and (t1.ulong is not null or t2.ulong is not null)) or (t1.ulonglong<>t2.ulonglong and (t1.ulonglong is not null or t2.ulonglong is not null)) or (t1.time_stamp<>t2.time_stamp and (t1.time_stamp is not null or t2.time_stamp is not null)) or (t1.date_field<>t2.date_field and (t1.date_field is not null or t2.date_field is not null)) or (t1.time_field<>t2.time_field and (t1.time_field is not null or t2.time_field is not null)) or (t1.date_time<>t2.date_time and (t1.date_time is not null or t2.date_time is not null)) or (t1.new_blob_col<>t2.new_blob_col and (t1.new_blob_col is not null or t2.new_blob_col is not null)) or (t1.tinyblob_col<>t2.tinyblob_col and (t1.tinyblob_col is not null or t2.tinyblob_col is not null)) or (t1.mediumblob_col<>t2.mediumblob_col and (t1.mediumblob_col is not null or t2.mediumblob_col is not null)) or (t1.options<>t2.options and (t1.options is not null or t2.options is not null)) or (t1.flags<>t2.flags and (t1.flags is not null or t2.flags is not n ull)) or (t1.new_field<>t2.new_field and (t1.new_field is not null or t2.new_field is not null))); auto auto 16 16 @@ -270,15 +270,15 @@ create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1; show full columns from t2; Field Type Collation Null Key Default Extra Privileges Comment -auto bigint(12) unsigned NULL NO PRI 0 # -t1 bigint(1) NULL NO 0 # -t2 varchar(1) latin1_swedish_ci NO # -t3 varchar(256) latin1_swedish_ci NO # -t4 varbinary(256) NULL NO # -t5 longtext latin1_swedish_ci NO # -t6 longblob NULL NO # -t7 char(0) latin1_swedish_ci NO # -t8 binary(0) NULL NO # +auto BIGINT(12) UNSIGNED NULL NO PRI 0 # +t1 BIGINT(1) NULL NO 0 # +t2 VARCHAR(1) latin1_swedish_ci NO # +t3 VARCHAR(256) latin1_swedish_ci NO # +t4 VARBINARY(256) NULL NO # +t5 LONGTEXT latin1_swedish_ci NO # +t6 LONGBLOB NULL NO # +t7 CHAR(0) latin1_swedish_ci NO # +t8 BINARY(0) NULL NO # select t1,t2,length(t3),length(t4),length(t5),length(t6),t7,t8 from t2; t1 t2 length(t3) length(t4) length(t5) length(t6) t7 t8 1 a 256 256 4096 4096 @@ -297,9 +297,9 @@ create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2; show full columns from t3; Field Type Collation Null Key Default Extra Privileges Comment -c1 int(11) NULL YES NULL # -c2 int(11) NULL YES NULL # -const bigint(1) NULL NO 0 # +c1 INT(11) NULL YES NULL # +c2 INT(11) NULL YES NULL # +const BIGINT(1) NULL NO 0 # drop table t1,t2,t3; create table t1 ( myfield INT NOT NULL, UNIQUE INDEX (myfield), unique (myfield), index(myfield)); drop table t1; --- 1.27/mysql-test/r/type_timestamp.result 2005-04-20 15:14:43 +02:00 +++ 1.28/mysql-test/r/type_timestamp.result 2005-06-10 13:29:16 +02:00 @@ -186,15 +186,15 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `t1` timestamp NOT NULL default '2003-01-01 00:00:00', - `t2` datetime default NULL, - `t3` timestamp NOT NULL default '0000-00-00 00:00:00' + `t1` TIMESTAMP NOT NULL DEFAULT '2003-01-01 00:00:00', + `t2` DATETIME DEFAULT NULL, + `t3` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show columns from t1; Field Type Null Key Default Extra -t1 timestamp YES 2003-01-01 00:00:00 -t2 datetime YES NULL -t3 timestamp YES 0000-00-00 00:00:00 +t1 TIMESTAMP YES 2003-01-01 00:00:00 +t2 DATETIME YES NULL +t3 TIMESTAMP YES 0000-00-00 00:00:00 drop table t1; create table t1 (t1 timestamp default now(), t2 datetime, t3 timestamp); SET TIMESTAMP=1000000002; @@ -210,15 +210,15 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `t1` timestamp NOT NULL default CURRENT_TIMESTAMP, - `t2` datetime default NULL, - `t3` timestamp NOT NULL default '0000-00-00 00:00:00' + `t1` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `t2` DATETIME DEFAULT NULL, + `t3` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show columns from t1; Field Type Null Key Default Extra -t1 timestamp YES CURRENT_TIMESTAMP -t2 datetime YES NULL -t3 timestamp YES 0000-00-00 00:00:00 +t1 TIMESTAMP YES CURRENT_TIMESTAMP +t2 DATETIME YES NULL +t3 TIMESTAMP YES 0000-00-00 00:00:00 drop table t1; create table t1 (t1 timestamp default '2003-01-01 00:00:00' on update now(), t2 datetime); SET TIMESTAMP=1000000004; @@ -237,13 +237,13 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `t1` timestamp NOT NULL default '2003-01-01 00:00:00' on update CURRENT_TIMESTAMP, - `t2` datetime default NULL + `t1` TIMESTAMP NOT NULL DEFAULT '2003-01-01 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `t2` DATETIME DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show columns from t1; Field Type Null Key Default Extra -t1 timestamp YES 2003-01-01 00:00:00 -t2 datetime YES NULL +t1 TIMESTAMP YES 2003-01-01 00:00:00 +t2 DATETIME YES NULL drop table t1; create table t1 (t1 timestamp default now() on update now(), t2 datetime); SET TIMESTAMP=1000000006; @@ -262,13 +262,13 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `t1` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `t2` datetime default NULL + `t1` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `t2` DATETIME DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show columns from t1; Field Type Null Key Default Extra -t1 timestamp YES CURRENT_TIMESTAMP -t2 datetime YES NULL +t1 TIMESTAMP YES CURRENT_TIMESTAMP +t2 DATETIME YES NULL drop table t1; create table t1 (t1 timestamp, t2 datetime, t3 timestamp); SET TIMESTAMP=1000000007; @@ -287,15 +287,15 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `t1` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `t2` datetime default NULL, - `t3` timestamp NOT NULL default '0000-00-00 00:00:00' + `t1` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `t2` DATETIME DEFAULT NULL, + `t3` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show columns from t1; Field Type Null Key Default Extra -t1 timestamp YES CURRENT_TIMESTAMP -t2 datetime YES NULL -t3 timestamp YES 0000-00-00 00:00:00 +t1 TIMESTAMP YES CURRENT_TIMESTAMP +t2 DATETIME YES NULL +t3 TIMESTAMP YES 0000-00-00 00:00:00 drop table t1; create table t1 (t1 timestamp default current_timestamp on update current_timestamp, t2 datetime); SET TIMESTAMP=1000000009; @@ -314,13 +314,13 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `t1` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `t2` datetime default NULL + `t1` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `t2` DATETIME DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show columns from t1; Field Type Null Key Default Extra -t1 timestamp YES CURRENT_TIMESTAMP -t2 datetime YES NULL +t1 TIMESTAMP YES CURRENT_TIMESTAMP +t2 DATETIME YES NULL delete from t1; insert into t1 values ('2004-04-01 00:00:00', '2004-04-01 00:00:00'); SET TIMESTAMP=1000000012; @@ -369,8 +369,8 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NULL default NULL, - `b` timestamp NULL default NULL + `a` TIMESTAMP NULL DEFAULT NULL, + `b` TIMESTAMP NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values (NULL, NULL); SET TIMESTAMP=1000000017; @@ -384,8 +384,8 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `b` timestamp NULL default NULL + `a` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `b` TIMESTAMP NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values (NULL, NULL); SET TIMESTAMP=1000000018; @@ -399,8 +399,8 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NULL default NULL, - `b` timestamp NULL default '2003-01-01 00:00:00' + `a` TIMESTAMP NULL DEFAULT NULL, + `b` TIMESTAMP NULL DEFAULT '2003-01-01 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values (NULL, NULL); insert into t1 values (DEFAULT, DEFAULT); @@ -431,8 +431,8 @@ show create table t1; Table Create Table t1 CREATE TABLE "t1" ( - "a" datetime default NULL, - "b" datetime default NULL + "a" DATETIME DEFAULT NULL, + "b" DATETIME DEFAULT NULL ) set sql_mode=''; drop table t1; --- 1.64/mysql-test/r/variables.result 2005-05-18 11:46:01 +02:00 +++ 1.65/mysql-test/r/variables.result 2005-06-10 13:29:16 +02:00 @@ -480,11 +480,11 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` tinyint(4) default NULL, - `c2` smallint(6) default NULL, - `c3` mediumint(9) default NULL, - `c4` int(11) default NULL, - `c5` bigint(20) default NULL + `c1` TINYINT(4) DEFAULT NULL, + `c2` SMALLINT(6) DEFAULT NULL, + `c3` MEDIUMINT(9) DEFAULT NULL, + `c4` INT(11) DEFAULT NULL, + `c5` BIGINT(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; set @arg00= 8, @arg01= 8.8, @arg02= 'a string', @arg03= 0.2e0; @@ -492,10 +492,10 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` bigint(20) default NULL, - `c2` decimal(65,30) default NULL, - `c3` longtext, - `c4` double default NULL + `c1` BIGINT(20) DEFAULT NULL, + `c2` DECIMAL(65,30) DEFAULT NULL, + `c3` LONGTEXT, + `c4` DOUBLE DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; SET GLOBAL MYISAM_DATA_POINTER_SIZE= 8; --- 1.62/mysql-test/r/myisam.result 2005-05-18 20:06:31 +02:00 +++ 1.63/mysql-test/r/myisam.result 2005-06-10 13:29:15 +02:00 @@ -611,41 +611,41 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(10) default NULL, - `c` char(10) default NULL, - `t` text + `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, - `t` text + `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, - `t` text + `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, - `t` text + `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, - `t` text + `v` CHAR(10) DEFAULT NULL, + `c` VARCHAR(10) DEFAULT NULL, + `t` TEXT ) ENGINE=MyISAM DEFAULT CHARSET=latin1 alter table t1 modify t varchar(10); Warnings: @@ -653,9 +653,9 @@ 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,'*') @@ -666,9 +666,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(10) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(10) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `v` (`v`), KEY `c` (`c`), KEY `t` (`t`(10)) @@ -885,9 +885,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(300) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(300) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`) @@ -965,9 +965,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(300) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(300) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`(30)) @@ -1045,9 +1045,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(600) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(600) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`) @@ -1123,9 +1123,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(10) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(10) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `v` (`v`(5)), KEY `c` (`c`(5)), KEY `t` (`t`(5)) @@ -1135,15 +1135,15 @@ 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; @@ -1176,7 +1176,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` mediumtext + `v` MEDIUMTEXT ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (v varchar(65530) character set utf8); @@ -1185,7 +1185,7 @@ 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)); --- 1.24/mysql-test/r/ctype_latin1_de.result 2005-05-05 18:13:07 +02:00 +++ 1.25/mysql-test/r/ctype_latin1_de.result 2005-06-10 13:29:14 +02:00 @@ -224,8 +224,8 @@ 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 @@ 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'); --- 1.20/mysql-test/r/symlink.result 2005-03-03 23:44:35 +01:00 +++ 1.21/mysql-test/r/symlink.result 2005-06-10 13:29:15 +02:00 @@ -36,9 +36,9 @@ show create table t9; Table Create Table t9 CREATE TABLE `t9` ( - `a` int(11) NOT NULL auto_increment, - `b` char(16) NOT NULL, - `c` int(11) NOT NULL, + `a` INT(11) NOT NULL AUTO_INCREMENT, + `b` CHAR(16) NOT NULL, + `c` INT(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/' alter table t9 rename t8, add column d int not null; @@ -48,10 +48,10 @@ SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `a` int(11) NOT NULL auto_increment, - `b` char(16) NOT NULL, - `c` int(11) NOT NULL, - `d` int(11) NOT NULL, + `a` INT(11) NOT NULL AUTO_INCREMENT, + `b` CHAR(16) NOT NULL, + `c` INT(11) NOT NULL, + `d` INT(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/' Got one of the listed errors @@ -66,10 +66,10 @@ show create table mysqltest.t9; Table Create Table t9 CREATE TABLE `t9` ( - `a` int(11) NOT NULL auto_increment, - `b` char(16) NOT NULL, - `c` int(11) NOT NULL, - `d` int(11) NOT NULL, + `a` INT(11) NOT NULL AUTO_INCREMENT, + `b` CHAR(16) NOT NULL, + `c` INT(11) NOT NULL, + `d` INT(11) NOT NULL, PRIMARY KEY (`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/' drop database mysqltest; @@ -77,31 +77,31 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL + `a` INT(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 alter table t1 add b int; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL, - `b` int(11) default NULL + `a` INT(11) NOT NULL, + `b` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` int(11) NOT NULL, - `b` int(11) default NULL + `a` INT(11) NOT NULL, + `b` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; 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 drop table t1; 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 drop table t1; --- 1.13/mysql-test/r/type_set.result 2005-02-28 11:16:52 +01:00 +++ 1.14/mysql-test/r/type_set.result 2005-06-10 13:29:16 +02:00 @@ -3,14 +3,14 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` set('','a','b') NOT NULL + `a` SET('','a','b') NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (a set (' ','a','b ') not null default 'b '); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` set('','a','b') NOT NULL default 'b' + `a` SET('','a','b') NOT NULL DEFAULT 'b' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; CREATE TABLE t1 ( user varchar(64) NOT NULL default '', path varchar(255) NOT NULL default '', privilege set('select','RESERVED30','RESERVED29','RESERVED28','RESERVED27','RESERVED26', 'RESERVED25','RESERVED24','data.delete','RESERVED22','RESERVED21', 'RESERVED20','data.insert.none','data.insert.approve', 'data.insert.delete','data.insert.move','data.insert.propose', 'data.insert.reject','RESERVED13','RESERVED12','RESERVED11','RESERVED10', 'RESERVED09','data.update','RESERVED07','RESERVED06','RESERVED05', 'RESERVED04','metadata.delete','metadata.put','RESERVED01','RESERVED00') NOT NULL default '', KEY user (user) ) ENGINE=MyISAM CHARSET=utf8; @@ -20,7 +20,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `s` set('a','A') character set latin1 collate latin1_bin default NULL + `s` SET('a','A') CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values ('a'),('a,A'),('A,a'),('A'); select s from t1 order by s; --- 1.29/mysql-test/r/cast.result 2005-04-30 17:40:05 +02:00 +++ 1.30/mysql-test/r/cast.result 2005-06-10 13:29:14 +02:00 @@ -145,7 +145,7 @@ 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 @@ -179,11 +179,11 @@ 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 @@ -212,11 +212,11 @@ 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(10), b char(10) character set koi8r); --- 1.6/mysql-test/r/constraints.result 2004-05-11 23:29:50 +02:00 +++ 1.7/mysql-test/r/constraints.result 2005-06-10 13:29:14 +02:00 @@ -21,7 +21,7 @@ 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`) --- 1.12/mysql-test/r/ctype_ujis.result 2005-01-15 13:37:04 +01:00 +++ 1.13/mysql-test/r/ctype_ujis.result 2005-06-10 13:29:14 +02:00 @@ -118,13 +118,13 @@ 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 -a char(1) NO -b enum('¤¢','¤¤') YES NULL +a CHAR(1) NO +b ENUM('¤¢','¤¤') YES NULL DROP TABLE t1; CREATE TABLE t1 ( --- 1.18/mysql-test/r/strict.result 2005-05-13 10:22:21 +02:00 +++ 1.19/mysql-test/r/strict.result 2005-06-10 13:29:15 +02:00 @@ -1007,8 +1007,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "col1" int(11) NOT NULL default '99', - "col2" char(6) NOT NULL + "col1" INT(11) NOT NULL DEFAULT '99', + "col2" CHAR(6) NOT NULL ) INSERT INTO t1 VALUES (1, 'hello'); INSERT INTO t1 (col2) VALUES ('hello2'); --- 1.5/mysql-test/r/type_varchar.result 2005-04-21 18:06:02 +02:00 +++ 1.6/mysql-test/r/type_varchar.result 2005-06-10 13:29:16 +02:00 @@ -4,18 +4,18 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(30) default NULL, - `c` char(3) default NULL, - `e` enum('abc','def','ghi') default NULL, - `t` text + `v` VARCHAR(30) DEFAULT NULL, + `c` CHAR(3) DEFAULT NULL, + `e` ENUM('abc','def','ghi') DEFAULT NULL, + `t` TEXT ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show create table vchar; Table Create Table vchar CREATE TABLE `vchar` ( - `v` varchar(30) default NULL, - `c` char(3) default NULL, - `e` enum('abc','def','ghi') default NULL, - `t` text + `v` VARCHAR(30) DEFAULT NULL, + `c` CHAR(3) DEFAULT NULL, + `e` ENUM('abc','def','ghi') DEFAULT NULL, + `t` TEXT ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values ('abc', 'de', 'ghi', 'jkl'); insert into t1 values ('abc ', 'de ', 'ghi', 'jkl '); @@ -37,11 +37,11 @@ show create table vchar; Table Create Table vchar CREATE TABLE `vchar` ( - `v` varchar(30) default NULL, - `c` char(3) default NULL, - `e` enum('abc','def','ghi') default NULL, - `t` text, - `i` int(11) default NULL + `v` VARCHAR(30) DEFAULT NULL, + `c` CHAR(3) DEFAULT NULL, + `e` ENUM('abc','def','ghi') DEFAULT NULL, + `t` TEXT, + `i` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select length(v),length(c),length(e),length(t) from vchar; length(v) length(c) length(e) length(t) --- 1.97/mysql-test/r/func_str.result 2005-04-01 14:04:43 +02:00 +++ 1.98/mysql-test/r/func_str.result 2005-06-10 13:29:14 +02:00 @@ -599,37 +599,37 @@ 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)` varchar(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)` VARCHAR(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); --- 1.2/mysql-test/r/ndb_bitfield.result 2005-01-07 11:54:43 +01:00 +++ 1.3/mysql-test/r/ndb_bitfield.result 2005-06-10 13:29:15 +02:00 @@ -6,8 +6,8 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `pk1` int(11) NOT NULL, - `b` bit(64) default NULL, + `pk1` INT(11) NOT NULL, + `b` BIT(64) DEFAULT NULL, PRIMARY KEY (`pk1`) ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 insert into t1 values --- 1.124/mysql-test/r/sp.result 2005-05-09 01:06:11 +02:00 +++ 1.125/mysql-test/r/sp.result 2005-06-10 13:29:15 +02:00 @@ -964,7 +964,7 @@ return 42| show create function chistics| Function sql_mode Create Function -chistics CREATE FUNCTION `test`.`chistics`() RETURNS int(11) +chistics CREATE FUNCTION `test`.`chistics`() RETURNS INT(11) DETERMINISTIC SQL SECURITY INVOKER COMMENT 'Characteristics procedure test' @@ -977,7 +977,7 @@ comment 'Characteristics function test'| show create function chistics| Function sql_mode Create Function -chistics CREATE FUNCTION `test`.`chistics`() RETURNS int(11) +chistics CREATE FUNCTION `test`.`chistics`() RETURNS INT(11) NO SQL DETERMINISTIC SQL SECURITY INVOKER @@ -2041,11 +2041,11 @@ insert into "t1" values ('foo', 1) show create function bug2564_3| Function sql_mode Create Function -bug2564_3 CREATE FUNCTION `test`.`bug2564_3`(x int, y int) RETURNS int(11) +bug2564_3 CREATE FUNCTION `test`.`bug2564_3`(x int, y int) RETURNS INT(11) return x || y show create function bug2564_4| Function sql_mode Create Function -bug2564_4 REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI CREATE FUNCTION "test"."bug2564_4"(x int, y int) RETURNS int(11) +bug2564_4 REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI CREATE FUNCTION "test"."bug2564_4"(x int, y int) RETURNS INT(11) return x || y drop procedure bug2564_1| drop procedure bug2564_2| @@ -2120,7 +2120,7 @@ show create table t3| Table Create Table t3 CREATE TABLE `t3` ( - `bug2773()` int(11) default NULL + `bug2773()` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t3| drop function bug2773| @@ -2183,16 +2183,16 @@ tinyint unsigned 1 0 255 0 0 YES YES YES YES YES NO NULL,0 A very small integer Table Create Table t1 CREATE TABLE `t1` ( - `id` char(16) NOT NULL default '', - `data` int(11) NOT NULL + `id` CHAR(16) NOT NULL DEFAULT '', + `data` INT(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 Database Create Database test CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET latin1 */ Database (foo) Level Code Message Field Type Null Key Default Extra -id char(16) NO -data int(11) NO +id CHAR(16) NO +data INT(11) NO Grants for root@localhost GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment @@ -2237,16 +2237,16 @@ tinyint unsigned 1 0 255 0 0 YES YES YES YES YES NO NULL,0 A very small integer Table Create Table t1 CREATE TABLE `t1` ( - `id` char(16) NOT NULL default '', - `data` int(11) NOT NULL + `id` CHAR(16) NOT NULL DEFAULT '', + `data` INT(11) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 Database Create Database test CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET latin1 */ Database (foo) Level Code Message Field Type Null Key Default Extra -id char(16) NO -data int(11) NO +id CHAR(16) NO +data INT(11) NO Grants for root@localhost GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment --- 1.44/mysql-test/r/mysqldump.result 2005-05-26 12:19:36 +02:00 +++ 1.45/mysql-test/r/mysqldump.result 2005-06-10 13:29:15 +02:00 @@ -7,7 +7,7 @@ <mysqldump> <database name="test"> <table_structure name="t1"> - <field Field="a" Type="int(11)" Null="YES" Key="" Extra="" /> + <field Field="a" Type="INT(11)" Null="YES" Key="" Extra="" /> </table_structure> <table_data name="t1"> <row> @@ -24,7 +24,7 @@ INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), ("0987654321098765432109876543210987654321"); CREATE TABLE `t1` ( - `a` decimal(64,20) default NULL + `a` DECIMAL(64,20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('987654321098765432109876543210987654321.00000000000000000000'); DROP TABLE t1; @@ -33,7 +33,7 @@ Warnings: Warning 1264 Out of range value adjusted for column 'a' at row 1 CREATE TABLE `t1` ( - `a` double default NULL + `a` DOUBLE DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; INSERT INTO `t1` VALUES (RES); DROP TABLE t1; @@ -48,13 +48,13 @@ ERROR 42S22: Unknown column '1.2345' in 'field list' SET SQL_MODE=@OLD_SQL_MODE; CREATE TABLE `t1` ( - `a` decimal(10,5) default NULL, - `b` float default NULL + `a` DECIMAL(10,5) DEFAULT NULL, + `b` FLOAT DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456); CREATE TABLE `t1` ( - `a` decimal(10,5) default NULL, - `b` float default NULL + `a` DECIMAL(10,5) DEFAULT NULL, + `b` FLOAT DEFAULT NULL ); INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456); @@ -68,8 +68,8 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` decimal(10,5) default NULL, - `b` float default NULL + `a` DECIMAL(10,5) DEFAULT NULL, + `b` FLOAT DEFAULT NULL ); @@ -92,8 +92,8 @@ /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; CREATE TABLE `t1` ( - `a` decimal(10,5) default NULL, - `b` float default NULL + `a` DECIMAL(10,5) DEFAULT NULL, + `b` FLOAT DEFAULT NULL ); INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456); @@ -110,9 +110,9 @@ <mysqldump> <database name="test"> <table_structure name="t1"> - <field Field="a" Type="int(11)" Null="YES" Key="" Extra="" /> - <field Field="b" Type="text" Null="YES" Key="" Extra="" /> - <field Field="c" Type="varchar(3)" Null="YES" Key="" Extra="" /> + <field Field="a" Type="INT(11)" Null="YES" Key="" Extra="" /> + <field Field="b" Type="TEXT" Null="YES" Key="" Extra="" /> + <field Field="c" Type="VARCHAR(3)" Null="YES" Key="" Extra="" /> </table_structure> <table_data name="t1"> <row> @@ -135,7 +135,7 @@ <mysqldump> <database name="test"> <table_structure name="t1"> - <field Field="a"b"" Type="char(2)" Null="YES" Key="" Extra="" /> + <field Field="a"b"" Type="CHAR(2)" Null="YES" Key="" Extra="" /> </table_structure> <table_data name="t1"> <row> @@ -161,7 +161,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` varchar(255) default NULL + `a` VARCHAR(255) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=koi8r; @@ -189,7 +189,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) TYPE=MyISAM; @@ -210,7 +210,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) TYPE=MyISAM; @@ -228,7 +228,7 @@ DROP TABLE t1; create table ```a` (i int); CREATE TABLE ```a` ( - `i` int(11) default NULL + `i` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; drop table ```a`; create table t1(a int); @@ -243,7 +243,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -266,7 +266,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS "t1"; CREATE TABLE "t1" ( - "a" int(11) default NULL + "a" INT(11) DEFAULT NULL ); @@ -292,7 +292,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -315,7 +315,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS "t1"; CREATE TABLE "t1" ( - "a" int(11) default NULL + "a" INT(11) DEFAULT NULL ); @@ -342,7 +342,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -369,7 +369,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -450,7 +450,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` char(10) default NULL + `a` CHAR(10) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -474,7 +474,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` char(10) default NULL + `a` CHAR(10) DEFAULT NULL ) TYPE=MyISAM; @@ -495,7 +495,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` char(10) default NULL + `a` CHAR(10) DEFAULT NULL ) TYPE=MyISAM; @@ -516,7 +516,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` char(10) default NULL + `a` CHAR(10) DEFAULT NULL ) TYPE=MyISAM; @@ -547,7 +547,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t2`; CREATE TABLE `t2` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -580,7 +580,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `b` blob + `b` BLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -612,7 +612,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` char(10) default NULL + `a` CHAR(10) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -645,7 +645,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -674,7 +674,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -1036,336 +1036,336 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `F_c4ca4238a0b923820dcc509a6f75849b` int(11) default NULL, - `F_c81e728d9d4c2f636f067f89cc14862c` int(11) default NULL, - `F_eccbc87e4b5ce2fe28308fd9f2a7baf3` int(11) default NULL, - `F_a87ff679a2f3e71d9181a67b7542122c` int(11) default NULL, - `F_e4da3b7fbbce2345d7772b0674a318d5` int(11) default NULL, - `F_1679091c5a880faf6fb5e6087eb1b2dc` int(11) default NULL, - `F_8f14e45fceea167a5a36dedd4bea2543` int(11) default NULL, - `F_c9f0f895fb98ab9159f51fd0297e236d` int(11) default NULL, - `F_45c48cce2e2d7fbdea1afc51c7c6ad26` int(11) default NULL, - `F_d3d9446802a44259755d38e6d163e820` int(11) default NULL, - `F_6512bd43d9caa6e02c990b0a82652dca` int(11) default NULL, - `F_c20ad4d76fe97759aa27a0c99bff6710` int(11) default NULL, - `F_c51ce410c124a10e0db5e4b97fc2af39` int(11) default NULL, - `F_aab3238922bcc25a6f606eb525ffdc56` int(11) default NULL, - `F_9bf31c7ff062936a96d3c8bd1f8f2ff3` int(11) default NULL, - `F_c74d97b01eae257e44aa9d5bade97baf` int(11) default NULL, - `F_70efdf2ec9b086079795c442636b55fb` int(11) default NULL, - `F_6f4922f45568161a8cdf4ad2299f6d23` int(11) default NULL, - `F_1f0e3dad99908345f7439f8ffabdffc4` int(11) default NULL, - `F_98f13708210194c475687be6106a3b84` int(11) default NULL, - `F_3c59dc048e8850243be8079a5c74d079` int(11) default NULL, - `F_b6d767d2f8ed5d21a44b0e5886680cb9` int(11) default NULL, - `F_37693cfc748049e45d87b8c7d8b9aacd` int(11) default NULL, - `F_1ff1de774005f8da13f42943881c655f` int(11) default NULL, - `F_8e296a067a37563370ded05f5a3bf3ec` int(11) default NULL, - `F_4e732ced3463d06de0ca9a15b6153677` int(11) default NULL, - `F_02e74f10e0327ad868d138f2b4fdd6f0` int(11) default NULL, - `F_33e75ff09dd601bbe69f351039152189` int(11) default NULL, - `F_6ea9ab1baa0efb9e19094440c317e21b` int(11) default NULL, - `F_34173cb38f07f89ddbebc2ac9128303f` int(11) default NULL, - `F_c16a5320fa475530d9583c34fd356ef5` int(11) default NULL, - `F_6364d3f0f495b6ab9dcf8d3b5c6e0b01` int(11) default NULL, - `F_182be0c5cdcd5072bb1864cdee4d3d6e` int(11) default NULL, - `F_e369853df766fa44e1ed0ff613f563bd` int(11) default NULL, - `F_1c383cd30b7c298ab50293adfecb7b18` int(11) default NULL, - `F_19ca14e7ea6328a42e0eb13d585e4c22` int(11) default NULL, - `F_a5bfc9e07964f8dddeb95fc584cd965d` int(11) default NULL, - `F_a5771bce93e200c36f7cd9dfd0e5deaa` int(11) default NULL, - `F_d67d8ab4f4c10bf22aa353e27879133c` int(11) default NULL, - `F_d645920e395fedad7bbbed0eca3fe2e0` int(11) default NULL, - `F_3416a75f4cea9109507cacd8e2f2aefc` int(11) default NULL, - `F_a1d0c6e83f027327d8461063f4ac58a6` int(11) default NULL, - `F_17e62166fc8586dfa4d1bc0e1742c08b` int(11) default NULL, - `F_f7177163c833dff4b38fc8d2872f1ec6` int(11) default NULL, - `F_6c8349cc7260ae62e3b1396831a8398f` int(11) default NULL, - `F_d9d4f495e875a2e075a1a4a6e1b9770f` int(11) default NULL, - `F_67c6a1e7ce56d3d6fa748ab6d9af3fd7` int(11) default NULL, - `F_642e92efb79421734881b53e1e1b18b6` int(11) default NULL, - `F_f457c545a9ded88f18ecee47145a72c0` int(11) default NULL, - `F_c0c7c76d30bd3dcaefc96f40275bdc0a` int(11) default NULL, - `F_2838023a778dfaecdc212708f721b788` int(11) default NULL, - `F_9a1158154dfa42caddbd0694a4e9bdc8` int(11) default NULL, - `F_d82c8d1619ad8176d665453cfb2e55f0` int(11) default NULL, - `F_a684eceee76fc522773286a895bc8436` int(11) default NULL, - `F_b53b3a3d6ab90ce0268229151c9bde11` int(11) default NULL, - `F_9f61408e3afb633e50cdf1b20de6f466` int(11) default NULL, - `F_72b32a1f754ba1c09b3695e0cb6cde7f` int(11) default NULL, - `F_66f041e16a60928b05a7e228a89c3799` int(11) default NULL, - `F_093f65e080a295f8076b1c5722a46aa2` int(11) default NULL, - `F_072b030ba126b2f4b2374f342be9ed44` int(11) default NULL, - `F_7f39f8317fbdb1988ef4c628eba02591` int(11) default NULL, - `F_44f683a84163b3523afe57c2e008bc8c` int(11) default NULL, - `F_03afdbd66e7929b125f8597834fa83a4` int(11) default NULL, - `F_ea5d2f1c4608232e07d3aa3d998e5135` int(11) default NULL, - `F_fc490ca45c00b1249bbe3554a4fdf6fb` int(11) default NULL, - `F_3295c76acbf4caaed33c36b1b5fc2cb1` int(11) default NULL, - `F_735b90b4568125ed6c3f678819b6e058` int(11) default NULL, - `F_a3f390d88e4c41f2747bfa2f1b5f87db` int(11) default NULL, - `F_14bfa6bb14875e45bba028a21ed38046` int(11) default NULL, - `F_7cbbc409ec990f19c78c75bd1e06f215` int(11) default NULL, - `F_e2c420d928d4bf8ce0ff2ec19b371514` int(11) default NULL, - `F_32bb90e8976aab5298d5da10fe66f21d` int(11) default NULL, - `F_d2ddea18f00665ce8623e36bd4e3c7c5` int(11) default NULL, - `F_ad61ab143223efbc24c7d2583be69251` int(11) default NULL, - `F_d09bf41544a3365a46c9077ebb5e35c3` int(11) default NULL, - `F_fbd7939d674997cdb4692d34de8633c4` int(11) default NULL, - `F_28dd2c7955ce926456240b2ff0100bde` int(11) default NULL, - `F_35f4a8d465e6e1edc05f3d8ab658c551` int(11) default NULL, - `F_d1fe173d08e959397adf34b1d77e88d7` int(11) default NULL, - `F_f033ab37c30201f73f142449d037028d` int(11) default NULL, - `F_43ec517d68b6edd3015b3edc9a11367b` int(11) default NULL, - `F_9778d5d219c5080b9a6a17bef029331c` int(11) default NULL, - `F_fe9fc289c3ff0af142b6d3bead98a923` int(11) default NULL, - `F_68d30a9594728bc39aa24be94b319d21` int(11) default NULL, - `F_3ef815416f775098fe977004015c6193` int(11) default NULL, - `F_93db85ed909c13838ff95ccfa94cebd9` int(11) default NULL, - `F_c7e1249ffc03eb9ded908c236bd1996d` int(11) default NULL, - `F_2a38a4a9316c49e5a833517c45d31070` int(11) default NULL, - `F_7647966b7343c29048673252e490f736` int(11) default NULL, - `F_8613985ec49eb8f757ae6439e879bb2a` int(11) default NULL, - `F_54229abfcfa5649e7003b83dd4755294` int(11) default NULL, - `F_92cc227532d17e56e07902b254dfad10` int(11) default NULL, - `F_98dce83da57b0395e163467c9dae521b` int(11) default NULL, - `F_f4b9ec30ad9f68f89b29639786cb62ef` int(11) default NULL, - `F_812b4ba287f5ee0bc9d43bbf5bbe87fb` int(11) default NULL, - `F_26657d5ff9020d2abefe558796b99584` int(11) default NULL, - `F_e2ef524fbf3d9fe611d5a8e90fefdc9c` int(11) default NULL, - `F_ed3d2c21991e3bef5e069713af9fa6ca` int(11) default NULL, - `F_ac627ab1ccbdb62ec96e702f07f6425b` int(11) default NULL, - `F_f899139df5e1059396431415e770c6dd` int(11) default NULL, - `F_38b3eff8baf56627478ec76a704e9b52` int(11) default NULL, - `F_ec8956637a99787bd197eacd77acce5e` int(11) default NULL, - `F_6974ce5ac660610b44d9b9fed0ff9548` int(11) default NULL, - `F_c9e1074f5b3f9fc8ea15d152add07294` int(11) default NULL, - `F_65b9eea6e1cc6bb9f0cd2a47751a186f` int(11) default NULL, - `F_f0935e4cd5920aa6c7c996a5ee53a70f` int(11) default NULL, - `F_a97da629b098b75c294dffdc3e463904` int(11) default NULL, - `F_a3c65c2974270fd093ee8a9bf8ae7d0b` int(11) default NULL, - `F_2723d092b63885e0d7c260cc007e8b9d` int(11) default NULL, - `F_5f93f983524def3dca464469d2cf9f3e` int(11) default NULL, - `F_698d51a19d8a121ce581499d7b701668` int(11) default NULL, - `F_7f6ffaa6bb0b408017b62254211691b5` int(11) default NULL, - `F_73278a4a86960eeb576a8fd4c9ec6997` int(11) default NULL, - `F_5fd0b37cd7dbbb00f97ba6ce92bf5add` int(11) default NULL, - `F_2b44928ae11fb9384c4cf38708677c48` int(11) default NULL, - `F_c45147dee729311ef5b5c3003946c48f` int(11) default NULL, - `F_eb160de1de89d9058fcb0b968dbbbd68` int(11) default NULL, - `F_5ef059938ba799aaa845e1c2e8a762bd` int(11) default NULL, - `F_07e1cd7dca89a1678042477183b7ac3f` int(11) default NULL, - `F_da4fb5c6e93e74d3df8527599fa62642` int(11) default NULL, - `F_4c56ff4ce4aaf9573aa5dff913df997a` int(11) default NULL, - `F_a0a080f42e6f13b3a2df133f073095dd` int(11) default NULL, - `F_202cb962ac59075b964b07152d234b70` int(11) default NULL, - `F_c8ffe9a587b126f152ed3d89a146b445` int(11) default NULL, - `F_3def184ad8f4755ff269862ea77393dd` int(11) default NULL, - `F_069059b7ef840f0c74a814ec9237b6ec` int(11) default NULL, - `F_ec5decca5ed3d6b8079e2e7e7bacc9f2` int(11) default NULL, - `F_76dc611d6ebaafc66cc0879c71b5db5c` int(11) default NULL, - `F_d1f491a404d6854880943e5c3cd9ca25` int(11) default NULL, - `F_9b8619251a19057cff70779273e95aa6` int(11) default NULL, - `F_1afa34a7f984eeabdbb0a7d494132ee5` int(11) default NULL, - `F_65ded5353c5ee48d0b7d48c591b8f430` int(11) default NULL, - `F_9fc3d7152ba9336a670e36d0ed79bc43` int(11) default NULL, - `F_02522a2b2726fb0a03bb19f2d8d9524d` int(11) default NULL, - `F_7f1de29e6da19d22b51c68001e7e0e54` int(11) default NULL, - `F_42a0e188f5033bc65bf8d78622277c4e` int(11) default NULL, - `F_3988c7f88ebcb58c6ce932b957b6f332` int(11) default NULL, - `F_013d407166ec4fa56eb1e1f8cbe183b9` int(11) default NULL, - `F_e00da03b685a0dd18fb6a08af0923de0` int(11) default NULL, - `F_1385974ed5904a438616ff7bdb3f7439` int(11) default NULL, - `F_0f28b5d49b3020afeecd95b4009adf4c` int(11) default NULL, - `F_a8baa56554f96369ab93e4f3bb068c22` int(11) default NULL, - `F_903ce9225fca3e988c2af215d4e544d3` int(11) default NULL, - `F_0a09c8844ba8f0936c20bd791130d6b6` int(11) default NULL, - `F_2b24d495052a8ce66358eb576b8912c8` int(11) default NULL, - `F_a5e00132373a7031000fd987a3c9f87b` int(11) default NULL, - `F_8d5e957f297893487bd98fa830fa6413` int(11) default NULL, - `F_47d1e990583c9c67424d369f3414728e` int(11) default NULL, - `F_f2217062e9a397a1dca429e7d70bc6ca` int(11) default NULL, - `F_7ef605fc8dba5425d6965fbd4c8fbe1f` int(11) default NULL, - `F_a8f15eda80c50adb0e71943adc8015cf` int(11) default NULL, - `F_37a749d808e46495a8da1e5352d03cae` int(11) default NULL, - `F_b3e3e393c77e35a4a3f3cbd1e429b5dc` int(11) default NULL, - `F_1d7f7abc18fcb43975065399b0d1e48e` int(11) default NULL, - `F_2a79ea27c279e471f4d180b08d62b00a` int(11) default NULL, - `F_1c9ac0159c94d8d0cbedc973445af2da` int(11) default NULL, - `F_6c4b761a28b734fe93831e3fb400ce87` int(11) default NULL, - `F_06409663226af2f3114485aa4e0a23b4` int(11) default NULL, - `F_140f6969d5213fd0ece03148e62e461e` int(11) default NULL, - `F_b73ce398c39f506af761d2277d853a92` int(11) default NULL, - `F_bd4c9ab730f5513206b999ec0d90d1fb` int(11) default NULL, - `F_82aa4b0af34c2313a562076992e50aa3` int(11) default NULL, - `F_0777d5c17d4066b82ab86dff8a46af6f` int(11) default NULL, - `F_fa7cdfad1a5aaf8370ebeda47a1ff1c3` int(11) default NULL, - `F_9766527f2b5d3e95d4a733fcfb77bd7e` int(11) default NULL, - `F_7e7757b1e12abcb736ab9a754ffb617a` int(11) default NULL, - `F_5878a7ab84fb43402106c575658472fa` int(11) default NULL, - `F_006f52e9102a8d3be2fe5614f42ba989` int(11) default NULL, - `F_3636638817772e42b59d74cff571fbb3` int(11) default NULL, - `F_149e9677a5989fd342ae44213df68868` int(11) default NULL, - `F_a4a042cf4fd6bfb47701cbc8a1653ada` int(11) default NULL, - `F_1ff8a7b5dc7a7d1f0ed65aaa29c04b1e` int(11) default NULL, - `F_f7e6c85504ce6e82442c770f7c8606f0` int(11) default NULL, - `F_bf8229696f7a3bb4700cfddef19fa23f` int(11) default NULL, - `F_82161242827b703e6acf9c726942a1e4` int(11) default NULL, - `F_38af86134b65d0f10fe33d30dd76442e` int(11) default NULL, - `F_96da2f590cd7246bbde0051047b0d6f7` int(11) default NULL, - `F_8f85517967795eeef66c225f7883bdcb` int(11) default NULL, - `F_8f53295a73878494e9bc8dd6c3c7104f` int(11) default NULL, - `F_045117b0e0a11a242b9765e79cbf113f` int(11) default NULL, - `F_fc221309746013ac554571fbd180e1c8` int(11) default NULL, - `F_4c5bde74a8f110656874902f07378009` int(11) default NULL, - `F_cedebb6e872f539bef8c3f919874e9d7` int(11) default NULL, - `F_6cdd60ea0045eb7a6ec44c54d29ed402` int(11) default NULL, - `F_eecca5b6365d9607ee5a9d336962c534` int(11) default NULL, - `F_9872ed9fc22fc182d371c3e9ed316094` int(11) default NULL, - `F_31fefc0e570cb3860f2a6d4b38c6490d` int(11) default NULL, - `F_9dcb88e0137649590b755372b040afad` int(11) default NULL, - `F_a2557a7b2e94197ff767970b67041697` int(11) default NULL, - `F_cfecdb276f634854f3ef915e2e980c31` int(11) default NULL, - `F_0aa1883c6411f7873cb83dacb17b0afc` int(11) default NULL, - `F_58a2fc6ed39fd083f55d4182bf88826d` int(11) default NULL, - `F_bd686fd640be98efaae0091fa301e613` int(11) default NULL, - `F_a597e50502f5ff68e3e25b9114205d4a` int(11) default NULL, - `F_0336dcbab05b9d5ad24f4333c7658a0e` int(11) default NULL, - `F_084b6fbb10729ed4da8c3d3f5a3ae7c9` int(11) default NULL, - `F_85d8ce590ad8981ca2c8286f79f59954` int(11) default NULL, - `F_0e65972dce68dad4d52d063967f0a705` int(11) default NULL, - `F_84d9ee44e457ddef7f2c4f25dc8fa865` int(11) default NULL, - `F_3644a684f98ea8fe223c713b77189a77` int(11) default NULL, - `F_757b505cfd34c64c85ca5b5690ee5293` int(11) default NULL, - `F_854d6fae5ee42911677c739ee1734486` int(11) default NULL, - `F_e2c0be24560d78c5e599c2a9c9d0bbd2` int(11) default NULL, - `F_274ad4786c3abca69fa097b85867d9a4` int(11) default NULL, - `F_eae27d77ca20db309e056e3d2dcd7d69` int(11) default NULL, - `F_7eabe3a1649ffa2b3ff8c02ebfd5659f` int(11) default NULL, - `F_69adc1e107f7f7d035d7baf04342e1ca` int(11) default NULL, - `F_091d584fced301b442654dd8c23b3fc9` int(11) default NULL, - `F_b1d10e7bafa4421218a51b1e1f1b0ba2` int(11) default NULL, - `F_6f3ef77ac0e3619e98159e9b6febf557` int(11) default NULL, - `F_eb163727917cbba1eea208541a643e74` int(11) default NULL, - `F_1534b76d325a8f591b52d302e7181331` int(11) default NULL, - `F_979d472a84804b9f647bc185a877a8b5` int(11) default NULL, - `F_ca46c1b9512a7a8315fa3c5a946e8265` int(11) default NULL, - `F_3b8a614226a953a8cd9526fca6fe9ba5` int(11) default NULL, - `F_45fbc6d3e05ebd93369ce542e8f2322d` int(11) default NULL, - `F_63dc7ed1010d3c3b8269faf0ba7491d4` int(11) default NULL, - `F_e96ed478dab8595a7dbda4cbcbee168f` int(11) default NULL, - `F_c0e190d8267e36708f955d7ab048990d` int(11) default NULL, - `F_ec8ce6abb3e952a85b8551ba726a1227` int(11) default NULL, - `F_060ad92489947d410d897474079c1477` int(11) default NULL, - `F_bcbe3365e6ac95ea2c0343a2395834dd` int(11) default NULL, - `F_115f89503138416a242f40fb7d7f338e` int(11) default NULL, - `F_13fe9d84310e77f13a6d184dbf1232f3` int(11) default NULL, - `F_d1c38a09acc34845c6be3a127a5aacaf` int(11) default NULL, - `F_9cfdf10e8fc047a44b08ed031e1f0ed1` int(11) default NULL, - `F_705f2172834666788607efbfca35afb3` int(11) default NULL, - `F_74db120f0a8e5646ef5a30154e9f6deb` int(11) default NULL, - `F_57aeee35c98205091e18d1140e9f38cf` int(11) default NULL, - `F_6da9003b743b65f4c0ccd295cc484e57` int(11) default NULL, - `F_9b04d152845ec0a378394003c96da594` int(11) default NULL, - `F_be83ab3ecd0db773eb2dc1b0a17836a1` int(11) default NULL, - `F_e165421110ba03099a1c0393373c5b43` int(11) default NULL, - `F_289dff07669d7a23de0ef88d2f7129e7` int(11) default NULL, - `F_577ef1154f3240ad5b9b413aa7346a1e` int(11) default NULL, - `F_01161aaa0b6d1345dd8fe4e481144d84` int(11) default NULL, - `F_539fd53b59e3bb12d203f45a912eeaf2` int(11) default NULL, - `F_ac1dd209cbcc5e5d1c6e28598e8cbbe8` int(11) default NULL, - `F_555d6702c950ecb729a966504af0a635` int(11) default NULL, - `F_335f5352088d7d9bf74191e006d8e24c` int(11) default NULL, - `F_f340f1b1f65b6df5b5e3f94d95b11daf` int(11) default NULL, - `F_e4a6222cdb5b34375400904f03d8e6a5` int(11) default NULL, - `F_cb70ab375662576bd1ac5aaf16b3fca4` int(11) default NULL, - `F_9188905e74c28e489b44e954ec0b9bca` int(11) default NULL, - `F_0266e33d3f546cb5436a10798e657d97` int(11) default NULL, - `F_38db3aed920cf82ab059bfccbd02be6a` int(11) default NULL, - `F_3cec07e9ba5f5bb252d13f5f431e4bbb` int(11) default NULL, - `F_621bf66ddb7c962aa0d22ac97d69b793` int(11) default NULL, - `F_077e29b11be80ab57e1a2ecabb7da330` int(11) default NULL, - `F_6c9882bbac1c7093bd25041881277658` int(11) default NULL, - `F_19f3cd308f1455b3fa09a282e0d496f4` int(11) default NULL, - `F_03c6b06952c750899bb03d998e631860` int(11) default NULL, - `F_c24cd76e1ce41366a4bbe8a49b02a028` int(11) default NULL, - `F_c52f1bd66cc19d05628bd8bf27af3ad6` int(11) default NULL, - `F_fe131d7f5a6b38b23cc967316c13dae2` int(11) default NULL, - `F_f718499c1c8cef6730f9fd03c8125cab` int(11) default NULL, - `F_d96409bf894217686ba124d7356686c9` int(11) default NULL, - `F_502e4a16930e414107ee22b6198c578f` int(11) default NULL, - `F_cfa0860e83a4c3a763a7e62d825349f7` int(11) default NULL, - `F_a4f23670e1833f3fdb077ca70bbd5d66` int(11) default NULL, - `F_b1a59b315fc9a3002ce38bbe070ec3f5` int(11) default NULL, - `F_36660e59856b4de58a219bcf4e27eba3` int(11) default NULL, - `F_8c19f571e251e61cb8dd3612f26d5ecf` int(11) default NULL, - `F_d6baf65e0b240ce177cf70da146c8dc8` int(11) default NULL, - `F_e56954b4f6347e897f954495eab16a88` int(11) default NULL, - `F_f7664060cc52bc6f3d620bcedc94a4b6` int(11) default NULL, - `F_eda80a3d5b344bc40f3bc04f65b7a357` int(11) default NULL, - `F_8f121ce07d74717e0b1f21d122e04521` int(11) default NULL, - `F_06138bc5af6023646ede0e1f7c1eac75` int(11) default NULL, - `F_39059724f73a9969845dfe4146c5660e` int(11) default NULL, - `F_7f100b7b36092fb9b06dfb4fac360931` int(11) default NULL, - `F_7a614fd06c325499f1680b9896beedeb` int(11) default NULL, - `F_4734ba6f3de83d861c3176a6273cac6d` int(11) default NULL, - `F_d947bf06a885db0d477d707121934ff8` int(11) default NULL, - `F_63923f49e5241343aa7acb6a06a751e7` int(11) default NULL, - `F_db8e1af0cb3aca1ae2d0018624204529` int(11) default NULL, - `F_20f07591c6fcb220ffe637cda29bb3f6` int(11) default NULL, - `F_07cdfd23373b17c6b337251c22b7ea57` int(11) default NULL, - `F_d395771085aab05244a4fb8fd91bf4ee` int(11) default NULL, - `F_92c8c96e4c37100777c7190b76d28233` int(11) default NULL, - `F_e3796ae838835da0b6f6ea37bcf8bcb7` int(11) default NULL, - `F_6a9aeddfc689c1d0e3b9ccc3ab651bc5` int(11) default NULL, - `F_0f49c89d1e7298bb9930789c8ed59d48` int(11) default NULL, - `F_46ba9f2a6976570b0353203ec4474217` int(11) default NULL, - `F_0e01938fc48a2cfb5f2217fbfb00722d` int(11) default NULL, - `F_16a5cdae362b8d27a1d8f8c7b78b4330` int(11) default NULL, - `F_918317b57931b6b7a7d29490fe5ec9f9` int(11) default NULL, - `F_48aedb8880cab8c45637abc7493ecddd` int(11) default NULL, - `F_839ab46820b524afda05122893c2fe8e` int(11) default NULL, - `F_f90f2aca5c640289d0a29417bcb63a37` int(11) default NULL, - `F_9c838d2e45b2ad1094d42f4ef36764f6` int(11) default NULL, - `F_1700002963a49da13542e0726b7bb758` int(11) default NULL, - `F_53c3bce66e43be4f209556518c2fcb54` int(11) default NULL, - `F_6883966fd8f918a4aa29be29d2c386fb` int(11) default NULL, - `F_49182f81e6a13cf5eaa496d51fea6406` int(11) default NULL, - `F_d296c101daa88a51f6ca8cfc1ac79b50` int(11) default NULL, - `F_9fd81843ad7f202f26c1a174c7357585` int(11) default NULL, - `F_26e359e83860db1d11b6acca57d8ea88` int(11) default NULL, - `F_ef0d3930a7b6c95bd2b32ed45989c61f` int(11) default NULL, - `F_94f6d7e04a4d452035300f18b984988c` int(11) default NULL, - `F_34ed066df378efacc9b924ec161e7639` int(11) default NULL, - `F_577bcc914f9e55d5e4e4f82f9f00e7d4` int(11) default NULL, - `F_11b9842e0a271ff252c1903e7132cd68` int(11) default NULL, - `F_37bc2f75bf1bcfe8450a1a41c200364c` int(11) default NULL, - `F_496e05e1aea0a9c4655800e8a7b9ea28` int(11) default NULL, - `F_b2eb7349035754953b57a32e2841bda5` int(11) default NULL, - `F_8e98d81f8217304975ccb23337bb5761` int(11) default NULL, - `F_a8c88a0055f636e4a163a5e3d16adab7` int(11) default NULL, - `F_eddea82ad2755b24c4e168c5fc2ebd40` int(11) default NULL, - `F_06eb61b839a0cefee4967c67ccb099dc` int(11) default NULL, - `F_9dfcd5e558dfa04aaf37f137a1d9d3e5` int(11) default NULL, - `F_950a4152c2b4aa3ad78bdd6b366cc179` int(11) default NULL, - `F_158f3069a435b314a80bdcb024f8e422` int(11) default NULL, - `F_758874998f5bd0c393da094e1967a72b` int(11) default NULL, - `F_ad13a2a07ca4b7642959dc0c4c740ab6` int(11) default NULL, - `F_3fe94a002317b5f9259f82690aeea4cd` int(11) default NULL, - `F_5b8add2a5d98b1a652ea7fd72d942dac` int(11) default NULL, - `F_432aca3a1e345e339f35a30c8f65edce` int(11) default NULL, - `F_8d3bba7425e7c98c50f52ca1b52d3735` int(11) default NULL, - `F_320722549d1751cf3f247855f937b982` int(11) default NULL, - `F_caf1a3dfb505ffed0d024130f58c5cfa` int(11) default NULL, - `F_5737c6ec2e0716f3d8a7a5c4e0de0d9a` int(11) default NULL, - `F_bc6dc48b743dc5d013b1abaebd2faed2` int(11) default NULL, - `F_f2fc990265c712c49d51a18a32b39f0c` int(11) default NULL, - `F_89f0fd5c927d466d6ec9a21b9ac34ffa` int(11) default NULL, - `F_a666587afda6e89aec274a3657558a27` int(11) default NULL, - `F_b83aac23b9528732c23cc7352950e880` int(11) default NULL, - `F_cd00692c3bfe59267d5ecfac5310286c` int(11) default NULL, - `F_6faa8040da20ef399b63a72d0e4ab575` int(11) default NULL, - `F_fe73f687e5bc5280214e0486b273a5f9` int(11) default NULL + `F_c4ca4238a0b923820dcc509a6f75849b` INT(11) DEFAULT NULL, + `F_c81e728d9d4c2f636f067f89cc14862c` INT(11) DEFAULT NULL, + `F_eccbc87e4b5ce2fe28308fd9f2a7baf3` INT(11) DEFAULT NULL, + `F_a87ff679a2f3e71d9181a67b7542122c` INT(11) DEFAULT NULL, + `F_e4da3b7fbbce2345d7772b0674a318d5` INT(11) DEFAULT NULL, + `F_1679091c5a880faf6fb5e6087eb1b2dc` INT(11) DEFAULT NULL, + `F_8f14e45fceea167a5a36dedd4bea2543` INT(11) DEFAULT NULL, + `F_c9f0f895fb98ab9159f51fd0297e236d` INT(11) DEFAULT NULL, + `F_45c48cce2e2d7fbdea1afc51c7c6ad26` INT(11) DEFAULT NULL, + `F_d3d9446802a44259755d38e6d163e820` INT(11) DEFAULT NULL, + `F_6512bd43d9caa6e02c990b0a82652dca` INT(11) DEFAULT NULL, + `F_c20ad4d76fe97759aa27a0c99bff6710` INT(11) DEFAULT NULL, + `F_c51ce410c124a10e0db5e4b97fc2af39` INT(11) DEFAULT NULL, + `F_aab3238922bcc25a6f606eb525ffdc56` INT(11) DEFAULT NULL, + `F_9bf31c7ff062936a96d3c8bd1f8f2ff3` INT(11) DEFAULT NULL, + `F_c74d97b01eae257e44aa9d5bade97baf` INT(11) DEFAULT NULL, + `F_70efdf2ec9b086079795c442636b55fb` INT(11) DEFAULT NULL, + `F_6f4922f45568161a8cdf4ad2299f6d23` INT(11) DEFAULT NULL, + `F_1f0e3dad99908345f7439f8ffabdffc4` INT(11) DEFAULT NULL, + `F_98f13708210194c475687be6106a3b84` INT(11) DEFAULT NULL, + `F_3c59dc048e8850243be8079a5c74d079` INT(11) DEFAULT NULL, + `F_b6d767d2f8ed5d21a44b0e5886680cb9` INT(11) DEFAULT NULL, + `F_37693cfc748049e45d87b8c7d8b9aacd` INT(11) DEFAULT NULL, + `F_1ff1de774005f8da13f42943881c655f` INT(11) DEFAULT NULL, + `F_8e296a067a37563370ded05f5a3bf3ec` INT(11) DEFAULT NULL, + `F_4e732ced3463d06de0ca9a15b6153677` INT(11) DEFAULT NULL, + `F_02e74f10e0327ad868d138f2b4fdd6f0` INT(11) DEFAULT NULL, + `F_33e75ff09dd601bbe69f351039152189` INT(11) DEFAULT NULL, + `F_6ea9ab1baa0efb9e19094440c317e21b` INT(11) DEFAULT NULL, + `F_34173cb38f07f89ddbebc2ac9128303f` INT(11) DEFAULT NULL, + `F_c16a5320fa475530d9583c34fd356ef5` INT(11) DEFAULT NULL, + `F_6364d3f0f495b6ab9dcf8d3b5c6e0b01` INT(11) DEFAULT NULL, + `F_182be0c5cdcd5072bb1864cdee4d3d6e` INT(11) DEFAULT NULL, + `F_e369853df766fa44e1ed0ff613f563bd` INT(11) DEFAULT NULL, + `F_1c383cd30b7c298ab50293adfecb7b18` INT(11) DEFAULT NULL, + `F_19ca14e7ea6328a42e0eb13d585e4c22` INT(11) DEFAULT NULL, + `F_a5bfc9e07964f8dddeb95fc584cd965d` INT(11) DEFAULT NULL, + `F_a5771bce93e200c36f7cd9dfd0e5deaa` INT(11) DEFAULT NULL, + `F_d67d8ab4f4c10bf22aa353e27879133c` INT(11) DEFAULT NULL, + `F_d645920e395fedad7bbbed0eca3fe2e0` INT(11) DEFAULT NULL, + `F_3416a75f4cea9109507cacd8e2f2aefc` INT(11) DEFAULT NULL, + `F_a1d0c6e83f027327d8461063f4ac58a6` INT(11) DEFAULT NULL, + `F_17e62166fc8586dfa4d1bc0e1742c08b` INT(11) DEFAULT NULL, + `F_f7177163c833dff4b38fc8d2872f1ec6` INT(11) DEFAULT NULL, + `F_6c8349cc7260ae62e3b1396831a8398f` INT(11) DEFAULT NULL, + `F_d9d4f495e875a2e075a1a4a6e1b9770f` INT(11) DEFAULT NULL, + `F_67c6a1e7ce56d3d6fa748ab6d9af3fd7` INT(11) DEFAULT NULL, + `F_642e92efb79421734881b53e1e1b18b6` INT(11) DEFAULT NULL, + `F_f457c545a9ded88f18ecee47145a72c0` INT(11) DEFAULT NULL, + `F_c0c7c76d30bd3dcaefc96f40275bdc0a` INT(11) DEFAULT NULL, + `F_2838023a778dfaecdc212708f721b788` INT(11) DEFAULT NULL, + `F_9a1158154dfa42caddbd0694a4e9bdc8` INT(11) DEFAULT NULL, + `F_d82c8d1619ad8176d665453cfb2e55f0` INT(11) DEFAULT NULL, + `F_a684eceee76fc522773286a895bc8436` INT(11) DEFAULT NULL, + `F_b53b3a3d6ab90ce0268229151c9bde11` INT(11) DEFAULT NULL, + `F_9f61408e3afb633e50cdf1b20de6f466` INT(11) DEFAULT NULL, + `F_72b32a1f754ba1c09b3695e0cb6cde7f` INT(11) DEFAULT NULL, + `F_66f041e16a60928b05a7e228a89c3799` INT(11) DEFAULT NULL, + `F_093f65e080a295f8076b1c5722a46aa2` INT(11) DEFAULT NULL, + `F_072b030ba126b2f4b2374f342be9ed44` INT(11) DEFAULT NULL, + `F_7f39f8317fbdb1988ef4c628eba02591` INT(11) DEFAULT NULL, + `F_44f683a84163b3523afe57c2e008bc8c` INT(11) DEFAULT NULL, + `F_03afdbd66e7929b125f8597834fa83a4` INT(11) DEFAULT NULL, + `F_ea5d2f1c4608232e07d3aa3d998e5135` INT(11) DEFAULT NULL, + `F_fc490ca45c00b1249bbe3554a4fdf6fb` INT(11) DEFAULT NULL, + `F_3295c76acbf4caaed33c36b1b5fc2cb1` INT(11) DEFAULT NULL, + `F_735b90b4568125ed6c3f678819b6e058` INT(11) DEFAULT NULL, + `F_a3f390d88e4c41f2747bfa2f1b5f87db` INT(11) DEFAULT NULL, + `F_14bfa6bb14875e45bba028a21ed38046` INT(11) DEFAULT NULL, + `F_7cbbc409ec990f19c78c75bd1e06f215` INT(11) DEFAULT NULL, + `F_e2c420d928d4bf8ce0ff2ec19b371514` INT(11) DEFAULT NULL, + `F_32bb90e8976aab5298d5da10fe66f21d` INT(11) DEFAULT NULL, + `F_d2ddea18f00665ce8623e36bd4e3c7c5` INT(11) DEFAULT NULL, + `F_ad61ab143223efbc24c7d2583be69251` INT(11) DEFAULT NULL, + `F_d09bf41544a3365a46c9077ebb5e35c3` INT(11) DEFAULT NULL, + `F_fbd7939d674997cdb4692d34de8633c4` INT(11) DEFAULT NULL, + `F_28dd2c7955ce926456240b2ff0100bde` INT(11) DEFAULT NULL, + `F_35f4a8d465e6e1edc05f3d8ab658c551` INT(11) DEFAULT NULL, + `F_d1fe173d08e959397adf34b1d77e88d7` INT(11) DEFAULT NULL, + `F_f033ab37c30201f73f142449d037028d` INT(11) DEFAULT NULL, + `F_43ec517d68b6edd3015b3edc9a11367b` INT(11) DEFAULT NULL, + `F_9778d5d219c5080b9a6a17bef029331c` INT(11) DEFAULT NULL, + `F_fe9fc289c3ff0af142b6d3bead98a923` INT(11) DEFAULT NULL, + `F_68d30a9594728bc39aa24be94b319d21` INT(11) DEFAULT NULL, + `F_3ef815416f775098fe977004015c6193` INT(11) DEFAULT NULL, + `F_93db85ed909c13838ff95ccfa94cebd9` INT(11) DEFAULT NULL, + `F_c7e1249ffc03eb9ded908c236bd1996d` INT(11) DEFAULT NULL, + `F_2a38a4a9316c49e5a833517c45d31070` INT(11) DEFAULT NULL, + `F_7647966b7343c29048673252e490f736` INT(11) DEFAULT NULL, + `F_8613985ec49eb8f757ae6439e879bb2a` INT(11) DEFAULT NULL, + `F_54229abfcfa5649e7003b83dd4755294` INT(11) DEFAULT NULL, + `F_92cc227532d17e56e07902b254dfad10` INT(11) DEFAULT NULL, + `F_98dce83da57b0395e163467c9dae521b` INT(11) DEFAULT NULL, + `F_f4b9ec30ad9f68f89b29639786cb62ef` INT(11) DEFAULT NULL, + `F_812b4ba287f5ee0bc9d43bbf5bbe87fb` INT(11) DEFAULT NULL, + `F_26657d5ff9020d2abefe558796b99584` INT(11) DEFAULT NULL, + `F_e2ef524fbf3d9fe611d5a8e90fefdc9c` INT(11) DEFAULT NULL, + `F_ed3d2c21991e3bef5e069713af9fa6ca` INT(11) DEFAULT NULL, + `F_ac627ab1ccbdb62ec96e702f07f6425b` INT(11) DEFAULT NULL, + `F_f899139df5e1059396431415e770c6dd` INT(11) DEFAULT NULL, + `F_38b3eff8baf56627478ec76a704e9b52` INT(11) DEFAULT NULL, + `F_ec8956637a99787bd197eacd77acce5e` INT(11) DEFAULT NULL, + `F_6974ce5ac660610b44d9b9fed0ff9548` INT(11) DEFAULT NULL, + `F_c9e1074f5b3f9fc8ea15d152add07294` INT(11) DEFAULT NULL, + `F_65b9eea6e1cc6bb9f0cd2a47751a186f` INT(11) DEFAULT NULL, + `F_f0935e4cd5920aa6c7c996a5ee53a70f` INT(11) DEFAULT NULL, + `F_a97da629b098b75c294dffdc3e463904` INT(11) DEFAULT NULL, + `F_a3c65c2974270fd093ee8a9bf8ae7d0b` INT(11) DEFAULT NULL, + `F_2723d092b63885e0d7c260cc007e8b9d` INT(11) DEFAULT NULL, + `F_5f93f983524def3dca464469d2cf9f3e` INT(11) DEFAULT NULL, + `F_698d51a19d8a121ce581499d7b701668` INT(11) DEFAULT NULL, + `F_7f6ffaa6bb0b408017b62254211691b5` INT(11) DEFAULT NULL, + `F_73278a4a86960eeb576a8fd4c9ec6997` INT(11) DEFAULT NULL, + `F_5fd0b37cd7dbbb00f97ba6ce92bf5add` INT(11) DEFAULT NULL, + `F_2b44928ae11fb9384c4cf38708677c48` INT(11) DEFAULT NULL, + `F_c45147dee729311ef5b5c3003946c48f` INT(11) DEFAULT NULL, + `F_eb160de1de89d9058fcb0b968dbbbd68` INT(11) DEFAULT NULL, + `F_5ef059938ba799aaa845e1c2e8a762bd` INT(11) DEFAULT NULL, + `F_07e1cd7dca89a1678042477183b7ac3f` INT(11) DEFAULT NULL, + `F_da4fb5c6e93e74d3df8527599fa62642` INT(11) DEFAULT NULL, + `F_4c56ff4ce4aaf9573aa5dff913df997a` INT(11) DEFAULT NULL, + `F_a0a080f42e6f13b3a2df133f073095dd` INT(11) DEFAULT NULL, + `F_202cb962ac59075b964b07152d234b70` INT(11) DEFAULT NULL, + `F_c8ffe9a587b126f152ed3d89a146b445` INT(11) DEFAULT NULL, + `F_3def184ad8f4755ff269862ea77393dd` INT(11) DEFAULT NULL, + `F_069059b7ef840f0c74a814ec9237b6ec` INT(11) DEFAULT NULL, + `F_ec5decca5ed3d6b8079e2e7e7bacc9f2` INT(11) DEFAULT NULL, + `F_76dc611d6ebaafc66cc0879c71b5db5c` INT(11) DEFAULT NULL, + `F_d1f491a404d6854880943e5c3cd9ca25` INT(11) DEFAULT NULL, + `F_9b8619251a19057cff70779273e95aa6` INT(11) DEFAULT NULL, + `F_1afa34a7f984eeabdbb0a7d494132ee5` INT(11) DEFAULT NULL, + `F_65ded5353c5ee48d0b7d48c591b8f430` INT(11) DEFAULT NULL, + `F_9fc3d7152ba9336a670e36d0ed79bc43` INT(11) DEFAULT NULL, + `F_02522a2b2726fb0a03bb19f2d8d9524d` INT(11) DEFAULT NULL, + `F_7f1de29e6da19d22b51c68001e7e0e54` INT(11) DEFAULT NULL, + `F_42a0e188f5033bc65bf8d78622277c4e` INT(11) DEFAULT NULL, + `F_3988c7f88ebcb58c6ce932b957b6f332` INT(11) DEFAULT NULL, + `F_013d407166ec4fa56eb1e1f8cbe183b9` INT(11) DEFAULT NULL, + `F_e00da03b685a0dd18fb6a08af0923de0` INT(11) DEFAULT NULL, + `F_1385974ed5904a438616ff7bdb3f7439` INT(11) DEFAULT NULL, + `F_0f28b5d49b3020afeecd95b4009adf4c` INT(11) DEFAULT NULL, + `F_a8baa56554f96369ab93e4f3bb068c22` INT(11) DEFAULT NULL, + `F_903ce9225fca3e988c2af215d4e544d3` INT(11) DEFAULT NULL, + `F_0a09c8844ba8f0936c20bd791130d6b6` INT(11) DEFAULT NULL, + `F_2b24d495052a8ce66358eb576b8912c8` INT(11) DEFAULT NULL, + `F_a5e00132373a7031000fd987a3c9f87b` INT(11) DEFAULT NULL, + `F_8d5e957f297893487bd98fa830fa6413` INT(11) DEFAULT NULL, + `F_47d1e990583c9c67424d369f3414728e` INT(11) DEFAULT NULL, + `F_f2217062e9a397a1dca429e7d70bc6ca` INT(11) DEFAULT NULL, + `F_7ef605fc8dba5425d6965fbd4c8fbe1f` INT(11) DEFAULT NULL, + `F_a8f15eda80c50adb0e71943adc8015cf` INT(11) DEFAULT NULL, + `F_37a749d808e46495a8da1e5352d03cae` INT(11) DEFAULT NULL, + `F_b3e3e393c77e35a4a3f3cbd1e429b5dc` INT(11) DEFAULT NULL, + `F_1d7f7abc18fcb43975065399b0d1e48e` INT(11) DEFAULT NULL, + `F_2a79ea27c279e471f4d180b08d62b00a` INT(11) DEFAULT NULL, + `F_1c9ac0159c94d8d0cbedc973445af2da` INT(11) DEFAULT NULL, + `F_6c4b761a28b734fe93831e3fb400ce87` INT(11) DEFAULT NULL, + `F_06409663226af2f3114485aa4e0a23b4` INT(11) DEFAULT NULL, + `F_140f6969d5213fd0ece03148e62e461e` INT(11) DEFAULT NULL, + `F_b73ce398c39f506af761d2277d853a92` INT(11) DEFAULT NULL, + `F_bd4c9ab730f5513206b999ec0d90d1fb` INT(11) DEFAULT NULL, + `F_82aa4b0af34c2313a562076992e50aa3` INT(11) DEFAULT NULL, + `F_0777d5c17d4066b82ab86dff8a46af6f` INT(11) DEFAULT NULL, + `F_fa7cdfad1a5aaf8370ebeda47a1ff1c3` INT(11) DEFAULT NULL, + `F_9766527f2b5d3e95d4a733fcfb77bd7e` INT(11) DEFAULT NULL, + `F_7e7757b1e12abcb736ab9a754ffb617a` INT(11) DEFAULT NULL, + `F_5878a7ab84fb43402106c575658472fa` INT(11) DEFAULT NULL, + `F_006f52e9102a8d3be2fe5614f42ba989` INT(11) DEFAULT NULL, + `F_3636638817772e42b59d74cff571fbb3` INT(11) DEFAULT NULL, + `F_149e9677a5989fd342ae44213df68868` INT(11) DEFAULT NULL, + `F_a4a042cf4fd6bfb47701cbc8a1653ada` INT(11) DEFAULT NULL, + `F_1ff8a7b5dc7a7d1f0ed65aaa29c04b1e` INT(11) DEFAULT NULL, + `F_f7e6c85504ce6e82442c770f7c8606f0` INT(11) DEFAULT NULL, + `F_bf8229696f7a3bb4700cfddef19fa23f` INT(11) DEFAULT NULL, + `F_82161242827b703e6acf9c726942a1e4` INT(11) DEFAULT NULL, + `F_38af86134b65d0f10fe33d30dd76442e` INT(11) DEFAULT NULL, + `F_96da2f590cd7246bbde0051047b0d6f7` INT(11) DEFAULT NULL, + `F_8f85517967795eeef66c225f7883bdcb` INT(11) DEFAULT NULL, + `F_8f53295a73878494e9bc8dd6c3c7104f` INT(11) DEFAULT NULL, + `F_045117b0e0a11a242b9765e79cbf113f` INT(11) DEFAULT NULL, + `F_fc221309746013ac554571fbd180e1c8` INT(11) DEFAULT NULL, + `F_4c5bde74a8f110656874902f07378009` INT(11) DEFAULT NULL, + `F_cedebb6e872f539bef8c3f919874e9d7` INT(11) DEFAULT NULL, + `F_6cdd60ea0045eb7a6ec44c54d29ed402` INT(11) DEFAULT NULL, + `F_eecca5b6365d9607ee5a9d336962c534` INT(11) DEFAULT NULL, + `F_9872ed9fc22fc182d371c3e9ed316094` INT(11) DEFAULT NULL, + `F_31fefc0e570cb3860f2a6d4b38c6490d` INT(11) DEFAULT NULL, + `F_9dcb88e0137649590b755372b040afad` INT(11) DEFAULT NULL, + `F_a2557a7b2e94197ff767970b67041697` INT(11) DEFAULT NULL, + `F_cfecdb276f634854f3ef915e2e980c31` INT(11) DEFAULT NULL, + `F_0aa1883c6411f7873cb83dacb17b0afc` INT(11) DEFAULT NULL, + `F_58a2fc6ed39fd083f55d4182bf88826d` INT(11) DEFAULT NULL, + `F_bd686fd640be98efaae0091fa301e613` INT(11) DEFAULT NULL, + `F_a597e50502f5ff68e3e25b9114205d4a` INT(11) DEFAULT NULL, + `F_0336dcbab05b9d5ad24f4333c7658a0e` INT(11) DEFAULT NULL, + `F_084b6fbb10729ed4da8c3d3f5a3ae7c9` INT(11) DEFAULT NULL, + `F_85d8ce590ad8981ca2c8286f79f59954` INT(11) DEFAULT NULL, + `F_0e65972dce68dad4d52d063967f0a705` INT(11) DEFAULT NULL, + `F_84d9ee44e457ddef7f2c4f25dc8fa865` INT(11) DEFAULT NULL, + `F_3644a684f98ea8fe223c713b77189a77` INT(11) DEFAULT NULL, + `F_757b505cfd34c64c85ca5b5690ee5293` INT(11) DEFAULT NULL, + `F_854d6fae5ee42911677c739ee1734486` INT(11) DEFAULT NULL, + `F_e2c0be24560d78c5e599c2a9c9d0bbd2` INT(11) DEFAULT NULL, + `F_274ad4786c3abca69fa097b85867d9a4` INT(11) DEFAULT NULL, + `F_eae27d77ca20db309e056e3d2dcd7d69` INT(11) DEFAULT NULL, + `F_7eabe3a1649ffa2b3ff8c02ebfd5659f` INT(11) DEFAULT NULL, + `F_69adc1e107f7f7d035d7baf04342e1ca` INT(11) DEFAULT NULL, + `F_091d584fced301b442654dd8c23b3fc9` INT(11) DEFAULT NULL, + `F_b1d10e7bafa4421218a51b1e1f1b0ba2` INT(11) DEFAULT NULL, + `F_6f3ef77ac0e3619e98159e9b6febf557` INT(11) DEFAULT NULL, + `F_eb163727917cbba1eea208541a643e74` INT(11) DEFAULT NULL, + `F_1534b76d325a8f591b52d302e7181331` INT(11) DEFAULT NULL, + `F_979d472a84804b9f647bc185a877a8b5` INT(11) DEFAULT NULL, + `F_ca46c1b9512a7a8315fa3c5a946e8265` INT(11) DEFAULT NULL, + `F_3b8a614226a953a8cd9526fca6fe9ba5` INT(11) DEFAULT NULL, + `F_45fbc6d3e05ebd93369ce542e8f2322d` INT(11) DEFAULT NULL, + `F_63dc7ed1010d3c3b8269faf0ba7491d4` INT(11) DEFAULT NULL, + `F_e96ed478dab8595a7dbda4cbcbee168f` INT(11) DEFAULT NULL, + `F_c0e190d8267e36708f955d7ab048990d` INT(11) DEFAULT NULL, + `F_ec8ce6abb3e952a85b8551ba726a1227` INT(11) DEFAULT NULL, + `F_060ad92489947d410d897474079c1477` INT(11) DEFAULT NULL, + `F_bcbe3365e6ac95ea2c0343a2395834dd` INT(11) DEFAULT NULL, + `F_115f89503138416a242f40fb7d7f338e` INT(11) DEFAULT NULL, + `F_13fe9d84310e77f13a6d184dbf1232f3` INT(11) DEFAULT NULL, + `F_d1c38a09acc34845c6be3a127a5aacaf` INT(11) DEFAULT NULL, + `F_9cfdf10e8fc047a44b08ed031e1f0ed1` INT(11) DEFAULT NULL, + `F_705f2172834666788607efbfca35afb3` INT(11) DEFAULT NULL, + `F_74db120f0a8e5646ef5a30154e9f6deb` INT(11) DEFAULT NULL, + `F_57aeee35c98205091e18d1140e9f38cf` INT(11) DEFAULT NULL, + `F_6da9003b743b65f4c0ccd295cc484e57` INT(11) DEFAULT NULL, + `F_9b04d152845ec0a378394003c96da594` INT(11) DEFAULT NULL, + `F_be83ab3ecd0db773eb2dc1b0a17836a1` INT(11) DEFAULT NULL, + `F_e165421110ba03099a1c0393373c5b43` INT(11) DEFAULT NULL, + `F_289dff07669d7a23de0ef88d2f7129e7` INT(11) DEFAULT NULL, + `F_577ef1154f3240ad5b9b413aa7346a1e` INT(11) DEFAULT NULL, + `F_01161aaa0b6d1345dd8fe4e481144d84` INT(11) DEFAULT NULL, + `F_539fd53b59e3bb12d203f45a912eeaf2` INT(11) DEFAULT NULL, + `F_ac1dd209cbcc5e5d1c6e28598e8cbbe8` INT(11) DEFAULT NULL, + `F_555d6702c950ecb729a966504af0a635` INT(11) DEFAULT NULL, + `F_335f5352088d7d9bf74191e006d8e24c` INT(11) DEFAULT NULL, + `F_f340f1b1f65b6df5b5e3f94d95b11daf` INT(11) DEFAULT NULL, + `F_e4a6222cdb5b34375400904f03d8e6a5` INT(11) DEFAULT NULL, + `F_cb70ab375662576bd1ac5aaf16b3fca4` INT(11) DEFAULT NULL, + `F_9188905e74c28e489b44e954ec0b9bca` INT(11) DEFAULT NULL, + `F_0266e33d3f546cb5436a10798e657d97` INT(11) DEFAULT NULL, + `F_38db3aed920cf82ab059bfccbd02be6a` INT(11) DEFAULT NULL, + `F_3cec07e9ba5f5bb252d13f5f431e4bbb` INT(11) DEFAULT NULL, + `F_621bf66ddb7c962aa0d22ac97d69b793` INT(11) DEFAULT NULL, + `F_077e29b11be80ab57e1a2ecabb7da330` INT(11) DEFAULT NULL, + `F_6c9882bbac1c7093bd25041881277658` INT(11) DEFAULT NULL, + `F_19f3cd308f1455b3fa09a282e0d496f4` INT(11) DEFAULT NULL, + `F_03c6b06952c750899bb03d998e631860` INT(11) DEFAULT NULL, + `F_c24cd76e1ce41366a4bbe8a49b02a028` INT(11) DEFAULT NULL, + `F_c52f1bd66cc19d05628bd8bf27af3ad6` INT(11) DEFAULT NULL, + `F_fe131d7f5a6b38b23cc967316c13dae2` INT(11) DEFAULT NULL, + `F_f718499c1c8cef6730f9fd03c8125cab` INT(11) DEFAULT NULL, + `F_d96409bf894217686ba124d7356686c9` INT(11) DEFAULT NULL, + `F_502e4a16930e414107ee22b6198c578f` INT(11) DEFAULT NULL, + `F_cfa0860e83a4c3a763a7e62d825349f7` INT(11) DEFAULT NULL, + `F_a4f23670e1833f3fdb077ca70bbd5d66` INT(11) DEFAULT NULL, + `F_b1a59b315fc9a3002ce38bbe070ec3f5` INT(11) DEFAULT NULL, + `F_36660e59856b4de58a219bcf4e27eba3` INT(11) DEFAULT NULL, + `F_8c19f571e251e61cb8dd3612f26d5ecf` INT(11) DEFAULT NULL, + `F_d6baf65e0b240ce177cf70da146c8dc8` INT(11) DEFAULT NULL, + `F_e56954b4f6347e897f954495eab16a88` INT(11) DEFAULT NULL, + `F_f7664060cc52bc6f3d620bcedc94a4b6` INT(11) DEFAULT NULL, + `F_eda80a3d5b344bc40f3bc04f65b7a357` INT(11) DEFAULT NULL, + `F_8f121ce07d74717e0b1f21d122e04521` INT(11) DEFAULT NULL, + `F_06138bc5af6023646ede0e1f7c1eac75` INT(11) DEFAULT NULL, + `F_39059724f73a9969845dfe4146c5660e` INT(11) DEFAULT NULL, + `F_7f100b7b36092fb9b06dfb4fac360931` INT(11) DEFAULT NULL, + `F_7a614fd06c325499f1680b9896beedeb` INT(11) DEFAULT NULL, + `F_4734ba6f3de83d861c3176a6273cac6d` INT(11) DEFAULT NULL, + `F_d947bf06a885db0d477d707121934ff8` INT(11) DEFAULT NULL, + `F_63923f49e5241343aa7acb6a06a751e7` INT(11) DEFAULT NULL, + `F_db8e1af0cb3aca1ae2d0018624204529` INT(11) DEFAULT NULL, + `F_20f07591c6fcb220ffe637cda29bb3f6` INT(11) DEFAULT NULL, + `F_07cdfd23373b17c6b337251c22b7ea57` INT(11) DEFAULT NULL, + `F_d395771085aab05244a4fb8fd91bf4ee` INT(11) DEFAULT NULL, + `F_92c8c96e4c37100777c7190b76d28233` INT(11) DEFAULT NULL, + `F_e3796ae838835da0b6f6ea37bcf8bcb7` INT(11) DEFAULT NULL, + `F_6a9aeddfc689c1d0e3b9ccc3ab651bc5` INT(11) DEFAULT NULL, + `F_0f49c89d1e7298bb9930789c8ed59d48` INT(11) DEFAULT NULL, + `F_46ba9f2a6976570b0353203ec4474217` INT(11) DEFAULT NULL, + `F_0e01938fc48a2cfb5f2217fbfb00722d` INT(11) DEFAULT NULL, + `F_16a5cdae362b8d27a1d8f8c7b78b4330` INT(11) DEFAULT NULL, + `F_918317b57931b6b7a7d29490fe5ec9f9` INT(11) DEFAULT NULL, + `F_48aedb8880cab8c45637abc7493ecddd` INT(11) DEFAULT NULL, + `F_839ab46820b524afda05122893c2fe8e` INT(11) DEFAULT NULL, + `F_f90f2aca5c640289d0a29417bcb63a37` INT(11) DEFAULT NULL, + `F_9c838d2e45b2ad1094d42f4ef36764f6` INT(11) DEFAULT NULL, + `F_1700002963a49da13542e0726b7bb758` INT(11) DEFAULT NULL, + `F_53c3bce66e43be4f209556518c2fcb54` INT(11) DEFAULT NULL, + `F_6883966fd8f918a4aa29be29d2c386fb` INT(11) DEFAULT NULL, + `F_49182f81e6a13cf5eaa496d51fea6406` INT(11) DEFAULT NULL, + `F_d296c101daa88a51f6ca8cfc1ac79b50` INT(11) DEFAULT NULL, + `F_9fd81843ad7f202f26c1a174c7357585` INT(11) DEFAULT NULL, + `F_26e359e83860db1d11b6acca57d8ea88` INT(11) DEFAULT NULL, + `F_ef0d3930a7b6c95bd2b32ed45989c61f` INT(11) DEFAULT NULL, + `F_94f6d7e04a4d452035300f18b984988c` INT(11) DEFAULT NULL, + `F_34ed066df378efacc9b924ec161e7639` INT(11) DEFAULT NULL, + `F_577bcc914f9e55d5e4e4f82f9f00e7d4` INT(11) DEFAULT NULL, + `F_11b9842e0a271ff252c1903e7132cd68` INT(11) DEFAULT NULL, + `F_37bc2f75bf1bcfe8450a1a41c200364c` INT(11) DEFAULT NULL, + `F_496e05e1aea0a9c4655800e8a7b9ea28` INT(11) DEFAULT NULL, + `F_b2eb7349035754953b57a32e2841bda5` INT(11) DEFAULT NULL, + `F_8e98d81f8217304975ccb23337bb5761` INT(11) DEFAULT NULL, + `F_a8c88a0055f636e4a163a5e3d16adab7` INT(11) DEFAULT NULL, + `F_eddea82ad2755b24c4e168c5fc2ebd40` INT(11) DEFAULT NULL, + `F_06eb61b839a0cefee4967c67ccb099dc` INT(11) DEFAULT NULL, + `F_9dfcd5e558dfa04aaf37f137a1d9d3e5` INT(11) DEFAULT NULL, + `F_950a4152c2b4aa3ad78bdd6b366cc179` INT(11) DEFAULT NULL, + `F_158f3069a435b314a80bdcb024f8e422` INT(11) DEFAULT NULL, + `F_758874998f5bd0c393da094e1967a72b` INT(11) DEFAULT NULL, + `F_ad13a2a07ca4b7642959dc0c4c740ab6` INT(11) DEFAULT NULL, + `F_3fe94a002317b5f9259f82690aeea4cd` INT(11) DEFAULT NULL, + `F_5b8add2a5d98b1a652ea7fd72d942dac` INT(11) DEFAULT NULL, + `F_432aca3a1e345e339f35a30c8f65edce` INT(11) DEFAULT NULL, + `F_8d3bba7425e7c98c50f52ca1b52d3735` INT(11) DEFAULT NULL, + `F_320722549d1751cf3f247855f937b982` INT(11) DEFAULT NULL, + `F_caf1a3dfb505ffed0d024130f58c5cfa` INT(11) DEFAULT NULL, + `F_5737c6ec2e0716f3d8a7a5c4e0de0d9a` INT(11) DEFAULT NULL, + `F_bc6dc48b743dc5d013b1abaebd2faed2` INT(11) DEFAULT NULL, + `F_f2fc990265c712c49d51a18a32b39f0c` INT(11) DEFAULT NULL, + `F_89f0fd5c927d466d6ec9a21b9ac34ffa` INT(11) DEFAULT NULL, + `F_a666587afda6e89aec274a3657558a27` INT(11) DEFAULT NULL, + `F_b83aac23b9528732c23cc7352950e880` INT(11) DEFAULT NULL, + `F_cd00692c3bfe59267d5ecfac5310286c` INT(11) DEFAULT NULL, + `F_6faa8040da20ef399b63a72d0e4ab575` INT(11) DEFAULT NULL, + `F_fe73f687e5bc5280214e0486b273a5f9` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -1403,7 +1403,7 @@ USE `test`; DROP TABLE IF EXISTS `t1`; CREATE TABLE `t1` ( - `a` int(11) default NULL + `a` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; --- 1.9/mysql-test/r/type_bit.result 2005-05-05 14:11:23 +02:00 +++ 1.10/mysql-test/r/type_bit.result 2005-06-10 13:29:15 +02:00 @@ -41,7 +41,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bit(1) default NULL + `a` BIT(1) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (a bit(64)); --- 1.13/mysql-test/r/gis-rtree.result 2005-05-13 11:08:02 +02:00 +++ 1.14/mysql-test/r/gis-rtree.result 2005-06-10 13:29:14 +02:00 @@ -7,8 +7,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `fid` int(11) NOT NULL auto_increment, - `g` geometry NOT NULL, + `fid` INT(11) NOT NULL AUTO_INCREMENT, + `g` GEOMETRY NOT NULL, PRIMARY KEY (`fid`), SPATIAL KEY `g` (`g`(32)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 @@ -290,8 +290,8 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `fid` int(11) NOT NULL auto_increment, - `g` geometry NOT NULL, + `fid` INT(11) NOT NULL AUTO_INCREMENT, + `g` GEOMETRY NOT NULL, PRIMARY KEY (`fid`), SPATIAL KEY `g` (`g`(32)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 --- 1.22/mysql-test/r/gis.result 2005-04-29 17:21:56 +02:00 +++ 1.23/mysql-test/r/gis.result 2005-06-10 13:29:14 +02:00 @@ -9,36 +9,36 @@ CREATE TABLE gis_geometry (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRY); SHOW FIELDS FROM gis_point; Field Type Null Key Default Extra -fid int(11) NO PRI -g point YES NULL +fid INT(11) NO PRI +g POINT YES NULL SHOW FIELDS FROM gis_line; Field Type Null Key Default Extra -fid int(11) NO PRI -g linestring YES NULL +fid INT(11) NO PRI +g LINESTRING YES NULL SHOW FIELDS FROM gis_polygon; Field Type Null Key Default Extra -fid int(11) NO PRI -g polygon YES NULL +fid INT(11) NO PRI +g POLYGON YES NULL SHOW FIELDS FROM gis_multi_point; Field Type Null Key Default Extra -fid int(11) NO PRI -g multipoint YES NULL +fid INT(11) NO PRI +g MULTIPOINT YES NULL SHOW FIELDS FROM gis_multi_line; Field Type Null Key Default Extra -fid int(11) NO PRI -g multilinestring YES NULL +fid INT(11) NO PRI +g MULTILINESTRING YES NULL SHOW FIELDS FROM gis_multi_polygon; Field Type Null Key Default Extra -fid int(11) NO PRI -g multipolygon YES NULL +fid INT(11) NO PRI +g MULTIPOLYGON YES NULL SHOW FIELDS FROM gis_geometrycollection; Field Type Null Key Default Extra -fid int(11) NO PRI -g geometrycollection YES NULL +fid INT(11) NO PRI +g GEOMETRYCOLLECTIOn YES NULL SHOW FIELDS FROM gis_geometry; Field Type Null Key Default Extra -fid int(11) NO PRI -g geometry YES NULL +fid INT(11) NO PRI +g GEOMETRY YES NULL INSERT INTO gis_point VALUES (101, PointFromText('POINT(10 10)')), (102, PointFromText('POINT(20 10)')), @@ -411,26 +411,26 @@ ); SHOW FIELDS FROM t1; Field Type Null Key Default Extra -gp point YES NULL -ln linestring YES NULL -pg polygon YES NULL -mp multipoint YES NULL -mln multilinestring YES NULL -mpg multipolygon YES NULL -gc geometrycollection YES NULL -gm geometry YES NULL +gp POINT YES NULL +ln LINESTRING YES NULL +pg POLYGON YES NULL +mp MULTIPOINT YES NULL +mln MULTILINESTRING YES NULL +mpg MULTIPOLYGON YES NULL +gc GEOMETRYCOLLECTIOn YES NULL +gm GEOMETRY YES NULL ALTER TABLE t1 ADD fid INT NOT NULL; SHOW FIELDS FROM t1; Field Type Null Key Default Extra -gp point YES NULL -ln linestring YES NULL -pg polygon YES NULL -mp multipoint YES NULL -mln multilinestring YES NULL -mpg multipolygon YES NULL -gc geometrycollection YES NULL -gm geometry YES NULL -fid int(11) NO +gp POINT YES NULL +ln LINESTRING YES NULL +pg POLYGON YES NULL +mp MULTIPOINT YES NULL +mln MULTILINESTRING YES NULL +mpg MULTIPOLYGON YES NULL +gc GEOMETRYCOLLECTIOn YES NULL +gm GEOMETRY YES NULL +fid INT(11) NO DROP TABLE t1; SELECT AsText(GeometryFromWKB(AsWKB(GeometryFromText('POINT(1 4)')))); AsText(GeometryFromWKB(AsWKB(GeometryFromText('POINT(1 4)')))) @@ -578,7 +578,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `POINT(1,3)` longblob NOT NULL + `POINT(1,3)` LONGBLOB NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; CREATE TABLE `t1` (`object_id` bigint(20) unsigned NOT NULL default '0', `geo` --- 1.2/mysql-test/r/type_bit_innodb.result 2005-04-14 11:32:17 +02:00 +++ 1.3/mysql-test/r/type_bit_innodb.result 2005-06-10 13:29:15 +02:00 @@ -41,7 +41,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bit(1) default NULL + `a` BIT(1) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop table t1; create table t1 (a bit(64)) engine=innodb; @@ -384,21 +384,21 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bit(1) default NULL, - `b` bit(10) default NULL + `a` BIT(1) DEFAULT NULL, + `b` BIT(10) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 alter table t1 engine=heap; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bit(1) default NULL, - `b` bit(10) default NULL + `a` BIT(1) DEFAULT NULL, + `b` BIT(10) DEFAULT NULL ) ENGINE=MEMORY DEFAULT CHARSET=latin1 alter table t1 engine=innodb; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bit(1) default NULL, - `b` bit(10) default NULL + `a` BIT(1) DEFAULT NULL, + `b` BIT(10) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 drop table t1; --- 1.18/mysql-test/r/rpl000002.result 2004-02-17 00:35:14 +01:00 +++ 1.19/mysql-test/r/rpl000002.result 2005-06-10 13:29:15 +02:00 @@ -33,14 +33,14 @@ show create table t3; Table Create Table t3 CREATE TABLE `t3` ( - `id` int(11) NOT NULL auto_increment, - `created` datetime default NULL, + `id` INT(11) NOT NULL AUTO_INCREMENT, + `created` DATETIME DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show create table t5; Table Create Table t5 CREATE TABLE `t5` ( - `id` int(11) NOT NULL default '0', - `created` datetime default NULL + `id` INT(11) NOT NULL DEFAULT '0', + `created` DATETIME DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t2,t3,t5; --- 1.34/mysql-test/r/user_var.result 2005-05-18 09:46:45 +02:00 +++ 1.35/mysql-test/r/user_var.result 2005-06-10 13:29:16 +02:00 @@ -188,7 +188,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `@first_var` longblob + `@first_var` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; set @first_var= cast(NULL as signed integer); @@ -196,7 +196,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `@first_var` bigint(20) default NULL + `@first_var` BIGINT(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; set @first_var= NULL; @@ -204,7 +204,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `@first_var` bigint(20) default NULL + `@first_var` BIGINT(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; set @first_var= concat(NULL); @@ -212,7 +212,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `@first_var` longblob + `@first_var` LONGBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; set @first_var=1; @@ -221,6 +221,6 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `@first_var` longtext + `@first_var` LONGTEXT ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; --- 1.41/mysql-test/r/bdb.result 2005-04-26 16:46:46 +02:00 +++ 1.42/mysql-test/r/bdb.result 2005-06-10 13:29:14 +02:00 @@ -1308,41 +1308,41 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(10) default NULL, - `c` char(10) default NULL, - `t` text + `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, - `t` text + `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, - `t` text + `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, - `t` text + `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, - `t` text + `v` CHAR(10) DEFAULT NULL, + `c` VARCHAR(10) DEFAULT NULL, + `t` TEXT ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1 alter table t1 modify t varchar(10); Warnings: @@ -1350,9 +1350,9 @@ 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,'*') @@ -1363,9 +1363,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(10) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(10) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `v` (`v`), KEY `c` (`c`), KEY `t` (`t`(10)) @@ -1584,9 +1584,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(300) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(300) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`(255)) @@ -1664,9 +1664,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(300) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(300) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`(30)) @@ -1746,9 +1746,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(600) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(600) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `c` (`c`), KEY `t` (`t`(10)), KEY `v` (`v`(255)) @@ -1824,9 +1824,9 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` varchar(10) default NULL, - `c` char(10) default NULL, - `t` text, + `v` VARCHAR(10) DEFAULT NULL, + `c` CHAR(10) DEFAULT NULL, + `t` TEXT, KEY `v` (`v`(5)), KEY `c` (`c`(5)), KEY `t` (`t`(5)) @@ -1836,15 +1836,15 @@ 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; @@ -1877,7 +1877,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `v` mediumtext + `v` MEDIUMTEXT ) ENGINE=BerkeleyDB DEFAULT CHARSET=latin1 drop table t1; create table t1 (v varchar(65530) character set utf8); @@ -1886,7 +1886,7 @@ 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; --- 1.1/mysql-test/r/bugs.result 2005-05-25 17:53:47 +02:00 +++ 1.2/mysql-test/r/bugs.result 2005-06-10 13:29:14 +02:00 @@ -32,34 +32,34 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `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, - `g` tinyblob, - `h` tinyblob, - `i` tinyblob, - `j` tinyblob, - `k` tinyblob, - `l` tinyblob, - `m` tinyblob, - `n` tinyblob, - `o` tinyblob, - `p` tinyblob, - `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 ' ', - `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 ' ', - `b1` tinyblob + `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, + `g` TINYBLOB, + `h` TINYBLOB, + `i` TINYBLOB, + `j` TINYBLOB, + `k` TINYBLOB, + `l` TINYBLOB, + `m` TINYBLOB, + `n` TINYBLOB, + `o` TINYBLOB, + `p` TINYBLOB, + `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 ' ', + `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 ' ', + `b1` TINYBLOB ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin INSERT into t1 (b) values ('1'); SHOW WARNINGS; @@ -99,34 +99,34 @@ 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', - `d` tinyblob, - `e` tinyblob, - `f` tinyblob, - `g` tinyblob, - `h` tinyblob, - `i` tinyblob, - `j` tinyblob, - `k` tinyblob, - `l` tinyblob, - `m` tinyblob, - `n` tinyblob, - `o` tinyblob, - `p` tinyblob, - `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 ' ', - `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 ' ', - `b1` tinyblob + `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, + `g` TINYBLOB, + `h` TINYBLOB, + `i` TINYBLOB, + `j` TINYBLOB, + `k` TINYBLOB, + `l` TINYBLOB, + `m` TINYBLOB, + `n` TINYBLOB, + `o` TINYBLOB, + `p` TINYBLOB, + `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 ' ', + `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 ' ', + `b1` TINYBLOB ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin INSERT into t2 (b) values ('1'); SHOW WARNINGS; --- 1.3/mysql-test/r/synchronization.result 2005-01-03 20:04:27 +01:00 +++ 1.4/mysql-test/r/synchronization.result 2005-06-10 13:29:15 +02:00 @@ -5,7 +5,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x2 x1 int; @@ -13,7 +13,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x1 x2 int; @@ -21,7 +21,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x2 x1 int; @@ -29,7 +29,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x1 x2 int; @@ -37,7 +37,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x2 x1 int; @@ -45,7 +45,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x1 x2 int; @@ -53,7 +53,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x2 x1 int; @@ -61,7 +61,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x1 x2 int; @@ -69,7 +69,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x2 x1 int; @@ -77,7 +77,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x1 x2 int; @@ -85,7 +85,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x2 x1 int; @@ -93,7 +93,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x1 x2 int; @@ -101,7 +101,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x2 x1 int; @@ -109,7 +109,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x1 x2 int; @@ -117,7 +117,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x2 x1 int; @@ -125,7 +125,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x1 x2 int; @@ -133,7 +133,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x2 x1 int; @@ -141,7 +141,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x1 x2 int; @@ -149,7 +149,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; ALTER TABLE t1 CHANGE x2 x1 int; @@ -157,7 +157,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `xx` int(11) default NULL + `xx` INT(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2; DROP TABLE t1; --- 1.24/mysql-test/r/system_mysql_db.result 2005-05-18 11:01:58 +02:00 +++ 1.25/mysql-test/r/system_mysql_db.result 2005-06-10 13:29:15 +02:00 @@ -21,163 +21,163 @@ show create table db; Table Create Table db CREATE TABLE `db` ( - `Host` char(60) collate utf8_bin NOT NULL default '', - `Db` char(64) collate utf8_bin NOT NULL default '', - `User` char(16) collate utf8_bin NOT NULL default '', - `Select_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Insert_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Update_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Delete_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Drop_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Grant_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `References_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Index_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Alter_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_tmp_table_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Lock_tables_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_view_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Show_view_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_routine_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Alter_routine_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Execute_priv` enum('N','Y') character set utf8 NOT NULL default 'N', + `Host` CHAR(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `Db` CHAR(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` CHAR(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Select_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Insert_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Update_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Delete_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Drop_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Grant_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `References_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Index_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Alter_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_tmp_table_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Lock_tables_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_view_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Show_view_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_routine_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Alter_routine_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Execute_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', PRIMARY KEY (`Host`,`Db`,`User`), KEY `User` (`User`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Database privileges' show create table host; Table Create Table host CREATE TABLE `host` ( - `Host` char(60) collate utf8_bin NOT NULL default '', - `Db` char(64) collate utf8_bin NOT NULL default '', - `Select_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Insert_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Update_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Delete_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Drop_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Grant_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `References_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Index_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Alter_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_tmp_table_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Lock_tables_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_view_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Show_view_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_routine_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Alter_routine_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Execute_priv` enum('N','Y') character set utf8 NOT NULL default 'N', + `Host` CHAR(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `Db` CHAR(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `Select_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Insert_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Update_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Delete_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Drop_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Grant_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `References_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Index_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Alter_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_tmp_table_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Lock_tables_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_view_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Show_view_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_routine_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Alter_routine_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Execute_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', PRIMARY KEY (`Host`,`Db`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Host privileges; Merged with database privileges' show create table user; Table Create Table user CREATE TABLE `user` ( - `Host` char(60) collate utf8_bin NOT NULL default '', - `User` char(16) collate utf8_bin NOT NULL default '', - `Password` char(41) collate utf8_bin NOT NULL default '', - `Select_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Insert_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Update_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Delete_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Drop_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Reload_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Shutdown_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Process_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `File_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Grant_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `References_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Index_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Alter_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Show_db_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Super_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_tmp_table_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Lock_tables_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Execute_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Repl_slave_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Repl_client_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_view_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Show_view_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_routine_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Alter_routine_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `Create_user_priv` enum('N','Y') character set utf8 NOT NULL default 'N', - `ssl_type` enum('','ANY','X509','SPECIFIED') character set utf8 NOT NULL default '', - `ssl_cipher` blob NOT NULL, - `x509_issuer` blob NOT NULL, - `x509_subject` blob NOT NULL, - `max_questions` int(11) unsigned NOT NULL default '0', - `max_updates` int(11) unsigned NOT NULL default '0', - `max_connections` int(11) unsigned NOT NULL default '0', - `max_user_connections` int(11) unsigned NOT NULL default '0', + `Host` CHAR(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` CHAR(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Password` CHAR(41) COLLATE utf8_bin NOT NULL DEFAULT '', + `Select_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Insert_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Update_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Delete_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Drop_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Reload_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Shutdown_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Process_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `File_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Grant_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `References_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Index_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Alter_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Show_db_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Super_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_tmp_table_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Lock_tables_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Execute_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Repl_slave_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Repl_client_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_view_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Show_view_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_routine_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Alter_routine_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `Create_user_priv` ENUM('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N', + `ssl_type` ENUM('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '', + `ssl_cipher` BLOB NOT NULL, + `x509_issuer` BLOB NOT NULL, + `x509_subject` BLOB NOT NULL, + `max_questions` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `max_updates` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `max_connections` INT(11) UNSIGNED NOT NULL DEFAULT '0', + `max_user_connections` INT(11) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (`Host`,`User`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges' show create table func; Table Create Table func CREATE TABLE `func` ( - `name` char(64) collate utf8_bin NOT NULL default '', - `ret` tinyint(1) NOT NULL default '0', - `dl` char(128) collate utf8_bin NOT NULL default '', - `type` enum('function','aggregate') character set utf8 NOT NULL, + `name` CHAR(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `ret` TINYINT(1) NOT NULL DEFAULT '0', + `dl` CHAR(128) COLLATE utf8_bin NOT NULL DEFAULT '', + `type` ENUM('function','aggregate') CHARACTER SET utf8 NOT NULL, PRIMARY KEY (`name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User defined functions' show create table tables_priv; Table Create Table tables_priv CREATE TABLE `tables_priv` ( - `Host` char(60) collate utf8_bin NOT NULL default '', - `Db` char(64) collate utf8_bin NOT NULL default '', - `User` char(16) collate utf8_bin NOT NULL default '', - `Table_name` char(64) collate utf8_bin NOT NULL default '', - `Grantor` char(77) collate utf8_bin NOT NULL default '', - `Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') character set utf8 NOT NULL default '', - `Column_priv` set('Select','Insert','Update','References') character set utf8 NOT NULL default '', + `Host` CHAR(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `Db` CHAR(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` CHAR(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Table_name` CHAR(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `Grantor` CHAR(77) COLLATE utf8_bin NOT NULL DEFAULT '', + `Timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `Table_priv` SET('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') CHARACTER SET utf8 NOT NULL DEFAULT '', + `Column_priv` SET('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '', PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`), KEY `Grantor` (`Grantor`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Table privileges' show create table columns_priv; Table Create Table columns_priv CREATE TABLE `columns_priv` ( - `Host` char(60) collate utf8_bin NOT NULL default '', - `Db` char(64) collate utf8_bin NOT NULL default '', - `User` char(16) collate utf8_bin NOT NULL default '', - `Table_name` char(64) collate utf8_bin NOT NULL default '', - `Column_name` char(64) collate utf8_bin NOT NULL default '', - `Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `Column_priv` set('Select','Insert','Update','References') character set utf8 NOT NULL default '', + `Host` CHAR(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `Db` CHAR(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` CHAR(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Table_name` CHAR(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `Column_name` CHAR(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `Timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `Column_priv` SET('Select','Insert','Update','References') CHARACTER SET utf8 NOT NULL DEFAULT '', PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`,`Column_name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Column privileges' show create table procs_priv; Table Create Table procs_priv CREATE TABLE `procs_priv` ( - `Host` char(60) collate utf8_bin NOT NULL default '', - `Db` char(64) collate utf8_bin NOT NULL default '', - `User` char(16) collate utf8_bin NOT NULL default '', - `Routine_name` char(64) collate utf8_bin NOT NULL default '', - `Routine_type` enum('FUNCTION','PROCEDURE') collate utf8_bin NOT NULL, - `Grantor` char(77) collate utf8_bin NOT NULL default '', - `Proc_priv` set('Execute','Alter Routine','Grant') character set utf8 NOT NULL default '', - `Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `Host` CHAR(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `Db` CHAR(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` CHAR(16) COLLATE utf8_bin NOT NULL DEFAULT '', + `Routine_name` CHAR(64) COLLATE utf8_bin NOT NULL DEFAULT '', + `Routine_type` ENUM('FUNCTION','PROCEDURE') COLLATE utf8_bin NOT NULL, + `Grantor` CHAR(77) COLLATE utf8_bin NOT NULL DEFAULT '', + `Proc_priv` SET('Execute','Alter Routine','Grant') CHARACTER SET utf8 NOT NULL DEFAULT '', + `Timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`,`Routine_type`), KEY `Grantor` (`Grantor`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges' show create table proc; Table Create Table proc CREATE TABLE `proc` ( - `db` char(64) character set latin1 collate latin1_bin NOT NULL default '', - `name` char(64) NOT NULL default '', - `type` enum('FUNCTION','PROCEDURE') NOT NULL, - `specific_name` char(64) NOT NULL default '', - `language` enum('SQL') NOT NULL default 'SQL', - `sql_data_access` enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') NOT NULL default 'CONTAINS_SQL', - `is_deterministic` enum('YES','NO') NOT NULL default 'NO', - `security_type` enum('INVOKER','DEFINER') NOT NULL default 'DEFINER', - `param_list` blob NOT NULL, - `returns` char(64) NOT NULL default '', - `body` blob NOT NULL, - `definer` char(77) character set latin1 collate latin1_bin NOT NULL default '', - `created` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, - `modified` timestamp NOT NULL default '0000-00-00 00:00:00', - `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 latin1 collate latin1_bin NOT NULL default '', + `db` CHAR(64) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '', + `name` CHAR(64) NOT NULL DEFAULT '', + `type` ENUM('FUNCTION','PROCEDURE') NOT NULL, + `specific_name` CHAR(64) NOT NULL DEFAULT '', + `language` ENUM('SQL') NOT NULL DEFAULT 'SQL', + `sql_data_access` ENUM('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') NOT NULL DEFAULT 'CONTAINS_SQL', + `is_deterministic` ENUM('YES','NO') NOT NULL DEFAULT 'NO', + `security_type` ENUM('INVOKER','DEFINER') NOT NULL DEFAULT 'DEFINER', + `param_list` BLOB NOT NULL, + `returns` CHAR(64) NOT NULL DEFAULT '', + `body` BLOB NOT NULL, + `definer` CHAR(77) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '', + `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `modified` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00', + `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 latin1 COLLATE latin1_bin NOT NULL DEFAULT '', PRIMARY KEY (`db`,`name`,`type`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Stored Procedures' show tables;
| Thread | ||
|---|---|---|
| • bk commit into 5.0 tree (msvensson:1.1938) BUG#10460 | msvensson | 10 Jun |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 2.193 sec. using MySQL 5.1.14-beta-log