diff options
| author | unknown <pem@mysql.com> | 2003-03-18 16:12:50 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-03-18 16:12:50 +0100 |
| commit | d956a1c580c0df2b3018fe341bb1bc2aa8bddb53 (patch) | |
| tree | f226e7f748105e5857cd34b3096608f3c89dff07 /libmysqld | |
| parent | 18d3292bb7cd47db17207f8cdbf74e925b34e74b (diff) | |
| parent | 867efa281af9ac6ff5d7930d2575fbca346cd443 (diff) | |
| download | mariadb-git-d956a1c580c0df2b3018fe341bb1bc2aa8bddb53.tar.gz | |
Merged 4.1 -> 5.0.
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
configure.in:
Auto merged
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
scripts/mysql_install_db.sh:
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.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'libmysqld')
| -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 daf65cb2f80..451ab3378d7 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 |