database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge with dynamic column code

Browse Source
This commit is contained in:
Michael Widenius
2011-05-12 14:30:34 +03:00
parent f34be18938 4c81cef75d
commit f09f1c7c7d
81 changed files with 8049 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sql/sql_base.cc
View File

@@ -9405,6 +9405,40 @@ void close_performance_schema_table(THD *thd, Open_tables_state *backup)
thd->restore_backup_open_tables_state(backup);
}
/**
Check result of dynamic column function and issue error if it is needed
@param rc The result code of dynamic column function
@return the result code which was get as an argument\
*/
int dynamic_column_error_message(enum_dyncol_func_result rc)
{
switch (rc) {
case ER_DYNCOL_YES:
case ER_DYNCOL_OK:
break; // it is not an error
case ER_DYNCOL_FORMAT:
my_error(ER_DYN_COL_WRONG_FORMAT, MYF(0));
break;
case ER_DYNCOL_LIMIT:
my_error(ER_DYN_COL_IMPLEMENTATION_LIMIT, MYF(0));
break;
case ER_DYNCOL_RESOURCE:
my_error(ER_OUT_OF_RESOURCES, MYF(0));
break;
case ER_DYNCOL_DATA:
my_error(ER_DYN_COL_DATA, MYF(0));
break;
case ER_DYNCOL_UNKNOWN_CHARSET:
my_error(ER_DYN_COL_WRONG_CHARSET, MYF(0));
break;
}
return rc;
}
/**
@} (end of group Data_Dictionary)
*/