database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt

Browse Source 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
This commit is contained in:
unknown
2008-03-12 13:56:50 +03:00
parent 9fcf16a055 f9bbd7533c
commit 6c2f9bf5e1
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_show.cc
View File

@ -5384,8 +5384,9 @@ ST_SCHEMA_TABLE *get_schema_table(enum enum_schema_tables schema_table_idx)
@param @param
thd thread handler 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 \# Pointer to created table
@retval NULL Can't create table @retval NULL Can't create table
@ -5436,6 +5437,7 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list)
DBUG_RETURN(NULL); DBUG_RETURN(NULL);
break; break;
case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_DECIMAL:
case MYSQL_TYPE_NEWDECIMAL:
if (!(item= new Item_decimal((longlong) fields_info->value, false))) if (!(item= new Item_decimal((longlong) fields_info->value, false)))
{ {
DBUG_RETURN(0); DBUG_RETURN(0);
@ -5785,7 +5787,7 @@ int make_schema_select(THD *thd, SELECT_LEX *sel,
{ {
ST_SCHEMA_TABLE *schema_table= get_schema_table(schema_table_idx); ST_SCHEMA_TABLE *schema_table= get_schema_table(schema_table_idx);
LEX_STRING db, table; 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)); DBUG_PRINT("enter", ("mysql_schema_select: %s", schema_table->table_name));
/* /*
We have to make non const db_name & table_name We have to make non const db_name & table_name

24
sql/table.h
View File

@ -759,12 +759,36 @@ enum enum_schema_tables
typedef struct st_field_info typedef struct st_field_info
{ {
/**
This is used as column name.
*/
const char* field_name; const char* field_name;
/**
For string-type columns, this is the maximum number of
characters. Otherwise, it is the 'display-length' for the column.
*/
uint field_length; uint field_length;
/**
This denotes data type for the column. For the most part, there seems to
be one entry in the enum for each SQL data type, although there seem to
be a number of additional entries in the enum.
*/
enum enum_field_types field_type; enum enum_field_types field_type;
int value; int value;
/**
This is used to set column attributes. By default, columns are @c NOT
@c NULL and @c SIGNED, and you can deviate from the default
by setting the appopriate flags. You can use either one of the flags
@c MY_I_S_MAYBE_NULL and @cMY_I_S_UNSIGNED or
combine them using the bitwise or operator @c |. Both flags are
defined in table.h.
*/
uint field_flags; // Field atributes(maybe_null, signed, unsigned etc.) uint field_flags; // Field atributes(maybe_null, signed, unsigned etc.)
const char* old_name; const char* old_name;
/**
This should be one of @c SKIP_OPEN_TABLE,
@c OPEN_FRM_ONLY or @c OPEN_FULL_TABLE.
*/
uint open_method; uint open_method;
} ST_FIELD_INFO; } ST_FIELD_INFO;