diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-17 22:44:51 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-17 22:44:51 +0300 |
| commit | 05821367d403ff69e6af3c83ceb45756376f9b94 (patch) | |
| tree | 84e69c2b39154e624f807c4628e21f3d0fdb1da3 /tools | |
| parent | 28097f40d3d13a1d42ef7a98b2ebc3330fd41a83 (diff) | |
| download | mariadb-git-05821367d403ff69e6af3c83ceb45756376f9b94.tar.gz | |
Fixed bug in UNION when doing UNION with the same tables
myisam/mi_extra.c:
More debugging information
mysql-test/r/union.result:
Added test for UNION bug
mysql-test/t/union.test:
Added test for UNION bug
sql/sql_base.cc:
Clear field->query_id when using UNION
sql/sql_parse.cc:
Fix for UNION bug
sql/sql_union.cc:
Cleanup
sql/table.h:
Fix for UNION bug
tools/Makefile.am:
Fix for compiling with MIT-threads
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 4e9fc3ac6f8..3c786dc9281 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,7 +1,6 @@ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include \ $(openssl_includes) -I../include -LIBS= @openssl_libs@ -LDADD= @CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la +LDADD= @CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la @openssl_libs@ bin_PROGRAMS= mysqlmanager mysqlmanager_SOURCES= mysqlmanager.c mysqlmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) |