Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new (82960f19) · Commits · Software / OSDI20 Artifacts / mariadb

VC++Files/mysys/mysys.vcproj

+0 −43

Original line number	Diff line number	Diff line
		@@ -4443,49 +4443,6 @@
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="raid.cpp">
		<FileConfiguration
		Name="Debug\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="0"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="Max\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="Release\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="TLS_DEBUG\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="0"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="TLS\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="rijndael.c">
		<FileConfiguration

sql/log_event.cc

+8 −6

Original line number	Diff line number	Diff line
		@@ -5598,13 +5598,14 @@ bool Rows_log_event::write_data_body(IO_CACHE*file)
		Note that this should be the number of bits, not the number of
		bytes.
		*/
		byte sbuf[sizeof(m_width)];
		char sbuf[sizeof(m_width)];
		my_ptrdiff_t const data_size= m_rows_cur - m_rows_buf;

		char *const sbuf_end= net_store_length(sbuf, (uint) m_width);
		DBUG_ASSERT(static_cast<my_size_t>(sbuf_end - (char*) sbuf) <= sizeof(sbuf));
		DBUG_ASSERT(static_cast<my_size_t>(sbuf_end - sbuf) <= sizeof(sbuf));

		return (my_b_safe_write(file, sbuf, sbuf_end - (char*) sbuf) \|\|
		return (my_b_safe_write(file, reinterpret_cast<byte*>(sbuf),
		sbuf_end - sbuf) \|\|
		my_b_safe_write(file, reinterpret_cast<byte*>(m_cols.bitmap),
		no_bytes_in_map(&m_cols)) \|\|
		my_b_safe_write(file, m_rows_buf, data_size));
		@@ -6048,15 +6049,16 @@ bool Table_map_log_event::write_data_body(IO_CACHE *file)
		byte const dbuf[]= { m_dblen };
		byte const tbuf[]= { m_tbllen };

		byte cbuf[sizeof(m_colcnt)];
		char cbuf[sizeof(m_colcnt)];
		char *const cbuf_end= net_store_length(cbuf, (uint) m_colcnt);
		DBUG_ASSERT(static_cast<my_size_t>(cbuf_end - (char*) cbuf) <= sizeof(cbuf));
		DBUG_ASSERT(static_cast<my_size_t>(cbuf_end - cbuf) <= sizeof(cbuf));

		return (my_b_safe_write(file, dbuf, sizeof(dbuf)) \|\|
		my_b_safe_write(file, (const byte*)m_dbnam, m_dblen+1) \|\|
		my_b_safe_write(file, tbuf, sizeof(tbuf)) \|\|
		my_b_safe_write(file, (const byte*)m_tblnam, m_tbllen+1) \|\|
		my_b_safe_write(file, cbuf, cbuf_end - cbuf) \|\|
		my_b_safe_write(file, reinterpret_cast<byte*>(cbuf),
		cbuf_end - cbuf) \|\|
		my_b_safe_write(file, reinterpret_cast<byte*>(m_coltype), m_colcnt));
		}
		#endif

win/cmakefiles/base

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,4 +32,5 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visu
		ADD_DEFINITIONS("-D_WINDOWS -D__WIN__")

		SUBDIRS(vio dbug strings regex mysys extra zlib storage/innobase storage/heap storage/myisam storage/myisammrg
		extra/yassl extra/yassl/taocrypt client sql server-tools/instance-manager)
		extra/yassl extra/yassl/taocrypt client sql server-tools/instance-manager
		libmysql tests)

win/cmakefiles/client

+4 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

		# The old Windows build method used renamed (.cc -> .cpp) source files, fails
		# in #include in mysqlbinlog.cc. So disable that using the USING_CMAKE define.
		ADD_DEFINITIONS(-DUSE_TLS -DUSING_CMAKE)
		ADD_DEFINITIONS(-DUSING_CMAKE)
		INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
		${CMAKE_SOURCE_DIR}/zlib
		${CMAKE_SOURCE_DIR}/extra/yassl/include
		@@ -75,3 +75,6 @@ TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient dbug yassl zlib wsock32)

		ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
		TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl zlib wsock32)

		ADD_EXECUTABLE(mysqlslap mysqlslap.c)
		TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib wsock32)

win/cmakefiles/deploy.bat

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,3 +17,5 @@ copy innobase ..\..\storage\innobase\cmakelists.txt
		copy myisam ..\..\storage\myisam\cmakelists.txt
		copy myisammrg ..\..\storage\myisammrg\cmakelists.txt
		copy im ..\..\server-tools\instance-manager\cmakelists.txt
		copy libmysql ..\..\libmysql\cmakelists.txt
		copy tests ..\..\tests\cmakelists.txt