database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

fixes for windows

Browse Source
This commit is contained in:
Sergei Golubchik
2010-09-20 15:17:59 +02:00
parent 44fc5897a1
commit 9132fab777
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/mysql-test-run.pl
View File

@ -4250,7 +4250,8 @@ sub extract_warning_lines ($) {
qr/Slave: Operation DROP USER failed for 'create_rout_db'/, qr/Slave: Operation DROP USER failed for 'create_rout_db'/,
qr|Checking table: '\./mtr/test_suppressions'|, qr|Checking table: '\./mtr/test_suppressions'|,
qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in MySQL|, 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= []; my $matched_lines= [];

1
mysql-test/r/mysqldump.result
View File

@ -1,3 +1,4 @@
call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
# Bug#37938 Test "mysqldump" lacks various insert statements # Bug#37938 Test "mysqldump" lacks various insert statements
# Turn off concurrent inserts to avoid random errors # Turn off concurrent inserts to avoid random errors
# NOTE: We reset the variable back to saved value at the end of test # NOTE: We reset the variable back to saved value at the end of test

8
mysql-test/r/upgrade.result
View File

@ -141,10 +141,10 @@ USE `#mysql50#../blablabla`;
ERROR 42000: Incorrect database name '#mysql50#../blablabla' ERROR 42000: Incorrect database name '#mysql50#../blablabla'
show full tables; show full tables;
Tables_in_test Table_type Tables_in_test Table_type
#mysql50#ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com BASE TABLE #mysql50#ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com BASE TABLE
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; show full tables;
Tables_in_test Table_type Tables_in_test Table_type
ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com BASE TABLE ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com BASE TABLE
drop table `ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com`; drop table `ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com`;
# End of 5.1 tests # End of 5.1 tests

2
mysql-test/t/mysqldump.test
View File

@ -1,3 +1,5 @@
call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
# Embedded server doesn't support external clients # Embedded server doesn't support external clients
--source include/not_embedded.inc --source include/not_embedded.inc

10
mysql-test/t/upgrade.test
View File

@ -172,13 +172,13 @@ USE `#mysql50#../blablabla`;
# #
# Test of Bug #56441: mysql_upgrade 5.0->5.1 fails for tables with long names # 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.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.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.frm $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com.frm;
show full tables; 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; show full tables;
drop table `ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com`; drop table `ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com`;
--echo # End of 5.1 tests --echo # End of 5.1 tests