diff options
| author | anozdrin@mysql.com <> | 2006-01-13 19:09:27 +0300 |
|---|---|---|
| committer | anozdrin@mysql.com <> | 2006-01-13 19:09:27 +0300 |
| commit | b1705ae5c4cf7f3fe52d742e0e7b89789f488a40 (patch) | |
| tree | c39f4747f6c64b9a61a4edb4ab053adc98010ea0 /libmysqld/Makefile.am | |
| parent | 89f3b9b2dbc79d5fec3322321b4ed4eb809ea498 (diff) | |
| parent | e5d26fc446f07d9898c6c1253bcd5dcd6d3f523f (diff) | |
| download | mariadb-git-b1705ae5c4cf7f3fe52d742e0e7b89789f488a40.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
Diffstat (limited to 'libmysqld/Makefile.am')
| -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 \ |