diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-02-18 10:48:15 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-02-18 10:48:15 +0200 |
| commit | 20dfd709d6454f8cdc25262c945ad203cecafc02 (patch) | |
| tree | 092ee60f4043975f4820722fc764625d6271be04 /mysql-test/r/bug39022.result | |
| parent | 141bb7d144e093c860f2183abf220875ee681930 (diff) | |
| download | mariadb-git-20dfd709d6454f8cdc25262c945ad203cecafc02.tar.gz | |
Bug #51049: main.bug39022 fails in mysql-trunk-merge
Fixed the test to behave correctly with ps-protocol
and binlog format row.
Diffstat (limited to 'mysql-test/r/bug39022.result')
| -rw-r--r-- | mysql-test/r/bug39022.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/bug39022.result b/mysql-test/r/bug39022.result index 1c02d7873e4..5963709aa2a 100644 --- a/mysql-test/r/bug39022.result +++ b/mysql-test/r/bug39022.result @@ -28,5 +28,5 @@ SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d); ERROR 40001: Deadlock found when trying to get lock; try restarting transaction # in thread2 d -# in default +# in thread1; DROP TABLE t1,t2; |