diff options
| author | monty@mysql.com <> | 2005-08-15 20:12:28 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-08-15 20:12:28 +0300 |
| commit | 8589f14d450fb3d50915da2a97af7a7be48e1bb5 (patch) | |
| tree | 90809e987ac321032fe995866e6a541cb92233ac /sql | |
| parent | c10f05552ff3a3566412a7f7ea42a4053abfed60 (diff) | |
| parent | c414bb15209939df14ca019b458f900704ebd80d (diff) | |
| download | mariadb-git-8589f14d450fb3d50915da2a97af7a7be48e1bb5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_show.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 397282acb56..0a76e9fb753 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2462,6 +2462,7 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables, table->field[5]->set_notnull(); } else if (field->unireg_check == Field::NEXT_NUMBER || + lex->orig_sql_command != SQLCOM_SHOW_FIELDS || field->maybe_null()) table->field[5]->set_null(); // Null as default else |