1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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.
This commit is contained in:
unknown
2005-07-09 23:11:17 +04:00
parent eef5f17bde
commit d0c69a8264
6 changed files with 18 additions and 28 deletions

View File

@ -1025,7 +1025,7 @@ end|
--error 1424
call bug11394(2, 1)|
drop procedure bug11394|
delimiter |;
delimiter ;|
#
# Bug#11834 "Re-execution of prepared statement with dropped function