merge of 38158 to 5.1-bugteam

mysql-test/r/client_xml.result

@@ -1,5 +1,6 @@
 set @old_concurrent_insert= @@global.concurrent_insert;
 set @@global.concurrent_insert= 0;
+drop table if exists t1;
 create table t1 (
 `a&b` int,
 `a<b` int,

mysql-test/r/mysql.result

@@ -38,8 +38,6 @@ t2
 t3
 Tables_in_test
 t1
-delimiter
-1
 _
 Test delimiter : from command line
 a

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

mysql-test/t/mysql_delimiter.sql

@@ -60,12 +60,6 @@ use test//
 show tables//
 delimiter ; # Reset delimiter
 
-#
-# Bug #33812: mysql client incorrectly parsing DELIMITER
-#
-select a as delimiter from t1
-delimiter ; # Reset delimiter
-
 #
 # Bug #36244: MySQL CLI doesn't recognize standalone -- as comment
 #             before DELIMITER statement