mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
3f24932124
Collect all tables and SPs refered by a statement, and open all tables with an implicit LOCK TABLES. Do find things refered by triggers and views, we open them first (and then repeat this until nothing new is found), before doing the actual lock tables. mysql-test/r/information_schema.result: Updated result for WL#2130. mysql-test/r/lock.result: Updated result for WL#2130. mysql-test/r/sp-error.result: Updated result for WL#2130. mysql-test/r/sp.result: Updated result for WL#2130. mysql-test/r/view.result: Updated result for WL#2130. mysql-test/t/information_schema.test: Disabled one test case due to a bug involving LOCK TABLES, which shows up with WL#2130. mysql-test/t/lock.test: New error message with WL#2130. This change is under debate and might change in the future, but will do for now. mysql-test/t/sp-error.test: Updated for WL#2130. Some tests are voided when table access does work from functions. mysql-test/t/sp.test: Updated for WL#2130. mysql-test/t/view.test: Updated for WL#2130. sql/item_func.cc: We now have to set net.no_send_ok for functions too, with WL#2130. sql/share/errmsg.txt: Reused an error code since the old use was voided by WL#2130, but a new one was needed instead (similar, but more specific restriction). sql/sp.cc: Fixed error handling and collection of used tables for WL#2130. sql/sp.h: Fixed error handling and collection of used tables for WL#2130. sql/sp_head.cc: Added support functions for collecting and merging hash tables and lists of used tables from SPs and substatements, for WL#2130. sql/sp_head.h: Added support functions for collecting and merging hash tables and lists of used tables from SPs and substatements, for WL#2130. sql/sql_base.cc: Changed the way table->query_id is tested and set during with locked tables in effect. This makes some SP test cases work with WL#2130, but has a side effect on some error cases with explicit LOCK TABLES. It's still debated if this is the correct way, so it might change. sql/sql_class.h: Added flags for circumventing some interference between WL#2130 and mysql_make_view(). sql/sql_derived.cc: Added some missing initializations. (Potential bugs.) sql/sql_lex.cc: Clear the new hash tables for WL#2130. sql/sql_lex.h: Added hash tables for procedures and tables too (as for functions), for WL#2130. sql/sql_parse.cc: WL#2130: Make table accesses from stored functions work by adding an implicit LOCK TABLES around (most) executed statements. To do this, we have to go through a loop where we collect all SPs and tables in mysql_execute_statement. sql/sql_prepare.cc: Cache both functions and procedures for WL#2130. sql/sql_show.cc: Added some missing initializations. (Potential bugs.) sql/sql_view.cc: Shortcut mysql_make_view() if thd->shortcut_make_view is true during the pre-open phase for collecting tables in WL#2130. Otherwise, the similar mechanism here causes interference. sql/sql_yacc.yy: For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
106 lines
2.7 KiB
C++
106 lines
2.7 KiB
C++
/* -*- C++ -*- */
|
|
/* Copyright (C) 2002 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifndef _SP_H_
|
|
#define _SP_H_
|
|
|
|
// Return codes from sp_create_*, sp_drop_*, and sp_show_*:
|
|
#define SP_OK 0
|
|
#define SP_KEY_NOT_FOUND -1
|
|
#define SP_OPEN_TABLE_FAILED -2
|
|
#define SP_WRITE_ROW_FAILED -3
|
|
#define SP_DELETE_ROW_FAILED -4
|
|
#define SP_GET_FIELD_FAILED -5
|
|
#define SP_PARSE_ERROR -6
|
|
#define SP_INTERNAL_ERROR -7
|
|
#define SP_NO_DB_ERROR -8
|
|
|
|
/* Drop all routines in database 'db' */
|
|
int
|
|
sp_drop_db_routines(THD *thd, char *db);
|
|
|
|
sp_head *
|
|
sp_find_procedure(THD *thd, sp_name *name);
|
|
|
|
int
|
|
sp_exists_routine(THD *thd, TABLE_LIST *procs, bool any, bool no_error);
|
|
|
|
int
|
|
sp_create_procedure(THD *thd, sp_head *sp);
|
|
|
|
int
|
|
sp_drop_procedure(THD *thd, sp_name *name);
|
|
|
|
|
|
int
|
|
sp_update_procedure(THD *thd, sp_name *name, st_sp_chistics *chistics);
|
|
|
|
int
|
|
sp_show_create_procedure(THD *thd, sp_name *name);
|
|
|
|
int
|
|
sp_show_status_procedure(THD *thd, const char *wild);
|
|
|
|
sp_head *
|
|
sp_find_function(THD *thd, sp_name *name, bool cache_only = 0);
|
|
|
|
int
|
|
sp_create_function(THD *thd, sp_head *sp);
|
|
|
|
int
|
|
sp_drop_function(THD *thd, sp_name *name);
|
|
|
|
int
|
|
sp_update_function(THD *thd, sp_name *name, st_sp_chistics *chistics);
|
|
|
|
int
|
|
sp_show_create_function(THD *thd, sp_name *name);
|
|
|
|
int
|
|
sp_show_status_function(THD *thd, const char *wild);
|
|
|
|
bool
|
|
sp_function_exists(THD *thd, sp_name *name);
|
|
|
|
|
|
/*
|
|
* For precaching of functions and procedures
|
|
*/
|
|
void
|
|
sp_add_to_hash(HASH *h, sp_name *fun);
|
|
void
|
|
sp_merge_hash(HASH *dst, HASH *src);
|
|
int
|
|
sp_cache_routines(THD *thd, LEX *lex, int type);
|
|
|
|
|
|
//
|
|
// Utilities...
|
|
//
|
|
|
|
// Do a "use newdb". The current db is stored at olddb.
|
|
// If newdb is the same as the current one, nothing is changed.
|
|
// dbchangedp is set to true if the db was actually changed.
|
|
int
|
|
sp_use_new_db(THD *thd, char *newdb, char *olddb, uint olddbmax,
|
|
bool no_access_check, bool *dbchangedp);
|
|
|
|
// Like mysql_change_db() but handles empty db name and the send_ok() problem.
|
|
int
|
|
sp_change_db(THD *thd, char *db, bool no_access_check);
|
|
|
|
#endif /* _SP_H_ */
|