diff options
| author | unknown <dlenev@mysql.com> | 2005-07-09 23:11:17 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-07-09 23:11:17 +0400 |
| commit | d0c69a8264a21d343f0f69e31e4494ae0fbff18f (patch) | |
| tree | 097d07e278960e3486ed5a1efd51abf4c98212b1 /sql/sp.cc | |
| parent | eef5f17bde32a703a1c34fea2607805a128be42d (diff) | |
| download | mariadb-git-d0c69a8264a21d343f0f69e31e4494ae0fbff18f.tar.gz | |
Manual fixes after merging patch for bug #8406 "Triggers crash if referencing
a table" with main tree.
mysql-test/r/trigger.result:
Temporalily disable part of test which exposes bug #11554 (work on which is in
progress).
mysql-test/t/sp-error.test:
After merge fix.
Fixed wrong delimiter command.
mysql-test/t/trigger.test:
Temporalily disable part of test which exposes bug #11554 (work on which is in
progress).
sql/sp.cc:
After merge fix.
Item_arena was renamed to Query_arena.
sql/sp.h:
After merge fix.
Item_arena was renamed to Query_arena.
sql/sql_lex.cc:
After merge fix.
LEX::spfuns/spprocs hashes were replaces with one LEX::sroutines hash.
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 9816fe2bba5..c251d0b8bc2 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1134,7 +1134,7 @@ extern "C" byte* sp_sroutine_key(const byte *ptr, uint *plen, my_bool first) FALSE - element was not added (because it is already present in the set). */ -static bool add_used_routine(LEX *lex, Item_arena *arena, +static bool add_used_routine(LEX *lex, Query_arena *arena, const LEX_STRING *key) { if (!hash_search(&lex->sroutines, (byte *)key->str, key->length)) @@ -1173,7 +1173,7 @@ static bool add_used_routine(LEX *lex, Item_arena *arena, persistent arena as second argument. */ -void sp_add_used_routine(LEX *lex, Item_arena *arena, +void sp_add_used_routine(LEX *lex, Query_arena *arena, sp_name *rt, char rt_type) { rt->set_routine_type(rt_type); |