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 /mysql-test/r/trigger.result | |
| 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 'mysql-test/r/trigger.result')
| -rw-r--r-- | mysql-test/r/trigger.result | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index 0e8142f2b54..746c900d743 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -573,12 +573,3 @@ i k ts 1 1 0000-00-00 00:00:00 2 2 0000-00-00 00:00:00 drop table t1, t2; -drop function if exists bug5893; -create table t1 (col1 int, col2 int); -insert into t1 values (1, 2); -create function bug5893 () returns int return 5; -create trigger t1_bu before update on t1 for each row set new.col1= bug5893(); -drop function bug5893; -update t1 set col2 = 4; -ERROR 42000: FUNCTION test.bug5893 does not exist -drop table t1; |