mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
7 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
unknown
|
192bf819eb |
merge with 4.0
BitKeeper/etc/ignore: auto-union VC++Files/comp_err/comp_err.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisampack/myisampack.dsp: Auto merged acinclude.m4: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/com/com0shm.c: Auto merged innobase/data/data0data.c: Auto merged innobase/ha/ha0ha.c: Auto merged innobase/include/buf0buf.ic: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/ibuf0ibuf.h: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/mtr0log.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/os0proc.h: Auto merged innobase/include/os0thread.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/os/os0proc.c: Auto merged innobase/page/page0page.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/trx/trx0rec.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0mem.c: Auto merged innobase/ut/ut0ut.c: Auto merged libmysql/libmysql.c: Auto merged scripts/mysql_config.sh: Auto merged sql/net_serv.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_yacc.yy: Auto merged |
||
|
unknown
|
ea9aa4d352 |
Major work on Windows build automation-- add binary packaging, suffixes
Build-tools/Do-win-build: Add suffix option, classic build, binary packaging VC++Files/comp_err/comp_err.dsp: Update project file -- binary goes to ../client_release now VC++Files/my_print_defaults/my_print_defaults.dsp: Update project file -- binary goes to ../client_release now VC++Files/myisam_ftdump/myisam_ftdump.dsp: Update project file -- binary goes to ../client_release now VC++Files/myisampack/myisampack.dsp: Update project file -- binary goes to ../client_release now scripts/Makefile.am: Add make_win_binary_distribution to Makefile (for @VERSION@) |
||
|
unknown
|
bab6d9f74b |
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
Updated project files for windows Made rpl_change_master.test portable Ensure that mutex are not freed if not initilized VC++Files/client/mysql.dsp: Updated project files for windows according to suggestions from Intel VC++Files/comp_err/comp_err.dsp: Updated project files for windows according to suggestions from Intel VC++Files/innobase/innobase.dsp: Updated project files for windows according to suggestions from Intel VC++Files/libmysqld/examples/test_libmysqld.dsp: Updated project files for windows according to suggestions from Intel VC++Files/libmysqld/libmysqld.dsp: Updated project files for windows according to suggestions from Intel VC++Files/myisamchk/myisamchk.dsp: Updated project files for windows according to suggestions from Intel VC++Files/myisamlog/myisamlog.dsp: Updated project files for windows according to suggestions from Intel VC++Files/myisampack/myisampack.dsp: Updated project files for windows according to suggestions from Intel VC++Files/mysqlmanager/MySqlManager.dsp: Updated project files for windows according to suggestions from Intel VC++Files/mysqlshutdown/mysqlshutdown.dsp: Updated project files for windows according to suggestions from Intel VC++Files/mysys/mysys.dsp: Updated project files for windows according to suggestions from Intel libmysql/libmysql.c: Removed not used include files (which caused problems on Win64) mysql-test/r/rpl_change_master.result: Made test portable mysql-test/t/rpl_change_master.test: Made test portable sql-common/client.c: Removed not used include files (which caused problems on Win64) sql/ha_innodb.cc: Ensure that mutex is not freed if not initilized sql/hostname.cc: Ensure that mutex is not freed if not initilized sql/slave.cc: Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file. |
||
|
unknown
|
b276b60e03 |
LOAD DATA INFILE is not replicated if replicate_*_table is set
LOAD DATA LOCAL INFILE was not replicated correctly VC++Files/bdb/bdb.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/Berkeley_DB.dsw: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_archive.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_buildall.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_checkpoint.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_deadlock.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_dll.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_dump.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_java.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_load.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_printlog.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_recover.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_stat.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_static.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_static1.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_tcl.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_test.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_upgrade.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/db_verify.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_access.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_btrec.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_env.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_lock.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_mpool.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/ex_tpcb.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_access.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_btrec.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_env.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_lock.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_mpool.dsp: Updated VC++ files +end space removed VC++Files/bdb/build_win32/excxx_tpcb.dsp: Updated VC++ files +end space removed VC++Files/client/mysql.dsp: Updated VC++ files +end space removed VC++Files/client/mysqladmin.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlcheck.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlclient.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlclient.dsw: Updated VC++ files +end space removed VC++Files/client/mysqldump.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlimport.dsp: Updated VC++ files +end space removed VC++Files/client/mysqlshow.dsp: Updated VC++ files +end space removed VC++Files/comp_err/comp_err.dsp: Updated VC++ files +end space removed VC++Files/contrib/asm386/zlibvc.dsp: Updated VC++ files +end space removed VC++Files/contrib/asm386/zlibvc.dsw: Updated VC++ files +end space removed VC++Files/contrib/minizip/zlibvc.dsp: Updated VC++ files +end space removed VC++Files/contrib/minizip/zlibvc.dsw: Updated VC++ files +end space removed VC++Files/dbug/dbug.dsp: Updated VC++ files +end space removed VC++Files/dbug/dbug.dsw: Updated VC++ files +end space removed VC++Files/heap/heap.dsp: Updated VC++ files +end space removed VC++Files/innobase/innobase.dsp: Updated VC++ files +end space removed VC++Files/isam/isam.dsp: Updated VC++ files +end space removed VC++Files/isam/isam.dsw: Updated VC++ files +end space removed VC++Files/isamchk/isamchk.dsp: Updated VC++ files +end space removed VC++Files/libmysql/libmysql.dsp: Updated VC++ files +end space removed VC++Files/libmysql/libmysql.dsw: Updated VC++ files +end space removed VC++Files/libmysqld/examples/test_libmysqld.dsp: Updated VC++ files +end space removed VC++Files/libmysqld/libmysqld.dsp: Updated VC++ files +end space removed VC++Files/libmysqltest/myTest.dsp: Updated VC++ files +end space removed VC++Files/libmysqltest/mytest.dsw: Updated VC++ files +end space removed VC++Files/merge/merge.dsp: Updated VC++ files +end space removed VC++Files/merge/merge.dsw: Updated VC++ files +end space removed VC++Files/my_print_defaults/my_print_defaults.dsp: Updated VC++ files +end space removed VC++Files/myisam/myisam.dsp: Updated VC++ files +end space removed VC++Files/myisamchk/myisamchk.dsp: Updated VC++ files +end space removed VC++Files/myisamlog/myisamlog.dsp: Updated VC++ files +end space removed VC++Files/myisammrg/myisammrg.dsp: Updated VC++ files +end space removed VC++Files/myisampack/myisampack.dsp: Updated VC++ files +end space removed VC++Files/mysql.dsp: Updated VC++ files +end space removed VC++Files/mysql.dsw: Updated VC++ files +end space removed VC++Files/mysqlbinlog/mysqlbinlog.dsp: Updated VC++ files +end space removed VC++Files/mysqlcheck/mysqlcheck.dsp: Updated VC++ files +end space removed VC++Files/mysqldemb/mysqldemb.dsp: Updated VC++ files +end space removed VC++Files/mysqlmanager/MySqlManager.dsp: Updated VC++ files +end space removed VC++Files/mysqlmanager/mysqlmanager.dsw: Updated VC++ files +end space removed VC++Files/mysqlserver/mysqlserver.dsp: Updated VC++ files +end space removed VC++Files/mysqlshutdown/myshutdown.dsp: Updated VC++ files +end space removed VC++Files/mysqlshutdown/mysqlshutdown.dsp: Updated VC++ files +end space removed VC++Files/mysqlwatch/mysqlwatch.dsp: Updated VC++ files +end space removed VC++Files/mysys/mysys.dsp: Updated VC++ files +end space removed VC++Files/mysys/mysys.dsw: Updated VC++ files +end space removed VC++Files/pack_isam/pack_isam.dsp: Updated VC++ files +end space removed VC++Files/perror/perror.dsp: Updated VC++ files +end space removed VC++Files/regex/regex.dsp: Updated VC++ files +end space removed VC++Files/regex/regex.dsw: Updated VC++ files +end space removed VC++Files/replace/replace.dsp: Updated VC++ files +end space removed VC++Files/sql/mysqld.dsp: Updated VC++ files +end space removed VC++Files/sql/mysqld.dsw: Updated VC++ files +end space removed VC++Files/sql/mysqldmax.dsp: Updated VC++ files +end space removed VC++Files/sql/old/mysqld.dsw: Updated VC++ files +end space removed VC++Files/strings/MASM6x/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/MASM6x/strings.dsw: Updated VC++ files +end space removed VC++Files/strings/backup/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/backup/strings.dsw: Updated VC++ files +end space removed VC++Files/strings/noMASM/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/noMASM/strings.dsw: Updated VC++ files +end space removed VC++Files/strings/strings.dsp: Updated VC++ files +end space removed VC++Files/strings/strings.dsw: Updated VC++ files +end space removed VC++Files/test1/test1.dsp: Updated VC++ files +end space removed VC++Files/thr_insert_test/thr_insert_test.dsp: Updated VC++ files +end space removed VC++Files/thr_test/thr_test.dsp: Updated VC++ files +end space removed VC++Files/vio/vio.dsp: Updated VC++ files +end space removed VC++Files/zlib/zlib.dsp: Updated VC++ files +end space removed include/my_global.h: Always include errno.h sql/log_event.cc: LOAD DATA INFILE is not replicated if replicate_*_table is set sql/mf_iocache.cc: LOAD DATA LOCAL INFILE was not replicated correctly |
||
|
unknown
|
5d5b1fee02 |
Update to VC++ build files
VC++Files/bdb/bdb.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/Berkeley_DB.dsw: Update to 4.1.0 VC++Files/bdb/build_win32/db_archive.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_buildall.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_checkpoint.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_deadlock.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_dll.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_dump.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_java.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_load.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_printlog.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_recover.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_stat.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_static.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_static1.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_tcl.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_test.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_upgrade.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/db_verify.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_access.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_btrec.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_env.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_lock.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_mpool.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/ex_tpcb.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_access.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_btrec.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_env.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_lock.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_mpool.dsp: Update to 4.1.0 VC++Files/bdb/build_win32/excxx_tpcb.dsp: Update to 4.1.0 VC++Files/client/mysql.dsp: Update to 4.1.0 VC++Files/client/mysqladmin.dsp: Update to 4.1.0 VC++Files/client/mysqlcheck.dsp: Update to 4.1.0 VC++Files/client/mysqlclient.dsp: Update to 4.1.0 VC++Files/client/mysqlclient.dsw: Update to 4.1.0 VC++Files/client/mysqldump.dsp: Update to 4.1.0 VC++Files/client/mysqlimport.dsp: Update to 4.1.0 VC++Files/client/mysqlshow.dsp: Update to 4.1.0 VC++Files/comp_err/comp_err.dsp: Update to 4.1.0 VC++Files/contrib/asm386/zlibvc.dsp: Update to 4.1.0 VC++Files/contrib/asm386/zlibvc.dsw: Update to 4.1.0 VC++Files/contrib/minizip/zlibvc.dsp: Update to 4.1.0 VC++Files/contrib/minizip/zlibvc.dsw: Update to 4.1.0 VC++Files/dbug/dbug.dsp: Update to 4.1.0 VC++Files/dbug/dbug.dsw: Update to 4.1.0 VC++Files/heap/heap.dsp: Update to 4.1.0 VC++Files/innobase/innobase.dsp: Update to 4.1.0 VC++Files/isam/isam.dsp: Update to 4.1.0 VC++Files/isam/isam.dsw: Update to 4.1.0 VC++Files/isamchk/isamchk.dsp: Update to 4.1.0 VC++Files/libmysql/libmysql.dsw: Update to 4.1.0 VC++Files/libmysqld/examples/test_libmysqld.dsp: Update to 4.1.0 VC++Files/libmysqld/libmysqld.dsp: Update to 4.1.0 VC++Files/libmysqltest/myTest.dsp: Update to 4.1.0 VC++Files/libmysqltest/mytest.dsw: Update to 4.1.0 VC++Files/merge/merge.dsp: Update to 4.1.0 VC++Files/merge/merge.dsw: Update to 4.1.0 VC++Files/my_print_defaults/my_print_defaults.dsp: Update to 4.1.0 VC++Files/myisam/myisam.dsp: Update to 4.1.0 VC++Files/myisamchk/myisamchk.dsp: Update to 4.1.0 VC++Files/myisamlog/myisamlog.dsp: Update to 4.1.0 VC++Files/myisammrg/myisammrg.dsp: Update to 4.1.0 VC++Files/myisampack/myisampack.dsp: Update to 4.1.0 VC++Files/mysql.dsp: Update to 4.1.0 VC++Files/mysql.dsw: Update to 4.1.0 VC++Files/mysqlbinlog/mysqlbinlog.dsp: Update to 4.1.0 VC++Files/mysqlcheck/mysqlcheck.dsp: Update to 4.1.0 VC++Files/mysqldemb/mysqldemb.dsp: Update to 4.1.0 VC++Files/mysqlmanager/MySqlManager.dsp: Update to 4.1.0 VC++Files/mysqlmanager/mysqlmanager.dsw: Update to 4.1.0 VC++Files/mysqlserver/mysqlserver.dsp: Update to 4.1.0 VC++Files/mysqlshutdown/myshutdown.dsp: Update to 4.1.0 VC++Files/mysqlshutdown/mysqlshutdown.dsp: Update to 4.1.0 VC++Files/mysqlwatch/mysqlwatch.dsp: Update to 4.1.0 VC++Files/mysys/mysys.dsp: Update to 4.1.0 VC++Files/mysys/mysys.dsw: Update to 4.1.0 VC++Files/pack_isam/pack_isam.dsp: Update to 4.1.0 VC++Files/perror/perror.dsp: Update to 4.1.0 VC++Files/regex/regex.dsp: Update to 4.1.0 VC++Files/regex/regex.dsw: Update to 4.1.0 VC++Files/replace/replace.dsp: Update to 4.1.0 VC++Files/sql/mysqld.dsp: Update to 4.1.0 VC++Files/sql/mysqld.dsw: Update to 4.1.0 VC++Files/sql/mysqldmax.dsp: Update to 4.1.0 VC++Files/sql/old/mysqld.dsw: Update to 4.1.0 VC++Files/strings/MASM6x/strings.dsp: Update to 4.1.0 VC++Files/strings/MASM6x/strings.dsw: Update to 4.1.0 VC++Files/strings/backup/strings.dsp: Update to 4.1.0 VC++Files/strings/backup/strings.dsw: Update to 4.1.0 VC++Files/strings/noMASM/strings.dsp: Update to 4.1.0 VC++Files/strings/noMASM/strings.dsw: Update to 4.1.0 VC++Files/strings/strings.dsp: Update to 4.1.0 VC++Files/strings/strings.dsw: Update to 4.1.0 VC++Files/test1/test1.dsp: Update to 4.1.0 VC++Files/thr_insert_test/thr_insert_test.dsp: Update to 4.1.0 VC++Files/thr_test/thr_test.dsp: Update to 4.1.0 VC++Files/vio/vio.dsp: Update to 4.1.0 VC++Files/zlib/zlib.dsp: Update to 4.1.0 bdb/build_win32/Berkeley_DB.dsw: Update to 4.1.0 |
||
|
unknown
|
5b975a555c |
Update for Visual Studio Projects Files
VC++Files/client/mysqlclient.dsp: Updated the sources files: < net.c >net_serv.cpp VC++Files/innobase/innobase.dsp: Added configuration for to compile all the dependencies options for the other projects. VC++Files/libmysql/libmysql.dsp: Modified the xcopy command for to avoid an error for waiting the confirmation of the copy VC++Files/myisampack/myisampack.dsp: Updated source location VC++Files/mysql.dsw: Added project files: the embedded static library; my_print_defaults; comp_err VC++Files/mysqldemb/mysqldemb.dsp: Updated flags VC++Files/mysqlserver/mysqlserver.dsp: Updated flags VC++Files/pack_isam/pack_isam.dsp: Updated source location VC++Files/sql/mysqld.dsp: Added UDF and updated flags BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted |
||
|
unknown
|
fe2be67362 |
Adding Win32 IDE Stuff
-WorkSpace and Project Files for VC++6.0 -InstallShield Files for setup program. |