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

libmysqld/CMakeLists.txt

@@ -91,7 +91,8 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/multi_range_read.cc
            ../sql/opt_index_cond_pushdown.cc
            ../sql/opt_subselect.cc
-           ../sql/create_options.cc
+           ../sql/create_options.cc ../sql/rpl_utility.cc
+           ../sql/rpl_reporting.cc
            ../sql/sql_expression_cache.cc
            ${GEN_SOURCES}
            ${MYSYS_LIBWRAP_SOURCE}

libmysqld/examples/CMakeLists.txt

@@ -36,7 +36,6 @@ ENDIF(UNIX)
 MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc)
 TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver)
 
-
 IF(CMAKE_GENERATOR MATCHES "Xcode")
 # It does not seem possible to tell Xcode the resulting target might need
 # to be linked with C++ runtime. The project needs to have at least one C++

libmysqld/lib_sql.cc

@@ -46,6 +46,7 @@ extern "C" void unireg_clear(int exit_code)
 {
   DBUG_ENTER("unireg_clear");
   clean_up(!opt_help && (exit_code || !opt_bootstrap)); /* purecov: inspected */
+  clean_up_mutexes();
   my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
   DBUG_VOID_RETURN;
 }
@@ -620,6 +621,7 @@ void end_embedded_server()
   my_free(copy_arguments_ptr);
   copy_arguments_ptr=0;
   clean_up(0);
+  clean_up_mutexes();
 }
 
 

libmysqld/libmysqld.def

@@ -1,5 +1,4 @@
 LIBRARY		LIBMYSQLD
-DESCRIPTION	'MySQL 5.1 Embedded Server Library'
 VERSION		5.1
 EXPORTS
 	mysql_thread_end