| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| | |
into neptunus.(none):/home/msvensson/mysql/bug18818/my51-bug18818
config/ac-macros/zlib.m4:
Auto merged
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Remove usage of $shrext_cmds variable
- Test for libs using all known library file endings
config/ac-macros/openssl.m4:
Remove the usage of $shrext_cmds. instead test for all the library file
endings we currently know, that is .a .so .sl and .dylib
config/ac-macros/zlib.m4:
Remove the usage of $shrext_cmds. instead test for all the library file
endings we currently know, that is .a .so .sl and .dylib
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-mysql_upgrade.dsp:
Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.c:
Delete: client/mysql_upgrade.c
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysql.sln:
Auto merged
VC++Files/mysql_ia64.dsw:
Auto merged
client/mysql.cc:
Auto merged
config/ac-macros/zlib.m4:
Auto merged
configure.in:
Auto merged
extra/yassl/Makefile.am:
Auto merged
extra/yassl/taocrypt/Makefile.am:
Auto merged
include/my_global.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.def:
Auto merged
libmysqld/libmysqld.def:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/rpl_openssl.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
client/Makefile.am:
Resolve conflict
config/ac-macros/yassl.m4:
Resolve conflict
mysql-test/include/have_udf.inc:
Resolve conflict
mysql-test/lib/mtr_process.pl:
Resolve conflict
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/r/have_udf.require:
Resolve conflict
mysql-test/r/rpl_openssl.result:
Resolve conflict
mysql-test/t/disabled.def:
Resolve conflict
mysql-test/t/information_schema.test:
Resolve conflict
server-tools/instance-manager/instance_options.cc:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/set_var.cc:
Resolve conflict
support-files/mysql.spec.sh:
Resolve conflict
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Eval shrext_cmds variable before using it
- Moved from acinclude.m4 to openssl.m4 and zlib.m4 when merging 4.1 -> 5.0
config/ac-macros/openssl.m4:
Move from acinclude.m4
config/ac-macros/zlib.m4:
Move from acinclude.m4
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
BUILD/compile-dist:
fixes for 'make dist' and 'make distcheck'
include yassl in "dist"
Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove double-listing of everything in SUBDIRS and DIST_SUBDIRS
remove @yassl_dir@, it belongs to extra/Makefile.am
specify --basedir for mysql_install_db, in case builddir (where mysql_install_db is)
differs from srcdir (where mysql_fix_privilege_tables.sql is)
config/ac-macros/yassl.m4:
fixes for 'make dist' and 'make distcheck'
create Makefile's only if yassl is used
yassl_dir must not include /
config/ac-macros/zlib.m4:
fixes for 'make dist' and 'make distcheck'
create Makefile only if zlib is used
configure.in:
fixes for 'make dist' and 'make distcheck'
create Makefile only if a feature is enabled
storage engine dirs must not include /
automatically disable readline/libedit/sql-bench if source dir is missing
extra/Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove SUBDIR/DIST_SUBDIR hack
libmysql_r/Makefile.am:
fixes for 'make dist' and 'make distcheck'
when symlinking all files from libmysql/ take into account that
srcdir != builddir
libmysqld/Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove fragile promiscuous search for object files
if .o file is not where we look for it - extract it from the library
mysql-test/ndb/Makefile.am:
fixes for 'make dist' and 'make distcheck'
ndbcluster script is not a "source"
don't forget to cleanup
plugin/Makefile.am:
fixes for 'make dist' and 'make distcheck'
include plugin/fulltext/configure.in template in the distribution
storage/Makefile.am:
fixes for 'make dist' and 'make distcheck'
remove SUBDIRS/DIST_SUBDIRS hack
storage/ndb/Makefile.am:
fixes for 'make dist' and 'make distcheck'
force common.mk.am out of DIST_COMMON (which is otherwise an
auto-generated list of Makefile's sources) because it's listed
indirectly in EXTRA_DIST, and with bk -r get, a file cannot be copied
twice.
|
| |
|
|
|
|
|
|
|
|
| |
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
and search the given include directory first (bug#18369)
config/ac-macros/zlib.m4:
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
and search the given include directory first (bug#18369)
|
| |
|
|
|
|
|
|
|
|
| |
Use when testing if shared library exists, bug#16332
config/ac-macros/openssl.m4:
Use when testing if shared library exists, bug#16332
config/ac-macros/zlib.m4:
Use when testing if shared library exists, bug#16332
|
| |
|
|
|
|
|
|
|
|
| |
(Patch provided by serg)
config/ac-macros/zlib.m4:
Check for zlib with a zzlibCompileFlags() function.
This makes it pick the bundled zlib if there's an old installed version
(which wouldn't work).
|
| |
|
|
|
|
|
|
|
|
| |
Accept any shared library for "libz", not just the static one. Bug#6584
Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.
config/ac-macros/zlib.m4:
Accept any shared library for "libz", not just the static one. Bug#6584
Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.
|
| |
|
|
|
|
|
|
| |
zlib)
config/ac-macros/zlib.m4:
Fix bad 4.1->5.0 merge
|
|
|
Would you believe that I wrote all of this on a Mac? I just happen to be not using HFS for the partition I did this work on. Oops :)
config/ac-macros/alloca.m4:
mvdir
config/ac-macros/character_sets.m4:
mvdir
config/ac-macros/check_cpu.m4:
mvdir
config/ac-macros/compiler_flag.m4:
mvdir
config/ac-macros/ha_archive.m4:
mvdir
config/ac-macros/ha_berkeley.m4:
mvdir
config/ac-macros/ha_example.m4:
mvdir
config/ac-macros/ha_innodb.m4:
mvdir
config/ac-macros/ha_isam.m4:
mvdir
config/ac-macros/ha_ndbcluster.m4:
mvdir
config/ac-macros/ha_tina.m4:
mvdir
config/ac-macros/large_file.m4:
mvdir
config/ac-macros/misc.m4:
mvdir
config/ac-macros/mysqlfs.m4:
mvdir
config/ac-macros/openssl.m4:
mvdir
config/ac-macros/readline.m4:
mvdir
config/ac-macros/sanity.m4:
mvdir
config/ac-macros/zlib.m4:
mvdir
configure.in:
Fix silly little problem with case insensitive filesystems.
Funny thing is that I wrote all this on a Mac, but I don't use HFS on that partition so I never noticed that it would be an issue.
Oops :)
|
