diff options
| author | unknown <monty@mysql.com> | 2003-11-20 22:30:48 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-20 22:30:48 +0200 |
| commit | 411b610e7169405ba1fbd8d3c8d4d30fb204dd14 (patch) | |
| tree | 47f72b790e762b88773ac94032106a9fec3ee4a4 /libmysql_r | |
| parent | 671cc0a57491e8084b06a7aa6153f0d05c8ae6ef (diff) | |
| parent | cd878c2c8a4a639b2a7147ecf00ce791e15faa42 (diff) | |
| download | mariadb-git-411b610e7169405ba1fbd8d3c8d4d30fb204dd14.tar.gz | |
Merge with 4.0 to get:
Fix for storing negative values in decimal fields
Fix for FLUSH TABLE with HANDLER
BitKeeper/etc/ignore:
auto-union
libmysql_r/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
mysql-test/r/rpl_loaddata.result:
Merge with 4.0
sql/item.cc:
Merge with 4.0 to get fix for storing negative values in decimal fields
sql/item.h:
Merge with 4.0 to get fix for storing negative values in decimal fields
sql/sql_handler.cc:
Merge with 4.0 to get fix for FLUSH TABLE with HANDLER
sql/sql_repl.cc:
Merge with 4.0
sql/sql_select.cc:
Used original file.
(Comments moved to sql/sql_select.h)
Diffstat (limited to 'libmysql_r')
| -rw-r--r-- | libmysql_r/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 265e31fafdb..60c29a99762 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -19,7 +19,7 @@ target = libmysqlclient_r.la target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ -## LIBS = @LIBS@ +LIBS = @LIBS@ @openssl_libs@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) |