Commit 1e3e30bd authored by unknown's avatar unknown
Browse files

log_event.cc: 

  Visual C++ dont relate 'byte' and 'char*' that close, added casts
mysql.sln:
  Only build mysqlserver.lib if embedded target


VC++Files/mysql.sln:
  Only build mysqlserver.lib if embedded target
sql/log_event.cc:
  Visual C++ dont relate 'byte' and 'char*' that close, added casts
parent 1c8bf361

VC++Files/mysql.sln

+5 −22
Original line number Diff line number Diff line
@@ -823,32 +823,21 @@ Global 
		{62E85884-3ACF-4F4C-873B-60B878147890}.TLS_DEBUG.ActiveCfg = Debug|Win32

		{62E85884-3ACF-4F4C-873B-60B878147890}.TLS_DEBUG.Build.0 = Debug|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic.ActiveCfg = classic|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic.Build.0 = classic|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic nt.ActiveCfg = classic|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.classic nt.Build.0 = classic|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Debug.ActiveCfg = Debug|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Debug.Build.0 = Debug|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Classic.ActiveCfg = classic|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Debug.ActiveCfg = Debug|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Pro.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_ProGPL.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Embedded_Release.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Max.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Max.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Max nt.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Max nt.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.nt.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.nt.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro.ActiveCfg = pro|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro.Build.0 = pro|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl nt.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro gpl nt.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro nt.ActiveCfg = pro|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.pro nt.Build.0 = pro|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Release.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.Release.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS.ActiveCfg = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS.Build.0 = Release|Win32

		{37D9BA79-302E-4582-A545-CB5FF7982EA3}.TLS_DEBUG.ActiveCfg = Debug|Win32
@@ -916,32 +905,26 @@ Global 
		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS_DEBUG.ActiveCfg = Debug|Win32

		{AD95DAD3-6DB9-4F8B-A345-7A39A83AAD3D}.TLS_DEBUG.Build.0 = Debug|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic nt.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.classic nt.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Debug.ActiveCfg = Debug|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Debug.Build.0 = Debug|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Classic.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Classic.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Debug.ActiveCfg = Debug|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Debug.Build.0 = Debug|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Pro.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Pro.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_ProGPL.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_ProGPL.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Release.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Embedded_Release.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Max.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Max.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Max nt.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Max nt.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.nt.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.nt.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl nt.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro gpl nt.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro nt.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.pro nt.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Release.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.Release.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS.ActiveCfg = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS.Build.0 = Release|Win32

		{94B86159-C581-42CD-825D-C69CBC237E5C}.TLS_DEBUG.ActiveCfg = Debug|Win32

sql/log_event.cc

+3 −3
Original line number Diff line number Diff line
@@ -5601,7 +5601,7 @@ bool Rows_log_event::write_data_body(IO_CACHE*file) 
  byte 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);

  char *const sbuf_end= net_store_length((char*) sbuf, (uint) m_width);

  DBUG_ASSERT(static_cast<my_size_t>(sbuf_end - (char*) sbuf) <= sizeof(sbuf));



  return (my_b_safe_write(file, sbuf, sbuf_end - (char*) sbuf) ||
@@ -6045,14 +6045,14 @@ bool Table_map_log_event::write_data_body(IO_CACHE *file) 
  byte const tbuf[]= { m_tbllen };



  byte cbuf[sizeof(m_colcnt)];

  char *const cbuf_end= net_store_length(cbuf, (uint) m_colcnt);

  char *const cbuf_end= net_store_length((char*) cbuf, (uint) m_colcnt);

  DBUG_ASSERT(static_cast<my_size_t>(cbuf_end - (char*) 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, cbuf,      cbuf_end - (char*) cbuf) ||

          my_b_safe_write(file, reinterpret_cast<byte*>(m_coltype), m_colcnt));

 }

#endif