3206 Evgeny Potemkin 2010-06-30
Post-merge fix.
modified:
sql/CMakeLists.txt
3205 Evgeny Potemkin 2010-06-30 [merge]
Auto-merge.
modified:
mysql-test/include/subquery_mat.inc
mysql-test/r/subquery_mat.result
mysql-test/r/subquery_mat_all.result
mysql-test/r/subquery_mat_none.result
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt 2010-06-30 13:09:43 +0000
+++ b/sql/CMakeLists.txt 2010-06-30 15:26:17 +0000
@@ -61,7 +61,7 @@ SET (SQL_SOURCE
sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc
sql_partition.cc sql_plugin.cc sql_prepare.cc sql_rename.cc
sql_join_cache.cc debug_sync.cc debug_sync.h
- sql_repl.cc sql_select.cc sql_show.cc sql_state.c sql_string.cc
+ sql_select.cc sql_show.cc sql_state.c sql_string.cc
sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc
sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc
sql_time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc
Attachment: [text/bzr-bundle] bzr/epotemkin@mysql.com-20100630152617-l60ofrqcq5vsztij.bundle
| Thread |
|---|
| • bzr push into mysql-next-mr-opt-backporting branch (epotemkin:3205 to3206) | Evgeny Potemkin | 30 Jun |
