bk commit into 5.0 tree (knielsen:1.2114)

[knielsen]

Below is the list of changes that have just been committed into a local
5.0 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2114 06/05/02 09:19:54 knielsen@stripped +5 -0
  Fix a bunch of non-Linux compile failures.

  tests/mysql_client_test.c
    1.183 06/05/02 09:19:50 knielsen@stripped +2 -1
    No declarations after statement in C code.

  tests/Makefile.am
    1.25 06/05/02 09:19:50 knielsen@stripped +1 -1
    -L must go before -l

  mysys/my_memmem.c
    1.2 06/05/02 09:19:50 knielsen@stripped +3 -2
    Fix illegal pointer arithmetics on void *.

  VC++Files/mysys/mysys.vcproj
    1.4 06/05/02 09:19:50 knielsen@stripped +43 -0
    Add new file missing in previous push.

  VC++Files/mysql.sln
    1.8 06/05/02 09:19:50 knielsen@stripped +1 -0
    mysql_client_test depends on mysys.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/tmp-5.0

--- 1.24/tests/Makefile.am	2006-05-02 04:10:44 +02:00
+++ 1.25/tests/Makefile.am	2006-05-02 09:19:50 +02:00
@@ -42,7 +42,7 @@
 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)

--- 1.1/mysys/my_memmem.c	2006-05-02 04:10:44 +02:00
+++ 1.2/mysys/my_memmem.c	2006-05-02 09:19:50 +02:00
@@ -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);

--- 1.7/VC++Files/mysql.sln	2006-04-28 06:05:57 +02:00
+++ 1.8/VC++Files/mysql.sln	2006-05-02 09:19:50 +02:00
@@ -278,6 +278,7 @@
 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}"

--- 1.3/VC++Files/mysys/mysys.vcproj	2006-04-01 02:21:33 +02:00
+++ 1.4/VC++Files/mysys/mysys.vcproj	2006-05-02 09:19:50 +02:00
@@ -3189,6 +3189,49 @@
 			</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
 				Name="Debug|Win32">

--- 1.182/tests/mysql_client_test.c	2006-05-02 04:10:44 +02:00
+++ 1.183/tests/mysql_client_test.c	2006-05-02 09:19:50 +02:00
@@ -14828,7 +14828,6 @@
 static void test_bug17667()
 {
   int rc;
-  myheader("test_bug17667");
   struct buffer_and_length {
     const char *buffer;
     const uint length;
@@ -14844,6 +14843,8 @@
 
   struct buffer_and_length *statement_cursor;
   FILE *log_file;
+
+  myheader("test_bug17667");
 
   for (statement_cursor= statements; statement_cursor->buffer != NULL;
       statement_cursor++) {