diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-29 16:03:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-29 16:03:02 +0300 |
| commit | a10b63bf58795335b96281bfc22169c9b8613037 (patch) | |
| tree | 09d4b117202c5df7985c84d6b5a30c4368dc6c72 /mysql-test/suite/plugins | |
| parent | 05abcd7e600ddc2dee280b000439ded2855ff772 (diff) | |
| parent | f3bc4f49f7c02018cac2c721837f9d1f52e9fff0 (diff) | |
| download | mariadb-git-a10b63bf58795335b96281bfc22169c9b8613037.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/plugins')
| -rw-r--r-- | mysql-test/suite/plugins/r/feedback_plugin_load.result | 16 | ||||
| -rw-r--r-- | mysql-test/suite/plugins/t/feedback_plugin_load.test | 7 |
2 files changed, 23 insertions, 0 deletions
diff --git a/mysql-test/suite/plugins/r/feedback_plugin_load.result b/mysql-test/suite/plugins/r/feedback_plugin_load.result index d76625bd3e2..4323dcce0a6 100644 --- a/mysql-test/suite/plugins/r/feedback_plugin_load.result +++ b/mysql-test/suite/plugins/r/feedback_plugin_load.result @@ -24,3 +24,19 @@ VARIABLE_VALUE>0 VARIABLE_NAME 1 Collation used utf8mb4_bin 1 Collation used utf8_bin 1 Collation used utf8_general_ci +prepare stmt from "SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK WHERE VARIABLE_NAME LIKE 'Collation used %' ORDER BY VARIABLE_NAME"; +execute stmt; +VARIABLE_VALUE>0 VARIABLE_NAME +1 Collation used binary +1 Collation used latin1_swedish_ci +1 Collation used utf8mb4_bin +1 Collation used utf8_bin +1 Collation used utf8_general_ci +execute stmt; +VARIABLE_VALUE>0 VARIABLE_NAME +1 Collation used binary +1 Collation used latin1_swedish_ci +1 Collation used utf8mb4_bin +1 Collation used utf8_bin +1 Collation used utf8_general_ci +deallocate prepare stmt; diff --git a/mysql-test/suite/plugins/t/feedback_plugin_load.test b/mysql-test/suite/plugins/t/feedback_plugin_load.test index ecf678eb420..f67397afdfe 100644 --- a/mysql-test/suite/plugins/t/feedback_plugin_load.test +++ b/mysql-test/suite/plugins/t/feedback_plugin_load.test @@ -42,3 +42,10 @@ if (`SELECT VERSION() LIKE '%embedded%'`) SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK WHERE VARIABLE_NAME LIKE 'Collation used %' ORDER BY VARIABLE_NAME; + +prepare stmt from "SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK WHERE VARIABLE_NAME LIKE 'Collation used %' ORDER BY VARIABLE_NAME"; + +execute stmt; +execute stmt; + +deallocate prepare stmt; |