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

diff --git a/.bzrignore b/.bzrignore
index af9188dc14d..1dda81015e7 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -117,6 +117,7 @@ client/rpl_tblmap.cc
 client/rpl_tblmap.h
 client/rpl_utility.cc
 client/rpl_utility.h
+client/rpl_utility.cc
 client/select_test
 client/sql_const.h
 client/sql_list.cc
@@ -456,6 +457,11 @@ libmysqld/transaction.cc
 libmysqld/tztime.cc
 libmysqld/uniques.cc
 libmysqld/unireg.cc
+libmysqld/discover_xt.cc
+libmysqld/ha_pbxt.cc
+libmysqld/myxt_xt.cc
+libmysqld/rpl_reporting.cc
+libmysqld/rpl_utility.cc
 libmysqltest/*.ds?
 libmysqltest/mytest.c
 libtool
@@ -1100,3 +1106,26 @@ Testing
 info_macros.cmake
 VERSION.dep
 configure
+libmysqld/examples/mysqltest.cc
+extra/libevent/event-config.h
+libmysqld/opt_table_elimination.cc
+libmysqld/ha_federatedx.cc
+libmysqld/multi_range_read.cc
+libmysqld/opt_index_cond_pushdown.cc
+libmysqld/opt_subselect.cc
+libmysqld/sql_join_cache.cc
+client/rpl_filter.cc
+client/rpl_filter.h
+client/sql_list.cc
+client/sql_list.h
+libmysqld/create_options.cc
+storage/pbxt/bin/xtstat
+libmysqld/sql_expression_cache.cc
+mysql-test/mtr_command
+scripts/convert-debug-for-diff
+plugin/handler_socket/client/hsclient
+client/strings_def.h
+libmysql/strings_def.h
+libmysql_r/strings_def.h
+storage/maria/aria_log_control
+scripts/mytop