Commit 6e667ec8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/wax/mysql/mysql-4.1 

into mysql.com:/home/wax/mysql/mysql-4.1test2
parents 4faf77a9 5ebe0dd2

VC++Files/mysql.dsw

+22 −19
Original line number Diff line number Diff line
@@ -819,12 +819,11 @@ Package=<4> 
Project: "mysqltest"=.\client\mysqltest.dsp - Package Owner=<4>



Package=<5>

{{{

}}}

{{{
}}}





Package=<4>

{{{

    Begin Project Dependency

{{{
    Begin Project Dependency

    Project_Dep_Name libmysql

    End Project Dependency

    Begin Project Dependency
@@ -835,7 +834,8 @@ Package=<4> 
    End Project Dependency

}}}



###############################################################################

###############################################################################

Project: "client_test"=.\tests\client_test.dsp - Package Owner=<4>



Package=<5>

{{{
}}}



Package=<4>

{{{
}}}


###############################################################################





Project: "mysql_test_run_new"=".\mysql-test\mysql_test_run_new.dsp" - Package Owner=<4>
@@ -844,15 +844,18 @@ Package=<5> 
}}}



Package=<4>

{{{

    Begin Project Dependency

{{{
    Begin Project Dependency

    Project_Dep_Name mysqltest

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mysqladmin

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name client_test

    End Project Dependency

}}}





###############################################################################



Global:

VC++Files/tests/client_test.dsp

0 → 100644
+94 −0
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="client_test" - Package Owner=<4>

# Microsoft Developer Studio Generated Build File, Format Version 6.00

# ** DO NOT EDIT **



# TARGTYPE "Win32 (x86) Console Application" 0x0103



CFG=client_test - Win32 Debug

!MESSAGE This is not a valid makefile. To build this project using NMAKE,

!MESSAGE use the Export Makefile command and run

!MESSAGE 

!MESSAGE NMAKE /f "client_test.mak".

!MESSAGE 

!MESSAGE You can specify a configuration when running NMAKE

!MESSAGE by defining the macro CFG on the command line. For example:

!MESSAGE 

!MESSAGE NMAKE /f "client_test.mak" CFG="client_test - Win32 Debug"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

!MESSAGE "client_test - Win32 Debug" (based on "Win32 (x86) Console Application")

!MESSAGE "client_test - Win32 Release" (based on "Win32 (x86) Console Application")

!MESSAGE 



# Begin Project

# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

MTL=midl.exe

RSC=rc.exe



!IF  "$(CFG)" == "client_test - Win32 Debug"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir ".\Debug"

# PROP BASE Intermediate_Dir ".\Debug"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir ".\Debug"

# PROP Intermediate_Dir ".\Debug"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX 

# ADD BASE MTL /nologo /tlb".\Debug\client_test.tlb" /win32 

# ADD MTL /nologo /tlb".\Debug\client_test.tlb" /win32 

# ADD BASE RSC /l 1033 

# ADD RSC /l 1033 

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.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 odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\client_test.pdb" /pdbtype:sept /map:".\Debug\client_test.map" /subsystem:console 

# 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 odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\client_test.pdb" /pdbtype:sept /map:".\Debug\client_test.map" /subsystem:console 



!ELSEIF  "$(CFG)" == "client_test - Win32 Release"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir ".\Release"

# PROP BASE Intermediate_Dir ".\Release"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir ".\Release"

# PROP Intermediate_Dir ".\Release"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD BASE MTL /nologo /tlb".\Release\client_test.tlb" /win32 

# ADD MTL /nologo /tlb".\Release\client_test.tlb" /win32 

# ADD BASE RSC /l 1033 

# ADD RSC /l 1033 

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.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 odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\client_test.exe" /incremental:no /pdb:".\Release\client_test.pdb" /pdbtype:sept /subsystem:console 

# 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 odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\client_test.exe" /incremental:no /pdb:".\Release\client_test.pdb" /pdbtype:sept /subsystem:console 



!ENDIF



# Begin Target



# Name "client_test - Win32 Debug"

# Name "client_test - Win32 Release"

# Begin Source File



SOURCE=mysql_client_test.c

# End Source File

# End Target

# End Project

mysql-test/my_create_tables.c

+46 −19
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"

      "PRIMARY KEY Host (Host,Db,User),"

      "KEY User (User))"

      "engine=MyISAM "

      "CHARACTER SET utf8 COLLATE utf8_bin "

      "comment='Database privileges';\n");



    if (test)
@@ -126,10 +128,12 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,"

      "Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"

      "PRIMARY KEY Host (Host,Db))"

      "comment='Host privileges;"

      " Merged with database privileges';\n");

      "engine=MyISAM "

      "CHARACTER SET utf8 COLLATE utf8_bin "

      "comment='Host privileges;  Merged with database privileges';\n");

  }





  if (test_sys_file(mdata,"mysql/user.frm"))

  {

#ifdef __WIN__
@@ -184,7 +188,10 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "max_updates int(11) unsigned DEFAULT 0  NOT NULL,"

      "max_connections int(11) unsigned DEFAULT 0  NOT NULL,"

      "PRIMARY KEY Host (Host,User)"

      ") comment='Users and global privileges';\n");

      ") engine=MyISAM "

      "CHARACTER SET utf8 COLLATE utf8_bin "

      "comment='Users and global privileges';\n");





    if (test)

    {
@@ -238,7 +245,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "dl char(128) DEFAULT '' NOT NULL,"

      "type enum ('function','aggregate') NOT NULL,"

      "PRIMARY KEY (name)"

      ") comment='User defined functions';\n");

      ") engine=MyISAM "

      "CHARACTER SET utf8 COLLATE utf8_bin "

      "comment='User defined functions';\n");

  }



  if (test_sys_file(mdata,"mysql/tables_priv.frm"))
