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, 0 insertions, 47 deletions

diff --git a/mysql-test/suite/sys_vars/t/maria_group_commit_basic.test b/mysql-test/suite/sys_vars/t/maria_group_commit_basic.test
deleted file mode 100644
index 09a9cb6f46e..00000000000
--- a/mysql-test/suite/sys_vars/t/maria_group_commit_basic.test
+++ /dev/null
@@ -1,47 +0,0 @@
-# enum global
---source include/have_maria.inc
-
-SET @start_global_value = @@global.maria_group_commit;
-
-#
-# exists as global only
-#
-select @@global.maria_group_commit, @@global.aria_group_commit;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-select @@session.maria_group_commit, @@session.aria_group_commit;
-show global variables like '%aria_group_commit';
-show session variables like '%aria_group_commit';
-select * from information_schema.global_variables where variable_name='maria_group_commit';
-select * from information_schema.session_variables where variable_name='maria_group_commit';
-
-#
-# show that it's writable
-#
-set global maria_group_commit=1;
-select @@global.maria_group_commit, @@global.aria_group_commit;
---error ER_GLOBAL_VARIABLE
-set session maria_group_commit=1;
-
-#
-# all valid values
-#
-set global maria_group_commit=none;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-set global maria_group_commit=hard;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-set global maria_group_commit=soft;
-select @@global.maria_group_commit, @@global.aria_group_commit;
-
-#
-# incorrect types/values
-#
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_group_commit=1.1;
---error ER_WRONG_TYPE_FOR_VAR
-set global maria_group_commit=1e1;
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_group_commit="foo";
---error ER_WRONG_VALUE_FOR_VAR
-set global maria_group_commit=3;
-
-SET @@global.maria_group_commit = @start_global_value;