database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Georgi Kodinov
2010-07-07 13:05:08 +03:00
parent 53816be259 d9e7c4efb6
commit 7ad0563075
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysql/libmysql.c
View File

@ -4042,6 +4042,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field)
case MYSQL_TYPE_TIME: case MYSQL_TYPE_TIME:
field->max_length= 15; /* 19:23:48.123456 */ field->max_length= 15; /* 19:23:48.123456 */
param->skip_result= skip_result_with_length; param->skip_result= skip_result_with_length;
break;
case MYSQL_TYPE_DATE: case MYSQL_TYPE_DATE:
field->max_length= 10; /* 2003-11-11 */ field->max_length= 10; /* 2003-11-11 */
param->skip_result= skip_result_with_length; param->skip_result= skip_result_with_length;

6
sql/sql_show.cc
View File

@ -2875,11 +2875,15 @@ make_table_name_list(THD *thd, List<LEX_STRING> *table_names, LEX *lex,
{ {
if (with_i_schema) if (with_i_schema)
{ {
LEX_STRING *name;
ST_SCHEMA_TABLE *schema_table= ST_SCHEMA_TABLE *schema_table=
find_schema_table(thd, lookup_field_vals->table_value.str); find_schema_table(thd, lookup_field_vals->table_value.str);
if (schema_table && !schema_table->hidden) 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; return 1;
} }
} }