From: kevin.lewis Date: March 9 2011 5:15pm Subject: bzr commit into mysql-5.5-innodb branch (kevin.lewis:3345) Bug#60196 Bug#11831040 List-Archive: http://lists.mysql.com/commits/132693 X-Bug: 60196,11831040 Message-Id: <20110309171559.CD110CAB7F4@kevin-lewis-macbook.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1721793523==" --===============1721793523== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/kevinlewis/Work/Mysql/Bug60196/mysql-5.5-innodb/ based on revid:kevin.lewis@stripped 3345 kevin.lewis@stripped 2011-03-09 Bug#60196 / Bug#11831040 Test case cannot run on embedded server. No need for precautionary cleanup of unique names. modified: mysql-test/suite/innodb/r/innodb_bug60196.result mysql-test/suite/innodb/t/innodb_bug60196.test === modified file 'mysql-test/suite/innodb/r/innodb_bug60196.result' --- a/mysql-test/suite/innodb/r/innodb_bug60196.result revid:kevin.lewis@stripped +++ b/mysql-test/suite/innodb/r/innodb_bug60196.result revid:kevin.lewis@stripped @@ -1,9 +1,6 @@ -DROP TABLE IF EXISTS Bug_60196_FK1 ; -DROP TABLE IF EXISTS Bug_60196_FK2 ; -DROP TABLE IF EXISTS Bug_60196 ; -CREATE TABLE `Bug_60196_FK1` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; -CREATE TABLE `Bug_60196_FK2` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; -CREATE TABLE `Bug_60196` ( +CREATE TABLE Bug_60196_FK1 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE Bug_60196_FK2 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE Bug_60196 ( FK1_Key INT NOT NULL, FK2_Key INT NOT NULL, PRIMARY KEY (FK2_Key, FK1_Key), @@ -46,7 +43,7 @@ FK1_Key FK2_Key 1 1 1 2 1 3 -# Stop master server +# Stop server # Restart server. # # Try to insert more to the example table with foreign keys. === modified file 'mysql-test/suite/innodb/t/innodb_bug60196.test' --- a/mysql-test/suite/innodb/t/innodb_bug60196.test revid:kevin.lewis@stripped +++ b/mysql-test/suite/innodb/t/innodb_bug60196.test revid:kevin.lewis@stripped @@ -1,26 +1,20 @@ # Bug#60196 - Setting lowercase_table_names to 2 on Windows causing # Foreign Key problems after an engine is restarted. -# This test case needs InnoDB. ---source include/have_innodb.inc +# This test case needs InnoDB, a lowercase file system, +# lower-case-table-names=2, and cannot use the embedded server +# because it restarts the server. +--source include/not_embedded.inc --source include/have_lowercase2.inc --source include/have_case_insensitive_file_system.inc - -# -# Precautionary clean up. -# ---disable_warnings -DROP TABLE IF EXISTS Bug_60196_FK1 ; -DROP TABLE IF EXISTS Bug_60196_FK2 ; -DROP TABLE IF EXISTS Bug_60196 ; ---enable_warnings +--source include/have_innodb.inc # # Create test data. # -CREATE TABLE `Bug_60196_FK1` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; -CREATE TABLE `Bug_60196_FK2` (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; -CREATE TABLE `Bug_60196` ( +CREATE TABLE Bug_60196_FK1 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE Bug_60196_FK2 (Primary_Key INT PRIMARY KEY) ENGINE=InnoDB; +CREATE TABLE Bug_60196 ( FK1_Key INT NOT NULL, FK2_Key INT NOT NULL, PRIMARY KEY (FK2_Key, FK1_Key), @@ -49,7 +43,7 @@ SELECT * FROM bug_60196_FK1; SELECT * FROM bug_60196_FK2; SELECT * FROM bug_60196; ---echo # Stop master server +--echo # Stop server # Write file to make mysql-test-run.pl wait for the server to stop -- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --===============1721793523== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/kevin.lewis@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kevin.lewis@stripped # target_branch: file:///Users/kevinlewis/Work/Mysql/Bug60196/mysql-\ # 5.5-innodb/ # testament_sha1: f73ce3f11d5ede1f7e8b60a2220d86da7cde84d2 # timestamp: 2011-03-09 11:15:59 -0600 # base_revision_id: kevin.lewis@stripped\ # 8ncx3gere5a72mdo # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY5l8mEAAp3fgAAQWGf//3+v XCC////wUAVtV4UAebDrKjToCSSNJpTYYqe9TKaYPVJ7UxI2hPUwT1PSPKGOYTAJgBMJhNMAAAmT TQMMiZFNTaGUNNPIDUABiBpoaNABJKnqfqSPUyHpNqGmEaYjTCYTJkyY1NMCSRGQNAImyJim0jAh MJ6jIBhKrN1xxxkaThR4DQrxyNcokKmT2pdkKxh+OlJVqpr9kt1JoPB6GDC4VvjetoUQH28wdrSk s9KwWIhB1ZLrq+bLelCbBPltFAP8H83hvDSTCbqG9PSBdkxsrB/6erGWuIhhTbNY4S2pRhNFEocB V9Y1CAxiAw1V8YdepEjJEdbLgOS1ZQ/ff9Li/s7NXQuZOha9Zy1wCfdtA5Vu4f7mdsSbrMyo1pJx Lr387RLEW9QnJpPXGcDiwNU6RSyAmmYeJUs4QPC0nyQPLRwE05SDKI/yotKIOwLBU/QcnkXdnwsK UBKRoWa2oCvHunhNXCpsKMAeVjdwdi9le8OJIZIzdLvc+sD3PzxAswoVbyg2RAiYTJPBYWzGfZfN CQPvLJoJerPiWViz1fdstH2WTVaORpzNhDqHwJg2gVJ7Y0hJAW67CYYguLFZMbSwC5rpthWUmRDX 8B9iqRWYYSCZwOHNuyKy4acknGj2iRFuULMxpDUQA2NbIqBidyXJFsAKJgLLDJwMZlrWNRQrWVML G0JhTWfY6d4nBR6jaamfbvvNL9GNphwImOmQOnCqWg1u8g4xd1GInAUmBIKAKaXpjC8vvvDllgVG lV2ZgFj4mJDCNkJSk8CkDUPWUPqkFj2BwEqIT14QxNkUGxgmK4lRTe4hw+4RlSrYOrfm06UM3hBw NFp1OiEWvDyXhIpLXDeAycd3vDT4kBLKLeDi2UKIyZmnBrFP8rLCcX0jeKMUwcBdVAMofAODhMDo zBME4Igqi/gO0GDseHEOQuYYglMAMJwpnYAuh4itD6huFGBpcOF1/s8K3C8entPgHtPBOPzSvr6C UoHmWzI+l4UPvuKfeXWJRo9AiDJjH6AerNHvY3bDLqPiPgL0HYT5WqFUMV7fYLE5iKrruB8nFzrl o3pqPJfxLhPe5hKiY+olHIiTBqM5DxseLjAxLOVARBtsyPgBQqBwmnMXrAyCVpr1OsLmCTozKiIC Z0CckstpYpkrA2kD88cjidpmXGVB2s55TejF9tvPaUZZrhiUKfr5cCetppGmi0uJxiiddKgmCI5c WKbnTLYGbSyOwwEW33QdfDiJMjMJUj0fgJrKrUxEsy6th+Rzh67CpdD7l/gMQOxy8TxNBgVQrA3d 1wHAdwF9aDUr64UINTzaBoKnWoaXUoJTBIQtEtg4xIvfKngma989co7ESw8+8SvRd64ndqbDIDcW oyMkw48tiOYHn/PALUWuODHRUyEnDhh3AS7Nee0aqBT4IXYB3FYdinXeFhFjZA3zTTBM+xnCTBJd HPIMWAqkOGV46iIACIsJNdwFkAZTjs8ZEHLu1AXr5KakXun7Rq/wJPQ5dHKtZ8TeSNkxpbowwOT8 y4sjGO4nK8NqKaujxQHpByfWMFkUrOSlyeodPQK1LCN43qnRPRfHdMEtOOJSDQEod0IiRmbNJRQy lvKkMVBZMedYDRQ5NR4Fciu40fuY1hO47wliQHtfZomCtiqrjcVfkqRIJxgueZVnf8ziJhUHOLrq n2l03Ad8mgoo3JBoUDhLxKA8QNxMRKQHI0IDgmDAYNSJ0v8irqVNpYeRE/8XckU4UJCOZfJh --===============1721793523==--