Commit 4245f22b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/space/my/mysql-4.1 

into mysql.com:/space/my/mysql-4.1-build
parents 62113c10 962512ad

VC++Files/sql/mysqld.dsp

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ BSC32=bscmake.exe 
# ADD BSC32 /nologo

LINK32=xilink6.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld-opt.exe"

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld.exe"

# SUBTRACT LINK32 /debug



!ELSEIF  "$(CFG)" == "mysqld - Win32 Debug"
@@ -84,7 +84,7 @@ BSC32=bscmake.exe 
# ADD BSC32 /nologo

LINK32=xilink6.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\vio.lib ..\lib_debug\isam.lib ..\lib_debug\merge.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqld.exe" /pdbtype:sept

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\vio.lib ..\lib_debug\isam.lib ..\lib_debug\merge.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqld-debug.exe" /pdbtype:sept



!ELSEIF  "$(CFG)" == "mysqld - Win32 nt"

sql/sql_base.cc

+0 −1
Original line number Diff line number Diff line
@@ -2305,7 +2305,6 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, 
	       List<Item> *sum_func_list,

	       uint wild_num)

{

  bool is_stmt_prepare;

  DBUG_ENTER("setup_wild");

  if (!wild_num)

    DBUG_RETURN(0);

sql/strfunc.cc

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ uint find_type(TYPELIB *lib, const char *find, uint length, bool part_match) 


uint find_type2(TYPELIB *typelib, const char *x, uint length, CHARSET_INFO *cs)

{

  int find,pos,findpos;

  int find,pos;

  const char *j;

  DBUG_ENTER("find_type2");

  DBUG_PRINT("enter",("x: '%s'  lib: 0x%lx",x,typelib));
@@ -157,7 +157,7 @@ uint find_type2(TYPELIB *typelib, const char *x, uint length, CHARSET_INFO *cs) 
    DBUG_PRINT("exit",("no count"));

    DBUG_RETURN(0);

  }

  LINT_INIT(findpos);



  for (find=0, pos=0 ; (j=typelib->type_names[pos]) ; pos++)

  {

    if (!my_strnncoll(cs, (const uchar*) x, length,