Commit f0341ac4 authored by knielsen@mysql.com's avatar knielsen@mysql.com
Browse files

Fix a bunch of non-Linux compile failures.

parent aaf2c26e

VC++Files/mysql.sln

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ EndProject 
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql_client_test", "tests\mysql_client_test.vcproj", "{DA224DAB-5006-42BE-BB77-16E8BE5326D5}"

	ProjectSection(ProjectDependencies) = postProject

		{26383276-4843-494B-8BE0-8936ED3EBAAB} = {26383276-4843-494B-8BE0-8936ED3EBAAB}

		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}

	EndProjectSection

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql_test_run_new", "mysql-test\mysql_test_run_new.vcproj", "{6189F838-21C6-42A1-B2D0-9146316573F7}"

VC++Files/mysys/mysys.vcproj

+43 −0
Original line number Diff line number Diff line
@@ -3188,6 +3188,49 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="my_memmem.c">

			<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="my_messnc.c">

			<FileConfiguration

mysys/my_memmem.c

+3 −2
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ 
void *my_memmem(const void *haystack, size_t haystacklen,

    const void *needle, size_t needlelen)

{

  const void *cursor;

  const void *last_possible_needle_location = haystack + haystacklen - needlelen;

  const unsigned char *cursor;

  const unsigned char *last_possible_needle_location =

    (unsigned char *)haystack + haystacklen - needlelen;



  /* Easy answers */

  if (needlelen > haystacklen) return(NULL);

tests/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ 
LIBS =			@CLIENT_LIBS@

LDADD =			@CLIENT_EXTRA_LDFLAGS@ \

                        $(top_builddir)/libmysql/libmysqlclient.la

mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -lmysys -L../mysys

mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys

mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)

insert_test_SOURCES=       insert_test.c $(yassl_dummy_link_fix)

select_test_SOURCES=       select_test.c $(yassl_dummy_link_fix)

tests/mysql_client_test.c

+2 −1
Original line number Diff line number Diff line
@@ -14828,7 +14828,6 @@ static void test_bug15613() 
static void test_bug17667()

{

  int rc;

  myheader("test_bug17667");

  struct buffer_and_length {

    const char *buffer;

    const uint length;
@@ -14845,6 +14844,8 @@ static void test_bug17667() 
  struct buffer_and_length *statement_cursor;

  FILE *log_file;



  myheader("test_bug17667");



  for (statement_cursor= statements; statement_cursor->buffer != NULL;

      statement_cursor++) {

    rc= mysql_real_query(mysql, statement_cursor->buffer,