Commit 297bc30c authored by unknown's avatar unknown
Browse files

Merge fixes 


mysql-test/r/mysqldump.result:
  Update test results
mysql-test/t/mysqldump.test:
  Add "use test" removed by the cset -x
parent 051e30a4

mysql-test/r/mysqldump.result

+2 −2
Original line number Diff line number Diff line
@@ -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="" />

mysql-test/t/mysqldump.test

+1 −1
Original line number Diff line number Diff line
@@ -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