diff options
author | Sergei Golubchik <sergii@pisem.net> | 2010-09-21 16:24:03 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-21 16:24:03 +0200 |
commit | 54708d354de7767b3303f7a41ae1a95fc8845765 (patch) | |
tree | 535115f63ecb75f0ebf44fb63d8232d3dcbea1b4 /mysql-test/r | |
parent | bbdbcd0eb81fde41f6f8f032fec882d9bc12a8a8 (diff) | |
parent | 27c90812cf6424c773562c2320924924ca13bb50 (diff) | |
download | mariadb-git-54708d354de7767b3303f7a41ae1a95fc8845765.tar.gz |
merged
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/mysqldump.result | 1 | ||||
-rw-r--r-- | mysql-test/r/upgrade.result | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index ccf60ae5fd9..2b041aee05a 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -1,3 +1,4 @@ +call mtr.add_suppression("@003f.frm' \\(errno: 22\\)"); # Bug#37938 Test "mysqldump" lacks various insert statements # Turn off concurrent inserts to avoid random errors # NOTE: We reset the variable back to saved value at the end of test diff --git a/mysql-test/r/upgrade.result b/mysql-test/r/upgrade.result index bdfac990a9a..f2c8886c915 100644 --- a/mysql-test/r/upgrade.result +++ b/mysql-test/r/upgrade.result @@ -141,10 +141,10 @@ USE `#mysql50#../blablabla`; ERROR 42000: Incorrect database name '#mysql50#../blablabla' show full tables; Tables_in_test Table_type -#mysql50#ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com BASE TABLE -rename table `#mysql50#ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com` to `ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com`; +#mysql50#ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com BASE TABLE +rename table `#mysql50#ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com` to `ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com`; show full tables; Tables_in_test Table_type -ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com BASE TABLE -drop table `ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com`; +ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com BASE TABLE +drop table `ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com`; # End of 5.1 tests |