database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Remove end . from error messages to get them consistent

Browse Source 
Fixed a few failing tests
This commit is contained in:
Monty
2016-10-03 18:49:44 +03:00
parent c1125c3218
commit af7490f95d
193 changed files with 2272 additions and 2267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/encryption/t/innodb-bad-key-change.test
View File

@ -56,12 +56,16 @@ SELECT * FROM t1;
--error ER_GET_ERRMSG
SELECT * FROM t1;
<<<<<<< HEAD
--replace_regex /.*tablespace [0-9]*//
=======
--replace_regex /tablespace [0-9]*/tablespace #/
>>>>>>> Remove end . from error messages to get them consistent
SHOW WARNINGS;
-- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keysbad3.txt
-- source include/restart_mysqld.inc
--replace_regex /.*tablespace [0-9]*//
--replace_regex /tablespace [0-9]*/tablespace #/
DROP TABLE t1;
#