diff options
| author | unknown <sergefp@mysql.com> | 2003-11-21 00:27:54 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2003-11-21 00:27:54 +0300 |
| commit | 075ce1ec5756584dc4f94908c224eb1ba7098c1f (patch) | |
| tree | 6b4bea3efe528c37d33b93dc225687872b614d11 /sql/sql_class.cc | |
| parent | 50685be51b54985cccaa299cb6d7a43ff1cbe2a1 (diff) | |
| parent | bc20df185777934065c1974c90e7f81bc71d89cd (diff) | |
| download | mariadb-git-075ce1ec5756584dc4f94908c224eb1ba7098c1f.tar.gz | |
Merged, most likely needs post-merge fix
BitKeeper/etc/logging_ok:
auto-union
sql/opt_range.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/opt_range.cc:
Merged
sql/sql_select.cc:
Merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 919cf8b969b..c0d2c85a7a9 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -575,8 +575,8 @@ int THD::send_explain_fields(select_result *result) item->maybe_null=1; field_list.push_back(item=new Item_empty_string("key",NAME_LEN)); item->maybe_null=1; - field_list.push_back(item=new Item_return_int("key_len",3, - MYSQL_TYPE_LONGLONG)); + field_list.push_back(item=new Item_empty_string("key_len", + NAME_LEN*MAX_KEY)); item->maybe_null=1; field_list.push_back(item=new Item_empty_string("ref", NAME_LEN*MAX_REF_PARTS)); |