Commit 37062786 authored by unknown's avatar unknown
Browse files

Windows compile fixes. 


win/cmakefiles/mysys:
  Remove no longer existing source file from list.
sql/log_event.cc:
  Fix byte * <-> char * Windows build problem.
VC++Files/mysys/mysys.vcproj:
  Remove no longer existing source file from list.
parent 00de3c04

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/mysys

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ ADD_LIBRARY(mysys array.c charset-def.c charset.c checksum.c default.c default_m 
				my_mkdir.c my_mmap.c my_net.c my_once.c my_open.c my_pread.c my_pthread.c 

				my_quick.c my_read.c my_realloc.c my_redel.c my_rename.c my_seek.c my_sleep.c

				my_static.c my_symlink.c my_symlink2.c my_sync.c my_thr_init.c my_wincond.c

				my_windac.c my_winsem.c my_winthread.c my_write.c ptr_cmp.c queues.c raid.cc

				my_windac.c my_winsem.c my_winthread.c my_write.c ptr_cmp.c queues.c

				rijndael.c safemalloc.c sha1.c string.c thr_alarm.c thr_lock.c thr_mutex.c

				thr_rwlock.c tree.c typelib.c my_vle.c base64.c)