diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-08-08 13:34:27 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-08-08 13:34:27 +0500 |
| commit | 3bb35e0cbabc167e71dbdc54ed16253f919415ca (patch) | |
| tree | 496449383286ad6404b72e7395320f82cb503503 /sql/sql_show.cc | |
| parent | a517c2440eb5d6e3c5839916a9b5be42cc614290 (diff) | |
| download | mariadb-git-3bb35e0cbabc167e71dbdc54ed16253f919415ca.tar.gz | |
bug #20910 (NOT NULL reported as NULL for TIMESTAMP)
we intentionally reported that for TIMESTAMPS, which isn't right
mysql-test/r/type_timestamp.result:
result fixed
mysql-test/t/type_timestamp.test:
testcase added
sql/sql_show.cc:
remove the check for TIMESTAMP type -
all types will report 'NO' if they're defined as NOT NULL
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 433238cb853..eb78f4fbdae 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2713,9 +2713,7 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables, table->field[5]->store("",0, cs); table->field[5]->set_notnull(); } - pos=(byte*) ((flags & NOT_NULL_FLAG) && - field->type() != FIELD_TYPE_TIMESTAMP ? - "NO" : "YES"); + pos=(byte*) ((flags & NOT_NULL_FLAG) ? "NO" : "YES"); table->field[6]->store((const char*) pos, strlen((const char*) pos), cs); is_blob= (field->type() == FIELD_TYPE_BLOB); |