diff options
| author | holyfoot/hf@mysql.com/deer.(none) <> | 2006-08-10 14:50:54 +0500 |
|---|---|---|
| committer | holyfoot/hf@mysql.com/deer.(none) <> | 2006-08-10 14:50:54 +0500 |
| commit | 1ada6ca10898fed572fe23aa10782e08f6ef9e9c (patch) | |
| tree | eb018b81fad89e82c7aef3860800f5211e47c698 | |
| parent | ba90c1e9fa673a5e68b94d4ecb1f4b7f4a76d3f2 (diff) | |
| download | mariadb-git-1ada6ca10898fed572fe23aa10782e08f6ef9e9c.tar.gz | |
bug #20910 (NOT NULL column reported as NULL in SHOW FIELDS)
two test results changed after the patch
| -rw-r--r-- | mysql-test/r/grant.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/type_ranges.result | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index 3f3325354ee..955af24a2aa 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -525,7 +525,7 @@ Db char(64) NO PRI User char(16) NO PRI Table_name char(64) NO PRI Grantor char(77) NO MUL -Timestamp timestamp YES CURRENT_TIMESTAMP +Timestamp timestamp NO CURRENT_TIMESTAMP Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view') NO Column_priv set('Select','Insert','Update','References') NO use test; diff --git a/mysql-test/r/type_ranges.result b/mysql-test/r/type_ranges.result index ec8211dc4bf..e949d734944 100644 --- a/mysql-test/r/type_ranges.result +++ b/mysql-test/r/type_ranges.result @@ -57,7 +57,7 @@ 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 # +time_stamp timestamp NULL NO CURRENT_TIMESTAMP # date_field date NULL YES NULL # time_field time NULL YES NULL # date_time datetime NULL YES NULL # @@ -229,7 +229,7 @@ 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 # +time_stamp timestamp NULL NO CURRENT_TIMESTAMP # date_field char(10) latin1_swedish_ci YES NULL # time_field time NULL YES NULL # date_time datetime NULL YES NULL # @@ -255,7 +255,7 @@ 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 # +time_stamp timestamp NULL NO 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 # |