diff options
| author | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2022-09-09 20:10:23 +0900 |
|---|---|---|
| committer | Nayuta Yanagisawa <nayuta.yanagisawa@hey.com> | 2022-09-09 20:10:23 +0900 |
| commit | c08d404f5a1c17f0c67d06db37712e2223ccbeea (patch) | |
| tree | 2bfcbc78fad8dfdbce7b6177e251513e9c105cf6 /storage/spider/mysql-test | |
| parent | 6978bcbf374e6eba8cd8eac7403af420a82efa1f (diff) | |
| parent | 87d82dd83f7b98b15c100aa83fc8cda84ac27ea1 (diff) | |
| download | mariadb-git-c08d404f5a1c17f0c67d06db37712e2223ccbeea.tar.gz | |
Merge 10.9 into 10.10
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; |