1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com 2005-08-11 16:43:22 +03:00
commit e80252e53c
7 changed files with 250 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
mysql-test/t/sp.test
View File

@ -2468,25 +2468,26 @@ drop table t3|
# #
# BUG#4318 # BUG#4318
# #
#QQ Don't know if HANDLER commands can work with SPs, or at all...
# --disable_parsing Don't know if HANDLER commands can work with SPs, or at all..
#create table t3 (s1 int)| create table t3 (s1 int)|
#insert into t3 values (3), (4)| insert into t3 values (3), (4)|
#
#--disable_warnings --disable_warnings
#drop procedure if exists bug4318| drop procedure if exists bug4318|
#--enable_warnings --enable_warnings
#create procedure bug4318() create procedure bug4318()
# handler t3 read next| handler t3 read next|
#
#handler t3 open| handler t3 open|
## Expect no results, as tables are closed, but there shouldn't be any errors # Expect no results, as tables are closed, but there shouldn't be any errors
#call bug4318()| call bug4318()|
#call bug4318()| call bug4318()|
#handler t3 close| handler t3 close|
#
#drop procedure bug4318| drop procedure bug4318|
#drop table t3| drop table t3|
--enable_parsing
# #
# BUG#4902: Stored procedure with SHOW WARNINGS leads to packet error # BUG#4902: Stored procedure with SHOW WARNINGS leads to packet error
@ -2834,26 +2835,27 @@ drop table t3|
# #
# BUG#6022: Stored procedure shutdown problem with self-calling function. # BUG#6022: Stored procedure shutdown problem with self-calling function.
# #
# This part of test is disabled until we implement support for
# recursive stored functions. --disable_parsing until we implement support for recursive stored functions.
#--disable_warnings --disable_warnings
#drop function if exists bug6022| drop function if exists bug6022|
#--enable_warnings --enable_warnings
#
#--disable_warnings --disable_warnings
#drop function if exists bug6022| drop function if exists bug6022|
#--enable_warnings --enable_warnings
#create function bug6022(x int) returns int create function bug6022(x int) returns int
#begin begin
# if x < 0 then if x < 0 then
# return 0; return 0;
# else else
# return bug6022(x-1); return bug6022(x-1);
# end if; end if;
#end| end|
#
#select bug6022(5)| select bug6022(5)|
#drop function bug6022| drop function bug6022|
--enable_parsing
# #
# BUG#6029: Stored procedure specific handlers should have priority # BUG#6029: Stored procedure specific handlers should have priority
@ -3760,27 +3762,28 @@ drop procedure if exists bug7088_1|
drop procedure if exists bug7088_2| drop procedure if exists bug7088_2|
--enable_warnings --enable_warnings
# psergey: temporarily disabled until Bar fixes BUG#11986 --disable_parsing temporarily disabled until Bar fixes BUG#11986
# create procedure bug6063() create procedure bug6063()
# lâbel: begin end| lâbel: begin end|
# call bug6063()| call bug6063()|
# # QQ Known bug: this will not show the label correctly. # QQ Known bug: this will not show the label correctly.
# show create procedure bug6063| show create procedure bug6063|
#
# set character set utf8| set character set utf8|
# create procedure bug7088_1() create procedure bug7088_1()
# label1: begin end label1| label1: begin end label1|
# create procedure bug7088_2() create procedure bug7088_2()
# läbel1: begin end| läbel1: begin end|
# call bug7088_1()| call bug7088_1()|
# call bug7088_2()| call bug7088_2()|
# set character set default| set character set default|
# show create procedure bug7088_1| show create procedure bug7088_1|
# show create procedure bug7088_2| show create procedure bug7088_2|
#
# drop procedure bug6063| drop procedure bug6063|
# drop procedure bug7088_1| drop procedure bug7088_1|
# drop procedure bug7088_2| drop procedure bug7088_2|
--enable_parsing
# #
# BUG#9565: "Wrong locking in stored procedure if a sub-sequent procedure # BUG#9565: "Wrong locking in stored procedure if a sub-sequent procedure

6
sql/lock.cc
View File

