Commit fd97821d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1 

into  mysql.com:/home/mydev/mysql-5.1-bug11527
parents 8c810efd 36a0a13d

client/client_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -59,5 +59,6 @@ enum options_client 
  OPT_MYSQL_PRESERVE_SCHEMA,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES

};

mysql-test/r/upgrade.result

0 → 100644
+43 −0
Original line number Diff line number Diff line 
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

0 → 100644
+28 −0
Original line number Diff line number Diff line 
--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`;