diff options
| author | unknown <andrey@example.com> | 2006-10-23 14:29:11 +0200 |
|---|---|---|
| committer | unknown <andrey@example.com> | 2006-10-23 14:29:11 +0200 |
| commit | 4f6ff70334796b1de66929bdceea222d53d8329f (patch) | |
| tree | 9b0e93b4fee8445a8f417db2655056f35dd09e12 /sql/sql_show.cc | |
| parent | 6c4f74eddd161aead927dcd8769a587c6f507c56 (diff) | |
| parent | 29947efc6257e3348b00363c4a4ab301249588b3 (diff) | |
| download | mariadb-git-4f6ff70334796b1de66929bdceea222d53d8329f.tar.gz | |
Merge example.com:/work/bug23037/my50
into example.com:/work/bug23037/my51
sql/sql_show.cc:
Auto merged
mysql-test/r/information_schema.result:
manual merge
mysql-test/t/information_schema.test:
manual merge
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 30f494a48ac..007e52a691b 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5247,7 +5247,7 @@ ST_FIELD_INFO columns_fields_info[]= {"TABLE_NAME", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, 0}, {"COLUMN_NAME", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, "Field"}, {"ORDINAL_POSITION", 21 , MYSQL_TYPE_LONG, 0, 0, 0}, - {"COLUMN_DEFAULT", NAME_LEN, MYSQL_TYPE_STRING, 0, 1, "Default"}, + {"COLUMN_DEFAULT", MAX_FIELD_VARCHARLENGTH, MYSQL_TYPE_STRING, 0, 1, "Default"}, {"IS_NULLABLE", 3, MYSQL_TYPE_STRING, 0, 0, "Null"}, {"DATA_TYPE", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, 0}, {"CHARACTER_MAXIMUM_LENGTH", 21 , MYSQL_TYPE_LONG, 0, 1, 0}, |