Below is the list of changes that have just been committed into a local
4.1 repository of acurtis. When acurtis 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.2206 05/04/25 21:35:14 acurtis@stripped +33 -0
Bug#9098 - Not possible for clients to distinguish between string default values and other
Change metadata to make this trivial.
sql/sql_show.cc
1.199 05/04/25 21:34:47 acurtis@stripped +9 -57
Bug#9098
use new Field::print() instead of doing same thing in
two different places.
sql/field.h
1.127 05/04/25 21:34:46 acurtis@stripped +41 -26
Bug#9098
new Field::print() methods
sql/field.cc
1.216 05/04/25 21:34:46 acurtis@stripped +78 -0
Bug#9098
new Field::print() methods
mysql-test/r/union.result
1.90 05/04/25 21:34:45 acurtis@stripped +4 -4
Bug#9098
Fix change in results
mysql-test/r/type_timestamp.result
1.27 05/04/25 21:34:45 acurtis@stripped +5 -5
Bug#9098
Fix change in results
mysql-test/r/type_ranges.result
1.27 05/04/25 21:34:45 acurtis@stripped +22 -22
Bug#9098
Fix change in results
mysql-test/r/type_enum.result
1.26 05/04/25 21:34:44 acurtis@stripped +3 -3
Bug#9098
Fix change in results
mysql-test/r/system_mysql_db.result
1.12 05/04/25 21:34:44 acurtis@stripped +4 -4
Bug#9098
Fix change in results
mysql-test/r/subselect.result
1.165 05/04/25 21:34:44 acurtis@stripped +7 -7
Bug#9098
Fix change in results
mysql-test/r/sql_mode.result
1.11 05/04/25 21:34:43 acurtis@stripped +3 -3
Bug#9098
Fix change in results
mysql-test/r/show_check.result
1.63 05/04/25 21:34:43 acurtis@stripped +12 -12
Bug#9098
Fix change in results
mysql-test/r/select.result
1.52 05/04/25 21:34:42 acurtis@stripped +11 -11
Bug#9098
Fix change in results
mysql-test/r/rpl_deadlock.result
1.3 05/04/25 21:34:42 acurtis@stripped +2 -2
Bug#9098
Fix change in results
mysql-test/r/rpl000002.result
1.19 05/04/25 21:34:42 acurtis@stripped +1 -1
Bug#9098
Fix change in results
mysql-test/r/ps_7ndb.result
1.18 05/04/25 21:34:41 acurtis@stripped +4 -4
Bug#9098
Fix change in results
mysql-test/r/ps_6bdb.result
1.24 05/04/25 21:34:41 acurtis@stripped +4 -4
Bug#9098
Fix change in results
mysql-test/r/ps_5merge.result
1.23 05/04/25 21:34:41 acurtis@stripped +8 -8
Bug#9098
Fix change in results
mysql-test/r/ps_4heap.result
1.23 05/04/25 21:34:40 acurtis@stripped +4 -4
Bug#9098
Fix change in results
mysql-test/r/ps_3innodb.result
1.25 05/04/25 21:34:39 acurtis@stripped +4 -4
Bug#9098
Fix change in results
mysql-test/r/ps_2myisam.result
1.24 05/04/25 21:34:38 acurtis@stripped +4 -4
Bug#9098
Fix change in results
mysql-test/r/ndb_autodiscover.result
1.12 05/04/25 21:34:37 acurtis@stripped +1 -1
Bug#9098
Fix change in results
mysql-test/r/merge.result
1.35 05/04/25 21:34:37 acurtis@stripped +16 -16
Bug#9098
Fix change in results
mysql-test/r/innodb.result
1.97 05/04/25 21:34:36 acurtis@stripped +19 -19
Bug#9098
Fix change in results
mysql-test/r/func_time.result
1.37 05/04/25 21:34:36 acurtis@stripped +1 -1
Bug#9098
Fix change in results
mysql-test/r/func_sapdb.result
1.9 05/04/25 21:34:36 acurtis@stripped +4 -4
Bug#9098
Fix change in results
mysql-test/r/func_group.result
1.39 05/04/25 21:34:36 acurtis@stripped +1 -1
Bug#9098
Fix change in results
mysql-test/r/ctype_ujis.result
1.11 05/04/25 21:34:35 acurtis@stripped +1 -1
Bug#9098
Fix change in results
mysql-test/r/ctype_recoding.result
1.25 05/04/25 21:34:35 acurtis@stripped +7 -7
Bug#9098
Fix change in results
mysql-test/r/ctype_collate.result
1.30 05/04/25 21:34:34 acurtis@stripped +1 -1
Bug#9098
Fix change in results
mysql-test/r/create.result
1.76 05/04/25 21:34:34 acurtis@stripped +16 -16
Bug#9098
Fix change in results
mysql-test/r/case.result
1.16 05/04/25 21:34:33 acurtis@stripped +5 -5
Bug#9098
Fix change in results
mysql-test/r/analyse.result
1.17 05/04/25 21:34:33 acurtis@stripped +12 -12
Bug#9098
Fix change in results
mysql-test/r/alter_table.result
1.47 05/04/25 21:34:33 acurtis@stripped +2 -2
Bug#9098
Fix change in results
# 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: acurtis
# Host: ltantony.xiphis.org
# Root: /.amd_mnt/bk.anubis/host/work-acurtis/bug9098.1
--- 1.215/sql/field.cc 2005-04-06 11:12:35 +01:00
+++ 1.216/sql/field.cc 2005-04-25 21:34:46 +01:00
@@ -6934,3 +6934,81 @@
return 0;
}
}
+
+
+void Field::print(String *str)
+{
+ str->append("NULL", 4);
+}
+
+
+void Field_num::print(String *str)
+{
+ if (is_null())
+ Field::print(str);
+ else
+ {
+ char buff[331];
+ String tmp(buff, sizeof(buff), system_charset_info);
+ tmp.set(val_real(), decimals(), system_charset_info);
+ str->append(tmp.ptr(), tmp.length(), tmp.charset());
+ }
+}
+
+void Field_intnum::print(String *str)
+{
+ if (is_null() || (unireg_check == NEXT_NUMBER))
+ Field::print(str);
+ else
+ {
+ char buff[32];
+ String tmp(buff, sizeof(buff), system_charset_info);
+ if (flags & UNSIGNED_FLAG)
+ tmp.set((ulonglong)val_int(), system_charset_info);
+ else
+ tmp.set((longlong)val_int(), system_charset_info);
+ str->append(tmp.ptr(), tmp.length(), tmp.charset());
+ }
+}
+
+void Field_str::print(String *str)
+{
+ if (is_null())
+ Field::print(str);
+ else
+ {
+ char buff[MAX_FIELD_WIDTH];
+ String tmp(buff, sizeof(buff), charset());
+ val_str(&tmp);
+ if (tmp.length())
+ {
+ uint dummy;
+ String val;
+ val.copy(tmp.ptr(), tmp.length(), charset(), system_charset_info, &dummy);
+ append_unescaped(str, val.ptr(), val.length());
+ }
+ else
+ str->append("''",2);
+ }
+}
+
+void Field_decimal::print(String *str)
+{
+ if (is_null())
+ Field::print(str);
+ else
+ {
+ char buff[MAX_FIELD_WIDTH];
+ String tmp(buff, sizeof(buff), charset());
+ val_str(&tmp, &tmp);
+ str->append(tmp.ptr(), tmp.length(), tmp.charset());
+ }
+}
+
+void Field_timestamp::print(String *str)
+{
+ if ((flags & TIMESTAMP_FLAG) && (unireg_check != TIMESTAMP_UN_FIELD))
+ str->append("CURRENT_TIMESTAMP", 17);
+ else
+ Field_str::print(str);
+}
--- 1.126/sql/field.h 2005-04-03 07:04:59 +01:00
+++ 1.127/sql/field.h 2005-04-25 21:34:46 +01:00
@@ -117,6 +117,7 @@
This trickery is used to decrease a number of malloc calls.
*/
virtual String *val_str(String*,String *)=0;
+ virtual void print(String*)=0;
virtual Item_result result_type () const=0;
virtual Item_result cmp_type () const { return result_type(); }
static enum_field_types field_type_merge(enum_field_types, enum_field_types);
@@ -331,6 +332,7 @@
flags|=UNSIGNED_FLAG;
}
Item_result result_type () const { return REAL_RESULT; }
+ void print(String *str);
void prepend_zeros(String *value);
void add_zerofill_and_unsigned(String &res) const;
friend class create_field;
@@ -341,6 +343,21 @@
};
+class Field_intnum :public Field_num {
+public:
+ Field_intnum(char *ptr_arg,uint32 len_arg, uchar *null_ptr_arg,
+ uchar null_bit_arg, utype unireg_check_arg,
+ const char *field_name_arg,
+ struct st_table *table_arg,
+ bool zero_arg,bool unsigned_arg)
+ :Field_num(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
+ unireg_check_arg, field_name_arg, table_arg,
+ 0, zero_arg, unsigned_arg) {}
+ Item_result result_type () const { return INT_RESULT; }
+ void print(String *str);
+};
+
+
class Field_str :public Field {
protected:
CHARSET_INFO *field_charset;
@@ -357,6 +374,7 @@
flags|=BINARY_FLAG;
}
Item_result result_type () const { return STRING_RESULT; }
+ void print(String *str);
uint decimals() const { return NOT_FIXED_DEC; }
int store(double nr);
int store(longlong nr)=0;
@@ -385,6 +403,7 @@
enum_field_types type() const { return FIELD_TYPE_DECIMAL;}
enum ha_base_keytype key_type() const
{ return zerofill ? HA_KEYTYPE_BINARY : HA_KEYTYPE_NUM; }
+ void print(String *str);
void reset(void);
int store(const char *to,uint length,CHARSET_INFO *charset);
int store(double nr);
@@ -401,18 +420,17 @@
};
-class Field_tiny :public Field_num {
+class Field_tiny :public Field_intnum {
public:
Field_tiny(char *ptr_arg, uint32 len_arg, uchar *null_ptr_arg,
uchar null_bit_arg,
enum utype unireg_check_arg, const char *field_name_arg,
struct st_table *table_arg,
bool zero_arg, bool unsigned_arg)
- :Field_num(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
+ :Field_intnum(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
unireg_check_arg, field_name_arg, table_arg,
- 0, zero_arg,unsigned_arg)
+ zero_arg,unsigned_arg)
{}
- enum Item_result result_type () const { return INT_RESULT; }
enum_field_types type() const { return FIELD_TYPE_TINY;}
enum ha_base_keytype key_type() const
{ return unsigned_flag ? HA_KEYTYPE_BINARY : HA_KEYTYPE_INT8; }
@@ -432,23 +450,22 @@
};
-class Field_short :public Field_num {
+class Field_short :public Field_intnum {
public:
Field_short(char *ptr_arg, uint32 len_arg, uchar *null_ptr_arg,
uchar null_bit_arg,
enum utype unireg_check_arg, const char *field_name_arg,
struct st_table *table_arg,
bool zero_arg, bool unsigned_arg)
- :Field_num(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
+ :Field_intnum(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
unireg_check_arg, field_name_arg, table_arg,
- 0, zero_arg,unsigned_arg)
+ zero_arg,unsigned_arg)
{}
Field_short(uint32 len_arg,bool maybe_null_arg, const char *field_name_arg,
struct st_table *table_arg,bool unsigned_arg)
- :Field_num((char*) 0, len_arg, maybe_null_arg ? (uchar*) "": 0,0,
- NONE, field_name_arg, table_arg,0,0,unsigned_arg)
+ :Field_intnum((char*) 0, len_arg, maybe_null_arg ? (uchar*) "": 0,0,
+ NONE, field_name_arg, table_arg,0,unsigned_arg)
{}
- enum Item_result result_type () const { return INT_RESULT; }
enum_field_types type() const { return FIELD_TYPE_SHORT;}
enum ha_base_keytype key_type() const
{ return unsigned_flag ? HA_KEYTYPE_USHORT_INT : HA_KEYTYPE_SHORT_INT;}
@@ -468,18 +485,17 @@
};
-class Field_medium :public Field_num {
+class Field_medium :public Field_intnum {
public:
Field_medium(char *ptr_arg, uint32 len_arg, uchar *null_ptr_arg,
uchar null_bit_arg,
enum utype unireg_check_arg, const char *field_name_arg,
struct st_table *table_arg,
bool zero_arg, bool unsigned_arg)
- :Field_num(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
+ :Field_intnum(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
unireg_check_arg, field_name_arg, table_arg,
- 0, zero_arg,unsigned_arg)
+ zero_arg,unsigned_arg)
{}
- enum Item_result result_type () const { return INT_RESULT; }
enum_field_types type() const { return FIELD_TYPE_INT24;}
enum ha_base_keytype key_type() const
{ return unsigned_flag ? HA_KEYTYPE_UINT24 : HA_KEYTYPE_INT24; }
@@ -499,23 +515,22 @@
};
-class Field_long :public Field_num {
+class Field_long :public Field_intnum {
public:
Field_long(char *ptr_arg, uint32 len_arg, uchar *null_ptr_arg,
uchar null_bit_arg,
enum utype unireg_check_arg, const char *field_name_arg,
struct st_table *table_arg,
bool zero_arg, bool unsigned_arg)
- :Field_num(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
+ :Field_intnum(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
unireg_check_arg, field_name_arg, table_arg,
- 0, zero_arg,unsigned_arg)
+ zero_arg,unsigned_arg)
{}
Field_long(uint32 len_arg,bool maybe_null_arg, const char *field_name_arg,
struct st_table *table_arg,bool unsigned_arg)
- :Field_num((char*) 0, len_arg, maybe_null_arg ? (uchar*) "": 0,0,
- NONE, field_name_arg, table_arg,0,0,unsigned_arg)
+ :Field_intnum((char*) 0, len_arg, maybe_null_arg ? (uchar*) "": 0,0,
+ NONE, field_name_arg, table_arg,0,unsigned_arg)
{}
- enum Item_result result_type () const { return INT_RESULT; }
enum_field_types type() const { return FIELD_TYPE_LONG;}
enum ha_base_keytype key_type() const
{ return unsigned_flag ? HA_KEYTYPE_ULONG_INT : HA_KEYTYPE_LONG_INT; }
@@ -536,24 +551,23 @@
#ifdef HAVE_LONG_LONG
-class Field_longlong :public Field_num {
+class Field_longlong :public Field_intnum {
public:
Field_longlong(char *ptr_arg, uint32 len_arg, uchar *null_ptr_arg,
uchar null_bit_arg,
enum utype unireg_check_arg, const char *field_name_arg,
struct st_table *table_arg,
bool zero_arg, bool unsigned_arg)
- :Field_num(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
+ :Field_intnum(ptr_arg, len_arg, null_ptr_arg, null_bit_arg,
unireg_check_arg, field_name_arg, table_arg,
- 0, zero_arg,unsigned_arg)
+ zero_arg,unsigned_arg)
{}
Field_longlong(uint32 len_arg,bool maybe_null_arg,
const char *field_name_arg,
struct st_table *table_arg, bool unsigned_arg)
- :Field_num((char*) 0, len_arg, maybe_null_arg ? (uchar*) "": 0,0,
- NONE, field_name_arg, table_arg,0,0,unsigned_arg)
+ :Field_intnum((char*) 0, len_arg, maybe_null_arg ? (uchar*) "": 0,0,
+ NONE, field_name_arg, table_arg,0,unsigned_arg)
{}
- enum Item_result result_type () const { return INT_RESULT; }
enum_field_types type() const { return FIELD_TYPE_LONGLONG;}
enum ha_base_keytype key_type() const
{ return unsigned_flag ? HA_KEYTYPE_ULONGLONG : HA_KEYTYPE_LONGLONG; }
@@ -682,6 +696,7 @@
enum_field_types type() const { return FIELD_TYPE_TIMESTAMP;}
enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONG_INT; }
enum Item_result cmp_type () const { return INT_RESULT; }
+ void print(String *str);
int store(const char *to,uint length,CHARSET_INFO *charset);
int store(double nr);
int store(longlong nr);
--- 1.198/sql/sql_show.cc 2005-04-16 20:35:37 +01:00
+++ 1.199/sql/sql_show.cc 2005-04-25 21:34:47 +01:00
@@ -724,43 +724,16 @@
(field->flags & MULTIPLE_KEY_FLAG) ? "MUL":"");
protocol->store((char*) pos, system_charset_info);
- if (table->timestamp_field == field &&
- field->unireg_check != Field::TIMESTAMP_UN_FIELD)
+ if ((!(flags & (NOT_NULL_FLAG | TIMESTAMP_FLAG)) && field->is_null()) ||
+ (field->unireg_check == Field::NEXT_NUMBER))
+ protocol->store_null();
+ else
{
- /*
- We have NOW() as default value but we use CURRENT_TIMESTAMP form
- because it is more SQL standard comatible
- */
- protocol->store("CURRENT_TIMESTAMP", system_charset_info);
- }
- else if (field->unireg_check != Field::NEXT_NUMBER &&
- !field->is_null())
- { // Not null by default
- /*
- Note: we have to convert the default value into
- system_charset_info before sending.
- This is necessary for "SET NAMES binary":
- If the client character set is binary, we want to
- send metadata in UTF8 rather than in the column's
- character set.
- This conversion also makes "SHOW COLUMNS" and
- "SHOW CREATE TABLE" output consistent. Without
- this conversion the default values were displayed
- differently.
- */
- String def(tmp1,sizeof(tmp1), system_charset_info);
- type.set(tmp, sizeof(tmp), field->charset());
- field->val_str(&type);
- uint dummy_errors;
- def.copy(type.ptr(), type.length(), type.charset(),
- system_charset_info, &dummy_errors);
- protocol->store(def.ptr(), def.length(), def.charset());
+ type.set(tmp, sizeof(tmp), system_charset_info);
+ type.length(0);
+ field->print(&type);
+ protocol->store(type.ptr(), type.length(), type.charset());
}
- else if (field->unireg_check == Field::NEXT_NUMBER ||
- field->maybe_null())
- protocol->store_null(); // Null as default
- else
- protocol->store("",0, system_charset_info); // empty string
char *end=tmp;
if (field->unireg_check == Field::NEXT_NUMBER)
@@ -1343,28 +1316,7 @@
if (has_default)
{
packet->append(" default ", 9);
- if (has_now_default)
- packet->append("CURRENT_TIMESTAMP",17);
- else if (!field->is_null())
- { // Not null by default
- type.set(tmp, sizeof(tmp), field->charset());
- field->val_str(&type);
- if (type.length())
- {
- String def_val;
- uint dummy_errors;
- /* convert to system_charset_info == utf8 */
- def_val.copy(type.ptr(), type.length(), field->charset(),
- system_charset_info, &dummy_errors);
- append_unescaped(packet, def_val.ptr(), def_val.length());
- }
- else
- packet->append("''",2);
- }
- else if (field->maybe_null())
- packet->append("NULL", 4); // Null as default
- else
- packet->append(tmp);
+ field->print(packet);
}
if (!foreign_db_mode && !limited_mysql_mode &&
--- 1.89/mysql-test/r/union.result 2005-04-10 08:40:13 +01:00
+++ 1.90/mysql-test/r/union.result 2005-04-25 21:34:45 +01:00
@@ -565,7 +565,7 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` double(53,1) NOT NULL default '0.0'
+ `a` double(53,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);
@@ -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;
@@ -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" ;
@@ -1226,7 +1226,7 @@
create table t2 select a from t1 union select a from t1;
show columns from t2;
Field Type Null Key Default Extra
-a char(1)
+a char(1) ''
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'
--- 1.29/mysql-test/r/ctype_collate.result 2005-04-10 08:40:19 +01:00
+++ 1.30/mysql-test/r/ctype_collate.result 2005-04-25 21:34:34 +01:00
@@ -488,7 +488,7 @@
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW FIELDS FROM t1;
Field Type Null Key Default Extra
-latin1_f char(32)
+latin1_f char(32) ''
ALTER TABLE t1 CHANGE latin1_f
latin1_f CHAR(32) CHARACTER SET latin1 COLLATE latin1_bin;
SHOW CREATE TABLE t1;
--- 1.24/mysql-test/r/ctype_recoding.result 2004-11-02 12:01:13 +00:00
+++ 1.25/mysql-test/r/ctype_recoding.result 2005-04-25 21:34:35 +01:00
@@ -54,7 +54,7 @@
Field Type Null Key Default Extra
SET CHARACTER SET cp1251;
SHOW TABLES;
Tables_in_test
@@ -66,7 +66,7 @@
Field Type Null Key Default Extra
SET CHARACTER SET utf8;
SHOW TABLES;
Tables_in_test
@@ -78,7 +78,7 @@
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='комментарий таблицы'
SHOW FIELDS FROM таблица;
Field Type Null Key Default Extra
-поле char(32)
+поле char(32) ''
SET CHARACTER SET koi8r;
SET CHARACTER SET default;
@@ -146,8 +146,8 @@
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SHOW COLUMNS FROM t1;
Field Type Null Key Default Extra
SET NAMES binary;
SHOW CREATE TABLE t1;
Table Create Table
@@ -157,8 +157,8 @@
) 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;
--- 1.164/mysql-test/r/subselect.result 2005-03-30 08:07:04 +01:00
+++ 1.165/mysql-test/r/subselect.result 2005-04-25 21:34:44 +01:00
@@ -1077,24 +1077,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;
@@ -1104,7 +1104,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.8/mysql-test/r/func_sapdb.result 2005-03-28 13:20:50 +01:00
+++ 1.9/mysql-test/r/func_sapdb.result 2005-04-25 21:34:36 +01:00
@@ -167,12 +167,12 @@
time("1997-12-31 23:59:59.000001") as f9;
describe t1;
Field Type Null Key Default Extra
-f1 date 0000-00-00
+f1 date '0000-00-00'
f2 datetime YES NULL
f3 time YES NULL
-f4 time 00:00:00
-f5 time 00:00:00
-f6 time 00:00:00
+f4 time '00:00:00'
+f5 time '00:00:00'
+f6 time '00:00:00'
f7 datetime YES NULL
f8 date YES NULL
f9 time YES NULL
--- 1.23/mysql-test/r/ps_2myisam.result 2005-03-30 13:30:31 +01:00
+++ 1.24/mysql-test/r/ps_2myisam.result 2005-04-25 21:34:38 +01:00
@@ -1775,11 +1775,11 @@
show create table t5 ;
Table Create Table
t5 CREATE TABLE `t5` (
- `const01` bigint(1) NOT NULL default '0',
+ `const01` bigint(1) NOT NULL default 0,
`param01` bigint(20) default NULL,
- `const02` double(3,1) NOT NULL default '0.0',
+ `const02` double(3,1) NOT NULL default 0.0,
`param02` double default NULL,
- `const03` double NOT NULL default '0',
+ `const03` double NOT NULL default 0,
`param03` double default NULL,
`const04` char(3) NOT NULL default '',
`param04` longtext,
@@ -1793,7 +1793,7 @@
`param08` longtext,
`const09` datetime default NULL,
`param09` longblob,
- `const10` int(10) NOT NULL default '0',
+ `const10` int(10) NOT NULL default 0,
`param10` bigint(20) default NULL,
`const11` int(4) default NULL,
`param11` bigint(20) default NULL,
--- 1.24/mysql-test/r/ps_3innodb.result 2005-03-30 13:30:31 +01:00
+++ 1.25/mysql-test/r/ps_3innodb.result 2005-04-25 21:34:39 +01:00
@@ -1758,11 +1758,11 @@
show create table t5 ;
Table Create Table
t5 CREATE TABLE `t5` (
- `const01` bigint(1) NOT NULL default '0',
+ `const01` bigint(1) NOT NULL default 0,
`param01` bigint(20) default NULL,
- `const02` double(3,1) NOT NULL default '0.0',
+ `const02` double(3,1) NOT NULL default 0.0,
`param02` double default NULL,
- `const03` double NOT NULL default '0',
+ `const03` double NOT NULL default 0,
`param03` double default NULL,
`const04` char(3) NOT NULL default '',
`param04` longtext,
@@ -1776,7 +1776,7 @@
`param08` longtext,
`const09` datetime default NULL,
`param09` longblob,
- `const10` int(10) NOT NULL default '0',
+ `const10` int(10) NOT NULL default 0,
`param10` bigint(20) default NULL,
`const11` int(4) default NULL,
`param11` bigint(20) default NULL,
--- 1.22/mysql-test/r/ps_4heap.result 2005-03-30 13:30:31 +01:00
+++ 1.23/mysql-test/r/ps_4heap.result 2005-04-25 21:34:40 +01:00
@@ -1759,11 +1759,11 @@
show create table t5 ;
Table Create Table
t5 CREATE TABLE `t5` (
- `const01` bigint(1) NOT NULL default '0',
+ `const01` bigint(1) NOT NULL default 0,
`param01` bigint(20) default NULL,
- `const02` double(3,1) NOT NULL default '0.0',
+ `const02` double(3,1) NOT NULL default 0.0,
`param02` double default NULL,
- `const03` double NOT NULL default '0',
+ `const03` double NOT NULL default 0,
`param03` double default NULL,
`const04` char(3) NOT NULL default '',
`param04` longtext,
@@ -1777,7 +1777,7 @@
`param08` longtext,
`const09` datetime default NULL,
`param09` longblob,
- `const10` int(10) NOT NULL default '0',
+ `const10` int(10) NOT NULL default 0,
`param10` bigint(20) default NULL,
`const11` int(4) default NULL,
`param11` bigint(20) default NULL,
--- 1.22/mysql-test/r/ps_5merge.result 2005-03-30 13:30:31 +01:00
+++ 1.23/mysql-test/r/ps_5merge.result 2005-04-25 21:34:41 +01:00
@@ -1695,11 +1695,11 @@
show create table t5 ;
Table Create Table
t5 CREATE TABLE `t5` (
- `const01` bigint(1) NOT NULL default '0',
+ `const01` bigint(1) NOT NULL default 0,
`param01` bigint(20) default NULL,
- `const02` double(3,1) NOT NULL default '0.0',
+ `const02` double(3,1) NOT NULL default 0.0,
`param02` double default NULL,
- `const03` double NOT NULL default '0',
+ `const03` double NOT NULL default 0,
`param03` double default NULL,
`const04` char(3) NOT NULL default '',
`param04` longtext,
@@ -1713,7 +1713,7 @@
`param08` longtext,
`const09` datetime default NULL,
`param09` longblob,
- `const10` int(10) NOT NULL default '0',
+ `const10` int(10) NOT NULL default 0,
`param10` bigint(20) default NULL,
`const11` int(4) default NULL,
`param11` bigint(20) default NULL,
@@ -4709,11 +4709,11 @@
show create table t5 ;
Table Create Table
t5 CREATE TABLE `t5` (
- `const01` bigint(1) NOT NULL default '0',
+ `const01` bigint(1) NOT NULL default 0,
`param01` bigint(20) default NULL,
- `const02` double(3,1) NOT NULL default '0.0',
+ `const02` double(3,1) NOT NULL default 0.0,
`param02` double default NULL,
- `const03` double NOT NULL default '0',
+ `const03` double NOT NULL default 0,
`param03` double default NULL,
`const04` char(3) NOT NULL default '',
`param04` longtext,
@@ -4727,7 +4727,7 @@
`param08` longtext,
`const09` datetime default NULL,
`param09` longblob,
- `const10` int(10) NOT NULL default '0',
+ `const10` int(10) NOT NULL default 0,
`param10` bigint(20) default NULL,
`const11` int(4) default NULL,
`param11` bigint(20) default NULL,
--- 1.23/mysql-test/r/ps_6bdb.result 2005-03-30 13:30:31 +01:00
+++ 1.24/mysql-test/r/ps_6bdb.result 2005-04-25 21:34:41 +01:00
@@ -1758,11 +1758,11 @@
show create table t5 ;
Table Create Table
t5 CREATE TABLE `t5` (
- `const01` bigint(1) NOT NULL default '0',
+ `const01` bigint(1) NOT NULL default 0,
`param01` bigint(20) default NULL,
- `const02` double(3,1) NOT NULL default '0.0',
+ `const02` double(3,1) NOT NULL default 0.0,
`param02` double default NULL,
- `const03` double NOT NULL default '0',
+ `const03` double NOT NULL default 0,
`param03` double default NULL,
`const04` char(3) NOT NULL default '',
`param04` longtext,
@@ -1776,7 +1776,7 @@
`param08` longtext,
`const09` datetime default NULL,
`param09` longblob,
- `const10` int(10) NOT NULL default '0',
+ `const10` int(10) NOT NULL default 0,
`param10` bigint(20) default NULL,
`const11` int(4) default NULL,
`param11` bigint(20) default NULL,
--- 1.2/mysql-test/r/rpl_deadlock.result 2005-03-23 18:19:08 +00:00
+++ 1.3/mysql-test/r/rpl_deadlock.result 2005-04-25 21:34:42 +01:00
@@ -14,13 +14,13 @@
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,
KEY `a` (`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `a` int(11) NOT NULL default '0',
+ `a` int(11) NOT NULL default 0,
KEY `a` (`a`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
show variables like 'slave_transaction_retries';
--- 1.10/mysql-test/r/sql_mode.result 2004-11-04 04:48:56 +00:00
+++ 1.11/mysql-test/r/sql_mode.result 2005-04-25 21:34:43 +01:00
@@ -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,13 +128,13 @@
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 ;
--- 1.17/mysql-test/r/ps_7ndb.result 2005-03-30 13:30:31 +01:00
+++ 1.18/mysql-test/r/ps_7ndb.result 2005-04-25 21:34:41 +01:00
@@ -1758,11 +1758,11 @@
show create table t5 ;
Table Create Table
t5 CREATE TABLE `t5` (
- `const01` bigint(1) NOT NULL default '0',
+ `const01` bigint(1) NOT NULL default 0,
`param01` bigint(20) default NULL,
- `const02` double(3,1) NOT NULL default '0.0',
+ `const02` double(3,1) NOT NULL default 0.0,
`param02` double default NULL,
- `const03` double NOT NULL default '0',
+ `const03` double NOT NULL default 0,
`param03` double default NULL,
`const04` char(3) NOT NULL default '',
`param04` longtext,
@@ -1776,7 +1776,7 @@
`param08` longtext,
`const09` datetime default NULL,
`param09` longblob,
- `const10` int(10) NOT NULL default '0',
+ `const10` int(10) NOT NULL default 0,
`param10` bigint(20) default NULL,
`const11` int(4) default NULL,
`param11` bigint(20) default NULL,
--- 1.11/mysql-test/r/ndb_autodiscover.result 2004-11-08 10:06:13 +00:00
+++ 1.12/mysql-test/r/ndb_autodiscover.result 2005-04-25 21:34:37 +01:00
@@ -105,7 +105,7 @@
SHOW CREATE TABLE t3;
Table Create Table
t3 CREATE TABLE `t3` (
- `id` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
`name` char(255) default NULL,
PRIMARY KEY (`id`)
) ENGINE=ndbcluster DEFAULT CHARSET=latin1
--- 1.46/mysql-test/r/alter_table.result 2005-02-10 02:12:25 +00:00
+++ 1.47/mysql-test/r/alter_table.result 2005-04-25 21:34:33 +01:00
@@ -54,7 +54,7 @@
Field Type Collation Null Key Default Extra Privileges Comment
GROUP_ID int(10) unsigned NULL PRI 0 #
LANG_ID smallint(5) unsigned NULL PRI 0 #
-NAME char(80) latin1_swedish_ci MUL #
+NAME char(80) latin1_swedish_ci MUL '' #
DROP TABLE t1;
create table t1 (n int);
insert into t1 values(9),(3),(12),(10);
@@ -456,7 +456,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,
`b` int(11) default NULL,
UNIQUE KEY `b` (`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
--- 1.16/mysql-test/r/analyse.result 2005-01-18 13:41:02 +00:00
+++ 1.17/mysql-test/r/analyse.result 2005-04-25 21:34:33 +01:00
@@ -39,10 +39,10 @@
`Field_name` binary(255) NOT NULL default '',
`Min_value` binary(255) default NULL,
`Max_value` binary(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',
+ `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` binary(255) NOT NULL default '',
`Std` binary(255) default NULL,
`Optimal_fieldtype` binary(64) NOT NULL default ''
@@ -58,10 +58,10 @@
`Field_name` binary(255) NOT NULL default '',
`Min_value` binary(255) default NULL,
`Max_value` binary(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',
+ `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` binary(255) NOT NULL default '',
`Std` binary(255) default NULL,
`Optimal_fieldtype` binary(64) NOT NULL default ''
@@ -81,10 +81,10 @@
`Field_name` binary(255) NOT NULL default '',
`Min_value` binary(255) default NULL,
`Max_value` binary(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',
+ `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` binary(255) NOT NULL default '',
`Std` binary(255) default NULL,
`Optimal_fieldtype` binary(64) NOT NULL default ''
--- 1.15/mysql-test/r/case.result 2005-01-18 13:41:02 +00:00
+++ 1.16/mysql-test/r/case.result 2005-04-25 21:34:33 +01:00
@@ -102,8 +102,8 @@
`c4` binary(1) NOT NULL default '',
`c5` binary(3) NOT NULL default '',
`c6` binary(3) NOT NULL default '',
- `c7` double(3,1) NOT NULL default '0.0',
- `c8` double(3,1) NOT NULL default '0.0',
+ `c7` double(3,1) NOT NULL default 0.0,
+ `c8` double(3,1) NOT NULL default 0.0,
`c9` double(3,1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
@@ -145,10 +145,10 @@
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `COALESCE(1)` int(1) NOT NULL default '0',
- `COALESCE(1.0)` double(3,1) NOT NULL default '0.0',
+ `COALESCE(1)` int(1) NOT NULL default 0,
+ `COALESCE(1.0)` double(3,1) NOT NULL default 0.0,
`COALESCE('a')` char(1) NOT NULL default '',
- `COALESCE(1,1.0)` double(3,1) NOT NULL default '0.0',
+ `COALESCE(1,1.0)` double(3,1) NOT NULL default 0.0,
`COALESCE(1,'1')` binary(1) NOT NULL default '',
`COALESCE(1.1,'1')` binary(3) NOT NULL default '',
`COALESCE('a' COLLATE latin1_bin,'b')` char(1) character set latin1 collate latin1_bin NOT NULL default ''
--- 1.75/mysql-test/r/create.result 2004-08-31 12:34:59 +01:00
+++ 1.76/mysql-test/r/create.result 2005-04-25 21:34:34 +01:00
@@ -100,9 +100,9 @@
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 0000-00-00 00:00:00
-b time 00:00:00
-c date 0000-00-00
+a datetime '0000-00-00 00:00:00'
+b time '00:00:00'
+c date '0000-00-00'
d bigint(17) 0
e double(18,1) 0.0
f bigint(17) 0
@@ -152,7 +152,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,
`b` int(11) default NULL,
PRIMARY KEY (`a`),
KEY `b` (`b`),
@@ -203,7 +203,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
) ENGINE=HEAP DEFAULT CHARSET=latin1
drop table t1;
SET SESSION storage_engine="gemini";
@@ -215,7 +215,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
) ENGINE=HEAP DEFAULT CHARSET=latin1
SET SESSION storage_engine=default;
drop table t1;
@@ -291,7 +291,7 @@
show create table t3;
Table Create Table
t3 CREATE TABLE `t3` (
- `id` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
`name` char(20) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
select * from t3;
@@ -306,7 +306,7 @@
show create table t3;
Table Create Table
t3 CREATE TEMPORARY TABLE `t3` (
- `id` int(11) NOT NULL default '0'
+ `id` int(11) NOT NULL default 0
) ENGINE=MyISAM DEFAULT CHARSET=latin1
select * from t3;
id
@@ -314,7 +314,7 @@
show create table t3;
Table Create Table
t3 CREATE TABLE `t3` (
- `id` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
`name` char(20) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
select * from t3;
@@ -326,14 +326,14 @@
show create table t3;
Table Create Table
t3 CREATE TEMPORARY TABLE `t3` (
- `id` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
`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 default '0',
+ `id` int(11) NOT NULL default 0,
`name` char(20) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
select * from t2;
@@ -360,7 +360,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
) ENGINE=HEAP DEFAULT CHARSET=latin1
drop table t1;
SET SESSION storage_engine="gemini";
@@ -372,7 +372,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
) ENGINE=HEAP DEFAULT CHARSET=latin1
SET SESSION storage_engine=default;
drop table t1;
@@ -415,10 +415,10 @@
b bigint(11) 0
c bigint(10) 0
d date YES NULL
-e char(1)
+e char(1) ''
f datetime YES NULL
g time YES NULL
-h longblob
+h longblob ''
dd time YES NULL
select * from t2;
a b c d e f g h dd
@@ -451,7 +451,7 @@
insert into t1 values ('','',0,0.0);
describe t1;
Field Type Null Key Default Extra
-str varchar(10) YES def
+str varchar(10) YES 'def'
strnull varchar(10) YES NULL
intg int(11) YES 10
rel double YES 3.14
--- 1.38/mysql-test/r/func_group.result 2005-03-23 06:36:41 +00:00
+++ 1.39/mysql-test/r/func_group.result 2005-04-25 21:34:36 +01:00
@@ -752,7 +752,7 @@
create table t2 select f2 from (select now() f2 from t1) a;
show columns from t2;
Field Type Null Key Default Extra
-f2 datetime 0000-00-00 00:00:00
+f2 datetime '0000-00-00 00:00:00'
drop table t2, t1;
CREATE TABLE t1(
id int PRIMARY KEY,
--- 1.36/mysql-test/r/func_time.result 2004-12-30 18:37:29 +00:00
+++ 1.37/mysql-test/r/func_time.result 2005-04-25 21:34:36 +01:00
@@ -557,7 +557,7 @@
from_days(to_days("960101")) as b;
describe t1;
Field Type Null Key Default Extra
-a date 0000-00-00
+a date '0000-00-00'
b date YES NULL
select * from t1;
a b
--- 1.96/mysql-test/r/innodb.result 2005-04-14 20:19:52 +01:00
+++ 1.97/mysql-test/r/innodb.result 2005-04-25 21:34:36 +01:00
@@ -1449,14 +1449,14 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `id` int(11) NOT NULL default '0',
- `id2` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
+ `id2` int(11) NOT NULL default 0,
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 default '0',
+ `id` int(11) NOT NULL default 0,
KEY `t1_id_fk` (`id`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -1464,7 +1464,7 @@
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `id` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
KEY `id` (`id`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -1472,7 +1472,7 @@
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `id` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
KEY `id` (`id`),
KEY `id2` (`id`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
@@ -1483,7 +1483,7 @@
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `id` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
KEY `id` (`id`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -1492,8 +1492,8 @@
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `id` int(11) NOT NULL default '0',
- `id2` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
+ `id2` int(11) NOT NULL default 0,
KEY `t1_id_fk` (`id`,`id2`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`, `id2`) REFERENCES `t1` (`id`, `id2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -1501,8 +1501,8 @@
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `id` int(11) NOT NULL default '0',
- `id2` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
+ `id2` int(11) NOT NULL default 0,
UNIQUE KEY `id` (`id`,`id2`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`, `id2`) REFERENCES `t1` (`id`, `id2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -1511,8 +1511,8 @@
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `id` int(11) NOT NULL default '0',
- `id2` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
+ `id2` int(11) NOT NULL default 0,
UNIQUE KEY `id` (`id`,`id2`),
KEY `t1_id_fk` (`id2`,`id`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id2`, `id`) REFERENCES `t1` (`id`, `id2`)
@@ -1522,8 +1522,8 @@
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `id` int(11) NOT NULL default '0',
- `id2` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
+ `id2` int(11) NOT NULL default 0,
UNIQUE KEY `id` (`id`,`id2`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -1532,8 +1532,8 @@
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
- `id` int(11) NOT NULL default '0',
- `id2` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
+ `id2` int(11) NOT NULL default 0,
UNIQUE KEY `id` (`id`,`id2`),
KEY `t1_id_fk` (`id2`,`id`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id2`, `id`) REFERENCES `t1` (`id`, `id2`)
@@ -1544,7 +1544,7 @@
Table Create Table
t2 CREATE TABLE `t2` (
`id` int(11) NOT NULL auto_increment,
- `id2` int(11) NOT NULL default '0',
+ `id2` int(11) NOT NULL default 0,
PRIMARY KEY (`id`),
KEY `id` (`id`,`id2`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
@@ -1555,7 +1555,7 @@
Table Create Table
t2 CREATE TABLE `t2` (
`id` int(11) NOT NULL auto_increment,
- `id2` int(11) NOT NULL default '0',
+ `id2` int(11) NOT NULL default 0,
KEY `t1_id_fk` (`id`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
@@ -1564,7 +1564,7 @@
Table Create Table
t2 CREATE TABLE `t2` (
`id` int(11) NOT NULL auto_increment,
- `id2` int(11) NOT NULL default '0',
+ `id2` int(11) NOT NULL default 0,
KEY `id_test` (`id`),
KEY `id_test2` (`id`,`id2`),
CONSTRAINT `t1_id_fk` FOREIGN KEY (`id`) REFERENCES `t1` (`id`)
--- 1.34/mysql-test/r/merge.result 2004-12-27 12:01:59 +00:00
+++ 1.35/mysql-test/r/merge.result 2005-04-25 21:34:37 +01:00
@@ -172,7 +172,7 @@
show create table t3;
Table Create Table
t3 CREATE TABLE `t3` (
- `a` int(11) NOT NULL default '0',
+ `a` int(11) NOT NULL default 0,
`b` char(20) default NULL,
KEY `a` (`a`)
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`t2`)
@@ -187,7 +187,7 @@
show create table t5;
Table Create Table
t5 CREATE TABLE `t5` (
- `a` int(11) NOT NULL default '0',
+ `a` int(11) NOT NULL default 0,
`b` char(20) default NULL,
KEY `a` (`a`)
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`mysqltest`.`t6`)
@@ -260,16 +260,16 @@
show create table t3;
Table Create Table
t3 CREATE TABLE `t3` (
- `incr` int(11) NOT NULL default '0',
- `othr` int(11) NOT NULL default '0',
+ `incr` int(11) NOT NULL default 0,
+ `othr` int(11) NOT NULL default 0,
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 default '0',
- `othr` int(11) NOT NULL default '0'
+ `incr` int(11) NOT NULL default 0,
+ `othr` int(11) NOT NULL default 0
) 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,28 +296,28 @@
show create table t3;
Table Create Table
t3 CREATE TABLE `t3` (
- `a` int(11) NOT NULL default '0',
- `b` int(11) NOT NULL default '0',
+ `a` int(11) NOT NULL default 0,
+ `b` int(11) NOT NULL default 0,
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 default '0',
- `b` int(11) NOT NULL default '0',
+ `a` int(11) NOT NULL default 0,
+ `b` int(11) NOT NULL default 0,
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 default '0',
+ `a` int(11) NOT NULL default 0,
`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 default '0',
+ `a` int(11) NOT NULL default 0,
`b` int(11) NOT NULL auto_increment,
PRIMARY KEY (`a`,`b`)
) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`t1`,`t2`)
@@ -382,8 +382,8 @@
show create table t4;
Table Create Table
t4 CREATE TABLE `t4` (
- `a` int(11) NOT NULL default '0',
- `b` int(11) NOT NULL default '0',
+ `a` int(11) NOT NULL default 0,
+ `b` int(11) NOT NULL default 0,
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 default '0',
- `b` int(11) NOT NULL default '0',
+ `a` int(11) NOT NULL default 0,
+ `b` int(11) NOT NULL default 0,
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.51/mysql-test/r/select.result 2005-04-02 01:41:49 +01:00
+++ 1.52/mysql-test/r/select.result 2005-04-25 21:34:42 +01:00
@@ -2034,19 +2034,19 @@
show full columns from t2;
Field Type Collation Null Key Default Extra Privileges Comment
auto int(11) NULL PRI NULL auto_increment #
-fld1 int(6) unsigned zerofill NULL UNI 000000 #
-companynr tinyint(2) unsigned zerofill NULL 00 #
-fld3 char(30) latin1_swedish_ci MUL #
-fld4 char(35) latin1_swedish_ci #
-fld5 char(35) latin1_swedish_ci #
-fld6 char(4) latin1_swedish_ci #
+fld1 int(6) unsigned zerofill NULL UNI 0 #
+companynr tinyint(2) unsigned zerofill NULL 0 #
+fld3 char(30) latin1_swedish_ci MUL '' #
+fld4 char(35) latin1_swedish_ci '' #
+fld5 char(35) latin1_swedish_ci '' #
+fld6 char(4) latin1_swedish_ci '' #
show full columns from t2 from test like 'f%';
Field Type Collation Null Key Default Extra Privileges Comment
-fld1 int(6) unsigned zerofill NULL UNI 000000 #
-fld3 char(30) latin1_swedish_ci MUL #
-fld4 char(35) latin1_swedish_ci #
-fld5 char(35) latin1_swedish_ci #
-fld6 char(4) latin1_swedish_ci #
+fld1 int(6) unsigned zerofill NULL UNI 0 #
+fld3 char(30) latin1_swedish_ci MUL '' #
+fld4 char(35) latin1_swedish_ci '' #
+fld5 char(35) latin1_swedish_ci '' #
+fld6 char(4) latin1_swedish_ci '' #
show full columns from t2 from test like 's%';
Field Type Collation Null Key Default Extra Privileges Comment
show keys from t2;
--- 1.62/mysql-test/r/show_check.result 2005-04-16 20:35:36 +01:00
+++ 1.63/mysql-test/r/show_check.result 2005-04-25 21:34:43 +01:00
@@ -80,13 +80,13 @@
show create table t1;
Table Create Table
t1 CREATE TEMPORARY TABLE `t1` (
- `a` int(11) NOT NULL default '0'
+ `a` int(11) NOT NULL default 0
) 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 default '0'
+ `a` int(11) NOT NULL default 0
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t2;
create table t1 (
@@ -101,7 +101,7 @@
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 default '0' COMMENT 'int column',
+ `c` int(11) NOT NULL default 0 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'
@@ -111,15 +111,15 @@
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 default '0' COMMENT 'int column',
+ c int(11) NOT NULL default 0 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 select,insert,update,references
-name char(20) latin1_swedish_ci YES O'Brien select,insert,update,references O'Brien as default
+test_set set('val1','val2','val3') latin1_swedish_ci '' 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 0 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
@@ -128,7 +128,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,
UNIQUE KEY `aa` (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
@@ -136,7 +136,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`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
@@ -153,7 +153,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,
`b` char(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'
@@ -161,7 +161,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,
`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'
@@ -169,7 +169,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,
`b` varchar(10) default NULL,
KEY `b` (`b`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
@@ -219,7 +219,7 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `type_bool` tinyint(1) NOT NULL default '0',
+ `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,
--- 1.25/mysql-test/r/type_enum.result 2005-03-23 19:38:36 +00:00
+++ 1.26/mysql-test/r/type_enum.result 2005-04-25 21:34:44 +01:00
@@ -1654,7 +1654,7 @@
create table t1 (a enum(0xE4, '1', '2') not null default 0xE4);
show columns from t1;
Field Type Null Key Default Extra
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
@@ -1669,13 +1669,13 @@
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` int(11) default '1',
+ `a` int(11) default 1,
) ENGINE=MyISAM DEFAULT CHARSET=latin1
show columns from t1;
Field Type Null Key Default Extra
a int(11) YES 1
drop table t1;
CREATE TABLE t1 (c enum('a', 'A') BINARY);
INSERT INTO t1 VALUES ('a'),('A');
--- 1.26/mysql-test/r/type_ranges.result 2005-03-31 02:32:40 +01:00
+++ 1.27/mysql-test/r/type_ranges.result 2005-04-25 21:34:45 +01:00
@@ -41,7 +41,7 @@
show full fields from t1;
Field Type Collation Null Key Default Extra Privileges Comment
auto int(5) unsigned NULL PRI NULL auto_increment #
-string varchar(10) latin1_swedish_ci YES hello #
+string varchar(10) latin1_swedish_ci YES 'hello' #
tiny tinyint(4) NULL MUL 0 #
short smallint(6) NULL MUL 1 #
medium mediumint(8) NULL MUL 0 #
@@ -50,7 +50,7 @@
real_float float(13,1) NULL MUL 0.0 #
real_double double(16,4) NULL YES NULL #
utiny tinyint(3) unsigned NULL MUL 0 #
-ushort smallint(5) unsigned zerofill NULL MUL 00000 #
+ushort smallint(5) unsigned zerofill NULL MUL 0 #
umedium mediumint(8) unsigned NULL MUL 0 #
ulong int(11) unsigned NULL MUL 0 #
ulonglong bigint(13) unsigned NULL MUL 0 #
@@ -60,10 +60,10 @@
date_time datetime NULL YES NULL #
blob_col blob NULL YES NULL #
tinyblob_col tinyblob NULL YES NULL #
-mediumblob_col mediumblob NULL #
-longblob_col longblob NULL #
-options enum('one','two','tree') latin1_swedish_ci MUL one #
-flags set('one','two','tree') latin1_swedish_ci #
+mediumblob_col mediumblob NULL '' #
+longblob_col longblob NULL '' #
+options enum('one','two','tree') latin1_swedish_ci MUL 'one' #
+flags set('one','two','tree') latin1_swedish_ci '' #
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
@@ -209,7 +209,7 @@
show full columns from t1;
Field Type Collation Null Key Default Extra Privileges Comment
auto int(5) unsigned NULL MUL NULL auto_increment #
-string varchar(10) latin1_swedish_ci YES new defaul #
+string varchar(10) latin1_swedish_ci YES 'new defaul' #
tiny tinyint(4) NULL MUL 0 #
short smallint(6) NULL MUL 0 #
medium mediumint(8) NULL MUL 0 #
@@ -218,7 +218,7 @@
real_float float(13,1) NULL MUL 0.0 #
real_double double(16,4) NULL YES NULL #
utiny tinyint(3) unsigned NULL 0 #
-ushort smallint(5) unsigned zerofill NULL 00000 #
+ushort smallint(5) unsigned zerofill NULL 0 #
umedium mediumint(8) unsigned NULL MUL 0 #
ulong int(11) unsigned NULL MUL 0 #
ulonglong bigint(13) unsigned NULL MUL 0 #
@@ -228,14 +228,14 @@
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 #
-options enum('one','two','tree') latin1_swedish_ci MUL one #
-flags set('one','two','tree') latin1_swedish_ci #
-new_field varchar(10) latin1_swedish_ci new #
+mediumblob_col mediumblob NULL '' #
+options enum('one','two','tree') latin1_swedish_ci MUL 'one' #
+flags set('one','two','tree') latin1_swedish_ci '' #
+new_field varchar(10) latin1_swedish_ci 'new' #
show full columns from t2;
Field Type Collation Null Key Default Extra Privileges Comment
auto int(5) unsigned NULL 0 #
-string varchar(10) latin1_swedish_ci YES new defaul #
+string varchar(10) latin1_swedish_ci YES 'new defaul' #
tiny tinyint(4) NULL 0 #
short smallint(6) NULL 0 #
medium mediumint(8) NULL 0 #
@@ -244,20 +244,20 @@
real_float float(13,1) NULL 0.0 #
real_double double(16,4) NULL YES NULL #
utiny tinyint(3) unsigned NULL 0 #
-ushort smallint(5) unsigned zerofill NULL 00000 #
+ushort smallint(5) unsigned zerofill NULL 0 #
umedium mediumint(8) unsigned NULL 0 #
ulong int(11) unsigned NULL 0 #
ulonglong bigint(13) unsigned NULL 0 #
-time_stamp timestamp NULL YES 0000-00-00 00:00:00 #
+time_stamp timestamp NULL YES '0000-00-00 00:00:00' #
date_field varchar(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 #
-options enum('one','two','tree') latin1_swedish_ci one #
-flags set('one','two','tree') latin1_swedish_ci #
-new_field varchar(10) latin1_swedish_ci new #
+mediumblob_col mediumblob NULL '' #
+options enum('one','two','tree') latin1_swedish_ci 'one' #
+flags set('one','two','tree') latin1_swedish_ci '' #
+new_field varchar(10) latin1_swedish_ci '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.ulon!
g 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!
null)) or (t1.new_field<>t2.new_field and (t1.new_field is no!
t null o
r t2.new_field is not null)));
auto auto
16 16
@@ -270,9 +270,9 @@
Field Type Collation Null Key Default Extra Privileges Comment
auto bigint(17) unsigned NULL PRI 0 #
t1 bigint(1) NULL 0 #
-t2 char(1) latin1_swedish_ci #
-t3 longtext latin1_swedish_ci #
-t4 longblob NULL #
+t2 char(1) latin1_swedish_ci '' #
+t3 longtext latin1_swedish_ci '' #
+t4 longblob NULL '' #
select * from t2;
auto t1 t2 t3 t4
11 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
--- 1.26/mysql-test/r/type_timestamp.result 2005-04-19 14:12:29 +01:00
+++ 1.27/mysql-test/r/type_timestamp.result 2005-04-25 21:34:45 +01:00
@@ -188,9 +188,9 @@
) ENGINE=MyISAM DEFAULT CHARSET=latin1
show columns from t1;
Field Type Null Key Default Extra
-t1 timestamp YES 2003-01-01 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
+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;
@@ -214,7 +214,7 @@
Field Type Null Key Default Extra
t1 timestamp YES CURRENT_TIMESTAMP
t2 datetime YES NULL
-t3 timestamp YES 0000-00-00 00:00:00
+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;
@@ -238,7 +238,7 @@
) ENGINE=MyISAM DEFAULT CHARSET=latin1
show columns from t1;
Field Type Null Key Default Extra
-t1 timestamp YES 2003-01-01 00:00:00
+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);
@@ -291,7 +291,7 @@
Field Type Null Key Default Extra
t1 timestamp YES CURRENT_TIMESTAMP
t2 datetime YES NULL
-t3 timestamp YES 0000-00-00 00:00:00
+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;
--- 1.10/mysql-test/r/ctype_ujis.result 2005-01-13 14:11:55 +00:00
+++ 1.11/mysql-test/r/ctype_ujis.result 2005-04-25 21:34:35 +01:00
@@ -123,7 +123,7 @@
) ENGINE=MyISAM DEFAULT CHARSET=ujis
SHOW COLUMNS FROM t1;
Field Type Null Key Default Extra
-a char(1)
+a char(1) ''
DROP TABLE t1;
CREATE TABLE t1
--- 1.18/mysql-test/r/rpl000002.result 2004-02-16 23:35:14 +00:00
+++ 1.19/mysql-test/r/rpl000002.result 2005-04-25 21:34:42 +01:00
@@ -40,7 +40,7 @@
show create table t5;
Table Create Table
t5 CREATE TABLE `t5` (
- `id` int(11) NOT NULL default '0',
+ `id` int(11) NOT NULL default 0,
`created` datetime default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t2,t3,t5;
--- 1.11/mysql-test/r/system_mysql_db.result 2005-02-11 04:09:07 +00:00
+++ 1.12/mysql-test/r/system_mysql_db.result 2005-04-25 21:34:44 +01:00
@@ -86,16 +86,16 @@
`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_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,
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',
+ `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 default 'function',
PRIMARY KEY (`name`)
| Thread |
|---|
| • bk commit into 4.1 tree (acurtis:1.2206) BUG#9098 | antony | 25 Apr |
