merge of 38158 to 5.1-bugteam

mysql-test/t/client_xml.test

@@ -6,6 +6,9 @@
 # the data is actually in the table).
 set @old_concurrent_insert= @@global.concurrent_insert;
 set @@global.concurrent_insert= 0;
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
 
 # Test of the xml output of the 'mysql' and 'mysqldump' clients -- makes
 # sure that basic encoding issues are handled properly