merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

1 files changed, 14 insertions, 0 deletions

diff --git a/mysql-test/t/variables-big.test b/mysql-test/t/variables-big.test
index 15cbe27c759..60d83e92c0a 100644
--- a/mysql-test/t/variables-big.test
+++ b/mysql-test/t/variables-big.test
@@ -3,6 +3,10 @@
 #
 
 --source include/big_test.inc
+# The test would allocate and initialize 5GB of memory
+# if compiled with debug. It can take a lot of time
+# of for paging/swapping.
+--source include/not_debug.inc
 
 #
 # Bug#27322 failure to allocate transaction_prealloc_size causes crash
@@ -41,22 +45,32 @@ SET SESSION transaction_prealloc_size=1024*1024*1024*1;
 # Embedded server is hardcoded to show "Writing to net" as STATE.
 --replace_result "Writing to net" "NULL"
 --replace_column 1 <Id> 3 <Host> 6 <Time>
+# Embedded server is hardcoded to show "Writing to net" as STATE.
+--replace_result "Writing to net" "NULL"
+--replace_regex /localhost[:0-9]*/localhost/
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*2;
 --replace_result "Writing to net" "NULL"
 --replace_column 1 <Id> 3 <Host> 6 <Time>
+--replace_result "Writing to net" "NULL"
+--replace_regex /localhost[:0-9]*/localhost/
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*3;
 --replace_result "Writing to net" "NULL"
 --replace_column 1 <Id> 3 <Host> 6 <Time>
+--replace_result "Writing to net" "NULL"
+--replace_regex /localhost[:0-9]*/localhost/
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*4;
 --replace_result "Writing to net" "NULL"
 --replace_column 1 <Id> 3 <Host> 6 <Time>
+--replace_result "Writing to net" "NULL"
+--replace_regex /localhost[:0-9]*/localhost/
 SHOW PROCESSLIST;
 SET SESSION transaction_prealloc_size=1024*1024*1024*5;
 --replace_result "Writing to net" "NULL"
 --replace_column 1 <Id> 3 <Host> 6 <Time>
+--replace_result "Writing to net" "NULL"
 SHOW PROCESSLIST;
 --enable_warnings