diff options
| author | istruewing@stella.local <> | 2008-03-14 12:02:11 +0100 |
|---|---|---|
| committer | istruewing@stella.local <> | 2008-03-14 12:02:11 +0100 |
| commit | eabe082d6fdf70dc15babb9cda6c01035594ae70 (patch) | |
| tree | b52789d6b0503cf1a56ee2fea977be99a7287207 /sql/sql_show.cc | |
| parent | df059d9ca678a6f8ad20960c241608870fdcd337 (diff) | |
| parent | eac3a26efab4f3886ba68ed24cc1ddfc453dfa0e (diff) | |
| download | mariadb-git-eabe082d6fdf70dc15babb9cda6c01035594ae70.tar.gz | |
Manual merge
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 09886d3e171..aaababc330a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5385,8 +5385,9 @@ ST_SCHEMA_TABLE *get_schema_table(enum enum_schema_tables schema_table_idx) @param thd thread handler - @param - schema_table pointer to 'shema_tables' element + + @param table_list Used to pass I_S table information(fields info, tables + parameters etc) and table name. @retval \# Pointer to created table @retval NULL Can't create table @@ -5437,6 +5438,7 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list) DBUG_RETURN(NULL); break; case MYSQL_TYPE_DECIMAL: + case MYSQL_TYPE_NEWDECIMAL: if (!(item= new Item_decimal((longlong) fields_info->value, false))) { DBUG_RETURN(0); @@ -5786,7 +5788,7 @@ int make_schema_select(THD *thd, SELECT_LEX *sel, { ST_SCHEMA_TABLE *schema_table= get_schema_table(schema_table_idx); LEX_STRING db, table; - DBUG_ENTER("mysql_schema_select"); + DBUG_ENTER("make_schema_select"); DBUG_PRINT("enter", ("mysql_schema_select: %s", schema_table->table_name)); /* We have to make non const db_name & table_name |