1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

into  example.com:/work/mysql-5.1-runtime-bug22830-new


sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2006-11-02 13:59:44 +01:00
10 changed files with 153 additions and 40 deletions

View File

@@ -2149,6 +2149,28 @@ void st_lex::restore_backup_query_tables_list(Query_tables_list *backup)
}
/*
Checks for usage of routines and/or tables in a parsed statement
SYNOPSIS
st_lex:table_or_sp_used()
RETURN
FALSE No routines and tables used
TRUE Either or both routines and tables are used.
*/
bool st_lex::table_or_sp_used()
{
DBUG_ENTER("table_or_sp_used");
if (sroutines.records || query_tables)
DBUG_RETURN(TRUE);
DBUG_RETURN(FALSE);
}
/*
Do end-of-prepare fixup for list of tables and their merge-VIEWed tables
@@ -2216,6 +2238,7 @@ void st_select_lex::fix_prepare_information(THD *thd, Item **conds,
}
}
/*
There are st_select_lex::add_table_to_list &
st_select_lex::set_lock_for_tables are in sql_parse.cc