into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/src/NdbBackup.cpp:
Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
merge
Include our base headers before system headers
storage/archive/archive_test.c:
Include our base headers before system headers
storage/archive/azio.c:
Include our base headers before system headers
a normal 'make dist' source .tar.gz.
libmysql/mytest.c:
bk cp VC++Files/libmysqltest/mytest.c libmysql/mytest.c
sql/message.mc:
bk cp VC++Files/sql/message.mc sql/message.mc
Makefile.am:
Add Windows CMake stuff.
client/Makefile.am:
Add extra files needed for CMake Windows build.
cmakelists.txt:
Fix subdir order to make CMake dependency calculations happy.
configure.in:
Add extra files needed for CMake Windows build.
extra/Makefile.am:
Add extra files needed for CMake Windows build.
extra/yassl/Makefile.am:
Add extra files needed for CMake Windows build.
libmysql/Makefile.am:
Add extra files needed for CMake Windows build.
libmysql/cmakelists.txt:
Move mytest.c to a more sensible location.
libmysqld/Makefile.am:
Add extra files needed for CMake Windows build.
mysys/Makefile.am:
Add extra files needed for CMake Windows build.
regex/Makefile.am:
Add extra files needed for CMake Windows build.
server-tools/instance-manager/Makefile.am:
Add extra files needed for CMake Windows build.
sql/Makefile.am:
Add extra files needed for CMake Windows build.
sql/cmakelists.txt:
Move message.mc to a more sensible location.
Add some dependencies to avoid a stale handlerton.cc.
storage/archive/Makefile.am:
Add extra files needed for CMake Windows build.
storage/bdb/Makefile.in:
Add extra files needed for CMake Windows build.
storage/example/Makefile.am:
Add extra files needed for CMake Windows build.
storage/heap/Makefile.am:
Add extra files needed for CMake Windows build.
storage/innobase/Makefile.am:
Add extra files needed for CMake Windows build.
storage/innobase/include/univ.i:
Avoid including Unix config in Windows build.
storage/myisam/Makefile.am:
Add extra files needed for CMake Windows build.
storage/myisammrg/Makefile.am:
Add extra files needed for CMake Windows build.
strings/Makefile.am:
Add extra files needed for CMake Windows build.
tests/Makefile.am:
Add extra files needed for CMake Windows build.
vio/Makefile.am:
Add extra files needed for CMake Windows build.
zlib/Makefile.am:
Add extra files needed for CMake Windows build.
still some compiler warnings
storage/ndb/include/util/OutputStream.hpp:
still some compiler warnings
storage/ndb/include/util/SimpleProperties.hpp:
still some compiler warnings
storage/ndb/src/kernel/vm/Pool.hpp:
still some compiler warnings
- make sure cluster/schema table is always created first
sql/ha_ndbcluster_binlog.cc:
make sure cluster/schema table is always created first
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
corrected bug causing hang in getTable when using blob tables
rewrite/clean up code a bit to avoid a gcc4 compiler bug
storage/ndb/src/kernel/vm/DLFifoList.hpp:
Fix compiler bug
storage/ndb/src/kernel/vm/DLList.hpp:
Fix compiler bug
storage/ndb/src/kernel/vm/SLList.hpp:
Fix compiler bug
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
mysql-test/lib/mtr_timer.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_innodb.cc:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
Auto merged
storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
Auto merged
storage/ndb/test/run-test/conf-dl145a.txt:
Auto merged
storage/ndb/test/run-test/conf-ndbmaster.txt:
Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
Auto merged
storage/ndb/test/run-test/conf-shark.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge
storage/ndb/src/ndbapi/TransporterFacade.hpp:
merge
storage/ndb/test/run-test/Makefile.am:
merge
storage/ndb/test/run-test/daily-basic-tests.txt:
merge
storage/ndb/tools/desc.cpp:
merge
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
mysql-test/r/ndb_insert.result:
Auto merged
mysql-test/r/ndb_replace.result:
Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Keeping local and do manual merge
sql/ha_ndbcluster.h:
Keeping local and do hand merge
builds.
cmakelists.txt:
Get the correct options for storage engines and defines from
config-version.js.
mysys/cmakelists.txt:
Set USE_TLS only for release builds, as it crashes in debug builds.
sql/cmakelists.txt:
Fix build options to only include the configured storage engines.
sql/mysqld.cc:
Fix dummy innodb declarations, otherwise non-innodb build fails.
storage/bdb/cmakelists.txt:
Create cmakelists.txt for BDB.
win/README:
Update with new configure.js options.
win/config-handlerton.js:
Extend with more storage engines.
win/config-version.js:
Extend to handle storage engines and other configuration parameters.
This is the first commit. Cleanups are
likely to follow after the merge.
mysql-test/r/csv.result:
update result
mysql-test/t/csv.test:
add tests for CSV REPAIR/RESTORE.
storage/csv/ha_tina.cc:
add repair/check and a meta-file processing for it
storage/csv/ha_tina.h:
add new functions required for tina repair/check
sql/log_event.cc:
Fix Windows compile errors.
storage/innobase/btr/btr0sea.c:
Fix AIX compile error (declarations must come before code in traditional C).
sql/sql_class.h:
Fix HPUX compile problem (HP compiler bug).
Local class of member in derived class has no access to protected members,
so make the class global and a friend.
sql/sql_insert.cc:
Fix HPUX compile problem (HP compiler bug).
Local class of member in derived class has no access to protected members,
so make the class global and a friend.
incorrect handling of varsize primary key and charsets in tup-scan
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
put tracenr log in signal log instead...as out file gets very big...
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
PK needs to be normalized before computing hashvalue, otherwise lock-req will not find row,
causing assertion in debug build, and inconsistency in release
put nrtrace in out file instead (debug compiled..)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
put nrtrace in out file instead (debug compiled..)
Dont put object file in list of SOURCES...causing really weird make dist problem
storage/ndb/src/kernel/vm/Makefile.am:
Dont put object file in list of SOURCES...causing really weird make dist problem