@@ -258,7 +267,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "  DEFAULT '' NOT NULL,"

      "PRIMARY KEY (Host,Db,User,Table_name),"

      "KEY Grantor (Grantor)"

      ") comment='Table privileges';\n");

      ") engine=MyISAM "

      "CHARACTER SET utf8 COLLATE utf8_bin "

      "comment='Table privileges';\n");

  }



  if (test_sys_file(mdata,"mysql/columns_priv.frm"))
@@ -274,7 +285,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "Column_priv set('Select','Insert','Update','References')"

      " DEFAULT '' NOT NULL,"

      "PRIMARY KEY (Host,Db,User,Table_name,Column_name)"

      ") comment='Column privileges';\n");

      ") engine=MyISAM "

      "CHARACTER SET utf8 COLLATE utf8_bin "

      "comment='Column privileges';\n");

  }



  if (test_sys_file(mdata,"mysql/help_topic.frm"))
@@ -289,7 +302,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "url              varchar(128) not null,"

      "primary key      (help_topic_id),"

      "unique index     (name)"

      ") comment='help topics';\n");

      ") engine=MyISAM "

      "CHARACTER SET utf8 "

      "comment='help topics';\n");

  }



  if (test_sys_file(mdata,"mysql/help_category.frm"))
@@ -302,7 +317,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "url                varchar(128) not null,"

      "primary key        (help_category_id),"

      "unique index       (name)"

      ") comment='help categories';\n");

      ") engine=MyISAM "

      "CHARACTER SET utf8 "

      "comment='help categories';\n");

  }



  if (test_sys_file(mdata,"mysql/help_keyword.frm"))
@@ -313,7 +330,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "name             varchar(64) not null,"

      "primary key      (help_keyword_id),"

      "unique index     (name)"

      ") comment='help keywords';\n");

      ") engine=MyISAM "

      "CHARACTER SET utf8 "

      "comment='help keywords';\n");

  }

				    

  if (test_sys_file(mdata,"mysql/help_relation.frm"))
@@ -323,7 +342,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "help_topic_id int unsigned not null references help_topic,"

      "help_keyword_id int unsigned not null references help_keyword,"

      "primary key      (help_keyword_id, help_topic_id)"

      ") comment='keyword-topic relation';\n");

      ") engine=MyISAM "

      "CHARACTER SET utf8 "

      "comment='keyword-topic relation';\n");

  }



  if (test_sys_file(mdata,"mysql/time_zone_name.frm"))
@@ -333,7 +354,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "Name char(64) NOT NULL,"

      "Time_zone_id int unsigned NOT NULL,"

      "PRIMARY KEY Name (Name)"

      ") DEFAULT CHARACTER SET latin1 "

      ") engine=MyISAM CHARACTER SET utf8 "

      "comment='Time zone names';\n");

  

    if (test)