@ -849,10 +849,6 @@ static void print_lock_error(int error, const char *table)
So in this exceptional case the COMMIT should not be blocked by the FLUSH So in this exceptional case the COMMIT should not be blocked by the FLUSH
TABLES WITH READ LOCK. TABLES WITH READ LOCK.
TODO in MySQL 5.x: make_global_read_lock_block_commit() should be
killable. Normally CPU does not spend a long time in this function (COMMITs
are quite fast), but it would still be nice.
****************************************************************************/ ****************************************************************************/
volatile uint global_read_lock=0; volatile uint global_read_lock=0;
@ -1003,7 +999,7 @@ bool make_global_read_lock_block_commit(THD *thd)
pthread_cond_wait(&COND_refresh, &LOCK_global_read_lock); pthread_cond_wait(&COND_refresh, &LOCK_global_read_lock);
DBUG_EXECUTE_IF("make_global_read_lock_block_commit_loop", DBUG_EXECUTE_IF("make_global_read_lock_block_commit_loop",
protect_against_global_read_lock--;); protect_against_global_read_lock--;);
if (error= thd->killed) if ((error= test(thd->killed)))
global_read_lock_blocks_commit--; // undo what we did global_read_lock_blocks_commit--; // undo what we did
else else
thd->global_read_lock= MADE_GLOBAL_READ_LOCK_BLOCK_COMMIT; thd->global_read_lock= MADE_GLOBAL_READ_LOCK_BLOCK_COMMIT;

6
sql/mysqld.cc
View File

