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

Merge bodhi.local:/opt/local/work/mysql-5.0-4968

Browse Source 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
This commit is contained in:
kostja@bodhi.local
2006-12-01 13:26:49 +03:00
parent 2fbb40b9c7 87a87bc04b
commit 88dadbbf60
4 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_class.cc
View File

@ -985,6 +985,13 @@ void select_result::cleanup()
/* do nothing */
}
bool select_result::check_simple_select() const
{
my_error(ER_SP_BAD_CURSOR_QUERY, MYF(0));
return TRUE;
}
static String default_line_term("\n",default_charset_info);
static String default_escaped("\\",default_charset_info);
static String default_field_term("\t",default_charset_info);
@ -1656,6 +1663,13 @@ int select_dumpvar::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
}
bool select_dumpvar::check_simple_select() const
{
my_error(ER_SP_BAD_CURSOR_SELECT, MYF(0));
return TRUE;
}
void select_dumpvar::cleanup()
{
vars.empty();