upgrade.result, upgrade.test:

  new file:
  Adding a test case for "Migration tool for 5.1 table name encoding"

mysql-test/r/upgrade.result

+drop database if exists `testdb1`;
+drop database if exists `testdb-1`;
+drop database if exists `#mysql50#testdb-1`;
+create database `testdb1`;
+create database `#mysql50#testdb-1`;
+create table `testdb1`.`t1` (a int);
+create table `testdb1`.`#mysql50#t-1` (a int);
+create table `#mysql50#testdb-1`.`t1` (a int);
+create table `#mysql50#testdb-1`.`#mysql50#t-1` (a int);
+show create database `testdb1`;
+Database	Create Database
+testdb1	CREATE DATABASE `testdb1` /*!40100 DEFAULT CHARACTER SET latin1 */
+show create database `testdb-1`;
+ERROR 42000: Unknown database 'testdb-1'
+show create database `#mysql50#testdb-1`;
+Database	Create Database
+#mysql50#testdb-1	CREATE DATABASE `#mysql50#testdb-1` /*!40100 DEFAULT CHARACTER SET latin1 */
+show tables in `testdb1`;
+Tables_in_testdb1
+#mysql50#t-1
+t1
+show tables in `#mysql50#testdb-1`;
+Tables_in_#mysql50#testdb-1
+#mysql50#t-1
+t1
+show create database `testdb1`;
+Database	Create Database
+testdb1	CREATE DATABASE `testdb1` /*!40100 DEFAULT CHARACTER SET latin1 */
+show create database `testdb-1`;
+Database	Create Database
+testdb-1	CREATE DATABASE `testdb-1` /*!40100 DEFAULT CHARACTER SET latin1 */
+show create database `#mysql50#testdb-1`;
+ERROR 42000: Unknown database '#mysql50#testdb-1'
+show tables in `testdb1`;
+Tables_in_testdb1
+t1
+t-1
+show tables in `testdb-1`;
+Tables_in_testdb-1
+t1
+t-1
+drop database `testdb1`;
+drop database `testdb-1`;

mysql-test/t/upgrade.test

+--disable_warnings
+drop database if exists `testdb1`;
+drop database if exists `testdb-1`;
+drop database if exists `#mysql50#testdb-1`;
+--enable_warnings
+create database `testdb1`;
+create database `#mysql50#testdb-1`;
+create table `testdb1`.`t1` (a int);
+create table `testdb1`.`#mysql50#t-1` (a int);
+create table `#mysql50#testdb-1`.`t1` (a int);
+create table `#mysql50#testdb-1`.`#mysql50#t-1` (a int);
+show create database `testdb1`;
+--error 1049
+show create database `testdb-1`;
+show create database `#mysql50#testdb-1`;
+show tables in `testdb1`;
+show tables in `#mysql50#testdb-1`;
+
+--exec $MYSQL_CHECK --all-databases --fix-db-names --fix-table-names
+
+show create database `testdb1`;
+show create database `testdb-1`;
+--error 1049
+show create database `#mysql50#testdb-1`;
+show tables in `testdb1`;
+show tables in `testdb-1`;
+drop database `testdb1`;
+drop database `testdb-1`;