@ -1908,7 +1908,8 @@ static void check_data_home(const char *path)
static void sig_reload(int signo) static void sig_reload(int signo)
{ {
// Flush everything // Flush everything
reload_acl_and_cache((THD*) 0,REFRESH_LOG, (TABLE_LIST*) 0, NULL); bool not_used;
reload_acl_and_cache((THD*) 0,REFRESH_LOG, (TABLE_LIST*) 0, &not_used);
signal(signo, SIG_ACK); signal(signo, SIG_ACK);
} }
@ -2267,12 +2268,13 @@ static void *signal_hand(void *arg __attribute__((unused)))
case SIGHUP: case SIGHUP:
if (!abort_loop) if (!abort_loop)
{ {
bool not_used;
mysql_print_status(); // Print some debug info mysql_print_status(); // Print some debug info
reload_acl_and_cache((THD*) 0, reload_acl_and_cache((THD*) 0,
(REFRESH_LOG | REFRESH_TABLES | REFRESH_FAST | (REFRESH_LOG | REFRESH_TABLES | REFRESH_FAST |
REFRESH_GRANT | REFRESH_GRANT |
REFRESH_THREADS | REFRESH_HOSTS), REFRESH_THREADS | REFRESH_HOSTS),
(TABLE_LIST*) 0, NULL); // Flush logs (TABLE_LIST*) 0, &not_used); // Flush logs
} }
break; break;
#ifdef USE_ONE_SIGNAL_HAND #ifdef USE_ONE_SIGNAL_HAND

54
sql/sp_cache.cc
View File

@ -22,7 +22,7 @@
#include "sp_head.h" #include "sp_head.h"
static pthread_mutex_t Cversion_lock; static pthread_mutex_t Cversion_lock;
static ulong Cversion = 0; static ulong volatile Cversion= 0;
/* /*
@ -86,9 +86,11 @@ void sp_cache_init()
/* /*
Clear the cache *cp and set *cp to NULL. Clear the cache *cp and set *cp to NULL.
SYNOPSIS SYNOPSIS
sp_cache_clear() sp_cache_clear()
cp Pointer to cache to clear cp Pointer to cache to clear
NOTE NOTE
This function doesn't invalidate other caches. This function doesn't invalidate other caches.
*/ */
@ -96,6 +98,7 @@ void sp_cache_init()
void sp_cache_clear(sp_cache **cp) void sp_cache_clear(sp_cache **cp)
{ {
sp_cache *c= *cp; sp_cache *c= *cp;
if (c) if (c)
{ {
delete c; delete c;
@ -109,8 +112,8 @@ void sp_cache_clear(sp_cache **cp)
SYNOPSIS SYNOPSIS
sp_cache_insert() sp_cache_insert()
cp The cache to put routine into cp The cache to put routine into
sp Routine to insert. sp Routine to insert.
TODO: Perhaps it will be more straightforward if in case we returned an TODO: Perhaps it will be more straightforward if in case we returned an
error from this function when we couldn't allocate sp_cache. (right error from this function when we couldn't allocate sp_cache. (right
@ -120,22 +123,19 @@ void sp_cache_clear(sp_cache **cp)
void sp_cache_insert(sp_cache **cp, sp_head *sp) void sp_cache_insert(sp_cache **cp, sp_head *sp)
{ {
sp_cache *c= *cp; sp_cache *c;
ulong v;
if (!c && (c= new sp_cache())) if (!(c= *cp))
{ {
pthread_mutex_lock(&Cversion_lock); // LOCK if (!(c= new sp_cache()))
c->version= Cversion; return; // End of memory error
pthread_mutex_unlock(&Cversion_lock); // UNLOCK c->version= Cversion; // No need to lock when reading long variable
}
if (c)
{
DBUG_PRINT("info",("sp_cache: inserting: %*s", sp->m_qname.length,
sp->m_qname.str));
c->insert(sp);
if (*cp == NULL)
*cp= c;
} }
DBUG_PRINT("info",("sp_cache: inserting: %*s", sp->m_qname.length,
sp->m_qname.str));
c->insert(sp);
*cp= c; // Update *cp if it was NULL
} }
@ -158,7 +158,7 @@ void sp_cache_insert(sp_cache **cp, sp_head *sp)
sp_head *sp_cache_lookup(sp_cache **cp, sp_name *name) sp_head *sp_cache_lookup(sp_cache **cp, sp_name *name)
{ {
sp_cache *c= *cp; sp_cache *c= *cp;
if (!c) if (! c)
return NULL; return NULL;
return c->lookup(name->m_qname.str, name->m_qname.length); return c->lookup(name->m_qname.str, name->m_qname.length);
} }
@ -178,9 +178,7 @@ sp_head *sp_cache_lookup(sp_cache **cp, sp_name *name)
void sp_cache_invalidate() void sp_cache_invalidate()
{ {
DBUG_PRINT("info",("sp_cache: invalidating")); DBUG_PRINT("info",("sp_cache: invalidating"));
pthread_mutex_lock(&Cversion_lock); // LOCK thread_safe_increment(Cversion, &Cversion_lock);
Cversion++;
pthread_mutex_unlock(&Cversion_lock); // UNLOCK
} }
@ -202,9 +200,7 @@ void sp_cache_flush_obsolete(sp_cache **cp)
if (c) if (c)
{ {
ulong v; ulong v;
pthread_mutex_lock(&Cversion_lock); // LOCK v= Cversion; // No need to lock when reading long variable
v= Cversion;
pthread_mutex_unlock(&Cversion_lock); // UNLOCK
if (c->version < v) if (c->version < v)
{ {
DBUG_PRINT("info",("sp_cache: deleting all functions")); DBUG_PRINT("info",("sp_cache: deleting all functions"));
@ -215,20 +211,20 @@ void sp_cache_flush_obsolete(sp_cache **cp)
} }
} }
/************************************************************************* /*************************************************************************
Internal functions Internal functions
*************************************************************************/ *************************************************************************/
static byte * static byte *hash_get_key_for_sp_head(const byte *ptr, uint *plen,
hash_get_key_for_sp_head(const byte *ptr, uint *plen,
my_bool first) my_bool first)
{ {
sp_head *sp= (sp_head *)ptr; sp_head *sp= (sp_head *)ptr;
*plen= sp->m_qname.length; *plen= sp->m_qname.length;
return (byte*) sp->m_qname.str; return (byte*) sp->m_qname.str;
} }
static void static void
hash_free_sp_head(void *p) hash_free_sp_head(void *p)
{ {
@ -236,16 +232,19 @@ hash_free_sp_head(void *p)
delete sp; delete sp;
} }
sp_cache::sp_cache() sp_cache::sp_cache()
{ {
init(); init();
} }
sp_cache::~sp_cache() sp_cache::~sp_cache()
{ {
hash_free(&m_hashtable); hash_free(&m_hashtable);
} }
void void
sp_cache::init() sp_cache::init()
{ {
@ -254,6 +253,7 @@ sp_cache::init()
version= 0; version= 0;
} }
void void
sp_cache::cleanup() sp_cache::cleanup()
{ {

214
sql/sp_head.cc
View File

@ -678,12 +678,14 @@ sp_head::execute(THD *thd)
cleanup_items(i->free_list); cleanup_items(i->free_list);
i->state= Query_arena::EXECUTED; i->state= Query_arena::EXECUTED;
// Check if an exception has occurred and a handler has been found /*
// Note: We havo to check even if ret==0, since warnings (and some Check if an exception has occurred and a handler has been found
// errors don't return a non-zero value. Note: We havo to check even if ret==0, since warnings (and some
// We also have to check even if thd->killed != 0, since some errors don't return a non-zero value.
// errors return with this even when a handler has been found We also have to check even if thd->killed != 0, since some
// (e.g. "bad data"). errors return with this even when a handler has been found
(e.g. "bad data").
*/
if (ctx) if (ctx)
{ {
uint hf; uint hf;
@ -759,8 +761,10 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, Item **resp)
if (argcount != params) if (argcount != params)
{ {
// Need to use my_printf_error here, or it will not terminate the /*
// invoking query properly. Need to use my_printf_error here, or it will not terminate the
invoking query properly.
*/
my_error(ER_SP_WRONG_NO_OF_ARGS, MYF(0), my_error(ER_SP_WRONG_NO_OF_ARGS, MYF(0),
"FUNCTION", m_qname.str, params, argcount); "FUNCTION", m_qname.str, params, argcount);
DBUG_RETURN(-1); DBUG_RETURN(-1);
@ -784,9 +788,11 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, Item **resp)
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
} }
// The rest of the frame are local variables which are all IN. /*
// Default all variables to null (those with default clauses will The rest of the frame are local variables which are all IN.
// be set by an set instruction). Default all variables to null (those with default clauses will
be set by an set instruction).
*/
{ {
Item_null *nit= NULL; // Re-use this, and only create if needed Item_null *nit= NULL; // Re-use this, and only create if needed
for (; i < csize ; i++) for (; i < csize ; i++)
@ -803,9 +809,11 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, Item **resp)
ret= execute(thd); ret= execute(thd);
// Partially restore context now. /*
// We still need the call mem root and free list for processing Partially restore context now.
// of the result. We still need the call mem root and free list for processing
of the result.
*/
thd->restore_backup_item_arena(&call_arena, &backup_arena); thd->restore_backup_item_arena(&call_arena, &backup_arena);
if (m_type == TYPE_ENUM_FUNCTION && ret == 0) if (m_type == TYPE_ENUM_FUNCTION && ret == 0)
@ -932,9 +940,11 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
close_thread_tables(thd, 0, 0); close_thread_tables(thd, 0, 0);
DBUG_PRINT("info",(" %.*s: eval args done", m_name.length, m_name.str)); DBUG_PRINT("info",(" %.*s: eval args done", m_name.length, m_name.str));
// The rest of the frame are local variables which are all IN. /*
// Default all variables to null (those with default clauses will The rest of the frame are local variables which are all IN.
// be set by an set instruction). Default all variables to null (those with default clauses will
be set by an set instruction).
*/
for (; i < csize ; i++) for (; i < csize ; i++)
{ {
if (! nit) if (! nit)
@ -956,8 +966,10 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
List_iterator<Item> li(*args); List_iterator<Item> li(*args);
Item *it; Item *it;
// Copy back all OUT or INOUT values to the previous frame, or /*
// set global user variables Copy back all OUT or INOUT values to the previous frame, or
set global user variables
*/
for (uint i = 0 ; (it= li++) && i < params ; i++) for (uint i = 0 ; (it= li++) && i < params ; i++)
{ {
sp_pvar_t *pvar= m_pcont->find_pvar(i); sp_pvar_t *pvar= m_pcont->find_pvar(i);
@ -987,8 +999,10 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
octx->set_item(offset, copy); octx->set_item(offset, copy);
if (orig && copy == orig) if (orig && copy == orig)
{ {
// A reused item slot, where the constructor put it in the /*
// free_list, so we have to restore the list. A reused item slot, where the constructor put it in the
free_list, so we have to restore the list.
*/
thd->free_list= o_free_list; thd->free_list= o_free_list;
copy->next= o_item_next; copy->next= o_item_next;
} }
@ -1420,8 +1434,6 @@ sp_head::opt_mark(uint ip)
ip= i->opt_mark(this); ip= i->opt_mark(this);
} }
// ------------------------------------------------------------------
/* /*
Prepare LEX and thread for execution of instruction, if requested open Prepare LEX and thread for execution of instruction, if requested open
@ -1513,6 +1525,7 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
thd->proc_info="closing tables"; thd->proc_info="closing tables";
close_thread_tables(thd); close_thread_tables(thd);
thd->proc_info= 0;
if (m_lex->query_tables_own_last) if (m_lex->query_tables_own_last)
{ {
@ -1549,9 +1562,10 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp,
} }
// /*
// sp_instr sp_instr class functions
// */
int sp_instr::exec_core(THD *thd, uint *nextp) int sp_instr::exec_core(THD *thd, uint *nextp)
{ {
DBUG_ASSERT(0); DBUG_ASSERT(0);
@ -1559,9 +1573,10 @@ int sp_instr::exec_core(THD *thd, uint *nextp)
} }
// /*
// sp_instr_stmt sp_instr_stmt class functions
// */
int int
sp_instr_stmt::execute(THD *thd, uint *nextp) sp_instr_stmt::execute(THD *thd, uint *nextp)
{ {
@ -1606,9 +1621,11 @@ sp_instr_stmt::exec_core(THD *thd, uint *nextp)
return res; return res;
} }
//
// sp_instr_set /*
// sp_instr_set class functions
*/
int int
sp_instr_set::execute(THD *thd, uint *nextp) sp_instr_set::execute(THD *thd, uint *nextp)
{ {
@ -1618,6 +1635,7 @@ sp_instr_set::execute(THD *thd, uint *nextp)
DBUG_RETURN(m_lex_keeper.reset_lex_and_exec_core(thd, nextp, TRUE, this)); DBUG_RETURN(m_lex_keeper.reset_lex_and_exec_core(thd, nextp, TRUE, this));
} }
int int
sp_instr_set::exec_core(THD *thd, uint *nextp) sp_instr_set::exec_core(THD *thd, uint *nextp)
{ {
@ -1638,9 +1656,10 @@ sp_instr_set::print(String *str)
} }
// /*
// sp_instr_set_trigger_field sp_instr_set_trigger_field class functions
// */
int int
sp_instr_set_trigger_field::execute(THD *thd, uint *nextp) sp_instr_set_trigger_field::execute(THD *thd, uint *nextp)
{ {
@ -1671,9 +1690,11 @@ sp_instr_set_trigger_field::print(String *str)
value->print(str); value->print(str);
} }
//
// sp_instr_jump /*
// sp_instr_jump class functions
*/
int int
sp_instr_jump::execute(THD *thd, uint *nextp) sp_instr_jump::execute(THD *thd, uint *nextp)
{ {
@ -1732,9 +1753,10 @@ sp_instr_jump::opt_move(uint dst, List<sp_instr> *bp)
m_ip= dst; m_ip= dst;
} }
//
// sp_instr_jump_if /*
// sp_instr_jump_if class functions
*/
int int
sp_instr_jump_if::execute(THD *thd, uint *nextp) sp_instr_jump_if::execute(THD *thd, uint *nextp)
@ -1790,9 +1812,11 @@ sp_instr_jump_if::opt_mark(sp_head *sp)
return m_ip+1; return m_ip+1;
} }
//
// sp_instr_jump_if_not /*
// sp_instr_jump_if_not class functions
*/
int int
sp_instr_jump_if_not::execute(THD *thd, uint *nextp) sp_instr_jump_if_not::execute(THD *thd, uint *nextp)
{ {
@ -1823,6 +1847,7 @@ sp_instr_jump_if_not::exec_core(THD *thd, uint *nextp)
return res; return res;
} }
void void
sp_instr_jump_if_not::print(String *str) sp_instr_jump_if_not::print(String *str)
{ {
@ -1833,6 +1858,7 @@ sp_instr_jump_if_not::print(String *str)
m_expr->print(str); m_expr->print(str);
} }
uint uint
sp_instr_jump_if_not::opt_mark(sp_head *sp) sp_instr_jump_if_not::opt_mark(sp_head *sp)
{ {
@ -1848,9 +1874,10 @@ sp_instr_jump_if_not::opt_mark(sp_head *sp)
return m_ip+1; return m_ip+1;
} }
//
// sp_instr_freturn /*
// sp_instr_freturn class functions
*/
int int
sp_instr_freturn::execute(THD *thd, uint *nextp) sp_instr_freturn::execute(THD *thd, uint *nextp)
@ -1889,9 +1916,10 @@ sp_instr_freturn::print(String *str)
m_value->print(str); m_value->print(str);
} }
// /*
// sp_instr_hpush_jump sp_instr_hpush_jump class functions
// */
int int
sp_instr_hpush_jump::execute(THD *thd, uint *nextp) sp_instr_hpush_jump::execute(THD *thd, uint *nextp)
{ {
@ -1935,9 +1963,11 @@ sp_instr_hpush_jump::opt_mark(sp_head *sp)
return m_ip+1; return m_ip+1;
} }
//
// sp_instr_hpop /*
// sp_instr_hpop class functions
*/
int int
sp_instr_hpop::execute(THD *thd, uint *nextp) sp_instr_hpop::execute(THD *thd, uint *nextp)
{ {
@ -1962,9 +1992,10 @@ sp_instr_hpop::backpatch(uint dest, sp_pcontext *dst_ctx)
} }
// /*
// sp_instr_hreturn sp_instr_hreturn class functions
// */
int int
sp_instr_hreturn::execute(THD *thd, uint *nextp) sp_instr_hreturn::execute(THD *thd, uint *nextp)
{ {
@ -1980,6 +2011,7 @@ sp_instr_hreturn::execute(THD *thd, uint *nextp)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
void void
sp_instr_hreturn::print(String *str) sp_instr_hreturn::print(String *str)
{ {
@ -1990,6 +2022,7 @@ sp_instr_hreturn::print(String *str)
str->qs_append(m_dest); str->qs_append(m_dest);
} }
uint uint
sp_instr_hreturn::opt_mark(sp_head *sp) sp_instr_hreturn::opt_mark(sp_head *sp)
{ {
@ -2003,9 +2036,10 @@ sp_instr_hreturn::opt_mark(sp_head *sp)
} }
// /*
// sp_instr_cpush sp_instr_cpush class functions
// */
int int
sp_instr_cpush::execute(THD *thd, uint *nextp) sp_instr_cpush::execute(THD *thd, uint *nextp)
{ {
@ -2015,15 +2049,18 @@ sp_instr_cpush::execute(THD *thd, uint *nextp)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
void void
sp_instr_cpush::print(String *str) sp_instr_cpush::print(String *str)
{ {
str->append("cpush"); str->append("cpush");
} }
//
// sp_instr_cpop /*
// sp_instr_cpop class functions
*/
int int
sp_instr_cpop::execute(THD *thd, uint *nextp) sp_instr_cpop::execute(THD *thd, uint *nextp)
{ {
@ -2033,6 +2070,7 @@ sp_instr_cpop::execute(THD *thd, uint *nextp)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
void void
sp_instr_cpop::print(String *str) sp_instr_cpop::print(String *str)
{ {
@ -2047,9 +2085,11 @@ sp_instr_cpop::backpatch(uint dest, sp_pcontext *dst_ctx)
m_count= m_ctx->diff_cursors(dst_ctx); m_count= m_ctx->diff_cursors(dst_ctx);
} }
//
// sp_instr_copen /*
// sp_instr_copen class functions
*/
int int
sp_instr_copen::execute(THD *thd, uint *nextp) sp_instr_copen::execute(THD *thd, uint *nextp)
{ {
@ -2117,9 +2157,11 @@ sp_instr_copen::print(String *str)
str->qs_append(m_cursor); str->qs_append(m_cursor);
} }
//
// sp_instr_cclose /*
// sp_instr_cclose class functions
*/
int int
sp_instr_cclose::execute(THD *thd, uint *nextp) sp_instr_cclose::execute(THD *thd, uint *nextp)
{ {
@ -2135,6 +2177,7 @@ sp_instr_cclose::execute(THD *thd, uint *nextp)
DBUG_RETURN(res); DBUG_RETURN(res);
} }
void void
sp_instr_cclose::print(String *str) sp_instr_cclose::print(String *str)
{ {
@ -2143,9 +2186,11 @@ sp_instr_cclose::print(String *str)
str->qs_append(m_cursor); str->qs_append(m_cursor);
} }
//
// sp_instr_cfetch /*
// sp_instr_cfetch class functions
*/
int int
sp_instr_cfetch::execute(THD *thd, uint *nextp) sp_instr_cfetch::execute(THD *thd, uint *nextp)
{ {
@ -2161,6 +2206,7 @@ sp_instr_cfetch::execute(THD *thd, uint *nextp)
DBUG_RETURN(res); DBUG_RETURN(res);
} }
void void
sp_instr_cfetch::print(String *str) sp_instr_cfetch::print(String *str)
{ {
@ -2178,9 +2224,11 @@ sp_instr_cfetch::print(String *str)
} }
} }
//
// sp_instr_error /*
// sp_instr_error class functions
*/
int int
sp_instr_error::execute(THD *thd, uint *nextp) sp_instr_error::execute(THD *thd, uint *nextp)
{ {
@ -2191,6 +2239,7 @@ sp_instr_error::execute(THD *thd, uint *nextp)
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
void void
sp_instr_error::print(String *str) sp_instr_error::print(String *str)
{ {
@ -2199,12 +2248,12 @@ sp_instr_error::print(String *str)
str->qs_append(m_errcode); str->qs_append(m_errcode);
} }
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
/*
// Security context swapping
// Security context swapping */
//
#ifndef NO_EMBEDDED_ACCESS_CHECKS #ifndef NO_EMBEDDED_ACCESS_CHECKS
void void
@ -2453,11 +2502,12 @@ sp_head::add_used_tables_to_table_list(THD *thd,
DBUG_RETURN(result); DBUG_RETURN(result);
} }
/* /*
* Simple function for adding an explicetly named (systems) table to Simple function for adding an explicetly named (systems) table to
* the global table list, e.g. "mysql", "proc". the global table list, e.g. "mysql", "proc".
* */
*/
TABLE_LIST * TABLE_LIST *
sp_add_to_query_tables(THD *thd, LEX *lex, sp_add_to_query_tables(THD *thd, LEX *lex,
const char *db, const char *name, const char *db, const char *name,

3
sql/sql_base.cc
View File

@ -1921,8 +1921,7 @@ int open_tables(THD *thd, TABLE_LIST **start, uint *counter, uint flags)
has added its base tables after itself, adjust the boundary pointer has added its base tables after itself, adjust the boundary pointer
accordingly. accordingly.
*/ */
if (query_tables_last_own && if (query_tables_last_own == &(tables->next_global) &&
query_tables_last_own == &(tables->next_global) &&
tables->view->query_tables) tables->view->query_tables)
query_tables_last_own= tables->view->query_tables_last; query_tables_last_own= tables->view->query_tables_last;

41
sql/sql_parse.cc
View File

@ -1863,17 +1863,18 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
} }
#endif #endif
case COM_REFRESH: case COM_REFRESH:
{ {
statistic_increment(thd->status_var.com_stat[SQLCOM_FLUSH], bool not_used;
&LOCK_status); statistic_increment(thd->status_var.com_stat[SQLCOM_FLUSH],
ulong options= (ulong) (uchar) packet[0]; &LOCK_status);
if (check_global_access(thd,RELOAD_ACL)) ulong options= (ulong) (uchar) packet[0];
break; if (check_global_access(thd,RELOAD_ACL))
mysql_log.write(thd,command,NullS);
if (!reload_acl_and_cache(thd, options, (TABLE_LIST*) 0, NULL))
send_ok(thd);
break; break;
} mysql_log.write(thd,command,NullS);
if (!reload_acl_and_cache(thd, options, (TABLE_LIST*) 0, &not_used))
send_ok(thd);
break;
}
#ifndef EMBEDDED_LIBRARY #ifndef EMBEDDED_LIBRARY
case COM_SHUTDOWN: case COM_SHUTDOWN:
{ {
@ -3822,13 +3823,13 @@ end_with_restore_list:
lex->no_write_to_binlog= 1; lex->no_write_to_binlog= 1;
case SQLCOM_FLUSH: case SQLCOM_FLUSH:
{ {
bool write_to_binlog;
if (check_global_access(thd,RELOAD_ACL) || check_db_used(thd, all_tables)) if (check_global_access(thd,RELOAD_ACL) || check_db_used(thd, all_tables))
goto error; goto error;
/* /*
reload_acl_and_cache() will tell us if we are allowed to write to the reload_acl_and_cache() will tell us if we are allowed to write to the
binlog or not. binlog or not.
*/ */
bool write_to_binlog;
if (!reload_acl_and_cache(thd, lex->type, first_table, &write_to_binlog)) if (!reload_acl_and_cache(thd, lex->type, first_table, &write_to_binlog))
{ {
/* /*
@ -6377,13 +6378,13 @@ void add_join_natural(TABLE_LIST *a,TABLE_LIST *b)
tables Tables to flush (if any) tables Tables to flush (if any)
write_to_binlog Depending on 'options', it may be very bad to write the write_to_binlog Depending on 'options', it may be very bad to write the
query to the binlog (e.g. FLUSH SLAVE); this is a query to the binlog (e.g. FLUSH SLAVE); this is a
pointer where, if it is not NULL, reload_acl_and_cache() pointer where reload_acl_and_cache() will put 0 if
will put 0 if it thinks we really should not write to it thinks we really should not write to the binlog.
the binlog. Otherwise it will put 1. Otherwise it will put 1.
RETURN RETURN
0 ok 0 ok
!=0 error !=0 error. thd->killed or thd->net.report_error is set
*/ */
bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
@ -6476,10 +6477,10 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
*/ */
tmp_write_to_binlog= 0; tmp_write_to_binlog= 0;
if (lock_global_read_lock(thd)) if (lock_global_read_lock(thd))
return 1; return 1; // Killed
result=close_cached_tables(thd,(options & REFRESH_FAST) ? 0 : 1, result=close_cached_tables(thd,(options & REFRESH_FAST) ? 0 : 1,
tables); tables);
if (make_global_read_lock_block_commit(thd)) if (make_global_read_lock_block_commit(thd)) // Killed
{ {
/* Don't leave things in a half-locked state */ /* Don't leave things in a half-locked state */
unlock_global_read_lock(thd); unlock_global_read_lock(thd);
@ -6501,7 +6502,10 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
{ {
tmp_write_to_binlog= 0; tmp_write_to_binlog= 0;
if (reset_master(thd)) if (reset_master(thd))
{
result=1; result=1;
thd->fatal_error(); // Ensure client get error
}
} }
#endif #endif
#ifdef OPENSSL #ifdef OPENSSL
@ -6523,8 +6527,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
#endif #endif
if (options & REFRESH_USER_RESOURCES) if (options & REFRESH_USER_RESOURCES)
reset_mqh((LEX_USER *) NULL); reset_mqh((LEX_USER *) NULL);
if (write_to_binlog) *write_to_binlog= tmp_write_to_binlog;
*write_to_binlog= tmp_write_to_binlog;
return result; return result;
} }