Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 (ed419a32) · Commits · Software / OSDI20 Artifacts / mariadb

.bzrignore

+141 −0

Original line number	Diff line number	Diff line
		@@ -1127,3 +1127,144 @@ vio/test-ssl
		vio/test-sslclient
		vio/test-sslserver
		vio/viotest-ssl
		*.bin
		*.exe
		*.idb
		*.lib
		*.map
		*.obj
		*.pch
		*.pdb
		*.res
		*.sbr
		./copy_mysql_files.bat
		./fix-project-files
		./mysql*.ds?
		./mysql.ncb
		./mysql.sln
		./mysql.suo
		./prepare
		./README.build-files
		bdb/*.ds?
		bdb/*.vcproj
		client/*.ds?
		client/*.vcproj
		client/completion_hash.cpp
		client/mysql.cpp
		client/mysqladmin.cpp
		client/mysqlbinlog.cpp
		client/readline.cpp
		client/sql_string.cpp
		client_debug/*
		client_release/*
		comp_err/*.ds?
		comp_err/*.vcproj
		contrib/*.ds?
		contrib/*.vcproj
		dbug/*.ds?
		dbug/*.vcproj
		examples/*.ds?
		examples/*.vcproj
		examples/udf_example/udf_example.def
		heap/*.ds?
		heap/*.vcproj
		innobase/*.ds?
		innobase/*.vcproj
		isam/*.ds?
		isam/*.vcproj
		isamchk/*.ds?
		isamchk/*.vcproj
		lib_debug/*
		lib_release/*
		libmysql/*.ds?
		libmysql/*.vcproj
		libmysql/debug/libmysql.exp
		libmysql/release/libmysql.exp
		libmysqld/*.ds?
		libmysqld/*.vcproj
		libmysqld/emb_qcache.cpp
		libmysqld/lib_sql.cpp
		libmysqld/sql_yacc.cpp
		libmysqld/sql_yacc.h
		libmysqltest/*.ds?
		libmysqltest/*.vcproj
		libmysqltest/mytest.c
		merge/*.ds?
		merge/*.vcproj
		my_print_defaults/*.ds?
		my_print_defaults/*.vcproj
		myisam/*.ds?
		myisam/*.vcproj
		myisam_ftdump/*.ds?
		myisam_ftdump/*.vcproj
		myisamchk/*.ds?
		myisamchk/*.vcproj
		myisamlog/*.ds?
		myisamlog/*.vcproj
		myisammrg/*.ds?
		myisammrg/*.vcproj
		myisampack/*.ds?
		myisampack/*.vcproj
		mysql-test/*.ds?
		mysql-test/*.vcproj
		mysql-test/r/*.err
		mysql-test/r/*.out
		mysqlbinlog/*.ds?
		mysqlbinlog/*.vcproj
		mysqlcheck/*.ds?
		mysqlcheck/*.vcproj
		mysqldemb/*.ds?
		mysqldemb/*.vcproj
		mysqlserver/*.ds?
		mysqlserver/*.vcproj
		mysys/*.ds?
		mysys/*.vcproj
		mysys/my_new.cpp
		mysys/raid.cpp
		pack_isam/*.ds?
		perror/*.ds?
		perror/*.vcproj
		regex/*.ds?
		regex/*.vcproj
		replace/*.ds?
		replace/*.vcproj
		server-tools/instance-manager/buffer.cpp
		server-tools/instance-manager/command.cpp
		server-tools/instance-manager/commands.cpp
		server-tools/instance-manager/guardian.cpp
		server-tools/instance-manager/instance.cpp
		server-tools/instance-manager/instance_map.cpp
		server-tools/instance-manager/instance_options.cpp
		server-tools/instance-manager/listener.cpp
		server-tools/instance-manager/log.cpp
		server-tools/instance-manager/manager.cpp
		server-tools/instance-manager/messages.cpp
		server-tools/instance-manager/mysql_connection.cpp
		server-tools/instance-manager/mysqlmanager.cpp
		server-tools/instance-manager/options.cpp
		server-tools/instance-manager/parse.cpp
		server-tools/instance-manager/parse_output.cpp
		server-tools/instance-manager/priv.cpp
		server-tools/instance-manager/protocol.cpp
		server-tools/instance-manager/thread_registry.cpp
		server-tools/instance-manager/user_map.cpp
		sql/*.cpp
		sql/*.ds?
		sql/*.vcproj
		sql/max/*
		sql/message.h
		sql/message.mc
		sql/message.rc
		strings/*.ds?
		strings/*.vcproj
		test1/*
		tests/*.ds?
		tests/*.vcproj
		thr_insert_test/*
		thr_test/*
		vio/*.ds?
		vio/*.vcproj
		vio/viotest-sslconnect.cpp
		vio/viotest.cpp
		zlib/*.ds?
		zlib/*.vcproj

VC++Files/mysqlbinlog/mysqlbinlog.vcproj

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		Name="VCCLCompilerTool"
		Optimization="0"
		OptimizeForProcessor="2"
		AdditionalIncludeDirectories="../include,../,../sql"
		AdditionalIncludeDirectories="../include,../,../sql,../strings"
		PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS;MYSQL_SERVER"
		RuntimeLibrary="1"
		PrecompiledHeaderFile=".\Debug/mysqlbinlog.pch"

include/config-win.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -392,8 +392,8 @@ inline double ulonglong2double(ulonglong value)
		#define HAVE_SPATIAL 1
		#define HAVE_RTREE_KEYS 1

		#define HAVE_OPENSSL 1
		#define HAVE_YASSL 1
		/* #undef HAVE_OPENSSL */
		/* #undef HAVE_YASSL */

		/* Define charsets you want */
		/* #undef HAVE_CHARSET_armscii8 */

include/my_global.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -553,6 +553,15 @@ typedef SOCKET_SIZE_TYPE size_socket;
		#define O_NOFOLLOW 0
		#endif

		/* additional file share flags for win32 */
		#ifdef __WIN__
		#define _SH_DENYRWD 0x110 /* deny read/write mode & delete */
		#define _SH_DENYWRD 0x120 /* deny write mode & delete */
		#define _SH_DENYRDD 0x130 /* deny read mode & delete */
		#define _SH_DENYDEL 0x140 /* deny delete only */
		#endif /* __WIN__ */


		/* #define USE_RECORD_LOCK */

		/* Unsigned types supported by the compiler */

include/my_sys.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -601,6 +601,7 @@ extern char _my_strdup_with_length(const byte from, uint length,

		#ifdef __WIN__
		extern int my_access(const char *path, int amode);
		extern File my_sopen(const char *path, int oflag, int shflag, int pmode);
		#else
		#define my_access access
		#endif