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

diff --git a/mysql-test/include/binlog_start_pos.inc b/mysql-test/include/binlog_start_pos.inc
new file mode 100644
index 00000000000..add5a42a426
--- /dev/null
+++ b/mysql-test/include/binlog_start_pos.inc
@@ -0,0 +1,28 @@
+##############################################################################
+#
+# binlog_start_pos is the postion of the the first event in the binary log
+# which follows the Format description event. Intended to reduce test suite
+# dependance on the Format description event length changes (e.g. in case
+# of adding new events). Evaluated as:
+#  
+#   binlog_start_pos = 4  /* binlog header */ +
+#                      (Format_description_log_event length)
+#
+#   Format_description_log_event length = 
+#                      19 /* event common header */ +
+#                      57 /* misc stuff in the Format description header */ +
+#                      number of events +
+#                      1 /* Checksum algorithm */ +
+#                      4 /* CRC32 length */
+# 
+# With current number of events = 160,
+#
+#   binlog_start_pos = 4 + 19 + 57 + 160 + 1 + 4 = 245.
+#
+##############################################################################
+
+let $binlog_start_pos=245;
+--disable_query_log
+SET @binlog_start_pos=245;
+--enable_query_log
+