diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-11 19:54:31 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-11 19:54:31 -0600 |
| commit | 2aed7cf90ef69ad58588cd8296176bad20b9dd04 (patch) | |
| tree | 9bf257a90e55b757a97fdd2fbc4149e054718451 /sql/Makefile.am | |
| parent | c9dbb4b72640ecfc063f06f9373ac42ef3d9775f (diff) | |
| download | mariadb-git-2aed7cf90ef69ad58588cd8296176bad20b9dd04.tar.gz | |
post-merge fixes to make it compile. It still fails the fulltext test,
(wrong error code) but I'll push it so that Sergei could clean up
my merge
include/mysqld_error.h:
fixed typo
mysql-test/r/order_by.result:
updated result for merged test
sql/Makefile.am:
put back sql_union.cc lost during merge
sql/mysql_priv.h:
restored variables lost in the merge
sql/mysqld.cc:
put back lost variable declarations
sql/share/czech/errmsg.txt:
merge fix
sql/share/danish/errmsg.txt:
merge fix
sql/share/dutch/errmsg.txt:
merge fix
sql/share/english/errmsg.txt:
merge fix
sql/share/estonian/errmsg.txt:
merge fix
sql/share/french/errmsg.txt:
merge fix
sql/share/german/errmsg.txt:
merge fix
sql/share/greek/errmsg.txt:
merge fix
sql/share/hungarian/errmsg.txt:
merge fix
sql/share/italian/errmsg.txt:
merge fix
sql/share/japanese/errmsg.txt:
merge fix
sql/share/korean/errmsg.txt:
merge fix
sql/share/norwegian-ny/errmsg.txt:
merge fix
sql/share/norwegian/errmsg.txt:
merge fix
sql/share/polish/errmsg.txt:
merge fix
sql/share/portuguese/errmsg.txt:
merge fix
sql/share/romanian/errmsg.txt:
merge fix
sql/share/russian/errmsg.txt:
merge fix
sql/share/slovak/errmsg.txt:
merge fix
sql/share/spanish/errmsg.txt:
merge fix
sql/share/swedish/errmsg.txt:
merge fix
sql/sql_acl.cc:
merge fix
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index d3c3ff541fd..3456a07977d 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -80,9 +80,9 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \ sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \ sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \ - slave.cc sql_repl.cc \ + slave.cc sql_repl.cc sql_union.cc \ mini_client.cc mini_client_errors.c \ - md5.c stacktrace.c + md5.c stacktrace.c gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) |