into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/t/disabled.def:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/lib/mtr_cases.pl:
immediately skip tests that need innodb if mysqld does not support it
mysql-test/mysql-test-run.pl:
Check if innodb is supported
- Make mwenv automatically adapt the setting to current build dir.
- Fix include paths that mwccnlm does not understand
- Link libmysl with yassl
netware/BUILD/mwccnlm:
Update mwccnlm to convert -I../.. to -I../../
netware/BUILD/mwenv:
Automatically detect current build dir and based on that calculate current build dir in winw format.
Allow caller to define MYDEV to override the defatul "F:/mydev"
Set all paths from these three variables
netware/Makefile.am:
Link libmysql with yassl_libs
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
Auto merged
Docs/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/stacktrace.h:
Auto merged
mysql-test/mysql-test-run.pl:
fixed path for udf_example.so when running testsuite on Windows
sql/CMakeLists.txt:
Added missing udf_example
sql/Makefile.am:
Added udf_example files for make dist
sql/udf_example.c:
fix for Windows: Windows doesn't have socket.h and friends
Added replacements for strmov,bzero and memcpy_fixed when compiling standalone.
sql/udf_example.def:
BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def
into bk-internal.mysql.com:/tmp/knielsen/mysql-5.1-new-maint
extra/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
storage/ndb/config/common.mk.am:
Auto merged
storage/ndb/config/type_ndbapitools.mk.am:
Auto merged
storage/ndb/src/common/portlib/Makefile.am:
Auto merged
storage/ndb/src/kernel/Makefile.am:
Auto merged
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/t/disabled.def:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
storage/innobase/Makefile.am:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
Using move_field_offset() to move field pointer to other record before
calling pack()/unpack().
sql/log_event.cc:
Using move_field_offset() to move the field pointer. It is necessary
for unpack() and pack() of BIT fields to operate correctly.
Adding debug printouts.
sql/sql_class.cc:
Using move_field_offset() to move the field pointer. It is necessary
for unpack() and pack() of BIT fields to operate correctly.
Adding debug printouts to packing of update rows event.
into trift2.:/MySQL/M50/push-5.0
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/stacktrace.c:
Auto merged
sql/stacktrace.h:
Auto merged
Fixed udf_example, so tests now can also run udf on win.
sql/udf_example.def:
BitKeeper file /home/georg/work/mysql/prod/mysql-5.1-win/sql/udf_example.def
include/config-win.h:
removed USE_32_BIT_TIME
include/my_time.h:
Fixed size of my_time for Win64 (should be 64bit)
mysql-test/mysql-test-run.pl:
Added windows paths for udf_example
sql/CMakeLists.txt:
Added udf_example.dll
sql/udf_example.c:
Windows doesn't know about socket.h and friends. Use winsock.h instead
into shellback.(none):/home/msvensson/mysql/work/my51-work
extra/yassl/testsuite/Makefile.am:
Auto merged
BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
Auto merged
