diff options
| author | Monty <monty@mariadb.org> | 2018-01-01 14:44:20 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-01-01 14:44:20 +0200 |
| commit | 7e882a60bfb116e40df89e793c2b71decbe82f6d (patch) | |
| tree | d6f50299247250fd439b4eb673d0f8a88eb370f3 /mysql-test/suite/vcol | |
| parent | 08ff39dca2ae8510dd2d2f9720b17eec9b23b38a (diff) | |
| download | mariadb-git-7e882a60bfb116e40df89e793c2b71decbe82f6d.tar.gz | |
Ensure that table->vcol_set is properly restored if used
Code in QUICK_RANGE_SELECT::init_ror_merged_scan() could theoretically
have caused crashes if this was ever called from an update or delete
This also found a bug in the vcol/range.result. file.
Diffstat (limited to 'mysql-test/suite/vcol')
| -rw-r--r-- | mysql-test/suite/vcol/r/range.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/vcol/r/range.result b/mysql-test/suite/vcol/r/range.result index ad7a39bc11c..5b081a5dbe8 100644 --- a/mysql-test/suite/vcol/r/range.result +++ b/mysql-test/suite/vcol/r/range.result @@ -4,6 +4,6 @@ create table t2 (a int, b int) engine=myisam; insert into t2 values (1,2),(2,4); select * from t1 inner join t2 on ( t2.b = t1.v or t2.a = t1.pk ); pk i v a b -1 1 0 1 2 -2 2 0 2 4 +1 1 2 1 2 +2 2 4 2 4 drop table t1, t2; |