diff options
| author | unknown <lars@mysql.com> | 2005-06-07 16:48:38 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-06-07 16:48:38 +0200 |
| commit | ed5b5420dcb22f0961c1402866cc7dabedd9726f (patch) | |
| tree | ffdf2f83da4ee9e7a936af95f6500bd28a040139 /mysql-test/r/sp_trans.result | |
| parent | fff8ff08d0166a0ad260785492982c64f6b1fc65 (diff) | |
| parent | 887172a466de944bb580aa804ab8ea631ec502f0 (diff) | |
| download | mariadb-git-ed5b5420dcb22f0961c1402866cc7dabedd9726f.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0
mysql-test/r/sp_trans.result:
Auto merged
mysql-test/t/sp_trans.test:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/sp_trans.result')
| -rw-r--r-- | mysql-test/r/sp_trans.result | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/r/sp_trans.result b/mysql-test/r/sp_trans.result index 047711bb736..6077087ab87 100644 --- a/mysql-test/r/sp_trans.result +++ b/mysql-test/r/sp_trans.result @@ -8,17 +8,13 @@ end| set autocommit=0| insert t1 values (2)| call bug8850()| -ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction commit| select * from t1| a -2 call bug8850()| -ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction set autocommit=1| select * from t1| a -2 drop table t1| drop procedure bug8850| drop function if exists bug10015_1| |