diff options
| author | unknown <anozdrin@mysql.com> | 2006-01-11 02:10:59 +0300 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-01-11 02:10:59 +0300 |
| commit | 9d2def68963e2ecf578eeac0fb376b5d006073c5 (patch) | |
| tree | 88a6d339e951a108cc143e14933101c432196774 /libmysqld | |
| parent | da73b0e137f251a55131ea229717dba941293a6b (diff) | |
| parent | d4d29edb836c697d744bb75496b58b76554fcb68 (diff) | |
| download | mariadb-git-9d2def68963e2ecf578eeac0fb376b5d006073c5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/alik/MySQL/devel/5.0-bug15110
sql/sql_parse.cc:
Auto 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 f07bbacba02..5ec9cdfe5bf 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -63,7 +63,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 \ - ha_blackhole.cc ha_archive.cc + ha_blackhole.cc ha_archive.cc my_user.c libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources) libmysqld_a_SOURCES= |