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

Merge fixes

mysql-test/r/mysqldump.result:
  Update test results
mysql-test/t/mysqldump.test:
  Add "use test" removed by the cset -x
This commit is contained in:
unknown
2005-06-22 20:49:58 +02:00
parent 051e30a45c
commit 297bc30c45
2 changed files with 3 additions and 3 deletions

View File

@ -1530,7 +1530,7 @@ CREATE TABLE `t2` (
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
<?xml version="1.0"?>
<mysqldump>
<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<database name="mysqldump_test_db">
<table_structure name="t1">
<field Field="a" Type="int(11)" Null="YES" Key="" Extra="" />
@ -1541,7 +1541,7 @@ CREATE TABLE `t2` (
</database>
</mysqldump>
<?xml version="1.0"?>
<mysqldump>
<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<database name="mysqldump_test_db">
<table_structure name="t1">
<field Field="a" Type="int(11)" Null="YES" Key="" Extra="" />

View File

@ -664,7 +664,7 @@ select '------ Testing with illegal database names ------' as test_sequence ;
drop table t1, t2, t3;
drop database mysqldump_test_db;
use test;
#
# Bug #9657 mysqldump xml ( -x ) does not format NULL fields correctly