diff options
| author | unknown <anozdrin@mysql.com> | 2006-01-13 19:09:27 +0300 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-01-13 19:09:27 +0300 |
| commit | 848235f797cbbc2e16cb132b67177a6728e6735d (patch) | |
| tree | c39f4747f6c64b9a61a4edb4ab053adc98010ea0 /libmysqld | |
| parent | 4a114543d5ea588a69f74418fc0cb472a519ebda (diff) | |
| parent | 9d2def68963e2ecf578eeac0fb376b5d006073c5 (diff) | |
| download | mariadb-git-848235f797cbbc2e16cb132b67177a6728e6735d.tar.gz | |
Merge BUG#15110 from 5.0 into 5.1.
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
BitKeeper/etc/ignore:
auto-union
client/mysqldump.c:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/type_time.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
client/Makefile.am:
Add my_user.c
include/Makefile.am:
Add my_user.c
libmysqld/Makefile.am:
Add my_user.c
mysql-test/t/disabled.def:
Enable type_time.test
sql/sql_parse.cc:
Merge.
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 ec6dfecb359..62418c0d669 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -67,7 +67,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ event_executor.cc event.cc event_timed.cc \ rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc \ sql_tablespace.cc \ - rpl_injector.cc + rpl_injector.cc my_user.c libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) EXTRA_libmysqld_a_SOURCES = ha_innodb.cc ha_berkeley.cc ha_archive.cc \ |