diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-24 09:38:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-24 09:38:49 +0300 |
| commit | 1864a8ea93aa1d1a540c83526a25df2ad0330763 (patch) | |
| tree | f6d1ae8e9e696ea8537a395d061f697e5bccd4aa /mysql-test/main/ctype_filename.test | |
| parent | b01a9fd817d9d8e5941008d6981338eaa7369c83 (diff) | |
| parent | 5c75ba9cadc7877e91d6b712f157ff5623c09c60 (diff) | |
| download | mariadb-git-1864a8ea93aa1d1a540c83526a25df2ad0330763.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/ctype_filename.test')
| -rw-r--r-- | mysql-test/main/ctype_filename.test | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/mysql-test/main/ctype_filename.test b/mysql-test/main/ctype_filename.test index 6f77a6c5a3a..0c38172a0ef 100644 --- a/mysql-test/main/ctype_filename.test +++ b/mysql-test/main/ctype_filename.test @@ -28,12 +28,40 @@ select convert(convert(',' using filename) using binary); SET NAMES utf8; SELECT @a:=CONVERT('aя' USING filename) AS `@a`, BINARY @a, REVERSE(@a), HEX(@a), HEX(REVERSE(@a)); +--echo # +--echo # Beginning of 10.2 test. +--echo # +--echo # MDEV-25462: Assertion `m_status == DA_ERROR || m_status == DA_OK || +--echo # m_status == DA_OK_BULK' failed in Diagnostics_area::message from +--echo # get_schema_tables_record +--echo # + +SELECT @@character_set_client, @@character_set_connection, @@character_set_results; +SET @old_character_set_client= @@character_set_client; +SET @old_character_set_connection= @@character_set_connection; +SET @old_character_set_results= @@character_set_results; +--error ER_WRONG_VALUE_FOR_VAR +SET NAMES 'filename'; +SELECT @@character_set_client, @@character_set_connection, @@character_set_results; +CREATE VIEW v2 AS SELECT 1; +SHOW TABLE STATUS; +DROP VIEW v2; +SET @@character_set_client= @old_character_set_client; +SET @@character_set_connection= @old_character_set_connection; +SET @@character_set_results= @old_character_set_results; + +--echo # +--echo # End of 10.2 test +--echo # --echo # --echo # MDEV-22022 Various mangled SQL statements will crash 10.3 to 10.5 debug builds --echo # +--error ER_WRONG_VALUE_FOR_VAR SET CHARACTER_SET_CLIENT=17; --error ER_PARSE_ERROR SELECT doc.`Children`.0 FROM t1; SET NAMES latin1; + +--echo # End of 10.3 tests |