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 sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
This commit is contained in:
bell@sanja.is.com.ua
2004-02-09 15:01:51 +02:00
parent cc78e2d97a 74a9ca1991
commit ff0a6e9686
19 changed files with 397 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_prepare.cc
View File

@ -733,7 +733,7 @@ static bool mysql_test_select_fields(Prepared_statement *stmt,
DBUG_RETURN(1);
#endif
if ((&lex->select_lex != lex->all_selects_list &&
lex->unit.create_total_list(thd, lex, &tables, 0)))
lex->unit.create_total_list(thd, lex, &tables)))
DBUG_RETURN(1);
if (open_and_lock_tables(thd, tables))
@ -746,7 +746,6 @@ static bool mysql_test_select_fields(Prepared_statement *stmt,
}
else
{
fix_tables_pointers(lex->all_selects_list);
if (!result && !(result= new select_send()))
{
send_error(thd, ER_OUT_OF_RESOURCES);