diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-15 22:07:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-15 22:07:58 +0100 |
| commit | 1efdd5a572ef202f64ef43d1868b021cf8c60873 (patch) | |
| tree | c68816016f9d44769d8205cde2f99636d90fe6a3 /mysql-test/r/merge_debug.result | |
| parent | b86ba751daf208f38aaa98672d10733fd7173eae (diff) | |
| download | mariadb-git-1efdd5a572ef202f64ef43d1868b021cf8c60873.tar.gz | |
rename debug variable to debug_dbug, to make test pass in release builds
(and to follow the naming conventons).
keep old debug variable, but mark it as deprecated.
Diffstat (limited to 'mysql-test/r/merge_debug.result')
| -rw-r--r-- | mysql-test/r/merge_debug.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/merge_debug.result b/mysql-test/r/merge_debug.result index 869d9e7536c..ff7222ac0f3 100644 --- a/mysql-test/r/merge_debug.result +++ b/mysql-test/r/merge_debug.result @@ -10,9 +10,9 @@ INSERT INTO crashed VALUES (10); INSERT INTO t2 VALUES (20); INSERT INTO t3 VALUES (30); LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, crashed WRITE; -SET GLOBAL debug="+d,myisam_pretend_crashed_table_on_open"; +SET GLOBAL debug_dbug="+d,myisam_pretend_crashed_table_on_open"; CREATE TRIGGER t1_ai AFTER INSERT ON crashed FOR EACH ROW INSERT INTO t2 VALUES(29); -SET GLOBAL debug=@orig_debug; +SET GLOBAL debug_dbug=@orig_debug; INSERT INTO t4 VALUES (39); ERROR HY000: Table 'crashed' was not locked with LOCK TABLES INSERT INTO crashed VALUES (11); |