diff options
| author | unknown <pem@mysql.com> | 2003-03-27 12:09:11 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-03-27 12:09:11 +0100 |
| commit | 8db55dcf86d87bece091520826f4142b96e9a283 (patch) | |
| tree | 3dbe93fb3b28f4aa6b8445c9b4aaa8c2ee776e02 /libmysqld/Makefile.am | |
| parent | 34559e803839a8f34f63e6a992d7e93fcb040a1f (diff) | |
| parent | 2c9ef84cc35198c1ae888a335c2e228ecfb6b81d (diff) | |
| download | mariadb-git-8db55dcf86d87bece091520826f4142b96e9a283.tar.gz | |
Merged 4.1 into 5.0.
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'libmysqld/Makefile.am')
| -rw-r--r-- | libmysqld/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index b36f8d92490..13e389b4dca 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -55,7 +55,8 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \ sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \ unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \ - spatial.cc gstream.cc sql_help.cc + spatial.cc gstream.cc sql_help.cc \ + sp_head.cc sp_pcontext.cc sp.cc EXTRA_DIST = lib_vio.c |