Commit fff65923 authored by unknown's avatar unknown
Browse files

Merge acurtis@bk-internal:/home/bk/mysql-5.1-new 

into  xiphis.org:/home/antony/work2/wl3201-final


sql/ha_innodb.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 7f6a9906 c49687f3

VC++Files/mysql.sln

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,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}") = "mysqlmanager", "server-tools\instance-manager\mysqlmanager.vcproj", "{6D524B3E-210A-4FCD-8D41-FEC0D21E83AC}"

VC++Files/mysys/mysys.vcproj

+43 −0
Original line number Diff line number Diff line
@@ -3232,6 +3232,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

client/mysql_upgrade.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ int main(int argc, char **argv) 
    b_read= my_read(check_file, chf_buffer, sizeof(chf_buffer)-1, MYF(0));

    chf_buffer[b_read]= 0;

    my_close(check_file, MYF(0));

    if (!strcmp(chf_buffer, VERSION))

    if (!strcmp(chf_buffer, MYSQL_SERVER_VERSION))

    {

      if (opt_verbose)

        puts("mysql_upgrade already done for this version");

include/m_ctype.h

+3 −3
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ typedef struct my_charset_handler_st 
  uint    (*lengthsp)(struct charset_info_st *, const char *ptr, uint length);

  uint    (*numcells)(struct charset_info_st *, const char *b, const char *e);

  

  /* Unicode convertion */

  /* Unicode conversion */

  int (*mb_wc)(struct charset_info_st *cs,my_wc_t *wc,

	       const unsigned char *s,const unsigned char *e);

  int (*wc_mb)(struct charset_info_st *cs,my_wc_t wc,
@@ -186,7 +186,7 @@ typedef struct my_charset_handler_st 
  int (*ctype)(struct charset_info_st *cs, int *ctype,

               const unsigned char *s, const unsigned char *e);

  

  /* Functions for case and sort convertion */

  /* Functions for case and sort conversion */

  void    (*caseup_str)(struct charset_info_st *, char *);

  void    (*casedn_str)(struct charset_info_st *, char *);

  uint    (*caseup)(struct charset_info_st *, char *src, uint srclen,
@@ -204,7 +204,7 @@ typedef struct my_charset_handler_st 
  

  void (*fill)(struct charset_info_st *, char *to, uint len, int fill);

  

  /* String-to-number convertion routines */

  /* String-to-number conversion routines */

  long        (*strntol)(struct charset_info_st *, const char *s, uint l,

			 int base, char **e, int *err);

  ulong      (*strntoul)(struct charset_info_st *, const char *s, uint l,

include/my_sys.h

+5 −0
Original line number Diff line number Diff line
@@ -601,6 +601,11 @@ extern char *_my_strndup(const byte *from, uint length, 
				    const char *sFile, uint uLine,

				    myf MyFlag);



/* implemented in my_memmem.c */

extern void *my_memmem(const void *haystack, size_t haystacklen,

    const void *needle, size_t needlelen);





#ifdef __WIN__

extern int my_access(const char *path, int amode);

extern File my_sopen(const char *path, int oflag, int shflag, int pmode);