diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-06 13:28:06 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-06 13:28:06 +0300 |
| commit | a72f90bc43a809e6678e1343a1ee760878061be3 (patch) | |
| tree | 16fe2efa0a3d5e40e00972a1dc3bc4e13f71170c /libmysqld | |
| parent | ba678eef7de4a8c5fbea07928b87fef84765f22b (diff) | |
| parent | b38ef2b5f7bc231b63b770c28688ee9f0109c88b (diff) | |
| download | mariadb-git-a72f90bc43a809e6678e1343a1ee760878061be3.tar.gz | |
Merge next-mr -> next-4284.
mysql-test/t/disabled.def:
Restore disabled ssl tests: SSL certificates were updated.
Disable sp_sync.test, the test case can't work in next-4284.
mysql-test/t/partition_innodb.test:
Disable parsing of the test case for Bug#47343,
the test can not work in next-4284.
mysql-test/t/ps_ddl.test:
Update results (CREATE TABLE IF NOT EXISTS takes
into account existence of the temporary table).
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index dbe2584a8a9..ae05a9401cf 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -132,7 +132,8 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc ../sql/partition_info.cc ../sql/sql_connect.cc - ../sql/scheduler.cc ../sql/event_parse_data.cc + ../sql/scheduler.cc ../sql/sql_audit.cc + ../sql/event_parse_data.cc ../sql/sql_signal.cc ../sql/rpl_handler.cc ../sql/mdl.cc ../sql/transaction.cc ${GEN_SOURCES} diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index b5e0521ff50..380dfb1396c 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -78,7 +78,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ debug_sync.cc sql_tablespace.cc transaction.cc \ rpl_injector.cc my_user.c partition_info.cc \ sql_servers.cc event_parse_data.cc sql_signal.cc \ - rpl_handler.cc mdl.cc keycaches.cc + rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc libmysqld_int_a_SOURCES= $(libmysqld_sources) nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources) |