diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-07-07 13:05:08 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-07-07 13:05:08 +0300 |
| commit | 7ad0563075462c9de4430dd6eee080cc18c42603 (patch) | |
| tree | f9000535eea03a7f950e096c8d353213f358b81a | |
| parent | 53816be2596069a6eaf7545907d69c8817dd5d5f (diff) | |
| parent | d9e7c4efb6bfebf625af629b3ca878f1d0dc7e02 (diff) | |
| download | mariadb-git-7ad0563075462c9de4430dd6eee080cc18c42603.tar.gz | |
merge
| -rw-r--r-- | libmysql/libmysql.c | 1 | ||||
| -rw-r--r-- | sql/sql_show.cc | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index f2ad085405f..3e89b24649a 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4042,6 +4042,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field) case MYSQL_TYPE_TIME: field->max_length= 15; /* 19:23:48.123456 */ param->skip_result= skip_result_with_length; + break; case MYSQL_TYPE_DATE: field->max_length= 10; /* 2003-11-11 */ param->skip_result= skip_result_with_length; diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 57c5d12abd7..1ddce1c319d 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2875,11 +2875,15 @@ make_table_name_list(THD *thd, List<LEX_STRING> *table_names, LEX *lex, { if (with_i_schema) { + LEX_STRING *name; ST_SCHEMA_TABLE *schema_table= find_schema_table(thd, lookup_field_vals->table_value.str); if (schema_table && !schema_table->hidden) { - if (table_names->push_back(&lookup_field_vals->table_value)) + if (!(name= + thd->make_lex_string(NULL, schema_table->table_name, + strlen(schema_table->table_name), TRUE)) || + table_names->push_back(name)) return 1; } } |