diff options
| author | unknown <andrey@example.com> | 2006-10-23 15:21:23 +0200 |
|---|---|---|
| committer | unknown <andrey@example.com> | 2006-10-23 15:21:23 +0200 |
| commit | 7cd0f1a62930012ec2dae8909b43f798572091bd (patch) | |
| tree | cad2dd65b1fb08d0fdf5a3f3138bff37b319d4bd /sql/sql_show.cc | |
| parent | 394b27b6b415f0042829d99ba6557e3c5db6e601 (diff) | |
| parent | 29947efc6257e3348b00363c4a4ab301249588b3 (diff) | |
| download | mariadb-git-7cd0f1a62930012ec2dae8909b43f798572091bd.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into example.com:/work/bug23037/my50
sql/sql_show.cc:
Auto merged
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 4469bbacf90..b0f5489b2f4 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4044,7 +4044,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}, |