diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-05-23 20:28:52 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-05-23 20:28:52 +0200 |
| commit | bc1784298f3efe11f29710a207ff2b42372e4b0d (patch) | |
| tree | 6e6c0e2abc00dedcaaa6cd3f6851a483ec53cd6d /libmysqld | |
| parent | e4e2d0293ffd062f5d54d4b5fd0a54065be12580 (diff) | |
| parent | 2b8527e94507acd10ff48fee4fe1b8814d246dea (diff) | |
| download | mariadb-git-bc1784298f3efe11f29710a207ff2b42372e4b0d.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
include/m_string.h:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
C
Merged.
?
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 8d1591282db..a3af2d43bd5 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -68,7 +68,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \ sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \ parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \ - event_executor.cc event.cc event_timed.cc \ + event_scheduler.cc event.cc event_timed.cc \ rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \ sql_tablespace.cc \ rpl_injector.cc my_user.c partition_info.cc |