into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/CMakeLists.txt:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysys/my_thr_init.c:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/rpl_injector.cc:
Auto merged
sql/rpl_injector.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
unittest/mysys/my_atomic-t.c:
Auto merged
sql/log_event.cc:
Manual merge main->rpl
sql/mysqld.cc:
Manual merge main->rpl
5.1-related fixes
libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that
keep dependance on THD structure.
Minor fixes to make tests working.
config/ac-macros/plugins.m4:
condition_dependent_plugin_objects added
libmysqld/Makefile.am:
rules for ha_*.o files added
condition_dependent_plugin_objects sent to linker
libmysqld/lib_sql.cc:
ddl_log initialization added
mysql-test/r/flush_block_commit_notembedded.result:
result fixed
mysql-test/t/crash_commit_before.test:
doesn't work in embedded server
mysql-test/t/csv.test:
replace_result added
mysql-test/t/ps.test:
doesn't work in embedded server
should be fixed by separating ps_notembedded.test
mysql-test/t/ps_1general.test:
replace_result fixed
mysql-test/t/ps_not_windows.test:
doesn't work in embedded server
mysql-test/t/trigger.test:
replace_result fixed
sql/sql_insert.cc:
#ifdef HAVE_ROW_BASED_REPLICATION added
storage/myisam/ha_myisam.cc:
MY_UNPACK_FILENAME flag added
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
config/ac-macros/ha_ndbcluster.m4:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/rpl_timezone.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/handler.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/rpl_injector.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/t/mysqldump.test:
Manual merge
sql/log_event.cc:
manual merge
Changed paths to ndb include directory to include "storage"
Makefile.am:
Adjusted path to yaSSL libtool libraries
ssl.m4:
Use libtool way of specifying yaSSL libraries
config/ac-macros/ssl.m4:
Use libtool way of specifying yaSSL libraries
libmysqld/Makefile.am:
Adjusted path to yaSSL libtool libraries
storage/ndb/config/type_kernel.mk.am:
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapi.mk.am:
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitest.mk.am:
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitools.mk.am:
Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_util.mk.am:
Changed paths to ndb include directory to include "storage"
into mysql.com:/home/kent/bk/mysql-5.1
BitKeeper/deleted/.del-gen_rec.awk:
Auto merged
client/mysql_upgrade.c:
Auto merged
configure.in:
Auto merged
extra/yassl/src/Makefile.am:
Auto merged
extra/yassl/taocrypt/benchmark/Makefile.am:
Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
Auto merged
extra/yassl/taocrypt/src/Makefile.am:
Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
Auto merged
extra/yassl/taocrypt/test.dsp:
Auto merged
extra/yassl/taocrypt/test/Makefile.am:
Auto merged
extra/yassl/testsuite/Makefile.am:
Auto merged
extra/yassl/testsuite/testsuite.dsp:
Auto merged
extra/yassl/yassl.dsp:
Auto merged
extra/yassl/yassl.vcproj:
Auto merged
include/my_sys.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.m4:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
sql-common/my_time.c:
Auto merged
storage/ndb/config/common.mk.am:
Auto merged
storage/ndb/config/type_kernel.mk.am:
Auto merged
storage/ndb/config/type_ndbapi.mk.am:
Auto merged
storage/ndb/config/type_ndbapitest.mk.am:
Auto merged
storage/ndb/config/type_ndbapitools.mk.am:
Auto merged
storage/ndb/config/type_util.mk.am:
Auto merged
Docs/Makefile.am:
SCCS merged
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server
config/ac-macros/plugins.m4:
macros added to check if the storage has sql/ - dependent code
libmysqld/Makefile.am:
symlink files from storage/*/ needed to be recompiled
with EMBEDDED_LIBRARY
storage/federated/plug.in:
ha_federated.cc uses THD structure
storage/heap/plug.in:
ha_heap.cc uses THD structure
storage/innobase/plug.in:
ha_innodb.cc uses THD structure
storage/myisam/plug.in:
ha_myisam.cc uses THD structure
storage/myisammrg/plug.in:
ha_myisammrg.cc uses THD structure
config/ac-macros/ha_ndbcluster.m4:
re-introduce NDB_SIZEOF substitutions to prevent NdbApi depending on my_config
which causes problems for autotools enabled ndbapi programs
storage/ndb/include/ndb_types.h.in:
remove dependency on my_config.h that was causing problems for ndbapi programs
using autoconf
for push in 5.1 (I will inform Trudy).
Storage engines and plugins can now have unit tests to test their components; such
test must be an executable C/C++ program which name ends with '-t' and which is
obeys the mytap protocol, it must be stored in the storage engine's or plugin's
source directory (storage/<engine> or plugin/<plugin>) or any subdirectories of
this.
The top-level Makefile target "test-unit" will run all unit tests: it will scan
the engines' and plugins' directories, recursively, and execute all executable
files which name ends with '-t'."
Makefile.am:
"unittest" directory must be built before "storage" and "plugin"
because the unit tests in these directories may need libmytap.a
which is in unittest/mytap.
config/ac-macros/plugins.m4:
When enabling engine "X", we add "../storage/X" to the unit tests
directories which unittest/unit.pl should traverse looking for
tests to execute. Same for plugins.
unittest/Makefile.am:
Those variables contain all enabled engines and plugins.
Deleted config/ac-macros/ha_berkeley.m4
Removed more referenses to bdb
BitKeeper/deleted/.del-ha_berkeley.m4:
Delete: config/ac-macros/ha_berkeley.m4
BUILD/FINISH.sh:
Removed more referenses to bdb
BUILD/compile-alpha-cxx:
Removed more referenses to bdb
BUILD/compile-alpha-debug:
Removed more referenses to bdb
BUILD/compile-dist:
Removed more referenses to bdb
BUILD/compile-ia64-debug-max:
Removed more referenses to bdb
CMakeLists.txt:
Removed more referenses to bdb
Makefile.am:
Removed more referenses to bdb
libmysqld/lib_sql.cc:
Removed more referenses to bdb
sql/mysql_priv.h:
Removed more referenses to bdb
storage/ndb/config/win-prg.am:
Removed more referenses to bdb
storage/ndb/test/run-test/ndb-autotest.sh:
Removed more referenses to bdb
support-files/my-huge.cnf.sh:
Removed more referenses to bdb
support-files/my-large.cnf.sh:
Removed more referenses to bdb
support-files/my-medium.cnf.sh:
Removed more referenses to bdb
- Change $d to $libs as suggested.
- Thanks to Michael Prohm for the patch!
config/ac-macros/openssl.m4:
Replace $d with $libs as suggested in bug report.
don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
but _do_ add them before calling plugins' configure scripts
config/ac-macros/plugins.m4:
don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
rename *.t* to *-t* to be automake-friendly
simplify Makefiles
test_atomic.c:
move to unittest, add GPL comment, fix warnings, convert to tap framework.
configure:
remove custom tests for available types, use AC_CHECK_TYPE instead
x86-gcc.h:
fix gcc -ansi errors while maintaining readability
ignore:
added *-t
unittest/mysys/base64-t.c:
Rename: unittest/mysys/base64.t.c -> unittest/mysys/base64-t.c
unittest/mysys/bitmap-t.c:
Rename: unittest/mysys/bitmap.t.c -> unittest/mysys/bitmap-t.c
unittest/mytap/t/basic-t.c:
Rename: unittest/mytap/t/basic.t.c -> unittest/mytap/t/basic-t.c
unittest/examples/no_plan-t.c:
Rename: unittest/examples/no_plan.t.c -> unittest/examples/no_plan-t.c
unittest/examples/simple-t.c:
Rename: unittest/examples/simple.t.c -> unittest/examples/simple-t.c
unittest/examples/skip-t.c:
Rename: unittest/examples/skip.t.c -> unittest/examples/skip-t.c
unittest/examples/skip_all-t.c:
Rename: unittest/examples/skip_all.t.c -> unittest/examples/skip_all-t.c
unittest/examples/todo-t.c:
Rename: unittest/examples/todo.t.c -> unittest/examples/todo-t.c
BitKeeper/etc/ignore:
added *-t
config/ac-macros/misc.m4:
remove custom AC_TRY_RUN tests for available types, use AC_CHECK_TYPE instead
configure.in:
remove custom tests for available types, use AC_CHECK_TYPE instead
include/atomic/x86-gcc.h:
fix gcc -ansi errors while maintaining readability
include/my_global.h:
remove custom tests for available types, use AC_CHECK_TYPE instead
include/my_sys.h:
add missing declaration
mysys/Makefile.am:
move test_atomic to unittest
unittest/Makefile.am:
simplifications, correct permissions in chmod
unittest/README.txt:
rename *.t* to *-t* to be automake-friendly
unittest/examples/Makefile.am:
rename *.t* to *-t* to be automake-friendly
simplify Makefile
unittest/mysys/Makefile.am:
rename *.t* to *-t* to be automake-friendly
simplify Makefile
unittest/mysys/my_atomic-t.c:
move mysys/test_atomic.c to unittest, add GPL comment, fix warnings,
convert to tap framework.
unittest/mytap/t/Makefile.am:
rename *.t* to *-t* to be automake-friendly
simplify Makefile
unittest/unit.pl:
rename *.t* to *-t* to be automake-friendly
- Include prefix files that renames all public functions in yaSSLs
OpenSSL API to ya<function_name>. They will otherwise conflict
with OpenSSL functions if loaded by an application that uses OpenSSL
as well as libmysqlclient with yaSSL support.
client/Makefile.am:
Remove $yassl_includes
...and one "suspicious line"
config/ac-macros/yassl.m4:
Remove yassl_includes as they are the same as "normal" include
extra/yassl/include/openssl/crypto.h:
Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_*
extra/yassl/include/openssl/ssl.h:
Add include file "prefix_crypto.h" to rename SSL_* functions to yaSSL_*
libmysql/Makefile.am:
Remove yassl_includes
libmysql_r/Makefile.am:
Remove yassl_includes
libmysqld/Makefile.am:
Remove yassl_includes
And one suspicious line
libmysqld/examples/Makefile.am:
Remove yassl_includes
server-tools/instance-manager/Makefile.am:
Remove yassl_includes
sql/Makefile.am:
Remove yassl_includes
tools/Makefile.am:
Add link with yaSSL libs
vio/Makefile.am:
Remove yassl_includes
extra/yassl/include/openssl/generate_prefix_files.pl:
Add utility script to parse the header files to generate the prefix_* files that renames yaSSL SSL_* functions
extra/yassl/include/openssl/prefix_crypto.h:
Add prefix file for crypto.h
extra/yassl/include/openssl/prefix_ssl.h:
Add prefix file for ssl.h
"Add line for non-executable stack in .s files"
Fix so that configure will use "--noexecstack" for assembler if gcc supports
option and compiled C doesn't need executable stack.
config/ac-macros/compiler_flag.m4:
Bug#12096
Add macro to check if "--noexecstack" should be used when compiling assembler
configure.in:
Bug#12096
Add macro to check if "--noexecstack" should be used when compiling assembler
strings/Makefile.am:
Bug#12096
Automake knows how to handle assembler
- Terminate configure with error(and message) if --with-yassl or --with-openssl is used.
config/ac-macros/ssl.m4:
Add error message if --with-yassl or --with-openssl is used
- Implement new switch --with-ssl to configure used for both bundled yaSSL or OpenSSL
BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
Delete: config/ac-macros/yassl.m4
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
Delete: config/ac-macros/openssl.m4
BUILD/SETUP.sh:
Use switch --with-ssl to configure
BUILD/compile-pentium-debug-openssl:
Use switch --with-ssl to configure
BUILD/compile-pentium-debug-yassl:
Use switch --with-ssl to configure
configure.in:
Change to use the MYSQL_CHECK_SSL macro from ssl.m4
config/ac-macros/ssl.m4:
New BitKeeper file ``config/ac-macros/ssl.m4''
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
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
config/ac-macros/ha_ndbcluster.m4:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/log.cc:
SCCS merged
sql/sql_base.cc:
SCCS merged
storage/archive/plug.in:
MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically
storage/example/plug.in:
MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically
config/ac-macros/plugins.m4:
remove unneccessary `ifelse'
add comment, add missing dnl
configure.in:
change description for heap engine
include/mysql/plugin.h:
change macro name
sql/ha_berkeley.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_federated.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_heap.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_innodb.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_myisam.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_myisammrg.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_ndbcluster.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_partition.cc:
store strings statically for use in handlerton and plugin structures
storage/archive/ha_archive.cc:
store strings statically for use in handlerton and plugin structures
storage/blackhole/ha_blackhole.cc:
store strings statically for use in handlerton and plugin structures
storage/csv/ha_tina.cc:
store strings statically for use in handlerton and plugin structures
storage/example/ha_example.cc:
store strings statically for use in handlerton and plugin structures
into mysql.com:/home/hf/work/mysql-5.1.18518
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
into xiphis.org:/home/antony/work2/wl3201-post-review.2
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/archive/ha_archive.h:
Auto merged
end plugin/module naming schizophrenia
fixup shell code and m4 macro comments
cmakelists.txt included in EXTRA_DIST
BUILD/SETUP.sh:
change module -> plugin
config/ac-macros/plugins.m4:
change module -> plugin
rename some macros
fixup comments
alter shell code to use similar 'test "X$var" = Xfoo"' which autoconf generates
configure.in:
change module -> plugin
move plugin mandatory declarations near rest of plugin declaration
storage/archive/Makefile.am:
cmakelists.txt needed in EXTRA_DIST
storage/blackhole/Makefile.am:
cmakelists.txt needed in EXTRA_DIST
storage/csv/Makefile.am:
cmakelists.txt needed in EXTRA_DIST
storage/example/Makefile.am:
cmakelists.txt needed in EXTRA_DIST
config/ac-macros/yassl.m4:
Fix like of yassl makefiles after merge
mysql-test/lib/mtr_process.pl:
Re-add line accidently cut out during merge
mysql-test/mysql-test-run.pl:
Don't start up ndbcluster slave if we don't need it, and fix how
NDB_STATUS_OK is defined
mysql-test/r/rpl_openssl.result:
Update results
sql/mysqld.cc:
Remove duplicate of have_dlopen (bad merge)
sql/set_var.cc:
Remove duplicate of prepared_stmt_count (bad merge)
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
Makefile.am:
plugin/ must be built before sql/
config/ac-macros/plugins.m4:
simplifications, style fixes
BitKeeper/etc/ignore:
Added compile libmysqld/sql_builtin.cc sql/sql_builtin.cc to the ignore list
plugin/Makefile.am:
restore comment
plugin/fulltext/Makefile.am:
revert
sql/sql_show.cc:
revert
- 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