@@ -341,7 +362,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      fprintf(out,

        "INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES"

        "('MET', 1), ('UTC', 2), ('Universal', 2), "

        "('Europe/Moscow',3), ('leap/Europe/Moscow',4);\n");

        "('Europe/Moscow',3), ('leap/Europe/Moscow',4),"

        "('Japan', 5);\n");



    }

  }
@@ -353,13 +376,13 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "Time_zone_id int unsigned NOT NULL auto_increment,"

      "Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL,"

      "PRIMARY KEY TzId (Time_zone_id)"

      ") DEFAULT CHARACTER SET latin1 "

      ") engine=MyISAM CHARACTER SET utf8 "

      "comment='Time zones';\n");

  

    if (test)

    {

      fprintf(out,"INSERT INTO time_zone (Time_zone_id, Use_leap_seconds)"

                  "VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y');\n");

                  "VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y'), (5,'N');\n");

    }

  }
@@ -371,7 +394,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "Transition_time bigint signed NOT NULL,"

      "Transition_type_id int unsigned NOT NULL,"

      "PRIMARY KEY TzIdTranTime (Time_zone_id, Transition_time)"

      ") DEFAULT CHARACTER SET latin1 "

      ") engine=MyISAM CHARACTER SET utf8 "

      "comment='Time zone transitions';\n");

  

    if (test)
@@ -576,7 +599,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
       ",(4, 2045689222, 8) ,(4, 2058390022, 9)"

       ",(4, 2077138822, 8) ,(4, 2090444422, 9)"

       ",(4, 2108588422, 8) ,(4, 2121894022, 9)"

       ",(4, 2140038022, 8);\n");

       ",(4, 2140038022, 8), (5, -1009875600, 1);\n");

       

       

    }

  }
@@ -590,7 +615,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "Is_DST tinyint unsigned DEFAULT 0 NOT NULL,"

      "Abbreviation char(8) DEFAULT '' NOT NULL,"

      "PRIMARY KEY TzIdTrTId (Time_zone_id, Transition_type_id)"

      ") DEFAULT CHARACTER SET latin1 "

      ") engine=MyISAM CHARACTER SET utf8 "

      "comment='Time zone transition types';\n");

  

    if (test)
@@ -612,7 +637,9 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
        ",(4, 4, 10800, 0, 'MSK') ,(4, 5, 14400, 1, 'MSD')"

        ",(4, 6, 18000, 1, 'MSD') ,(4, 7, 7200, 0, 'EET')"

        ",(4, 8, 10800, 0, 'MSK') ,(4, 9, 14400, 1, 'MSD')"

        ",(4, 10, 10800, 1, 'EEST') ,(4, 11, 7200, 0, 'EET');\n");

        ",(4, 10, 10800, 1, 'EEST') ,(4, 11, 7200, 0, 'EET')"

        ",(5, 0, 32400, 0, 'CJT') ,(5, 1, 32400, 0, 'JST');\n");

	

    }

  }
@@ -623,7 +650,7 @@ bool create_system_files(const char *mdata,const char *output_file, bool test) 
      "Transition_time bigint signed NOT NULL,"

      "Correction int signed NOT NULL,"

      "PRIMARY KEY TranTime (Transition_time)"

      ") DEFAULT CHARACTER SET latin1 "

      ") engine=MyISAM CHARACTER SET utf8 "

      "comment='Leap seconds information for time zones';\n");

  

    if (test)

mysql-test/my_manage.c

+2 −7
Original line number Diff line number Diff line
@@ -800,12 +800,7 @@ int removef(const char *format, ...) 
#ifndef STRUCT_DIRENT_HAS_D_TYPE

    struct stat st;



    if (lstat(entry->d_name, &st) == -1)

    {

      return 1;

    }



    if (!S_ISDIR(st.st_mode) && !fnmatch(p, entry->d_name,0))

    if (lstat(entry->d_name, &st) == -1 && !fnmatch(p, entry->d_name,0))

#else

    if (!S_ISDIR(entry->d_type) && !fnmatch(p, entry->d_name,0))

#endif

mysql-test/mysql_test_run_new.c

+205 −115

File changed.

Preview size limit exceeded, changes collapsed.