[Commits] Rev 2940: fixes for windows in http://bazaar.launchpad.net/~maria-captains/maria/5.1/

serg at askmonty.org serg at askmonty.org
Mon Sep 20 16:18:05 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1/

------------------------------------------------------------
revno: 2940
revision-id: sergii at pisem.net-20100920131759-d8uvabe633jmcudf
parent: sergii at pisem.net-20100918075348-d0hv4anqrpf7tboj
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.1
timestamp: Mon 2010-09-20 15:17:59 +0200
message:
  fixes for windows
-------------- next part --------------
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-09-14 18:00:10 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-09-20 13:17:59 +0000
@@ -4250,7 +4250,8 @@ sub extract_warning_lines ($) {
      qr/Slave: Operation DROP USER failed for 'create_rout_db'/,
      qr|Checking table:   '\./mtr/test_suppressions'|,
      qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in MySQL|,
-     qr|mysqld: Table '\./mtr/test_suppressions' is marked as crashed and should be repaired|
+     qr|mysqld: Table '\./mtr/test_suppressions' is marked as crashed and should be repaired|,
+     qr|InnoDB: Error: table 'test/bug39438'|,
     );
 
   my $matched_lines= [];

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2010-08-02 09:01:24 +0000
+++ b/mysql-test/r/mysqldump.result	2010-09-20 13:17:59 +0000
@@ -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

=== modified file 'mysql-test/r/upgrade.result'
--- a/mysql-test/r/upgrade.result	2010-09-03 16:20:30 +0000
+++ b/mysql-test/r/upgrade.result	2010-09-20 13:17:59 +0000
@@ -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

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2010-08-02 09:01:24 +0000
+++ b/mysql-test/t/mysqldump.test	2010-09-20 13:17:59 +0000
@@ -1,3 +1,5 @@
+call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
+
 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 

=== modified file 'mysql-test/t/upgrade.test'
--- a/mysql-test/t/upgrade.test	2010-09-07 20:46:10 +0000
+++ b/mysql-test/t/upgrade.test	2010-09-20 13:17:59 +0000
@@ -172,13 +172,13 @@ USE `#mysql50#../blablabla`;
 #
 # Test of Bug #56441: mysql_upgrade 5.0->5.1 fails for tables with long names
 #
-copy_file $MYSQL_TEST_DIR/std_data/long_table_name.MYI $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com.MYI;
-copy_file $MYSQL_TEST_DIR/std_data/long_table_name.MYD $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com.MYD;
-copy_file $MYSQL_TEST_DIR/std_data/long_table_name.frm $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com.frm;
+copy_file $MYSQL_TEST_DIR/std_data/long_table_name.MYI $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com.MYI;
+copy_file $MYSQL_TEST_DIR/std_data/long_table_name.MYD $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com.MYD;
+copy_file $MYSQL_TEST_DIR/std_data/long_table_name.frm $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com.frm;
 show full tables;
-rename table `#mysql50#ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com` to `ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com`;
+rename table `#mysql50#ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com` to `ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com`;
 show full tables;
-drop table `ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com`;
+drop table `ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com`;
 
 --echo # End of 5.1 tests
 



More information about the commits mailing list