diff options
| author | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2022-09-09 00:20:34 +0900 |
|---|---|---|
| committer | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2022-09-09 00:20:34 +0900 |
| commit | d95ffd3df02906303625e7d5c4a6c431013f5b41 (patch) | |
| tree | 6f00670b8e1bc417d4e188f19f1ac6f10b56951f /storage/spider/mysql-test | |
| parent | 7a93d4535ff853b6dd352a7169c9dae03f4a75b4 (diff) | |
| parent | 313343513405a4ecc11b0a0e413de29fb8e6210a (diff) | |
| download | mariadb-git-d95ffd3df02906303625e7d5c4a6c431013f5b41.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'storage/spider/mysql-test')
| -rw-r--r-- | storage/spider/mysql-test/spider/bugfix/r/mdev_27172.result | 3 | ||||
| -rw-r--r-- | storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_27172.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_27172.result index d4c8c7e8ec2..531e48b880b 100644 --- a/storage/spider/mysql-test/spider/bugfix/r/mdev_27172.result +++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_27172.result @@ -64,12 +64,11 @@ SELECT * FROM tbl_c WHERE greeting = "Aloha!" id greeting 2 Aloha! connection child2_1; -SELECT argument FROM mysql.general_log WHERE argument LIKE 'select %'; +SELECT argument FROM mysql.general_log WHERE argument LIKE 'select `id`,`greeting` from %'; argument select `id`,`greeting` from `auto_test_remote`.`tbl_a` where `greeting` = 'Aloha!' and ((`greeting` = 'Aloha!')) select `id`,`greeting` from `auto_test_remote`.`tbl_b` where `greeting` like 'Aloha%' and ((`greeting` = 'Aloha!')) select `id`,`greeting` from `auto_test_remote`.`tbl_c` where `greeting` like 'Aloha%' and ((`greeting` = 'Aloha!')) -SELECT argument FROM mysql.general_log WHERE argument LIKE 'select %' connection child2_1; SET @@global.general_log = @general_log_backup; SET @@global.log_output = @log_output_backup; diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test index d544a0b400e..60c0ad42921 100644 --- a/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test +++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_27172.test @@ -75,7 +75,7 @@ SELECT * FROM tbl_c WHERE greeting = "Aloha!" AND CASE greeting WHEN "Aloha!" THEN "one" ELSE 'more' END = "one"; # hack to disable GBH --connection child2_1 -SELECT argument FROM mysql.general_log WHERE argument LIKE 'select %'; +SELECT argument FROM mysql.general_log WHERE argument LIKE 'select `id`,`greeting` from %'; --connection child2_1 SET @@global.general_log = @general_log_backup; |