diff options
| author | unknown <lenz@mysql.com> | 2003-09-16 22:10:19 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2003-09-16 22:10:19 +0200 |
| commit | 65cf37d3fb29560badceeb980a8d825b8253ed64 (patch) | |
| tree | c41a7b6c642104e80ff54d444cd60f2b5022ca0f | |
| parent | d9167cd73b641a5d3c188bd13b33162cd60c6757 (diff) | |
| parent | a3056adeb6991dd7f0987b71a590a41859ce2db8 (diff) | |
| download | mariadb-git-65cf37d3fb29560badceeb980a8d825b8253ed64.tar.gz | |
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
63 files changed, 195 insertions, 5029 deletions
diff --git a/.bzrignore b/.bzrignore index 1e4c8ae88af..7bdc90fd76a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -538,3 +538,4 @@ Docs/internals_toc.html scripts/make_win_src_distribution libmysql/vio_priv.h libmysql_r/vio_priv.h +hardcopy.0 diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl b/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl deleted file mode 100644 index 81e474f9be8..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/.fgl +++ /dev/null @@ -1,37 +0,0 @@ -[General] -Type=FILELIST -Version=1.00.000 - -[topdir] -subdir0=<WINDIR> -subdir1=<PROGRAMFILES> -subdir2=<TARGETDIR> -subdir3=USERDEFINED - -[<WINDIR>] -DISPLAYTEXT=Windows Operating System -TYPE=TEXTSUBFIXED -subdir0=<WINDIR>\<WINSYSDIR> - -[<WINDIR>\<WINSYSDIR>] -DISPLAYTEXT=Windows System Folder -TYPE=TEXTSUBFIXED - -[<PROGRAMFILES>] -DISPLAYTEXT=Program Files Folder -TYPE=TEXTSUBFIXED -subdir0=<PROGRAMFILES>\<COMMONFILES> - -[<PROGRAMFILES>\<COMMONFILES>] -DISPLAYTEXT=Common Files Folder -TYPE=TEXTSUBFIXED - -[<TARGETDIR>] -DISPLAYTEXT=General Application Destination -TYPE=TEXTSUBFIXED - -[USERDEFINED] -DISPLAYTEXT=Script-defined Folders -TYPE=USERSTART - - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf b/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf deleted file mode 100644 index 48d37800cd1..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.cdf +++ /dev/null @@ -1,192 +0,0 @@ -[Development] -required0=Servers -SELECTED=Yes -FILENEED=STANDARD -required1=Grant Tables -HTTPLOCATION= -STATUS=Examples, Libraries, Includes and Script files -UNINSTALLABLE=Yes -TARGET=<TARGETDIR> -FTPLOCATION= -VISIBLE=Yes -DESCRIPTION=Examples, Libraries, Includes and Script files -DISPLAYTEXT=Examples, Libraries, Includes and Script files -IMAGE= -DEFSELECTION=Yes -filegroup0=Development -COMMENT= -INCLUDEINBUILD=Yes -INSTALLATION=ALWAYSOVERWRITE -COMPRESSIFSEPARATE=No -MISC= -ENCRYPT=No -DISK=ANYDISK -TARGETDIRCDROM= -PASSWORD= -TARGETHIDDEN=General Application Destination - -[Grant Tables] -required0=Servers -SELECTED=Yes -FILENEED=CRITICAL -HTTPLOCATION= -STATUS=The Grant Tables and Core Files -UNINSTALLABLE=Yes -TARGET=<TARGETDIR> -FTPLOCATION= -VISIBLE=Yes -DESCRIPTION=The Grant Tables and Core Files -DISPLAYTEXT=The Grant Tables and Core Files -IMAGE= -DEFSELECTION=Yes -filegroup0=Grant Tables -requiredby0=Development -COMMENT= -INCLUDEINBUILD=Yes -requiredby1=Clients and Tools -INSTALLATION=NEVEROVERWRITE -requiredby2=Documentation -COMPRESSIFSEPARATE=No -MISC= -ENCRYPT=No -DISK=ANYDISK -TARGETDIRCDROM= -PASSWORD= -TARGETHIDDEN=General Application Destination - -[Components] -component0=Development -component1=Grant Tables -component2=Servers -component3=Clients and Tools -component4=Documentation - -[TopComponents] -component0=Servers -component1=Clients and Tools -component2=Documentation -component3=Development -component4=Grant Tables - -[SetupType] -setuptype0=Compact -setuptype1=Typical -setuptype2=Custom - -[Clients and Tools] -required0=Servers -SELECTED=Yes -FILENEED=HIGHLYRECOMMENDED -required1=Grant Tables -HTTPLOCATION= -STATUS=The MySQL clients and Maintenance Tools -UNINSTALLABLE=Yes -TARGET=<TARGETDIR> -FTPLOCATION= -VISIBLE=Yes -DESCRIPTION=The MySQL clients and Maintenance Tools -DISPLAYTEXT=The MySQL clients and Maintenance Tools -IMAGE= -DEFSELECTION=Yes -filegroup0=Clients and Tools -COMMENT= -INCLUDEINBUILD=Yes -INSTALLATION=NEWERDATE -COMPRESSIFSEPARATE=No -MISC= -ENCRYPT=No -DISK=ANYDISK -TARGETDIRCDROM= -PASSWORD= -TARGETHIDDEN=General Application Destination - -[Servers] -SELECTED=Yes -FILENEED=CRITICAL -HTTPLOCATION= -STATUS=The MySQL Servers -UNINSTALLABLE=Yes -TARGET=<TARGETDIR> -FTPLOCATION= -VISIBLE=Yes -DESCRIPTION=The MySQL Servers -DISPLAYTEXT=The MySQL Servers -IMAGE= -DEFSELECTION=Yes -filegroup0=Servers -requiredby0=Development -COMMENT= -INCLUDEINBUILD=Yes -requiredby1=Grant Tables -INSTALLATION=ALWAYSOVERWRITE -requiredby2=Clients and Tools -requiredby3=Documentation -COMPRESSIFSEPARATE=No -MISC= -ENCRYPT=No -DISK=ANYDISK -TARGETDIRCDROM= -PASSWORD= -TARGETHIDDEN=General Application Destination - -[SetupTypeItem-Compact] -Comment= -item0=Grant Tables -item1=Servers -item2=Clients and Tools -item3=Documentation -Descrip= -DisplayText= - -[SetupTypeItem-Custom] -Comment= -item0=Development -item1=Grant Tables -item2=Servers -item3=Clients and Tools -Descrip= -item4=Documentation -DisplayText= - -[Info] -Type=CompDef -Version=1.00.000 -Name= - -[SetupTypeItem-Typical] -Comment= -item0=Development -item1=Grant Tables -item2=Servers -item3=Clients and Tools -Descrip= -item4=Documentation -DisplayText= - -[Documentation] -required0=Servers -SELECTED=Yes -FILENEED=HIGHLYRECOMMENDED -required1=Grant Tables -HTTPLOCATION= -STATUS=The MySQL Documentation with different formats -UNINSTALLABLE=Yes -TARGET=<TARGETDIR> -FTPLOCATION= -VISIBLE=Yes -DESCRIPTION=The MySQL Documentation with different formats -DISPLAYTEXT=The MySQL Documentation with different formats -IMAGE= -DEFSELECTION=Yes -filegroup0=Documentation -COMMENT= -INCLUDEINBUILD=Yes -INSTALLATION=ALWAYSOVERWRITE -COMPRESSIFSEPARATE=No -MISC= -ENCRYPT=No -DISK=ANYDISK -TARGETDIRCDROM= -PASSWORD= -TARGETHIDDEN=General Application Destination - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl b/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl deleted file mode 100644 index 4e20dcea4ab..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Component Definitions/Default.fgl +++ /dev/null @@ -1,42 +0,0 @@ -[<PROGRAMFILES>\<COMMONFILES>] -DISPLAYTEXT=Common Files Folder -TYPE=TEXTSUBFIXED -fulldirectory= - -[<WINDIR>\<WINSYSDIR>] -DISPLAYTEXT=Windows System Folder -TYPE=TEXTSUBFIXED -fulldirectory= - -[USERDEFINED] -DISPLAYTEXT=Script-defined Folders -TYPE=USERSTART -fulldirectory= - -[<PROGRAMFILES>] -DISPLAYTEXT=Program Files Folder -SubDir0=<PROGRAMFILES>\<COMMONFILES> -TYPE=TEXTSUBFIXED -fulldirectory= - -[<TARGETDIR>] -DISPLAYTEXT=General Application Destination -TYPE=TEXTSUBFIXED -fulldirectory= - -[<WINDIR>] -DISPLAYTEXT=Windows Operating System -SubDir0=<WINDIR>\<WINSYSDIR> -TYPE=TEXTSUBFIXED -fulldirectory= - -[TopDir] -SubDir0=<WINDIR> -SubDir1=<PROGRAMFILES> -SubDir2=<TARGETDIR> -SubDir3=USERDEFINED - -[General] -Type=FILELIST -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl b/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl deleted file mode 100644 index 7f30ff9f64b..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Clients and Tools.fgl +++ /dev/null @@ -1,35 +0,0 @@ -[bin] -file15=C:\mysql\bin\pack_isam.exe -file16=C:\mysql\bin\perror.exe -file0=C:\mysql\bin\isamchk.exe -file17=C:\mysql\bin\replace.exe -file1=C:\mysql\bin\myisamchk.exe -file18=C:\mysql\bin\winmysqladmin.cnt -file2=C:\mysql\bin\myisamlog.exe -file19=C:\mysql\bin\winmysqladmin.exe -file3=C:\mysql\bin\myisampack.exe -file4=C:\mysql\bin\mysql.exe -file5=C:\mysql\bin\mysqladmin.exe -file6=C:\mysql\bin\mysqlbinlog.exe -file7=C:\mysql\bin\mysqlc.exe -file8=C:\mysql\bin\mysqlcheck.exe -file9=C:\mysql\bin\mysqldump.exe -file20=C:\mysql\bin\WINMYSQLADMIN.HLP -file21=C:\mysql\bin\cygwinb19.dll -file10=C:\mysql\bin\mysqlimport.exe -fulldirectory= -file22=C:\mysql\bin\libmySQL.dll -file11=C:\mysql\bin\MySqlManager.exe -file23=C:\mysql\bin\my_print_defaults.exe -file12=C:\mysql\bin\mysqlshow.exe -file24=C:\mysql\bin\comp-err.exe -file13=C:\mysql\bin\mysqlshutdown.exe -file14=C:\mysql\bin\mysqlwatch.exe - -[TopDir] -SubDir0=bin - -[General] -Type=FILELIST -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf b/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf deleted file mode 100644 index 8096a4b74bf..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fdf +++ /dev/null @@ -1,82 +0,0 @@ -[FileGroups] -group0=Development -group1=Grant Tables -group2=Servers -group3=Clients and Tools -group4=Documentation - -[Development] -SELFREGISTERING=No -HTTPLOCATION= -LANGUAGE= -OPERATINGSYSTEM= -FTPLOCATION= -FILETYPE=No -INFOTYPE=Standard -COMMENT= -COMPRESS=Yes -COMPRESSDLL= -POTENTIALLY=No -MISC= - -[Grant Tables] -SELFREGISTERING=No -HTTPLOCATION= -LANGUAGE= -OPERATINGSYSTEM= -FTPLOCATION= -FILETYPE=No -INFOTYPE=Standard -COMMENT= -COMPRESS=Yes -COMPRESSDLL= -POTENTIALLY=No -MISC= - -[Clients and Tools] -SELFREGISTERING=No -HTTPLOCATION= -LANGUAGE= -OPERATINGSYSTEM=0000000000000000 -FTPLOCATION= -FILETYPE=No -INFOTYPE=Standard -COMMENT= -COMPRESS=Yes -COMPRESSDLL= -POTENTIALLY=No -MISC= - -[Servers] -SELFREGISTERING=No -HTTPLOCATION= -LANGUAGE= -OPERATINGSYSTEM= -FTPLOCATION= -FILETYPE=No -INFOTYPE=Standard -COMMENT= -COMPRESS=Yes -COMPRESSDLL= -POTENTIALLY=No -MISC= - -[Info] -Type=FileGrp -Version=1.00.000 -Name= - -[Documentation] -SELFREGISTERING=No -HTTPLOCATION= -LANGUAGE= -OPERATINGSYSTEM= -FTPLOCATION= -FILETYPE=No -INFOTYPE=Standard -COMMENT= -COMPRESS=Yes -COMPRESSDLL= -POTENTIALLY=No -MISC= - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl b/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl deleted file mode 100644 index 94344a6ff69..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Default.fgl +++ /dev/null @@ -1,4 +0,0 @@ -[General] -Type=FILELIST -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl b/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl deleted file mode 100644 index e7b8cc7cd0f..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Development.fgl +++ /dev/null @@ -1,191 +0,0 @@ -[bench\Data\Wisconsin] -file0=C:\mysql\bench\Data\Wisconsin\onek.data -file1=C:\mysql\bench\Data\Wisconsin\tenk.data -fulldirectory= - -[lib\debug] -file0=C:\mysql\lib\debug\libmySQL.dll -file1=C:\mysql\lib\debug\libmySQL.lib -file2=C:\mysql\lib\debug\mysqlclient.lib -file3=C:\mysql\lib\debug\zlib.lib -fulldirectory= - -[bench\output] -fulldirectory= - -[examples\libmysqltest] -file0=C:\mysql\examples\libmysqltest\myTest.c -file1=C:\mysql\examples\libmysqltest\myTest.dsp -file2=C:\mysql\examples\libmysqltest\myTest.dsw -file3=C:\mysql\examples\libmysqltest\myTest.exe -file4=C:\mysql\examples\libmysqltest\myTest.mak -file5=C:\mysql\examples\libmysqltest\myTest.ncb -file6=C:\mysql\examples\libmysqltest\myTest.opt -file7=C:\mysql\examples\libmysqltest\readme -fulldirectory= - -[include] -file0=C:\mysql\include\raid.h -file1=C:\mysql\include\errmsg.h -file2=C:\mysql\include\Libmysql.def -file3=C:\mysql\include\m_ctype.h -file4=C:\mysql\include\m_string.h -file5=C:\mysql\include\my_list.h -file6=C:\mysql\include\my_pthread.h -file7=C:\mysql\include\my_sys.h -file8=C:\mysql\include\mysql.h -file9=C:\mysql\include\mysql_com.h -file10=C:\mysql\include\mysql_version.h -fulldirectory= -file11=C:\mysql\include\mysqld_error.h -file12=C:\mysql\include\dbug.h -file13=C:\mysql\include\my_global.h -file14=C:\mysql\include\config-win.h - -[examples] -SubDir0=examples\libmysqltest -SubDir1=examples\tests -fulldirectory= - -[lib\opt] -file0=C:\mysql\lib\opt\libmySQL.dll -file1=C:\mysql\lib\opt\libmySQL.lib -file2=C:\mysql\lib\opt\mysqlclient.lib -file3=C:\mysql\lib\opt\zlib.lib -fulldirectory= - -[bench\Data] -SubDir0=bench\Data\ATIS -SubDir1=bench\Data\Wisconsin -fulldirectory= - -[bench\limits] -file15=C:\mysql\bench\limits\pg.comment -file16=C:\mysql\bench\limits\solid.cfg -file0=C:\mysql\bench\limits\access.cfg -file17=C:\mysql\bench\limits\solid-nt4.cfg -file1=C:\mysql\bench\limits\access.comment -file18=C:\mysql\bench\limits\sybase.cfg -file2=C:\mysql\bench\limits\Adabas.cfg -file3=C:\mysql\bench\limits\Adabas.comment -file4=C:\mysql\bench\limits\Db2.cfg -file5=C:\mysql\bench\limits\empress.cfg -file6=C:\mysql\bench\limits\empress.comment -file7=C:\mysql\bench\limits\Informix.cfg -file8=C:\mysql\bench\limits\Informix.comment -file9=C:\mysql\bench\limits\msql.cfg -file10=C:\mysql\bench\limits\ms-sql.cfg -fulldirectory= -file11=C:\mysql\bench\limits\Ms-sql65.cfg -file12=C:\mysql\bench\limits\mysql.cfg -file13=C:\mysql\bench\limits\oracle.cfg -file14=C:\mysql\bench\limits\pg.cfg - -[TopDir] -SubDir0=bench -SubDir1=examples -SubDir2=include -SubDir3=lib -SubDir4=scripts - -[bench] -file15=C:\mysql\bench\test-create -file16=C:\mysql\bench\test-insert -file0=C:\mysql\bench\uname.bat -file17=C:\mysql\bench\test-select -file1=C:\mysql\bench\compare-results -file18=C:\mysql\bench\test-wisconsin -file2=C:\mysql\bench\copy-db -file19=C:\mysql\bench\bench-init.pl -file3=C:\mysql\bench\crash-me -file4=C:\mysql\bench\example.bat -file5=C:\mysql\bench\print-limit-table -file6=C:\mysql\bench\pwd.bat -file7=C:\mysql\bench\Readme -SubDir0=bench\Data -file8=C:\mysql\bench\run.bat -SubDir1=bench\limits -file9=C:\mysql\bench\run-all-tests -SubDir2=bench\output -file10=C:\mysql\bench\server-cfg -fulldirectory= -file11=C:\mysql\bench\test-alter-table -file12=C:\mysql\bench\test-ATIS -file13=C:\mysql\bench\test-big-tables -file14=C:\mysql\bench\test-connect - -[examples\tests] -file15=C:\mysql\examples\tests\lock_test.res -file16=C:\mysql\examples\tests\mail_to_db.pl -file0=C:\mysql\examples\tests\unique_users.tst -file17=C:\mysql\examples\tests\table_types.pl -file1=C:\mysql\examples\tests\auto_increment.tst -file18=C:\mysql\examples\tests\test_delayed_insert.pl -file2=C:\mysql\examples\tests\big_record.pl -file19=C:\mysql\examples\tests\udf_test -file3=C:\mysql\examples\tests\big_record.res -file4=C:\mysql\examples\tests\czech-sorting -file5=C:\mysql\examples\tests\deadlock-script.pl -file6=C:\mysql\examples\tests\export.pl -file7=C:\mysql\examples\tests\fork_test.pl -file8=C:\mysql\examples\tests\fork2_test.pl -file9=C:\mysql\examples\tests\fork3_test.pl -file20=C:\mysql\examples\tests\udf_test.res -file21=C:\mysql\examples\tests\auto_increment.res -file10=C:\mysql\examples\tests\function.res -fulldirectory= -file11=C:\mysql\examples\tests\function.tst -file12=C:\mysql\examples\tests\grant.pl -file13=C:\mysql\examples\tests\grant.res -file14=C:\mysql\examples\tests\lock_test.pl - -[bench\Data\ATIS] -file26=C:\mysql\bench\Data\ATIS\stop1.txt -file15=C:\mysql\bench\Data\ATIS\flight_class.txt -file27=C:\mysql\bench\Data\ATIS\time_interval.txt -file16=C:\mysql\bench\Data\ATIS\flight_day.txt -file0=C:\mysql\bench\Data\ATIS\transport.txt -file28=C:\mysql\bench\Data\ATIS\time_zone.txt -file17=C:\mysql\bench\Data\ATIS\flight_fare.txt -file1=C:\mysql\bench\Data\ATIS\airline.txt -file29=C:\mysql\bench\Data\ATIS\aircraft.txt -file18=C:\mysql\bench\Data\ATIS\food_service.txt -file2=C:\mysql\bench\Data\ATIS\airport.txt -file19=C:\mysql\bench\Data\ATIS\ground_service.txt -file3=C:\mysql\bench\Data\ATIS\airport_service.txt -file4=C:\mysql\bench\Data\ATIS\city.txt -file5=C:\mysql\bench\Data\ATIS\class_of_service.txt -file6=C:\mysql\bench\Data\ATIS\code_description.txt -file7=C:\mysql\bench\Data\ATIS\compound_class.txt -file8=C:\mysql\bench\Data\ATIS\connect_leg.txt -file9=C:\mysql\bench\Data\ATIS\date_day.txt -file20=C:\mysql\bench\Data\ATIS\month_name.txt -file21=C:\mysql\bench\Data\ATIS\restrict_carrier.txt -file10=C:\mysql\bench\Data\ATIS\day_name.txt -fulldirectory= -file22=C:\mysql\bench\Data\ATIS\restrict_class.txt -file11=C:\mysql\bench\Data\ATIS\dual_carrier.txt -file23=C:\mysql\bench\Data\ATIS\restriction.txt -file12=C:\mysql\bench\Data\ATIS\fare.txt -file24=C:\mysql\bench\Data\ATIS\state.txt -file13=C:\mysql\bench\Data\ATIS\fconnection.txt -file25=C:\mysql\bench\Data\ATIS\stop.txt -file14=C:\mysql\bench\Data\ATIS\flight.txt - -[General] -Type=FILELIST -Version=1.00.000 - -[scripts] -file0=C:\mysql\scripts\mysql_find_rows.pl -file1=C:\mysql\scripts\mysql_setpermission.pl -file2=C:\mysql\scripts\mysqlhotcopy.pl -file3=C:\mysql\scripts\Readme -fulldirectory= - -[lib] -file0=C:\mysql\lib\Readme -SubDir0=lib\debug -SubDir1=lib\opt -fulldirectory= - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl b/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl deleted file mode 100644 index 80fe777cf0f..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Documentation.fgl +++ /dev/null @@ -1,99 +0,0 @@ -[Docs\Flags] -file59=C:\mysql\Docs\Flags\romania.gif -file48=C:\mysql\Docs\Flags\kroatia.eps -file37=C:\mysql\Docs\Flags\iceland.gif -file26=C:\mysql\Docs\Flags\france.eps -file15=C:\mysql\Docs\Flags\china.gif -file49=C:\mysql\Docs\Flags\kroatia.gif -file38=C:\mysql\Docs\Flags\ireland.eps -file27=C:\mysql\Docs\Flags\france.gif -file16=C:\mysql\Docs\Flags\croatia.eps -file0=C:\mysql\Docs\Flags\usa.gif -file39=C:\mysql\Docs\Flags\ireland.gif -file28=C:\mysql\Docs\Flags\germany.eps -file17=C:\mysql\Docs\Flags\croatia.gif -file1=C:\mysql\Docs\Flags\argentina.gif -file29=C:\mysql\Docs\Flags\germany.gif -file18=C:\mysql\Docs\Flags\czech-republic.eps -file2=C:\mysql\Docs\Flags\australia.eps -file19=C:\mysql\Docs\Flags\czech-republic.gif -file3=C:\mysql\Docs\Flags\australia.gif -file80=C:\mysql\Docs\Flags\usa.eps -file4=C:\mysql\Docs\Flags\austria.eps -file81=C:\mysql\Docs\Flags\argentina.eps -file70=C:\mysql\Docs\Flags\spain.eps -file5=C:\mysql\Docs\Flags\austria.gif -file71=C:\mysql\Docs\Flags\spain.gif -file60=C:\mysql\Docs\Flags\russia.eps -file6=C:\mysql\Docs\Flags\brazil.eps -file72=C:\mysql\Docs\Flags\sweden.eps -file61=C:\mysql\Docs\Flags\russia.gif -file50=C:\mysql\Docs\Flags\latvia.eps -file7=C:\mysql\Docs\Flags\brazil.gif -file73=C:\mysql\Docs\Flags\sweden.gif -file62=C:\mysql\Docs\Flags\singapore.eps -file51=C:\mysql\Docs\Flags\latvia.gif -file40=C:\mysql\Docs\Flags\island.eps -file8=C:\mysql\Docs\Flags\bulgaria.eps -file74=C:\mysql\Docs\Flags\switzerland.eps -file63=C:\mysql\Docs\Flags\singapore.gif -file52=C:\mysql\Docs\Flags\netherlands.eps -file41=C:\mysql\Docs\Flags\island.gif -file30=C:\mysql\Docs\Flags\great-britain.eps -file9=C:\mysql\Docs\Flags\bulgaria.gif -file75=C:\mysql\Docs\Flags\switzerland.gif -file64=C:\mysql\Docs\Flags\south-africa.eps -file53=C:\mysql\Docs\Flags\netherlands.gif -file42=C:\mysql\Docs\Flags\israel.eps -file31=C:\mysql\Docs\Flags\great-britain.gif -file20=C:\mysql\Docs\Flags\denmark.eps -file76=C:\mysql\Docs\Flags\taiwan.eps -file65=C:\mysql\Docs\Flags\south-africa.gif -file54=C:\mysql\Docs\Flags\poland.eps -file43=C:\mysql\Docs\Flags\israel.gif -file32=C:\mysql\Docs\Flags\greece.eps -file21=C:\mysql\Docs\Flags\denmark.gif -file10=C:\mysql\Docs\Flags\canada.eps -fulldirectory= -file77=C:\mysql\Docs\Flags\taiwan.gif -file66=C:\mysql\Docs\Flags\south-africa1.eps -file55=C:\mysql\Docs\Flags\poland.gif -file44=C:\mysql\Docs\Flags\italy.eps -file33=C:\mysql\Docs\Flags\greece.gif -file22=C:\mysql\Docs\Flags\estonia.eps -file11=C:\mysql\Docs\Flags\canada.gif -file78=C:\mysql\Docs\Flags\ukraine.eps -file67=C:\mysql\Docs\Flags\south-africa1.gif -file56=C:\mysql\Docs\Flags\portugal.eps -file45=C:\mysql\Docs\Flags\italy.gif -file34=C:\mysql\Docs\Flags\hungary.eps -file23=C:\mysql\Docs\Flags\estonia.gif -file12=C:\mysql\Docs\Flags\chile.eps -file79=C:\mysql\Docs\Flags\ukraine.gif -file68=C:\mysql\Docs\Flags\south-korea.eps -file57=C:\mysql\Docs\Flags\portugal.gif -file46=C:\mysql\Docs\Flags\japan.eps -file35=C:\mysql\Docs\Flags\hungary.gif -file24=C:\mysql\Docs\Flags\finland.eps -file13=C:\mysql\Docs\Flags\chile.gif -file69=C:\mysql\Docs\Flags\south-korea.gif -file58=C:\mysql\Docs\Flags\romania.eps -file47=C:\mysql\Docs\Flags\japan.gif -file36=C:\mysql\Docs\Flags\iceland.eps -file25=C:\mysql\Docs\Flags\finland.gif -file14=C:\mysql\Docs\Flags\china.eps - -[Docs] -file0=C:\mysql\Docs\manual_toc.html -file1=C:\mysql\Docs\manual.html -file2=C:\mysql\Docs\manual.txt -SubDir0=Docs\Flags -fulldirectory= - -[TopDir] -SubDir0=Docs - -[General] -Type=FILELIST -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl b/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl deleted file mode 100644 index 178065a7003..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Grant Tables.fgl +++ /dev/null @@ -1,36 +0,0 @@ -[data\test] -fulldirectory= - -[data\mysql] -file15=C:\mysql\data\mysql\func.frm -file16=C:\mysql\data\mysql\func.MYD -file0=C:\mysql\data\mysql\columns_priv.frm -file17=C:\mysql\data\mysql\func.MYI -file1=C:\mysql\data\mysql\columns_priv.MYD -file2=C:\mysql\data\mysql\columns_priv.MYI -file3=C:\mysql\data\mysql\db.frm -file4=C:\mysql\data\mysql\db.MYD -file5=C:\mysql\data\mysql\db.MYI -file6=C:\mysql\data\mysql\host.frm -file7=C:\mysql\data\mysql\host.MYD -file8=C:\mysql\data\mysql\host.MYI -file9=C:\mysql\data\mysql\tables_priv.frm -file10=C:\mysql\data\mysql\tables_priv.MYD -fulldirectory= -file11=C:\mysql\data\mysql\tables_priv.MYI -file12=C:\mysql\data\mysql\user.frm -file13=C:\mysql\data\mysql\user.MYD -file14=C:\mysql\data\mysql\user.MYI - -[TopDir] -SubDir0=data - -[data] -SubDir0=data\mysql -SubDir1=data\test -fulldirectory= - -[General] -Type=FILELIST -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl b/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl deleted file mode 100644 index b23e2f90595..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/File Groups/Servers.fgl +++ /dev/null @@ -1,184 +0,0 @@ -[share\polish] -file0=C:\mysql\share\polish\errmsg.sys -file1=C:\mysql\share\polish\errmsg.txt -fulldirectory= - -[share\dutch] -file0=C:\mysql\share\dutch\errmsg.sys -file1=C:\mysql\share\dutch\errmsg.txt -fulldirectory= - -[share\spanish] -file0=C:\mysql\share\spanish\errmsg.sys -file1=C:\mysql\share\spanish\errmsg.txt -fulldirectory= - -[share\english] -file0=C:\mysql\share\english\errmsg.sys -file1=C:\mysql\share\english\errmsg.txt -fulldirectory= - -[bin] -file0=C:\mysql\bin\mysqld-opt.exe -file1=C:\mysql\bin\mysqld-max.exe -file2=C:\mysql\bin\mysqld-max-nt.exe -file3=C:\mysql\bin\mysqld-nt.exe -file4=C:\mysql\bin\mysqld.exe -fulldirectory= - -[share\korean] -file0=C:\mysql\share\korean\errmsg.sys -file1=C:\mysql\share\korean\errmsg.txt -fulldirectory= - -[share\charsets] -file15=C:\mysql\share\charsets\latin1.conf -file16=C:\mysql\share\charsets\latin2.conf -file0=C:\mysql\share\charsets\win1251ukr.conf -file17=C:\mysql\share\charsets\latin5.conf -file1=C:\mysql\share\charsets\cp1257.conf -file18=C:\mysql\share\charsets\Readme -file2=C:\mysql\share\charsets\croat.conf -file19=C:\mysql\share\charsets\swe7.conf -file3=C:\mysql\share\charsets\danish.conf -file4=C:\mysql\share\charsets\dec8.conf -file5=C:\mysql\share\charsets\dos.conf -file6=C:\mysql\share\charsets\estonia.conf -file7=C:\mysql\share\charsets\german1.conf -file8=C:\mysql\share\charsets\greek.conf -file9=C:\mysql\share\charsets\hebrew.conf -file20=C:\mysql\share\charsets\usa7.conf -file21=C:\mysql\share\charsets\win1250.conf -file10=C:\mysql\share\charsets\hp8.conf -fulldirectory= -file22=C:\mysql\share\charsets\win1251.conf -file11=C:\mysql\share\charsets\hungarian.conf -file23=C:\mysql\share\charsets\cp1251.conf -file12=C:\mysql\share\charsets\Index -file13=C:\mysql\share\charsets\koi8_ru.conf -file14=C:\mysql\share\charsets\koi8_ukr.conf - -[share\ukrainian] -file0=C:\mysql\share\ukrainian\errmsg.sys -file1=C:\mysql\share\ukrainian\errmsg.txt -fulldirectory= - -[share\hungarian] -file0=C:\mysql\share\hungarian\errmsg.sys -file1=C:\mysql\share\hungarian\errmsg.txt -fulldirectory= - -[share\german] -file0=C:\mysql\share\german\errmsg.sys -file1=C:\mysql\share\german\errmsg.txt -fulldirectory= - -[share\portuguese] -file0=C:\mysql\share\portuguese\errmsg.sys -file1=C:\mysql\share\portuguese\errmsg.txt -fulldirectory= - -[share\estonian] -file0=C:\mysql\share\estonian\errmsg.sys -file1=C:\mysql\share\estonian\errmsg.txt -fulldirectory= - -[share\romanian] -file0=C:\mysql\share\romanian\errmsg.sys -file1=C:\mysql\share\romanian\errmsg.txt -fulldirectory= - -[share\french] -file0=C:\mysql\share\french\errmsg.sys -file1=C:\mysql\share\french\errmsg.txt -fulldirectory= - -[share\swedish] -file0=C:\mysql\share\swedish\errmsg.sys -file1=C:\mysql\share\swedish\errmsg.txt -fulldirectory= - -[share\slovak] -file0=C:\mysql\share\slovak\errmsg.sys -file1=C:\mysql\share\slovak\errmsg.txt -fulldirectory= - -[share\greek] -file0=C:\mysql\share\greek\errmsg.sys -file1=C:\mysql\share\greek\errmsg.txt -fulldirectory= - -[TopDir] -file0=C:\mysql\mysqlbug.txt -file1=C:\mysql\my-small.cnf -file2=C:\mysql\my-large.cnf -file3=C:\mysql\my-medium.cnf -file4=C:\mysql\my-huge.cnf -SubDir0=bin -SubDir1=share - -[share] -SubDir8=share\hungarian -SubDir9=share\charsets -SubDir20=share\spanish -SubDir21=share\swedish -SubDir10=share\italian -SubDir22=share\ukrainian -SubDir11=share\japanese -SubDir12=share\korean -SubDir13=share\norwegian -SubDir14=share\norwegian-ny -SubDir15=share\polish -SubDir16=share\portuguese -SubDir0=share\czech -SubDir17=share\romanian -SubDir1=share\danish -SubDir18=share\russian -SubDir2=share\dutch -SubDir19=share\slovak -SubDir3=share\english -fulldirectory= -SubDir4=share\estonian -SubDir5=share\french -SubDir6=share\german -SubDir7=share\greek - -[share\norwegian-ny] -file0=C:\mysql\share\norwegian-ny\errmsg.sys -file1=C:\mysql\share\norwegian-ny\errmsg.txt -fulldirectory= - -[share\danish] -file0=C:\mysql\share\danish\errmsg.sys -file1=C:\mysql\share\danish\errmsg.txt -fulldirectory= - -[share\czech] -file0=C:\mysql\share\czech\errmsg.sys -file1=C:\mysql\share\czech\errmsg.txt -fulldirectory= - -[General] -Type=FILELIST -Version=1.00.000 - -[share\russian] -file0=C:\mysql\share\russian\errmsg.sys -file1=C:\mysql\share\russian\errmsg.txt -fulldirectory= - -[share\norwegian] -file0=C:\mysql\share\norwegian\errmsg.sys -file1=C:\mysql\share\norwegian\errmsg.txt -fulldirectory= - -[share\japanese] -file0=C:\mysql\share\japanese\errmsg.sys -file1=C:\mysql\share\japanese\errmsg.txt -fulldirectory= - -[share\italian] -file0=C:\mysql\share\italian\errmsg.sys -file1=C:\mysql\share\italian\errmsg.txt -fulldirectory= - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr b/VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr deleted file mode 100644 index de15790e744..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/MySQL 3.23.XX-GPL.ipr +++ /dev/null @@ -1,51 +0,0 @@ -[Language] -LanguageSupport0=0009 - -[OperatingSystem] -OSSupport=0000000000010010 - -[Data] -CurrentMedia= -CurrentComponentDef=Default.cdf -ProductName=MySQL Servers and Clients -set_mifserial= -DevEnvironment=Microsoft Visual C++ 6 -AppExe= -set_dlldebug=No -EmailAddresss= -Instructions=Instructions.txt -set_testmode=No -set_mif=No -SummaryText= -Department= -HomeURL= -Author= -Type=Database Application -InstallRoot=C:\MySQL-Install\3.23.XX-gpl -Version=1.00.000 -InstallationGUID=40744a4d-efed-4cff-84a9-9e6389550f5c -set_level=Level 3 -CurrentFileGroupDef=Default.fdf -Notes=Notes.txt -set_maxerr=50 -set_args= -set_miffile=Status.mif -set_dllcmdline= -Copyright= -set_warnaserr=No -CurrentPlatform= -Category= -set_preproc= -CurrentLanguage=English -CompanyName=MySQL -Description=Description.txt -set_maxwarn=50 -set_crc=Yes -set_compileb4build=No - -[MediaInfo] - -[General] -Type=INSTALLMAIN -Version=1.10.000 - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge b/VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge deleted file mode 100644 index 537dfd82e48..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Registry Entries/Default.rge +++ /dev/null @@ -1,4 +0,0 @@ -[General] -Type=REGISTRYDATA -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg b/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg Binary files differdeleted file mode 100644 index 0c6d4e6b708..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.dbg +++ /dev/null diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino b/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino Binary files differdeleted file mode 100644 index 204d8ea0f36..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ino +++ /dev/null diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins b/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins Binary files differdeleted file mode 100644 index 759009b5c84..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.ins +++ /dev/null diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs b/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs Binary files differdeleted file mode 100644 index 5fcfcb62c4e..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.obs +++ /dev/null diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul b/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul deleted file mode 100644 index 0db8417a62c..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Script Files/Setup.rul +++ /dev/null @@ -1,641 +0,0 @@ - -//////////////////////////////////////////////////////////////////////////////// -// -// IIIIIII SSSSSS -// II SS InstallShield (R) -// II SSSSSS (c) 1996-1997, InstallShield Software Corporation -// II SS (c) 1990-1996, InstallShield Corporation -// IIIIIII SSSSSS All Rights Reserved. -// -// -// This code is generated as a starting setup template. You should -// modify it to provide all necessary steps for your setup. -// -// -// File Name: Setup.rul -// -// Description: InstallShield script -// -// Comments: This template script performs a basic setup on a -// Windows 95 or Windows NT 4.0 platform. With minor -// modifications, this template can be adapted to create -// new, customized setups. -// -//////////////////////////////////////////////////////////////////////////////// - - - // Include header file -#include "sdlang.h" -#include "sddialog.h" - -////////////////////// string defines //////////////////////////// - -#define UNINST_LOGFILE_NAME "Uninst.isu" - -//////////////////// installation declarations /////////////////// - - // ----- DLL prototypes ----- - - - // your DLL prototypes - - - // ---- script prototypes ----- - - // generated - prototype ShowDialogs(); - prototype MoveFileData(); - prototype HandleMoveDataError( NUMBER ); - prototype ProcessBeforeDataMove(); - prototype ProcessAfterDataMove(); - prototype SetupRegistry(); - prototype SetupFolders(); - prototype CleanUpInstall(); - prototype SetupInstall(); - prototype SetupScreen(); - prototype CheckRequirements(); - prototype DialogShowSdWelcome(); - prototype DialogShowSdShowInfoList(); - prototype DialogShowSdAskDestPath(); - prototype DialogShowSdSetupType(); - prototype DialogShowSdComponentDialog2(); - prototype DialogShowSdFinishReboot(); - - // your prototypes - - - // ----- global variables ------ - - // generated - BOOL bWinNT, bIsShellExplorer, bInstallAborted, bIs32BitSetup; - STRING svDir; - STRING svName, svCompany, svSerial; - STRING szAppPath; - STRING svSetupType; - - - // your global variables - - -/////////////////////////////////////////////////////////////////////////////// -// -// MAIN PROGRAM -// -// The setup begins here by hiding the visible setup -// window. This is done to allow all the titles, images, etc. to -// be established before showing the main window. The following -// logic then performs the setup in a series of steps. -// -/////////////////////////////////////////////////////////////////////////////// -program - Disable( BACKGROUND ); - - CheckRequirements(); - - SetupInstall(); - - SetupScreen(); - - if (ShowDialogs()<0) goto end_install; - - if (ProcessBeforeDataMove()<0) goto end_install; - - if (MoveFileData()<0) goto end_install; - - if (ProcessAfterDataMove()<0) goto end_install; - - if (SetupRegistry()<0) goto end_install; - - if (SetupFolders()<0) goto end_install; - - - end_install: - - CleanUpInstall(); - - // If an unrecoverable error occurred, clean up the partial installation. - // Otherwise, exit normally. - - if (bInstallAborted) then - abort; - endif; - -endprogram - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: ShowDialogs // -// // -// Purpose: This function manages the display and navigation // -// the standard dialogs that exist in a setup. // -// // -/////////////////////////////////////////////////////////////////////////////// -function ShowDialogs() - NUMBER nResult; - begin - - Dlg_Start: - // beginning of dialogs label - - Dlg_SdWelcome: - nResult = DialogShowSdWelcome(); - if (nResult = BACK) goto Dlg_Start; - - Dlg_SdShowInfoList: - nResult = DialogShowSdShowInfoList(); - if (nResult = BACK) goto Dlg_SdWelcome; - - Dlg_SdAskDestPath: - nResult = DialogShowSdAskDestPath(); - if (nResult = BACK) goto Dlg_SdShowInfoList; - - Dlg_SdSetupType: - nResult = DialogShowSdSetupType(); - if (nResult = BACK) goto Dlg_SdAskDestPath; - - Dlg_SdComponentDialog2: - if ((nResult = BACK) && (svSetupType != "Custom") && (svSetupType != "")) then - goto Dlg_SdSetupType; - endif; - nResult = DialogShowSdComponentDialog2(); - if (nResult = BACK) goto Dlg_SdSetupType; - - return 0; - - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: ProcessBeforeDataMove // -// // -// Purpose: This function performs any necessary operations prior to the // -// actual data move operation. // -// // -/////////////////////////////////////////////////////////////////////////////// -function ProcessBeforeDataMove() - STRING svLogFile; - NUMBER nResult; - begin - - InstallationInfo( @COMPANY_NAME, @PRODUCT_NAME, @PRODUCT_VERSION, @PRODUCT_KEY ); - - svLogFile = UNINST_LOGFILE_NAME; - - nResult = DeinstallStart( svDir, svLogFile, @UNINST_KEY, 0 ); - if (nResult < 0) then - MessageBox( @ERROR_UNINSTSETUP, WARNING ); - endif; - - szAppPath = TARGETDIR; // TODO : if your application .exe is in a subdir of TARGETDIR then add subdir - - if ((bIs32BitSetup) && (bIsShellExplorer)) then - RegDBSetItem( REGDB_APPPATH, szAppPath ); - RegDBSetItem( REGDB_APPPATH_DEFAULT, szAppPath ^ @PRODUCT_KEY ); - RegDBSetItem( REGDB_UNINSTALL_NAME, @UNINST_DISPLAY_NAME ); - endif; - - // TODO : update any items you want to process before moving the data - // - - return 0; - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: MoveFileData // -// // -// Purpose: This function handles the data movement for // -// the setup. // -// // -/////////////////////////////////////////////////////////////////////////////// -function MoveFileData() - NUMBER nResult, nDisk; - begin - - nDisk = 1; - SetStatusWindow( 0, "" ); - Disable( DIALOGCACHE ); - Enable( STATUS ); - StatusUpdate( ON, 100 ); - nResult = ComponentMoveData( MEDIA, nDisk, 0 ); - - HandleMoveDataError( nResult ); - - Disable( STATUS ); - - return nResult; - - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: HandleMoveDataError // -// // -// Purpose: This function handles the error (if any) during the move data // -// operation. // -// // -/////////////////////////////////////////////////////////////////////////////// -function HandleMoveDataError( nResult ) - STRING szErrMsg, svComponent , svFileGroup , svFile; - begin - - svComponent = ""; - svFileGroup = ""; - svFile = ""; - - switch (nResult) - case 0: - return 0; - default: - ComponentError ( MEDIA , svComponent , svFileGroup , svFile , nResult ); - szErrMsg = @ERROR_MOVEDATA + "\n\n" + - @ERROR_COMPONENT + " " + svComponent + "\n" + - @ERROR_FILEGROUP + " " + svFileGroup + "\n" + - @ERROR_FILE + " " + svFile; - SprintfBox( SEVERE, @TITLE_CAPTIONBAR, szErrMsg, nResult ); - bInstallAborted = TRUE; - return nResult; - endswitch; - - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: ProcessAfterDataMove // -// // -// Purpose: This function performs any necessary operations needed after // -// all data has been moved. // -// // -/////////////////////////////////////////////////////////////////////////////// -function ProcessAfterDataMove() - begin - - // TODO : update self-registered files and other processes that - // should be performed after the data has been moved. - - - return 0; - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: SetupRegistry // -// // -// Purpose: This function makes the registry entries for this setup. // -// // -/////////////////////////////////////////////////////////////////////////////// -function SetupRegistry() - NUMBER nResult; - - begin - - // TODO : Add all your registry entry keys here - // - // - // RegDBCreateKeyEx, RegDBSetKeyValueEx.... - // - - nResult = CreateRegistrySet( "" ); - - return nResult; - end; - -/////////////////////////////////////////////////////////////////////////////// -// -// Function: SetupFolders -// -// Purpose: This function creates all the folders and shortcuts for the -// setup. This includes program groups and items for Windows 3.1. -// -/////////////////////////////////////////////////////////////////////////////// -function SetupFolders() - NUMBER nResult; - - begin - - - // TODO : Add all your folder (program group) along with shortcuts (program items) - // - // - // CreateProgramFolder, AddFolderIcon.... - // - - nResult = CreateShellObjects( "" ); - - return nResult; - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: CleanUpInstall // -// // -// Purpose: This cleans up the setup. Anything that should // -// be released or deleted at the end of the setup should // -// be done here. // -// // -/////////////////////////////////////////////////////////////////////////////// -function CleanUpInstall() - begin - - - if (bInstallAborted) then - return 0; - endif; - - DialogShowSdFinishReboot(); - - if (BATCH_INSTALL) then // ensure locked files are properly written - CommitSharedFiles(0); - endif; - - return 0; - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: SetupInstall // -// // -// Purpose: This will setup the installation. Any general initialization // -// needed for the installation should be performed here. // -// // -/////////////////////////////////////////////////////////////////////////////// -function SetupInstall() - begin - - Enable( CORECOMPONENTHANDLING ); - - bInstallAborted = FALSE; - - if (bIs32BitSetup) then - svDir = "C:\\mysql"; //PROGRAMFILES ^ @COMPANY_NAME ^ @PRODUCT_NAME; - else - svDir = "C:\\mysql"; //PROGRAMFILES ^ @COMPANY_NAME16 ^ @PRODUCT_NAME16; // use shorten names - endif; - - TARGETDIR = svDir; - - SdProductName( @PRODUCT_NAME ); - - Enable( DIALOGCACHE ); - - return 0; - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: SetupScreen // -// // -// Purpose: This function establishes the screen look. This includes // -// colors, fonts, and text to be displayed. // -// // -/////////////////////////////////////////////////////////////////////////////// -function SetupScreen() - begin - - Enable( FULLWINDOWMODE ); - Enable( INDVFILESTATUS ); - SetTitle( @TITLE_MAIN, 24, WHITE ); - - SetTitle( @TITLE_CAPTIONBAR, 0, BACKGROUNDCAPTION ); // Caption bar text. - - Enable( BACKGROUND ); - - Delay( 1 ); - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: CheckRequirements // -// // -// Purpose: This function checks all minimum requirements for the // -// application being installed. If any fail, then the user // -// is informed and the setup is terminated. // -// // -/////////////////////////////////////////////////////////////////////////////// -function CheckRequirements() - NUMBER nvDx, nvDy, nvResult; - STRING svResult; - - begin - - bWinNT = FALSE; - bIsShellExplorer = FALSE; - - // Check screen resolution. - GetExtents( nvDx, nvDy ); - - if (nvDy < 480) then - MessageBox( @ERROR_VGARESOLUTION, WARNING ); - abort; - endif; - - // set 'setup' operation mode - bIs32BitSetup = TRUE; - GetSystemInfo( ISTYPE, nvResult, svResult ); - if (nvResult = 16) then - bIs32BitSetup = FALSE; // running 16-bit setup - return 0; // no additional information required - endif; - - // --- 32-bit testing after this point --- - - // Determine the target system's operating system. - GetSystemInfo( OS, nvResult, svResult ); - - if (nvResult = IS_WINDOWSNT) then - // Running Windows NT. - bWinNT = TRUE; - - // Check to see if the shell being used is EXPLORER shell. - if (GetSystemInfo( OSMAJOR, nvResult, svResult ) = 0) then - if (nvResult >= 4) then - bIsShellExplorer = TRUE; - endif; - endif; - - elseif (nvResult = IS_WINDOWS95 ) then - bIsShellExplorer = TRUE; - - endif; - -end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdWelcome // -// // -// Purpose: This function handles the standard welcome dialog. // -// // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdWelcome() - NUMBER nResult; - STRING szTitle, szMsg; - begin - - szTitle = ""; - szMsg = ""; - nResult = SdWelcome( szTitle, szMsg ); - - return nResult; - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdShowInfoList // -// // -// Purpose: This function displays the general information list dialog. // -// // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdShowInfoList() - NUMBER nResult; - LIST list; - STRING szTitle, szMsg, szFile; - begin - - szFile = SUPPORTDIR ^ "infolist.txt"; - - list = ListCreate( STRINGLIST ); - ListReadFromFile( list, szFile ); - szTitle = ""; - szMsg = " "; - nResult = SdShowInfoList( szTitle, szMsg, list ); - - ListDestroy( list ); - - return nResult; - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdAskDestPath // -// // -// Purpose: This function asks the user for the destination directory. // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdAskDestPath() - NUMBER nResult; - STRING szTitle, szMsg; - begin - - szTitle = ""; - szMsg = ""; - nResult = SdAskDestPath( szTitle, szMsg, svDir, 0 ); - - TARGETDIR = svDir; - - return nResult; - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdSetupType // -// // -// Purpose: This function displays the standard setup type dialog. // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdSetupType() - NUMBER nResult, nType; - STRING szTitle, szMsg; - begin - - switch (svSetupType) - case "Typical": - nType = TYPICAL; - case "Custom": - nType = CUSTOM; - case "Compact": - nType = COMPACT; - case "": - svSetupType = "Typical"; - nType = TYPICAL; - endswitch; - - szTitle = ""; - szMsg = ""; - nResult = SetupType( szTitle, szMsg, "", nType, 0 ); - - switch (nResult) - case COMPACT: - svSetupType = "Compact"; - case TYPICAL: - svSetupType = "Typical"; - case CUSTOM: - svSetupType = "Custom"; - endswitch; - - return nResult; - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdComponentDialog2 // -// // -// Purpose: This function displays the custom component dialog. // -// // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdComponentDialog2() - NUMBER nResult; - STRING szTitle, szMsg; - begin - - if ((svSetupType != "Custom") && (svSetupType != "")) then - return 0; - endif; - - szTitle = ""; - szMsg = ""; - nResult = SdComponentDialog2( szTitle, szMsg, svDir, "" ); - - return nResult; - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdFinishReboot // -// // -// Purpose: This function will show the last dialog of the product. // -// It will allow the user to reboot and/or show some readme text. // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdFinishReboot() - NUMBER nResult, nDefOptions; - STRING szTitle, szMsg1, szMsg2, szOption1, szOption2; - NUMBER bOpt1, bOpt2; - begin -/* - if (!BATCH_INSTALL) then - bOpt1 = FALSE; - bOpt2 = FALSE; - szMsg1 = ""; - szMsg2 = ""; - szOption1 = ""; - szOption2 = ""; - nResult = SdFinish( szTitle, szMsg1, szMsg2, szOption1, szOption2, bOpt1, bOpt2 ); - return 0; - endif; - - nDefOptions = SYS_BOOTMACHINE; - szTitle = ""; - szMsg1 = ""; - szMsg2 = ""; - nResult = SdFinishReboot( szTitle, szMsg1, nDefOptions, szMsg2, 0 ); -*/ - return nResult; - end; - - // --- include script file section --- - -#include "sddialog.rul" - - - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt b/VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt deleted file mode 100644 index 2f561d29d81..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt +++ /dev/null @@ -1,24 +0,0 @@ -This is a release of MySQL 3.23.56 for Win32. - -NOTE: If you install MySQL in a folder other than -C:\MYSQL or you intend to start MySQL on NT/Win2000 -as a service, you must create a file named C:\MY.CNF -or \Windows\my.ini or \winnt\my.ini with the following -information:: - -[mysqld] -basedir=E:/installation-path/ -datadir=E:/data-path/ - -After your have installed MySQL, the installation -directory which contains the files named 'my-size.cnf'. -You can use this as a starting point for your own -C:\my.cnf file. - -If you have any problems, you can mail them to -win32@lists.mysql.com after you have consulted the -MySQL manual and the MySQL mailing list archive -(http://www.mysql.com/documentation/index.html) - -On behalf of the MySQL AB gang, -Michael Widenius
\ No newline at end of file diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP b/VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP Binary files differdeleted file mode 100644 index 3229d50c9bf..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP +++ /dev/null diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl b/VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl deleted file mode 100644 index 187cb651307..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Shell Objects/Default.shl +++ /dev/null @@ -1,12 +0,0 @@ -[Data] -Folder3=<FOLDER_STARTUP> -Group0=Main -Group1=Startup -Folder0=<FOLDER_DESKTOP> -Folder1=<FOLDER_STARTMENU> -Folder2=<FOLDER_PROGRAMS> - -[Info] -Type=ShellObject -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl b/VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl deleted file mode 100644 index 687c58b7b21..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl +++ /dev/null @@ -1,23 +0,0 @@ -[Data] -TITLE_MAIN=MySQL Servers and Clients 3.23.56 -COMPANY_NAME=MySQL AB -ERROR_COMPONENT=Component: -COMPANY_NAME16=Company -PRODUCT_VERSION=3.23.56 -ERROR_MOVEDATA=An error occurred during the move data process: %d -ERROR_FILEGROUP=File Group: -UNINST_KEY=MySQL Servers and Clients 3.23.56 -TITLE_CAPTIONBAR=MySQL Servers and Clients 3.23.56 Setup -PRODUCT_NAME16=Product -ERROR_VGARESOLUTION=This program requires VGA or better resolution. -ERROR_FILE=File: -UNINST_DISPLAY_NAME=MySQL Servers and Clients 3.23.56 -PRODUCT_KEY=yourapp.Exe -PRODUCT_NAME=MySQL Servers and Clients 3.23.56 -ERROR_UNINSTSETUP=unInstaller setup failed to initialize. You may not be able to uninstall this product. - -[General] -Language=0009 -Type=STRINGTABLESPECIFIC -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl b/VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl deleted file mode 100644 index d4dc4925ab1..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/String Tables/Default.shl +++ /dev/null @@ -1,74 +0,0 @@ -[TITLE_MAIN] -Comment= - -[COMPANY_NAME] -Comment= - -[ERROR_COMPONENT] -Comment= - -[COMPANY_NAME16] -Comment= - -[PRODUCT_VERSION] -Comment= - -[ERROR_MOVEDATA] -Comment= - -[ERROR_FILEGROUP] -Comment= - -[Language] -Lang0=0009 -CurrentLang=0 - -[UNINST_KEY] -Comment= - -[TITLE_CAPTIONBAR] -Comment= - -[Data] -Entry0=ERROR_VGARESOLUTION -Entry1=TITLE_MAIN -Entry2=TITLE_CAPTIONBAR -Entry3=UNINST_KEY -Entry4=UNINST_DISPLAY_NAME -Entry5=COMPANY_NAME -Entry6=PRODUCT_NAME -Entry7=PRODUCT_VERSION -Entry8=PRODUCT_KEY -Entry9=ERROR_MOVEDATA -Entry10=ERROR_UNINSTSETUP -Entry11=COMPANY_NAME16 -Entry12=PRODUCT_NAME16 -Entry13=ERROR_COMPONENT -Entry14=ERROR_FILEGROUP -Entry15=ERROR_FILE - -[PRODUCT_NAME16] -Comment= - -[ERROR_VGARESOLUTION] -Comment= - -[ERROR_FILE] -Comment= - -[General] -Type=STRINGTABLE -Version=1.00.000 - -[UNINST_DISPLAY_NAME] -Comment= - -[PRODUCT_KEY] -Comment= - -[PRODUCT_NAME] -Comment= - -[ERROR_UNINSTSETUP] -Comment= - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb b/VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb deleted file mode 100644 index 3949bd4c066..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Build.tsb +++ /dev/null @@ -1,56 +0,0 @@ -[<HKUS>] -Value= -KeyType=4 - -[<HKCR>] -Value= -KeyType=4 - -[<PROGRAMFILES>] -Value= -KeyType=4 - -[<WINSYSDIR>] -Value= -KeyType=4 - -[<COMMONFILES>] -Value= -KeyType=4 - -[<WINDIR>] -Value= -KeyType=4 - -[Data] -Key0=<PROGRAMFILES> -Key1=<COMMONFILES> -Key2=<WINDIR> -Key3=<WINSYSDIR> -Key4=<HKLM> -Key5=<HKCU> -Key6=<HKCC> -Key7=<HKDD> -Key8=<HKUS> -Key9=<HKCR> - -[General] -Type=TEXTSUB -Version=1.00.000 - -[<HKLM>] -Value= -KeyType=4 - -[<HKCU>] -Value= -KeyType=4 - -[<HKCC>] -Value= -KeyType=4 - -[<HKDD>] -Value= -KeyType=4 - diff --git a/VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb b/VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb deleted file mode 100644 index b0c5a509f0b..00000000000 --- a/VC++Files/InstallShield/3.23.XX-gpl/Text Substitutions/Setup.tsb +++ /dev/null @@ -1,76 +0,0 @@ -[<SRCDIR>] -Value= -KeyType=4 - -[<HKUS>] -Value= -KeyType=4 - -[<HKCR>] -Value= -KeyType=4 - -[<PROGRAMFILES>] -Value= -KeyType=4 - -[<TARGETDIR>] -Value= -KeyType=4 - -[<WINSYSDIR>] -Value= -KeyType=4 - -[<COMMONFILES>] -Value= -KeyType=4 - -[<WINDIR>] -Value= -KeyType=4 - -[Data] -Key0=<PROGRAMFILES> -Key1=<COMMONFILES> -Key2=<WINDIR> -Key3=<WINSYSDIR> -Key4=<TARGETDIR> -Key5=<SUPPORTDIR> -Key10=<HKDD> -Key6=<SRCDIR> -Key11=<HKUS> -Key7=<HKLM> -Key12=<HKCR> -Key8=<HKCU> -Key13=<SHELL_OBJECT_FOLDER> -Key9=<HKCC> - -[<SUPPORTDIR>] -Value= -KeyType=4 - -[<SHELL_OBJECT_FOLDER>] -Value= -KeyType=4 - -[General] -Type=TEXTSUB -Version=1.00.000 - -[<HKLM>] -Value= -KeyType=4 - -[<HKCU>] -Value= -KeyType=4 - -[<HKCC>] -Value= -KeyType=4 - -[<HKDD>] -Value= -KeyType=4 - diff --git a/VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl b/VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl deleted file mode 100644 index 81e474f9be8..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Component Definitions/.fgl +++ /dev/null @@ -1,37 +0,0 @@ -[General] -Type=FILELIST -Version=1.00.000 - -[topdir] -subdir0=<WINDIR> -subdir1=<PROGRAMFILES> -subdir2=<TARGETDIR> -subdir3=USERDEFINED - -[<WINDIR>] -DISPLAYTEXT=Windows Operating System -TYPE=TEXTSUBFIXED -subdir0=<WINDIR>\<WINSYSDIR> - -[<WINDIR>\<WINSYSDIR>] -DISPLAYTEXT=Windows System Folder -TYPE=TEXTSUBFIXED - -[<PROGRAMFILES>] -DISPLAYTEXT=Program Files Folder -TYPE=TEXTSUBFIXED -subdir0=<PROGRAMFILES>\<COMMONFILES> - -[<PROGRAMFILES>\<COMMONFILES>] -DISPLAYTEXT=Common Files Folder -TYPE=TEXTSUBFIXED - -[<TARGETDIR>] -DISPLAYTEXT=General Application Destination -TYPE=TEXTSUBFIXED - -[USERDEFINED] -DISPLAYTEXT=Script-defined Folders -TYPE=USERSTART - - diff --git a/VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf b/VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf deleted file mode 100644 index f44131f754e..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.cdf +++ /dev/null @@ -1,192 +0,0 @@ -[Development] -required0=Servers -SELECTED=Yes -FILENEED=STANDARD -required1=Grant Tables -HTTPLOCATION= -STATUS=Examples, Libraries, Includes and Script files -UNINSTALLABLE=Yes -TARGET=<TARGETDIR> -FTPLOCATION= -VISIBLE=Yes -DESCRIPTION=Examples, Libraries, Includes and Script files -DISPLAYTEXT=Examples, Libraries, Includes and Script files -IMAGE= -DEFSELECTION=Yes -filegroup0=Development -COMMENT= -INCLUDEINBUILD=Yes -INSTALLATION=ALWAYSOVERWRITE -COMPRESSIFSEPARATE=No -MISC= -ENCRYPT=No -DISK=ANYDISK -TARGETDIRCDROM= -PASSWORD= -TARGETHIDDEN=General Application Destination - -[Grant Tables] -required0=Servers -SELECTED=Yes -FILENEED=CRITICAL -HTTPLOCATION= -STATUS=The Grant Tables and Core Files -UNINSTALLABLE=Yes -TARGET=<TARGETDIR> -FTPLOCATION= -VISIBLE=Yes -DESCRIPTION=The Grant Tables and Core Files -DISPLAYTEXT=The Grant Tables and Core Files -IMAGE= -DEFSELECTION=Yes -filegroup0=Grant Tables -requiredby0=Development -COMMENT= -INCLUDEINBUILD=Yes -requiredby1=Clients and Tools -INSTALLATION=NEVEROVERWRITE -requiredby2=Documentation -COMPRESSIFSEPARATE=No -MISC= -ENCRYPT=No -DISK=ANYDISK -TARGETDIRCDROM= -PASSWORD= -TARGETHIDDEN=General Application Destination - -[Components] -component0=Development -component1=Grant Tables -component2=Clients and Tools -component3=Servers -component4=Documentation - -[TopComponents] -component0=Servers -component1=Clients and Tools -component2=Documentation -component3=Development -component4=Grant Tables - -[SetupType] -setuptype0=Compact -setuptype1=Typical -setuptype2=Custom - -[Servers] -SELECTED=Yes -FILENEED=CRITICAL -HTTPLOCATION= -STATUS=The MySQL Servers -UNINSTALLABLE=Yes -TARGET=<TARGETDIR> -FTPLOCATION= -VISIBLE=Yes -DESCRIPTION=The MySQL Servers -DISPLAYTEXT=The MySQL Servers -IMAGE= -DEFSELECTION=Yes -filegroup0=Servers -requiredby0=Development -COMMENT= -INCLUDEINBUILD=Yes -requiredby1=Grant Tables -INSTALLATION=ALWAYSOVERWRITE -requiredby2=Clients and Tools -requiredby3=Documentation -COMPRESSIFSEPARATE=No -MISC= -ENCRYPT=No -DISK=ANYDISK -TARGETDIRCDROM= -PASSWORD= -TARGETHIDDEN=General Application Destination - -[Clients and Tools] -required0=Servers -SELECTED=Yes -FILENEED=HIGHLYRECOMMENDED -required1=Grant Tables -HTTPLOCATION= -STATUS=The MySQL clients and Maintenance Tools -UNINSTALLABLE=Yes -TARGET=<TARGETDIR> -FTPLOCATION= -VISIBLE=Yes -DESCRIPTION=The MySQL clients and Maintenance Tools -DISPLAYTEXT=The MySQL clients and Maintenance Tools -IMAGE= -DEFSELECTION=Yes -filegroup0=Clients and Tools -COMMENT= -INCLUDEINBUILD=Yes -INSTALLATION=NEWERDATE -COMPRESSIFSEPARATE=No -MISC= -ENCRYPT=No -DISK=ANYDISK -TARGETDIRCDROM= -PASSWORD= -TARGETHIDDEN=General Application Destination - -[SetupTypeItem-Compact] -Comment= -item0=Grant Tables -item1=Clients and Tools -item2=Servers -item3=Documentation -Descrip= -DisplayText= - -[SetupTypeItem-Custom] -Comment= -item0=Development -item1=Grant Tables -item2=Clients and Tools -item3=Servers -Descrip= -item4=Documentation -DisplayText= - -[Info] -Type=CompDef -Version=1.00.000 -Name= - -[SetupTypeItem-Typical] -Comment= -item0=Development -item1=Grant Tables -item2=Clients and Tools -item3=Servers -Descrip= -item4=Documentation -DisplayText= - -[Documentation] -required0=Servers -SELECTED=Yes -FILENEED=HIGHLYRECOMMENDED -required1=Grant Tables -HTTPLOCATION= -STATUS=The MySQL Documentation with different formats -UNINSTALLABLE=Yes -TARGET=<TARGETDIR> -FTPLOCATION= -VISIBLE=Yes -DESCRIPTION=The MySQL Documentation with different formats -DISPLAYTEXT=The MySQL Documentation with different formats -IMAGE= -DEFSELECTION=Yes -filegroup0=Documentation -COMMENT= -INCLUDEINBUILD=Yes -INSTALLATION=ALWAYSOVERWRITE -COMPRESSIFSEPARATE=No -MISC= -ENCRYPT=No -DISK=ANYDISK -TARGETDIRCDROM= -PASSWORD= -TARGETHIDDEN=General Application Destination - diff --git a/VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl b/VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl deleted file mode 100644 index 4e20dcea4ab..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Component Definitions/Default.fgl +++ /dev/null @@ -1,42 +0,0 @@ -[<PROGRAMFILES>\<COMMONFILES>] -DISPLAYTEXT=Common Files Folder -TYPE=TEXTSUBFIXED -fulldirectory= - -[<WINDIR>\<WINSYSDIR>] -DISPLAYTEXT=Windows System Folder -TYPE=TEXTSUBFIXED -fulldirectory= - -[USERDEFINED] -DISPLAYTEXT=Script-defined Folders -TYPE=USERSTART -fulldirectory= - -[<PROGRAMFILES>] -DISPLAYTEXT=Program Files Folder -SubDir0=<PROGRAMFILES>\<COMMONFILES> -TYPE=TEXTSUBFIXED -fulldirectory= - -[<TARGETDIR>] -DISPLAYTEXT=General Application Destination -TYPE=TEXTSUBFIXED -fulldirectory= - -[<WINDIR>] -DISPLAYTEXT=Windows Operating System -SubDir0=<WINDIR>\<WINSYSDIR> -TYPE=TEXTSUBFIXED -fulldirectory= - -[TopDir] -SubDir0=<WINDIR> -SubDir1=<PROGRAMFILES> -SubDir2=<TARGETDIR> -SubDir3=USERDEFINED - -[General] -Type=FILELIST -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl b/VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl deleted file mode 100644 index 7f30ff9f64b..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/File Groups/Clients and Tools.fgl +++ /dev/null @@ -1,35 +0,0 @@ -[bin] -file15=C:\mysql\bin\pack_isam.exe -file16=C:\mysql\bin\perror.exe -file0=C:\mysql\bin\isamchk.exe -file17=C:\mysql\bin\replace.exe -file1=C:\mysql\bin\myisamchk.exe -file18=C:\mysql\bin\winmysqladmin.cnt -file2=C:\mysql\bin\myisamlog.exe -file19=C:\mysql\bin\winmysqladmin.exe -file3=C:\mysql\bin\myisampack.exe -file4=C:\mysql\bin\mysql.exe -file5=C:\mysql\bin\mysqladmin.exe -file6=C:\mysql\bin\mysqlbinlog.exe -file7=C:\mysql\bin\mysqlc.exe -file8=C:\mysql\bin\mysqlcheck.exe -file9=C:\mysql\bin\mysqldump.exe -file20=C:\mysql\bin\WINMYSQLADMIN.HLP -file21=C:\mysql\bin\cygwinb19.dll -file10=C:\mysql\bin\mysqlimport.exe -fulldirectory= -file22=C:\mysql\bin\libmySQL.dll -file11=C:\mysql\bin\MySqlManager.exe -file23=C:\mysql\bin\my_print_defaults.exe -file12=C:\mysql\bin\mysqlshow.exe -file24=C:\mysql\bin\comp-err.exe -file13=C:\mysql\bin\mysqlshutdown.exe -file14=C:\mysql\bin\mysqlwatch.exe - -[TopDir] -SubDir0=bin - -[General] -Type=FILELIST -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf b/VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf deleted file mode 100644 index 282fae9d19b..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fdf +++ /dev/null @@ -1,82 +0,0 @@ -[FileGroups] -group0=Development -group1=Grant Tables -group2=Clients and Tools -group3=Servers -group4=Documentation - -[Development] -SELFREGISTERING=No -HTTPLOCATION= -LANGUAGE= -OPERATINGSYSTEM= -FTPLOCATION= -FILETYPE=No -INFOTYPE=Standard -COMMENT= -COMPRESS=Yes -COMPRESSDLL= -POTENTIALLY=No -MISC= - -[Grant Tables] -SELFREGISTERING=No -HTTPLOCATION= -LANGUAGE= -OPERATINGSYSTEM= -FTPLOCATION= -FILETYPE=No -INFOTYPE=Standard -COMMENT= -COMPRESS=Yes -COMPRESSDLL= -POTENTIALLY=No -MISC= - -[Servers] -SELFREGISTERING=No -HTTPLOCATION= -LANGUAGE= -OPERATINGSYSTEM= -FTPLOCATION= -FILETYPE=No -INFOTYPE=Standard -COMMENT= -COMPRESS=Yes -COMPRESSDLL= -POTENTIALLY=No -MISC= - -[Clients and Tools] -SELFREGISTERING=No -HTTPLOCATION= -LANGUAGE= -OPERATINGSYSTEM=0000000000000000 -FTPLOCATION= -FILETYPE=No -INFOTYPE=Standard -COMMENT= -COMPRESS=Yes -COMPRESSDLL= -POTENTIALLY=No -MISC= - -[Info] -Type=FileGrp -Version=1.00.000 -Name= - -[Documentation] -SELFREGISTERING=No -HTTPLOCATION= -LANGUAGE= -OPERATINGSYSTEM= -FTPLOCATION= -FILETYPE=No -INFOTYPE=Standard -COMMENT= -COMPRESS=Yes -COMPRESSDLL= -POTENTIALLY=No -MISC= - diff --git a/VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl b/VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl deleted file mode 100644 index 94344a6ff69..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/File Groups/Default.fgl +++ /dev/null @@ -1,4 +0,0 @@ -[General] -Type=FILELIST -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl b/VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl deleted file mode 100644 index a1cf53f880a..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/File Groups/Development.fgl +++ /dev/null @@ -1,190 +0,0 @@ -[bench\Data\Wisconsin] -file0=C:\mysql\bench\Data\Wisconsin\onek.data -file1=C:\mysql\bench\Data\Wisconsin\tenk.data -fulldirectory= - -[lib\debug] -file0=C:\mysql\lib\debug\libmySQL.dll -file1=C:\mysql\lib\debug\libmySQL.lib -file2=C:\mysql\lib\debug\mysqlclient.lib -file3=C:\mysql\lib\debug\zlib.lib -fulldirectory= - -[bench\output] -fulldirectory= - -[examples\libmysqltest] -file0=C:\mysql\examples\libmysqltest\myTest.c -file1=C:\mysql\examples\libmysqltest\myTest.dsp -file2=C:\mysql\examples\libmysqltest\myTest.dsw -file3=C:\mysql\examples\libmysqltest\myTest.exe -file4=C:\mysql\examples\libmysqltest\myTest.mak -file5=C:\mysql\examples\libmysqltest\myTest.ncb -file6=C:\mysql\examples\libmysqltest\myTest.opt -file7=C:\mysql\examples\libmysqltest\readme -fulldirectory= - -[include] -file0=C:\mysql\include\raid.h -file1=C:\mysql\include\errmsg.h -file2=C:\mysql\include\Libmysql.def -file3=C:\mysql\include\m_ctype.h -file4=C:\mysql\include\m_string.h -file5=C:\mysql\include\my_list.h -file6=C:\mysql\include\my_pthread.h -file7=C:\mysql\include\my_sys.h -file8=C:\mysql\include\mysql.h -file9=C:\mysql\include\mysql_com.h -file10=C:\mysql\include\mysql_version.h -fulldirectory= -file11=C:\mysql\include\mysqld_error.h -file12=C:\mysql\include\dbug.h -file13=C:\mysql\include\my_global.h -file14=C:\mysql\include\config-win.h - -[examples] -SubDir0=examples\libmysqltest -SubDir1=examples\tests -fulldirectory= - -[lib\opt] -file0=C:\mysql\lib\opt\libmySQL.dll -file1=C:\mysql\lib\opt\libmySQL.lib -file2=C:\mysql\lib\opt\mysqlclient.lib -file3=C:\mysql\lib\opt\zlib.lib -fulldirectory= - -[bench\Data] -SubDir0=bench\Data\ATIS -SubDir1=bench\Data\Wisconsin -fulldirectory= - -[bench\limits] -file15=C:\mysql\bench\limits\pg.comment -file16=C:\mysql\bench\limits\solid.cfg -file0=C:\mysql\bench\limits\access.cfg -file17=C:\mysql\bench\limits\solid-nt4.cfg -file1=C:\mysql\bench\limits\access.comment -file18=C:\mysql\bench\limits\sybase.cfg -file2=C:\mysql\bench\limits\Adabas.cfg -file3=C:\mysql\bench\limits\Adabas.comment -file4=C:\mysql\bench\limits\Db2.cfg -file5=C:\mysql\bench\limits\empress.cfg -file6=C:\mysql\bench\limits\empress.comment -file7=C:\mysql\bench\limits\Informix.cfg -file8=C:\mysql\bench\limits\Informix.comment -file9=C:\mysql\bench\limits\msql.cfg -file10=C:\mysql\bench\limits\ms-sql.cfg -fulldirectory= -file11=C:\mysql\bench\limits\Ms-sql65.cfg -file12=C:\mysql\bench\limits\mysql.cfg -file13=C:\mysql\bench\limits\oracle.cfg -file14=C:\mysql\bench\limits\pg.cfg - -[TopDir] -SubDir0=bench -SubDir1=examples -SubDir2=include -SubDir3=lib -SubDir4=scripts - -[bench] -file15=C:\mysql\bench\test-create -file16=C:\mysql\bench\test-insert -file0=C:\mysql\bench\uname.bat -file17=C:\mysql\bench\test-select -file1=C:\mysql\bench\compare-results -file18=C:\mysql\bench\test-wisconsin -file2=C:\mysql\bench\copy-db -file19=C:\mysql\bench\bench-init.pl -file3=C:\mysql\bench\crash-me -file4=C:\mysql\bench\example.bat -file5=C:\mysql\bench\print-limit-table -file6=C:\mysql\bench\pwd.bat -file7=C:\mysql\bench\Readme -SubDir0=bench\Data -file8=C:\mysql\bench\run.bat -SubDir1=bench\limits -file9=C:\mysql\bench\run-all-tests -SubDir2=bench\output -file10=C:\mysql\bench\server-cfg -fulldirectory= -file11=C:\mysql\bench\test-alter-table -file12=C:\mysql\bench\test-ATIS -file13=C:\mysql\bench\test-big-tables -file14=C:\mysql\bench\test-connect - -[examples\tests] -file15=C:\mysql\examples\tests\lock_test.res -file16=C:\mysql\examples\tests\mail_to_db.pl -file0=C:\mysql\examples\tests\unique_users.tst -file17=C:\mysql\examples\tests\table_types.pl -file1=C:\mysql\examples\tests\auto_increment.tst -file18=C:\mysql\examples\tests\test_delayed_insert.pl -file2=C:\mysql\examples\tests\big_record.pl -file19=C:\mysql\examples\tests\udf_test -file3=C:\mysql\examples\tests\big_record.res -file4=C:\mysql\examples\tests\czech-sorting -file5=C:\mysql\examples\tests\deadlock-script.pl -file6=C:\mysql\examples\tests\export.pl -file7=C:\mysql\examples\tests\fork_test.pl -file8=C:\mysql\examples\tests\fork2_test.pl -file9=C:\mysql\examples\tests\fork3_test.pl -file20=C:\mysql\examples\tests\udf_test.res -file21=C:\mysql\examples\tests\auto_increment.res -file10=C:\mysql\examples\tests\function.res -fulldirectory= -file11=C:\mysql\examples\tests\function.tst -file12=C:\mysql\examples\tests\grant.pl -file13=C:\mysql\examples\tests\grant.res -file14=C:\mysql\examples\tests\lock_test.pl - -[bench\Data\ATIS] -file26=C:\mysql\bench\Data\ATIS\stop1.txt -file15=C:\mysql\bench\Data\ATIS\flight_class.txt -file27=C:\mysql\bench\Data\ATIS\time_interval.txt -file16=C:\mysql\bench\Data\ATIS\flight_day.txt -file0=C:\mysql\bench\Data\ATIS\transport.txt -file28=C:\mysql\bench\Data\ATIS\time_zone.txt -file17=C:\mysql\bench\Data\ATIS\flight_fare.txt -file1=C:\mysql\bench\Data\ATIS\airline.txt -file29=C:\mysql\bench\Data\ATIS\aircraft.txt -file18=C:\mysql\bench\Data\ATIS\food_service.txt -file2=C:\mysql\bench\Data\ATIS\airport.txt -file19=C:\mysql\bench\Data\ATIS\ground_service.txt -file3=C:\mysql\bench\Data\ATIS\airport_service.txt -file4=C:\mysql\bench\Data\ATIS\city.txt -file5=C:\mysql\bench\Data\ATIS\class_of_service.txt -file6=C:\mysql\bench\Data\ATIS\code_description.txt -file7=C:\mysql\bench\Data\ATIS\compound_class.txt -file8=C:\mysql\bench\Data\ATIS\connect_leg.txt -file9=C:\mysql\bench\Data\ATIS\date_day.txt -file20=C:\mysql\bench\Data\ATIS\month_name.txt -file21=C:\mysql\bench\Data\ATIS\restrict_carrier.txt -file10=C:\mysql\bench\Data\ATIS\day_name.txt -fulldirectory= -file22=C:\mysql\bench\Data\ATIS\restrict_class.txt -file11=C:\mysql\bench\Data\ATIS\dual_carrier.txt -file23=C:\mysql\bench\Data\ATIS\restriction.txt -file12=C:\mysql\bench\Data\ATIS\fare.txt -file24=C:\mysql\bench\Data\ATIS\state.txt -file13=C:\mysql\bench\Data\ATIS\fconnection.txt -file25=C:\mysql\bench\Data\ATIS\stop.txt -file14=C:\mysql\bench\Data\ATIS\flight.txt - -[General] -Type=FILELIST -Version=1.00.000 - -[scripts] -file0=C:\mysql\scripts\mysql_find_rows.pl -file1=C:\mysql\scripts\mysql_setpermission.pl -file2=C:\mysql\scripts\mysqlhotcopy.pl -file3=C:\mysql\scripts\Readme -fulldirectory= - -[lib] -SubDir0=lib\debug -SubDir1=lib\opt -fulldirectory= - diff --git a/VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl b/VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl deleted file mode 100644 index d36acb64538..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/File Groups/Documentation.fgl +++ /dev/null @@ -1,98 +0,0 @@ -[Docs\Flags] -file59=C:\mysql\Docs\Flags\romania.gif -file48=C:\mysql\Docs\Flags\kroatia.eps -file37=C:\mysql\Docs\Flags\iceland.gif -file26=C:\mysql\Docs\Flags\france.eps -file15=C:\mysql\Docs\Flags\china.gif -file49=C:\mysql\Docs\Flags\kroatia.gif -file38=C:\mysql\Docs\Flags\ireland.eps -file27=C:\mysql\Docs\Flags\france.gif -file16=C:\mysql\Docs\Flags\croatia.eps -file0=C:\mysql\Docs\Flags\usa.gif -file39=C:\mysql\Docs\Flags\ireland.gif -file28=C:\mysql\Docs\Flags\germany.eps -file17=C:\mysql\Docs\Flags\croatia.gif -file1=C:\mysql\Docs\Flags\argentina.gif -file29=C:\mysql\Docs\Flags\germany.gif -file18=C:\mysql\Docs\Flags\czech-republic.eps -file2=C:\mysql\Docs\Flags\australia.eps -file19=C:\mysql\Docs\Flags\czech-republic.gif -file3=C:\mysql\Docs\Flags\australia.gif -file80=C:\mysql\Docs\Flags\usa.eps -file4=C:\mysql\Docs\Flags\austria.eps -file81=C:\mysql\Docs\Flags\argentina.eps -file70=C:\mysql\Docs\Flags\spain.eps -file5=C:\mysql\Docs\Flags\austria.gif -file71=C:\mysql\Docs\Flags\spain.gif -file60=C:\mysql\Docs\Flags\russia.eps -file6=C:\mysql\Docs\Flags\brazil.eps -file72=C:\mysql\Docs\Flags\sweden.eps -file61=C:\mysql\Docs\Flags\russia.gif -file50=C:\mysql\Docs\Flags\latvia.eps -file7=C:\mysql\Docs\Flags\brazil.gif -file73=C:\mysql\Docs\Flags\sweden.gif -file62=C:\mysql\Docs\Flags\singapore.eps -file51=C:\mysql\Docs\Flags\latvia.gif -file40=C:\mysql\Docs\Flags\island.eps -file8=C:\mysql\Docs\Flags\bulgaria.eps -file74=C:\mysql\Docs\Flags\switzerland.eps -file63=C:\mysql\Docs\Flags\singapore.gif -file52=C:\mysql\Docs\Flags\netherlands.eps -file41=C:\mysql\Docs\Flags\island.gif -file30=C:\mysql\Docs\Flags\great-britain.eps -file9=C:\mysql\Docs\Flags\bulgaria.gif -file75=C:\mysql\Docs\Flags\switzerland.gif -file64=C:\mysql\Docs\Flags\south-africa.eps -file53=C:\mysql\Docs\Flags\netherlands.gif -file42=C:\mysql\Docs\Flags\israel.eps -file31=C:\mysql\Docs\Flags\great-britain.gif -file20=C:\mysql\Docs\Flags\denmark.eps -file76=C:\mysql\Docs\Flags\taiwan.eps -file65=C:\mysql\Docs\Flags\south-africa.gif -file54=C:\mysql\Docs\Flags\poland.eps -file43=C:\mysql\Docs\Flags\israel.gif -file32=C:\mysql\Docs\Flags\greece.eps -file21=C:\mysql\Docs\Flags\denmark.gif -file10=C:\mysql\Docs\Flags\canada.eps -fulldirectory= -file77=C:\mysql\Docs\Flags\taiwan.gif -file66=C:\mysql\Docs\Flags\south-africa1.eps -file55=C:\mysql\Docs\Flags\poland.gif -file44=C:\mysql\Docs\Flags\italy.eps -file33=C:\mysql\Docs\Flags\greece.gif -file22=C:\mysql\Docs\Flags\estonia.eps -file11=C:\mysql\Docs\Flags\canada.gif -file78=C:\mysql\Docs\Flags\ukraine.eps -file67=C:\mysql\Docs\Flags\south-africa1.gif -file56=C:\mysql\Docs\Flags\portugal.eps -file45=C:\mysql\Docs\Flags\italy.gif -file34=C:\mysql\Docs\Flags\hungary.eps -file23=C:\mysql\Docs\Flags\estonia.gif -file12=C:\mysql\Docs\Flags\chile.eps -file79=C:\mysql\Docs\Flags\ukraine.gif -file68=C:\mysql\Docs\Flags\south-korea.eps -file57=C:\mysql\Docs\Flags\portugal.gif -file46=C:\mysql\Docs\Flags\japan.eps -file35=C:\mysql\Docs\Flags\hungary.gif -file24=C:\mysql\Docs\Flags\finland.eps -file13=C:\mysql\Docs\Flags\chile.gif -file69=C:\mysql\Docs\Flags\south-korea.gif -file58=C:\mysql\Docs\Flags\romania.eps -file47=C:\mysql\Docs\Flags\japan.gif -file36=C:\mysql\Docs\Flags\iceland.eps -file25=C:\mysql\Docs\Flags\finland.gif -file14=C:\mysql\Docs\Flags\china.eps - -[Docs] -file0=C:\mysql\Docs\manual_toc.html -file1=C:\mysql\Docs\manual.html -SubDir0=Docs\Flags -fulldirectory= - -[TopDir] -SubDir0=Docs - -[General] -Type=FILELIST -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl b/VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl deleted file mode 100644 index 178065a7003..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/File Groups/Grant Tables.fgl +++ /dev/null @@ -1,36 +0,0 @@ -[data\test] -fulldirectory= - -[data\mysql] -file15=C:\mysql\data\mysql\func.frm -file16=C:\mysql\data\mysql\func.MYD -file0=C:\mysql\data\mysql\columns_priv.frm -file17=C:\mysql\data\mysql\func.MYI -file1=C:\mysql\data\mysql\columns_priv.MYD -file2=C:\mysql\data\mysql\columns_priv.MYI -file3=C:\mysql\data\mysql\db.frm -file4=C:\mysql\data\mysql\db.MYD -file5=C:\mysql\data\mysql\db.MYI -file6=C:\mysql\data\mysql\host.frm -file7=C:\mysql\data\mysql\host.MYD -file8=C:\mysql\data\mysql\host.MYI -file9=C:\mysql\data\mysql\tables_priv.frm -file10=C:\mysql\data\mysql\tables_priv.MYD -fulldirectory= -file11=C:\mysql\data\mysql\tables_priv.MYI -file12=C:\mysql\data\mysql\user.frm -file13=C:\mysql\data\mysql\user.MYD -file14=C:\mysql\data\mysql\user.MYI - -[TopDir] -SubDir0=data - -[data] -SubDir0=data\mysql -SubDir1=data\test -fulldirectory= - -[General] -Type=FILELIST -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl b/VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl deleted file mode 100644 index 6f91a474d80..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/File Groups/Servers.fgl +++ /dev/null @@ -1,183 +0,0 @@ -[share\polish] -file0=C:\mysql\share\polish\errmsg.sys -file1=C:\mysql\share\polish\errmsg.txt -fulldirectory= - -[share\dutch] -file0=C:\mysql\share\dutch\errmsg.sys -file1=C:\mysql\share\dutch\errmsg.txt -fulldirectory= - -[share\spanish] -file0=C:\mysql\share\spanish\errmsg.sys -file1=C:\mysql\share\spanish\errmsg.txt -fulldirectory= - -[share\english] -file0=C:\mysql\share\english\errmsg.sys -file1=C:\mysql\share\english\errmsg.txt -fulldirectory= - -[bin] -file0=C:\mysql\bin\mysqld-opt.exe -file1=C:\mysql\bin\mysqld-max.exe -file2=C:\mysql\bin\mysqld-max-nt.exe -file3=C:\mysql\bin\mysqld-nt.exe -file4=C:\mysql\bin\mysqld.exe -fulldirectory= - -[share\korean] -file0=C:\mysql\share\korean\errmsg.sys -file1=C:\mysql\share\korean\errmsg.txt -fulldirectory= - -[share\charsets] -file15=C:\mysql\share\charsets\latin1.conf -file16=C:\mysql\share\charsets\latin2.conf -file0=C:\mysql\share\charsets\win1251ukr.conf -file17=C:\mysql\share\charsets\latin5.conf -file1=C:\mysql\share\charsets\cp1257.conf -file18=C:\mysql\share\charsets\Readme -file2=C:\mysql\share\charsets\croat.conf -file19=C:\mysql\share\charsets\swe7.conf -file3=C:\mysql\share\charsets\danish.conf -file4=C:\mysql\share\charsets\dec8.conf -file5=C:\mysql\share\charsets\dos.conf -file6=C:\mysql\share\charsets\estonia.conf -file7=C:\mysql\share\charsets\german1.conf -file8=C:\mysql\share\charsets\greek.conf -file9=C:\mysql\share\charsets\hebrew.conf -file20=C:\mysql\share\charsets\usa7.conf -file21=C:\mysql\share\charsets\win1250.conf -file10=C:\mysql\share\charsets\hp8.conf -fulldirectory= -file22=C:\mysql\share\charsets\win1251.conf -file11=C:\mysql\share\charsets\hungarian.conf -file23=C:\mysql\share\charsets\cp1251.conf -file12=C:\mysql\share\charsets\Index -file13=C:\mysql\share\charsets\koi8_ru.conf -file14=C:\mysql\share\charsets\koi8_ukr.conf - -[share\ukrainian] -file0=C:\mysql\share\ukrainian\errmsg.sys -file1=C:\mysql\share\ukrainian\errmsg.txt -fulldirectory= - -[share\hungarian] -file0=C:\mysql\share\hungarian\errmsg.sys -file1=C:\mysql\share\hungarian\errmsg.txt -fulldirectory= - -[share\german] -file0=C:\mysql\share\german\errmsg.sys -file1=C:\mysql\share\german\errmsg.txt -fulldirectory= - -[share\portuguese] -file0=C:\mysql\share\portuguese\errmsg.sys -file1=C:\mysql\share\portuguese\errmsg.txt -fulldirectory= - -[share\estonian] -file0=C:\mysql\share\estonian\errmsg.sys -file1=C:\mysql\share\estonian\errmsg.txt -fulldirectory= - -[share\romanian] -file0=C:\mysql\share\romanian\errmsg.sys -file1=C:\mysql\share\romanian\errmsg.txt -fulldirectory= - -[share\french] -file0=C:\mysql\share\french\errmsg.sys -file1=C:\mysql\share\french\errmsg.txt -fulldirectory= - -[share\swedish] -file0=C:\mysql\share\swedish\errmsg.sys -file1=C:\mysql\share\swedish\errmsg.txt -fulldirectory= - -[share\slovak] -file0=C:\mysql\share\slovak\errmsg.sys -file1=C:\mysql\share\slovak\errmsg.txt -fulldirectory= - -[share\greek] -file0=C:\mysql\share\greek\errmsg.sys -file1=C:\mysql\share\greek\errmsg.txt -fulldirectory= - -[TopDir] -file0=C:\mysql\my-small.cnf -file1=C:\mysql\my-large.cnf -file2=C:\mysql\my-medium.cnf -file3=C:\mysql\my-huge.cnf -SubDir0=bin -SubDir1=share - -[share] -SubDir8=share\hungarian -SubDir9=share\charsets -SubDir20=share\spanish -SubDir21=share\swedish -SubDir10=share\italian -SubDir22=share\ukrainian -SubDir11=share\japanese -SubDir12=share\korean -SubDir13=share\norwegian -SubDir14=share\norwegian-ny -SubDir15=share\polish -SubDir16=share\portuguese -SubDir0=share\czech -SubDir17=share\romanian -SubDir1=share\danish -SubDir18=share\russian -SubDir2=share\dutch -SubDir19=share\slovak -SubDir3=share\english -fulldirectory= -SubDir4=share\estonian -SubDir5=share\french -SubDir6=share\german -SubDir7=share\greek - -[share\norwegian-ny] -file0=C:\mysql\share\norwegian-ny\errmsg.sys -file1=C:\mysql\share\norwegian-ny\errmsg.txt -fulldirectory= - -[share\danish] -file0=C:\mysql\share\danish\errmsg.sys -file1=C:\mysql\share\danish\errmsg.txt -fulldirectory= - -[share\czech] -file0=C:\mysql\share\czech\errmsg.sys -file1=C:\mysql\share\czech\errmsg.txt -fulldirectory= - -[General] -Type=FILELIST -Version=1.00.000 - -[share\russian] -file0=C:\mysql\share\russian\errmsg.sys -file1=C:\mysql\share\russian\errmsg.txt -fulldirectory= - -[share\norwegian] -file0=C:\mysql\share\norwegian\errmsg.sys -file1=C:\mysql\share\norwegian\errmsg.txt -fulldirectory= - -[share\japanese] -file0=C:\mysql\share\japanese\errmsg.sys -file1=C:\mysql\share\japanese\errmsg.txt -fulldirectory= - -[share\italian] -file0=C:\mysql\share\italian\errmsg.sys -file1=C:\mysql\share\italian\errmsg.txt -fulldirectory= - diff --git a/VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr b/VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr deleted file mode 100644 index 811d69717d8..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/MySQL 3.23.com.ipr +++ /dev/null @@ -1,51 +0,0 @@ -[Language] -LanguageSupport0=0009 - -[OperatingSystem] -OSSupport=0000000000010010 - -[Data] -CurrentMedia= -set_mifserial= -ProductName=MySQL Servers and Clients -CurrentComponentDef=Default.cdf -set_dlldebug=No -AppExe= -DevEnvironment=Microsoft Visual C++ 6 -set_mif=No -set_testmode=No -Instructions=Instructions.txt -EmailAddresss= -SummaryText= -Department= -Type=Database Application -Author= -HomeURL= -InstallRoot=C:\MySQL-Install\3.23.XXcom -set_level=Level 3 -InstallationGUID=40744a4d-efed-4cff-84a9-9e6389550f5c -Version=1.00.000 -set_miffile=Status.mif -set_args= -set_maxerr=50 -Notes=Notes.txt -CurrentFileGroupDef=Default.fdf -set_dllcmdline= -set_warnaserr=No -Copyright= -set_preproc= -Category= -CurrentPlatform= -set_compileb4build=No -set_crc=Yes -set_maxwarn=50 -Description=Description.txt -CompanyName=MySQL -CurrentLanguage=English - -[MediaInfo] - -[General] -Type=INSTALLMAIN -Version=1.10.000 - diff --git a/VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge b/VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge deleted file mode 100644 index 537dfd82e48..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Registry Entries/Default.rge +++ /dev/null @@ -1,4 +0,0 @@ -[General] -Type=REGISTRYDATA -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg b/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg Binary files differdeleted file mode 100644 index 0c6d4e6b708..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.dbg +++ /dev/null diff --git a/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino b/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino Binary files differdeleted file mode 100644 index 204d8ea0f36..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ino +++ /dev/null diff --git a/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins b/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins Binary files differdeleted file mode 100644 index 759009b5c84..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.ins +++ /dev/null diff --git a/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs b/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs Binary files differdeleted file mode 100644 index 5fcfcb62c4e..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.obs +++ /dev/null diff --git a/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul b/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul deleted file mode 100644 index 0db8417a62c..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Script Files/Setup.rul +++ /dev/null @@ -1,641 +0,0 @@ - -//////////////////////////////////////////////////////////////////////////////// -// -// IIIIIII SSSSSS -// II SS InstallShield (R) -// II SSSSSS (c) 1996-1997, InstallShield Software Corporation -// II SS (c) 1990-1996, InstallShield Corporation -// IIIIIII SSSSSS All Rights Reserved. -// -// -// This code is generated as a starting setup template. You should -// modify it to provide all necessary steps for your setup. -// -// -// File Name: Setup.rul -// -// Description: InstallShield script -// -// Comments: This template script performs a basic setup on a -// Windows 95 or Windows NT 4.0 platform. With minor -// modifications, this template can be adapted to create -// new, customized setups. -// -//////////////////////////////////////////////////////////////////////////////// - - - // Include header file -#include "sdlang.h" -#include "sddialog.h" - -////////////////////// string defines //////////////////////////// - -#define UNINST_LOGFILE_NAME "Uninst.isu" - -//////////////////// installation declarations /////////////////// - - // ----- DLL prototypes ----- - - - // your DLL prototypes - - - // ---- script prototypes ----- - - // generated - prototype ShowDialogs(); - prototype MoveFileData(); - prototype HandleMoveDataError( NUMBER ); - prototype ProcessBeforeDataMove(); - prototype ProcessAfterDataMove(); - prototype SetupRegistry(); - prototype SetupFolders(); - prototype CleanUpInstall(); - prototype SetupInstall(); - prototype SetupScreen(); - prototype CheckRequirements(); - prototype DialogShowSdWelcome(); - prototype DialogShowSdShowInfoList(); - prototype DialogShowSdAskDestPath(); - prototype DialogShowSdSetupType(); - prototype DialogShowSdComponentDialog2(); - prototype DialogShowSdFinishReboot(); - - // your prototypes - - - // ----- global variables ------ - - // generated - BOOL bWinNT, bIsShellExplorer, bInstallAborted, bIs32BitSetup; - STRING svDir; - STRING svName, svCompany, svSerial; - STRING szAppPath; - STRING svSetupType; - - - // your global variables - - -/////////////////////////////////////////////////////////////////////////////// -// -// MAIN PROGRAM -// -// The setup begins here by hiding the visible setup -// window. This is done to allow all the titles, images, etc. to -// be established before showing the main window. The following -// logic then performs the setup in a series of steps. -// -/////////////////////////////////////////////////////////////////////////////// -program - Disable( BACKGROUND ); - - CheckRequirements(); - - SetupInstall(); - - SetupScreen(); - - if (ShowDialogs()<0) goto end_install; - - if (ProcessBeforeDataMove()<0) goto end_install; - - if (MoveFileData()<0) goto end_install; - - if (ProcessAfterDataMove()<0) goto end_install; - - if (SetupRegistry()<0) goto end_install; - - if (SetupFolders()<0) goto end_install; - - - end_install: - - CleanUpInstall(); - - // If an unrecoverable error occurred, clean up the partial installation. - // Otherwise, exit normally. - - if (bInstallAborted) then - abort; - endif; - -endprogram - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: ShowDialogs // -// // -// Purpose: This function manages the display and navigation // -// the standard dialogs that exist in a setup. // -// // -/////////////////////////////////////////////////////////////////////////////// -function ShowDialogs() - NUMBER nResult; - begin - - Dlg_Start: - // beginning of dialogs label - - Dlg_SdWelcome: - nResult = DialogShowSdWelcome(); - if (nResult = BACK) goto Dlg_Start; - - Dlg_SdShowInfoList: - nResult = DialogShowSdShowInfoList(); - if (nResult = BACK) goto Dlg_SdWelcome; - - Dlg_SdAskDestPath: - nResult = DialogShowSdAskDestPath(); - if (nResult = BACK) goto Dlg_SdShowInfoList; - - Dlg_SdSetupType: - nResult = DialogShowSdSetupType(); - if (nResult = BACK) goto Dlg_SdAskDestPath; - - Dlg_SdComponentDialog2: - if ((nResult = BACK) && (svSetupType != "Custom") && (svSetupType != "")) then - goto Dlg_SdSetupType; - endif; - nResult = DialogShowSdComponentDialog2(); - if (nResult = BACK) goto Dlg_SdSetupType; - - return 0; - - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: ProcessBeforeDataMove // -// // -// Purpose: This function performs any necessary operations prior to the // -// actual data move operation. // -// // -/////////////////////////////////////////////////////////////////////////////// -function ProcessBeforeDataMove() - STRING svLogFile; - NUMBER nResult; - begin - - InstallationInfo( @COMPANY_NAME, @PRODUCT_NAME, @PRODUCT_VERSION, @PRODUCT_KEY ); - - svLogFile = UNINST_LOGFILE_NAME; - - nResult = DeinstallStart( svDir, svLogFile, @UNINST_KEY, 0 ); - if (nResult < 0) then - MessageBox( @ERROR_UNINSTSETUP, WARNING ); - endif; - - szAppPath = TARGETDIR; // TODO : if your application .exe is in a subdir of TARGETDIR then add subdir - - if ((bIs32BitSetup) && (bIsShellExplorer)) then - RegDBSetItem( REGDB_APPPATH, szAppPath ); - RegDBSetItem( REGDB_APPPATH_DEFAULT, szAppPath ^ @PRODUCT_KEY ); - RegDBSetItem( REGDB_UNINSTALL_NAME, @UNINST_DISPLAY_NAME ); - endif; - - // TODO : update any items you want to process before moving the data - // - - return 0; - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: MoveFileData // -// // -// Purpose: This function handles the data movement for // -// the setup. // -// // -/////////////////////////////////////////////////////////////////////////////// -function MoveFileData() - NUMBER nResult, nDisk; - begin - - nDisk = 1; - SetStatusWindow( 0, "" ); - Disable( DIALOGCACHE ); - Enable( STATUS ); - StatusUpdate( ON, 100 ); - nResult = ComponentMoveData( MEDIA, nDisk, 0 ); - - HandleMoveDataError( nResult ); - - Disable( STATUS ); - - return nResult; - - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: HandleMoveDataError // -// // -// Purpose: This function handles the error (if any) during the move data // -// operation. // -// // -/////////////////////////////////////////////////////////////////////////////// -function HandleMoveDataError( nResult ) - STRING szErrMsg, svComponent , svFileGroup , svFile; - begin - - svComponent = ""; - svFileGroup = ""; - svFile = ""; - - switch (nResult) - case 0: - return 0; - default: - ComponentError ( MEDIA , svComponent , svFileGroup , svFile , nResult ); - szErrMsg = @ERROR_MOVEDATA + "\n\n" + - @ERROR_COMPONENT + " " + svComponent + "\n" + - @ERROR_FILEGROUP + " " + svFileGroup + "\n" + - @ERROR_FILE + " " + svFile; - SprintfBox( SEVERE, @TITLE_CAPTIONBAR, szErrMsg, nResult ); - bInstallAborted = TRUE; - return nResult; - endswitch; - - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: ProcessAfterDataMove // -// // -// Purpose: This function performs any necessary operations needed after // -// all data has been moved. // -// // -/////////////////////////////////////////////////////////////////////////////// -function ProcessAfterDataMove() - begin - - // TODO : update self-registered files and other processes that - // should be performed after the data has been moved. - - - return 0; - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: SetupRegistry // -// // -// Purpose: This function makes the registry entries for this setup. // -// // -/////////////////////////////////////////////////////////////////////////////// -function SetupRegistry() - NUMBER nResult; - - begin - - // TODO : Add all your registry entry keys here - // - // - // RegDBCreateKeyEx, RegDBSetKeyValueEx.... - // - - nResult = CreateRegistrySet( "" ); - - return nResult; - end; - -/////////////////////////////////////////////////////////////////////////////// -// -// Function: SetupFolders -// -// Purpose: This function creates all the folders and shortcuts for the -// setup. This includes program groups and items for Windows 3.1. -// -/////////////////////////////////////////////////////////////////////////////// -function SetupFolders() - NUMBER nResult; - - begin - - - // TODO : Add all your folder (program group) along with shortcuts (program items) - // - // - // CreateProgramFolder, AddFolderIcon.... - // - - nResult = CreateShellObjects( "" ); - - return nResult; - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: CleanUpInstall // -// // -// Purpose: This cleans up the setup. Anything that should // -// be released or deleted at the end of the setup should // -// be done here. // -// // -/////////////////////////////////////////////////////////////////////////////// -function CleanUpInstall() - begin - - - if (bInstallAborted) then - return 0; - endif; - - DialogShowSdFinishReboot(); - - if (BATCH_INSTALL) then // ensure locked files are properly written - CommitSharedFiles(0); - endif; - - return 0; - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: SetupInstall // -// // -// Purpose: This will setup the installation. Any general initialization // -// needed for the installation should be performed here. // -// // -/////////////////////////////////////////////////////////////////////////////// -function SetupInstall() - begin - - Enable( CORECOMPONENTHANDLING ); - - bInstallAborted = FALSE; - - if (bIs32BitSetup) then - svDir = "C:\\mysql"; //PROGRAMFILES ^ @COMPANY_NAME ^ @PRODUCT_NAME; - else - svDir = "C:\\mysql"; //PROGRAMFILES ^ @COMPANY_NAME16 ^ @PRODUCT_NAME16; // use shorten names - endif; - - TARGETDIR = svDir; - - SdProductName( @PRODUCT_NAME ); - - Enable( DIALOGCACHE ); - - return 0; - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: SetupScreen // -// // -// Purpose: This function establishes the screen look. This includes // -// colors, fonts, and text to be displayed. // -// // -/////////////////////////////////////////////////////////////////////////////// -function SetupScreen() - begin - - Enable( FULLWINDOWMODE ); - Enable( INDVFILESTATUS ); - SetTitle( @TITLE_MAIN, 24, WHITE ); - - SetTitle( @TITLE_CAPTIONBAR, 0, BACKGROUNDCAPTION ); // Caption bar text. - - Enable( BACKGROUND ); - - Delay( 1 ); - end; - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: CheckRequirements // -// // -// Purpose: This function checks all minimum requirements for the // -// application being installed. If any fail, then the user // -// is informed and the setup is terminated. // -// // -/////////////////////////////////////////////////////////////////////////////// -function CheckRequirements() - NUMBER nvDx, nvDy, nvResult; - STRING svResult; - - begin - - bWinNT = FALSE; - bIsShellExplorer = FALSE; - - // Check screen resolution. - GetExtents( nvDx, nvDy ); - - if (nvDy < 480) then - MessageBox( @ERROR_VGARESOLUTION, WARNING ); - abort; - endif; - - // set 'setup' operation mode - bIs32BitSetup = TRUE; - GetSystemInfo( ISTYPE, nvResult, svResult ); - if (nvResult = 16) then - bIs32BitSetup = FALSE; // running 16-bit setup - return 0; // no additional information required - endif; - - // --- 32-bit testing after this point --- - - // Determine the target system's operating system. - GetSystemInfo( OS, nvResult, svResult ); - - if (nvResult = IS_WINDOWSNT) then - // Running Windows NT. - bWinNT = TRUE; - - // Check to see if the shell being used is EXPLORER shell. - if (GetSystemInfo( OSMAJOR, nvResult, svResult ) = 0) then - if (nvResult >= 4) then - bIsShellExplorer = TRUE; - endif; - endif; - - elseif (nvResult = IS_WINDOWS95 ) then - bIsShellExplorer = TRUE; - - endif; - -end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdWelcome // -// // -// Purpose: This function handles the standard welcome dialog. // -// // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdWelcome() - NUMBER nResult; - STRING szTitle, szMsg; - begin - - szTitle = ""; - szMsg = ""; - nResult = SdWelcome( szTitle, szMsg ); - - return nResult; - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdShowInfoList // -// // -// Purpose: This function displays the general information list dialog. // -// // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdShowInfoList() - NUMBER nResult; - LIST list; - STRING szTitle, szMsg, szFile; - begin - - szFile = SUPPORTDIR ^ "infolist.txt"; - - list = ListCreate( STRINGLIST ); - ListReadFromFile( list, szFile ); - szTitle = ""; - szMsg = " "; - nResult = SdShowInfoList( szTitle, szMsg, list ); - - ListDestroy( list ); - - return nResult; - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdAskDestPath // -// // -// Purpose: This function asks the user for the destination directory. // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdAskDestPath() - NUMBER nResult; - STRING szTitle, szMsg; - begin - - szTitle = ""; - szMsg = ""; - nResult = SdAskDestPath( szTitle, szMsg, svDir, 0 ); - - TARGETDIR = svDir; - - return nResult; - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdSetupType // -// // -// Purpose: This function displays the standard setup type dialog. // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdSetupType() - NUMBER nResult, nType; - STRING szTitle, szMsg; - begin - - switch (svSetupType) - case "Typical": - nType = TYPICAL; - case "Custom": - nType = CUSTOM; - case "Compact": - nType = COMPACT; - case "": - svSetupType = "Typical"; - nType = TYPICAL; - endswitch; - - szTitle = ""; - szMsg = ""; - nResult = SetupType( szTitle, szMsg, "", nType, 0 ); - - switch (nResult) - case COMPACT: - svSetupType = "Compact"; - case TYPICAL: - svSetupType = "Typical"; - case CUSTOM: - svSetupType = "Custom"; - endswitch; - - return nResult; - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdComponentDialog2 // -// // -// Purpose: This function displays the custom component dialog. // -// // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdComponentDialog2() - NUMBER nResult; - STRING szTitle, szMsg; - begin - - if ((svSetupType != "Custom") && (svSetupType != "")) then - return 0; - endif; - - szTitle = ""; - szMsg = ""; - nResult = SdComponentDialog2( szTitle, szMsg, svDir, "" ); - - return nResult; - end; - - -/////////////////////////////////////////////////////////////////////////////// -// // -// Function: DialogShowSdFinishReboot // -// // -// Purpose: This function will show the last dialog of the product. // -// It will allow the user to reboot and/or show some readme text. // -// // -/////////////////////////////////////////////////////////////////////////////// -function DialogShowSdFinishReboot() - NUMBER nResult, nDefOptions; - STRING szTitle, szMsg1, szMsg2, szOption1, szOption2; - NUMBER bOpt1, bOpt2; - begin -/* - if (!BATCH_INSTALL) then - bOpt1 = FALSE; - bOpt2 = FALSE; - szMsg1 = ""; - szMsg2 = ""; - szOption1 = ""; - szOption2 = ""; - nResult = SdFinish( szTitle, szMsg1, szMsg2, szOption1, szOption2, bOpt1, bOpt2 ); - return 0; - endif; - - nDefOptions = SYS_BOOTMACHINE; - szTitle = ""; - szMsg1 = ""; - szMsg2 = ""; - nResult = SdFinishReboot( szTitle, szMsg1, nDefOptions, szMsg2, 0 ); -*/ - return nResult; - end; - - // --- include script file section --- - -#include "sddialog.rul" - - - diff --git a/VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt b/VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt deleted file mode 100644 index 2f561d29d81..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt +++ /dev/null @@ -1,24 +0,0 @@ -This is a release of MySQL 3.23.56 for Win32. - -NOTE: If you install MySQL in a folder other than -C:\MYSQL or you intend to start MySQL on NT/Win2000 -as a service, you must create a file named C:\MY.CNF -or \Windows\my.ini or \winnt\my.ini with the following -information:: - -[mysqld] -basedir=E:/installation-path/ -datadir=E:/data-path/ - -After your have installed MySQL, the installation -directory which contains the files named 'my-size.cnf'. -You can use this as a starting point for your own -C:\my.cnf file. - -If you have any problems, you can mail them to -win32@lists.mysql.com after you have consulted the -MySQL manual and the MySQL mailing list archive -(http://www.mysql.com/documentation/index.html) - -On behalf of the MySQL AB gang, -Michael Widenius
\ No newline at end of file diff --git a/VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP b/VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP Binary files differdeleted file mode 100644 index 3229d50c9bf..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP +++ /dev/null diff --git a/VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl b/VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl deleted file mode 100644 index 187cb651307..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Shell Objects/Default.shl +++ /dev/null @@ -1,12 +0,0 @@ -[Data] -Folder3=<FOLDER_STARTUP> -Group0=Main -Group1=Startup -Folder0=<FOLDER_DESKTOP> -Folder1=<FOLDER_STARTMENU> -Folder2=<FOLDER_PROGRAMS> - -[Info] -Type=ShellObject -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl b/VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl deleted file mode 100644 index dd998365667..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/String Tables/0009-English/value.shl +++ /dev/null @@ -1,23 +0,0 @@ -[Data] -TITLE_MAIN=MySQL Commercial Servers and Clients 3.23.56 -ERROR_COMPONENT=Component: -COMPANY_NAME=MySQL AB -COMPANY_NAME16=Company -ERROR_FILEGROUP=File Group: -ERROR_MOVEDATA=An error occurred during the move data process: %d -PRODUCT_VERSION=3.23.56 -UNINST_KEY=MySQL Commercial Servers and Clients 3.23.56 -TITLE_CAPTIONBAR=MySQL Commercial Servers and Clients 3.23.56 Setup -PRODUCT_NAME16=Product -ERROR_FILE=File: -ERROR_VGARESOLUTION=This program requires VGA or better resolution. -PRODUCT_KEY=yourapp.Exe -UNINST_DISPLAY_NAME=MySQL Commercial Servers and Clients 3.23.56 -ERROR_UNINSTSETUP=unInstaller setup failed to initialize. You may not be able to uninstall this product. -PRODUCT_NAME=MySQL Commercial Servers and Clients 3.23.56 - -[General] -Language=0009 -Type=STRINGTABLESPECIFIC -Version=1.00.000 - diff --git a/VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl b/VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl deleted file mode 100644 index f197667992e..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/String Tables/Default.shl +++ /dev/null @@ -1,74 +0,0 @@ -[TITLE_MAIN] -Comment= - -[ERROR_COMPONENT] -Comment= - -[COMPANY_NAME] -Comment= - -[COMPANY_NAME16] -Comment= - -[ERROR_FILEGROUP] -Comment= - -[ERROR_MOVEDATA] -Comment= - -[PRODUCT_VERSION] -Comment= - -[UNINST_KEY] -Comment= - -[Language] -Lang0=0009 -CurrentLang=0 - -[TITLE_CAPTIONBAR] -Comment= - -[PRODUCT_NAME16] -Comment= - -[Data] -Entry0=ERROR_VGARESOLUTION -Entry1=TITLE_MAIN -Entry2=TITLE_CAPTIONBAR -Entry3=UNINST_KEY -Entry4=UNINST_DISPLAY_NAME -Entry5=COMPANY_NAME -Entry6=PRODUCT_NAME -Entry7=PRODUCT_VERSION -Entry8=PRODUCT_KEY -Entry10=ERROR_UNINSTSETUP -Entry9=ERROR_MOVEDATA -Entry11=COMPANY_NAME16 -Entry12=PRODUCT_NAME16 -Entry13=ERROR_COMPONENT -Entry14=ERROR_FILEGROUP -Entry15=ERROR_FILE - -[ERROR_FILE] -Comment= - -[ERROR_VGARESOLUTION] -Comment= - -[PRODUCT_KEY] -Comment= - -[UNINST_DISPLAY_NAME] -Comment= - -[General] -Type=STRINGTABLE -Version=1.00.000 - -[ERROR_UNINSTSETUP] -Comment= - -[PRODUCT_NAME] -Comment= - diff --git a/VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb b/VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb deleted file mode 100644 index 0478df14bff..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Build.tsb +++ /dev/null @@ -1,56 +0,0 @@ -[<HKCR>] -KeyType=4 -Value= - -[<HKUS>] -KeyType=4 -Value= - -[<PROGRAMFILES>] -KeyType=4 -Value= - -[<WINSYSDIR>] -KeyType=4 -Value= - -[<COMMONFILES>] -KeyType=4 -Value= - -[<WINDIR>] -KeyType=4 -Value= - -[Data] -Key0=<PROGRAMFILES> -Key1=<COMMONFILES> -Key2=<WINDIR> -Key3=<WINSYSDIR> -Key4=<HKLM> -Key5=<HKCU> -Key6=<HKCC> -Key7=<HKDD> -Key8=<HKUS> -Key9=<HKCR> - -[General] -Type=TEXTSUB -Version=1.00.000 - -[<HKCU>] -KeyType=4 -Value= - -[<HKLM>] -KeyType=4 -Value= - -[<HKDD>] -KeyType=4 -Value= - -[<HKCC>] -KeyType=4 -Value= - diff --git a/VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb b/VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb deleted file mode 100644 index 258173c7a48..00000000000 --- a/VC++Files/InstallShield/3.23.XXcom/Text Substitutions/Setup.tsb +++ /dev/null @@ -1,76 +0,0 @@ -[<HKCR>] -KeyType=4 -Value= - -[<HKUS>] -KeyType=4 -Value= - -[<SRCDIR>] -KeyType=4 -Value= - -[<PROGRAMFILES>] -KeyType=4 -Value= - -[<TARGETDIR>] -KeyType=4 -Value= - -[<WINSYSDIR>] -KeyType=4 -Value= - -[<COMMONFILES>] -KeyType=4 -Value= - -[<WINDIR>] -KeyType=4 -Value= - -[Data] -Key0=<PROGRAMFILES> -Key1=<COMMONFILES> -Key2=<WINDIR> -Key3=<WINSYSDIR> -Key4=<TARGETDIR> -Key10=<HKDD> -Key5=<SUPPORTDIR> -Key11=<HKUS> -Key6=<SRCDIR> -Key12=<HKCR> -Key7=<HKLM> -Key13=<SHELL_OBJECT_FOLDER> -Key8=<HKCU> -Key9=<HKCC> - -[<SHELL_OBJECT_FOLDER>] -KeyType=4 -Value= - -[<SUPPORTDIR>] -KeyType=4 -Value= - -[General] -Type=TEXTSUB -Version=1.00.000 - -[<HKCU>] -KeyType=4 -Value= - -[<HKLM>] -KeyType=4 -Value= - -[<HKDD>] -KeyType=4 -Value= - -[<HKCC>] -KeyType=4 -Value= - diff --git a/VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt b/VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt index acad9353244..e5a6f6ac433 100755 --- a/VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt +++ b/VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt @@ -1,4 +1,4 @@ -This is a release of MySQL Classic 4.0.11a-gamma for Win32. +This is a release of MySQL Classic @VERSION@ for Win32. NOTE: If you install MySQL in a folder other than C:\MYSQL or you intend to start MySQL on NT/Win2000 @@ -22,4 +22,4 @@ MySQL manual and the MySQL mailing list archive (http://www.mysql.com/documentation/index.html) On behalf of the MySQL AB gang, -Michael Widenius
\ No newline at end of file +Michael Widenius diff --git a/VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl b/VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl index 9359ce70202..5f767a63f43 100755 --- a/VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl +++ b/VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl @@ -1,23 +1,23 @@ [Data] -TITLE_MAIN=MySQL Classic Servers and Clients 4.0.11a-gamma +TITLE_MAIN=MySQL Classic Servers and Clients @VERSION@ COMPANY_NAME=MySQL AB ERROR_COMPONENT=Component: COMPANY_NAME16=Company -PRODUCT_VERSION=MySQL Classic Servers and Clients 4.0.11a-gamma +PRODUCT_VERSION=MySQL Classic Servers and Clients @VERSION@ ERROR_MOVEDATA=An error occurred during the move data process: %d ERROR_FILEGROUP=File Group: -UNINST_KEY=MySQL Classic Servers and Clients 4.0.11a-gamma -TITLE_CAPTIONBAR=MySQL Classic Servers and Clients 4.0.11a-gamma +UNINST_KEY=MySQL Classic Servers and Clients @VERSION@ +TITLE_CAPTIONBAR=MySQL Classic Servers and Clients @VERSION@ PRODUCT_NAME16=Product ERROR_VGARESOLUTION=This program requires VGA or better resolution. ERROR_FILE=File: -UNINST_DISPLAY_NAME=MySQL Classic Servers and Clients 4.0.11a-gamma +UNINST_DISPLAY_NAME=MySQL Classic Servers and Clients @VERSION@ PRODUCT_KEY=yourapp.Exe -PRODUCT_NAME=MySQL Classic Servers and Clients 4.0.11a-gamma +PRODUCT_NAME=MySQL Classic Servers and Clients @VERSION@ ERROR_UNINSTSETUP=unInstaller setup failed to initialize. You may not be able to uninstall this product. [General] Language=0009 Type=STRINGTABLESPECIFIC -Version=1.00.000 +Version=@VERSION@ diff --git a/VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt b/VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt index c91cb20740d..acdf4f48618 100755 --- a/VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt +++ b/VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt @@ -1,4 +1,4 @@ -This is a release of MySQL 4.0.11a-gamma for Win32. +This is a release of MySQL @VERSION@ for Win32. NOTE: If you install MySQL in a folder other than C:\MYSQL or you intend to start MySQL on NT/Win2000 @@ -22,4 +22,4 @@ MySQL manual and the MySQL mailing list archive (http://www.mysql.com/documentation/index.html) On behalf of the MySQL AB gang, -Michael Widenius
\ No newline at end of file +Michael Widenius diff --git a/VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl b/VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl index ccd18e688eb..0a6c33be42b 100755 --- a/VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl +++ b/VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl @@ -1,23 +1,23 @@ [Data] -TITLE_MAIN=MySQL Servers and Clients 4.0.11a-gamma +TITLE_MAIN=MySQL Servers and Clients @VERSION@ COMPANY_NAME=MySQL AB ERROR_COMPONENT=Component: COMPANY_NAME16=Company -PRODUCT_VERSION=MySQL Servers and Clients 4.0.11a-gamma +PRODUCT_VERSION=MySQL Servers and Clients @VERSION@ ERROR_MOVEDATA=An error occurred during the move data process: %d ERROR_FILEGROUP=File Group: -UNINST_KEY=MySQL Servers and Clients 4.0.11a-gamma -TITLE_CAPTIONBAR=MySQL Servers and Clients 4.0.11a-gamma +UNINST_KEY=MySQL Servers and Clients @VERSION@ +TITLE_CAPTIONBAR=MySQL Servers and Clients @VERSION@ PRODUCT_NAME16=Product ERROR_VGARESOLUTION=This program requires VGA or better resolution. ERROR_FILE=File: -UNINST_DISPLAY_NAME=MySQL Servers and Clients 4.0.11a-gamma +UNINST_DISPLAY_NAME=MySQL Servers and Clients @VERSION@ PRODUCT_KEY=yourapp.Exe -PRODUCT_NAME=MySQL Servers and Clients 4.0.11a-gamma +PRODUCT_NAME=MySQL Servers and Clients @VERSION@ ERROR_UNINSTSETUP=unInstaller setup failed to initialize. You may not be able to uninstall this product. [General] Language=0009 Type=STRINGTABLESPECIFIC -Version=1.00.000 +Version=@VERSION@ diff --git a/VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt b/VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt index 18d7995fd50..52ccf8e11a9 100755 --- a/VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt +++ b/VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt @@ -1,4 +1,4 @@ -This is a release of MySQL Pro 4.0.11a-gamma for Win32. +This is a release of MySQL Pro @VERSION@ for Win32. NOTE: If you install MySQL in a folder other than C:\MYSQL or you intend to start MySQL on NT/Win2000 @@ -22,4 +22,4 @@ MySQL manual and the MySQL mailing list archive (http://www.mysql.com/documentation/index.html) On behalf of the MySQL AB gang, -Michael Widenius
\ No newline at end of file +Michael Widenius diff --git a/VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl b/VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl index c1dd3707afb..61b2e6fb50f 100755 --- a/VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl +++ b/VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl @@ -1,23 +1,23 @@ [Data] -TITLE_MAIN=MySQL Pro Servers and Clients 4.0.11a-gamma +TITLE_MAIN=MySQL Pro Servers and Clients @VERSION@ COMPANY_NAME=MySQL AB ERROR_COMPONENT=Component: COMPANY_NAME16=Company -PRODUCT_VERSION=MySQL Pro Servers and Clients 4.0.11a-gamma +PRODUCT_VERSION=MySQL Pro Servers and Clients @VERSION@ ERROR_MOVEDATA=An error occurred during the move data process: %d ERROR_FILEGROUP=File Group: -UNINST_KEY=MySQL Pro Servers and Clients 4.0.11a-gamma -TITLE_CAPTIONBAR=MySQL Pro Servers and Clients 4.0.11a-gamma +UNINST_KEY=MySQL Pro Servers and Clients @VERSION@ +TITLE_CAPTIONBAR=MySQL Pro Servers and Clients @VERSION@ PRODUCT_NAME16=Product ERROR_VGARESOLUTION=This program requires VGA or better resolution. ERROR_FILE=File: -UNINST_DISPLAY_NAME=MySQL Pro Servers and Clients 4.0.11a-gamma +UNINST_DISPLAY_NAME=MySQL Pro Servers and Clients @VERSION@ PRODUCT_KEY=yourapp.Exe -PRODUCT_NAME=MySQL Pro Servers and Clients 4.0.11a-gamma +PRODUCT_NAME=MySQL Pro Servers and Clients @VERSION@ ERROR_UNINSTSETUP=unInstaller setup failed to initialize. You may not be able to uninstall this product. [General] Language=0009 Type=STRINGTABLESPECIFIC -Version=1.00.000 +Version=@VERSION@ diff --git a/VC++Files/libmysqltest/myTest-package.dsp b/VC++Files/libmysqltest/myTest-package.dsp new file mode 100644 index 00000000000..a5c73d447b3 --- /dev/null +++ b/VC++Files/libmysqltest/myTest-package.dsp @@ -0,0 +1,92 @@ +# Microsoft Developer Studio Project File - Name="myTest" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=myTest - 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 "myTest.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 "myTest.mak" CFG="myTest - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "myTest - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "myTest - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=xicl6.exe +RSC=rc.exe + +!IF "$(CFG)" == "myTest - 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 Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /W3 /O2 /I "..\..\include" /D "NDEBUG" /D "DBUG_UFF" /D "_CONSOLE" /D "_MBCS" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 ..\..\lib\opt\libmysql.lib 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 /libpath:"..\lib_release" + +!ELSEIF "$(CFG)" == "myTest - 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 Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "..\..\include" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# SUBTRACT CPP /Fr /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 ..\..\lib\debug\libmysql.lib 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 /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\lib_debug" + +!ENDIF + +# Begin Target + +# Name "myTest - Win32 Release" +# Name "myTest - Win32 Debug" +# Begin Source File + +SOURCE=.\Mytest.c +# End Source File +# End Target +# End Project diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index 1dbccb65748..da0c6a5eb72 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -173,9 +173,9 @@ INSERT INTO t2 values (1),(2),(3); INSERT INTO t3 VALUES (1,'1'),(2,'2'),(1,'1'),(2,'2'); explain SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a; table type possible_keys key key_len ref rows Extra -t3 index a a 5 NULL 6 Using index; Using temporary -t2 index a a 4 NULL 5 Using index; Distinct -t1 eq_ref PRIMARY PRIMARY 4 t2.a 1 Using where; Distinct +t2 index a a 4 NULL 5 Using index; Using temporary +t1 eq_ref PRIMARY PRIMARY 4 t2.a 1 +t3 index a a 5 NULL 5 Using where; Using index SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a; a 1 diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index 8f3f82201c3..debec01fbdc 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -615,7 +615,7 @@ INSERT INTO t2 VALUES (1,1); explain SELECT * from t1 left join t2 on t1.id=t2.id where t2.id IS NULL; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 2 -t2 index id id 8 NULL 1 Using where; Using index; Not exists +t2 ref id id 4 t1.id 1 Using where; Using index; Not exists SELECT * from t1 left join t2 on t1.id=t2.id where t2.id IS NULL; id name id idx 2 no NULL NULL diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index bde527b9b44..09a4ffdb88b 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -25,1205 +25,6 @@ UNIQUE fld1 (fld1), KEY fld3 (fld3), PRIMARY KEY (auto) ); -INSERT INTO t2 VALUES (1,000001,00,'Omaha','teethe','neat',''); -INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W'); -INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring',''); -INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); -INSERT INTO t2 VALUES (5,011501,37,'bewilderingly','wallet','balled',''); -INSERT INTO t2 VALUES (6,011701,37,'astound','parters','persist','W'); -INSERT INTO t2 VALUES (7,011702,37,'admonishing','eschew','attainments',''); -INSERT INTO t2 VALUES (8,011703,37,'sumac','quitter','fanatic',''); -INSERT INTO t2 VALUES (9,012001,37,'flanking','neat','measures','FAS'); -INSERT INTO t2 VALUES (10,012003,37,'combed','Steinberg','rightfulness',''); -INSERT INTO t2 VALUES (11,012004,37,'subjective','jarring','capably',''); -INSERT INTO t2 VALUES (12,012005,37,'scatterbrain','tinily','impulsive',''); -INSERT INTO t2 VALUES (13,012301,37,'Eulerian','balled','starlet',''); -INSERT INTO t2 VALUES (14,012302,36,'dubbed','persist','terminators',''); -INSERT INTO t2 VALUES (15,012303,37,'Kane','attainments','untying',''); -INSERT INTO t2 VALUES (16,012304,37,'overlay','fanatic','announces','FAS'); -INSERT INTO t2 VALUES (17,012305,37,'perturb','measures','featherweight','FAS'); -INSERT INTO t2 VALUES (18,012306,37,'goblins','rightfulness','pessimist','FAS'); -INSERT INTO t2 VALUES (19,012501,37,'annihilates','capably','daughter',''); -INSERT INTO t2 VALUES (20,012602,37,'Wotan','impulsive','decliner','FAS'); -INSERT INTO t2 VALUES (21,012603,37,'snatching','starlet','lawgiver',''); -INSERT INTO t2 VALUES (22,012604,37,'concludes','terminators','stated',''); -INSERT INTO t2 VALUES (23,012605,37,'laterally','untying','readable',''); -INSERT INTO t2 VALUES (24,012606,37,'yelped','announces','attrition',''); -INSERT INTO t2 VALUES (25,012701,37,'grazing','featherweight','cascade','FAS'); -INSERT INTO t2 VALUES (26,012702,37,'Baird','pessimist','motors','FAS'); -INSERT INTO t2 VALUES (27,012703,37,'celery','daughter','interrogate',''); -INSERT INTO t2 VALUES (28,012704,37,'misunderstander','decliner','pests','W'); -INSERT INTO t2 VALUES (29,013601,37,'handgun','lawgiver','stairway',''); -INSERT INTO t2 VALUES (30,013602,37,'foldout','stated','dopers','FAS'); -INSERT INTO t2 VALUES (31,013603,37,'mystic','readable','testicle','W'); -INSERT INTO t2 VALUES (32,013604,37,'succumbed','attrition','Parsifal','W'); -INSERT INTO t2 VALUES (33,013605,37,'Nabisco','cascade','leavings',''); -INSERT INTO t2 VALUES (34,013606,37,'fingerings','motors','postulation','W'); -INSERT INTO t2 VALUES (35,013607,37,'aging','interrogate','squeaking',''); -INSERT INTO t2 VALUES (36,013608,37,'afield','pests','contrasted',''); -INSERT INTO t2 VALUES (37,013609,37,'ammonium','stairway','leftover',''); -INSERT INTO t2 VALUES (38,013610,37,'boat','dopers','whiteners',''); -INSERT INTO t2 VALUES (39,013801,37,'intelligibility','testicle','erases','W'); -INSERT INTO t2 VALUES (40,013802,37,'Augustine','Parsifal','Punjab','W'); -INSERT INTO t2 VALUES (41,013803,37,'teethe','leavings','Merritt',''); -INSERT INTO t2 VALUES (42,013804,37,'dreaded','postulation','Quixotism',''); -INSERT INTO t2 VALUES (43,013901,37,'scholastics','squeaking','sweetish','FAS'); -INSERT INTO t2 VALUES (44,016001,37,'audiology','contrasted','dogging','FAS'); -INSERT INTO t2 VALUES (45,016201,37,'wallet','leftover','scornfully','FAS'); -INSERT INTO t2 VALUES (46,016202,37,'parters','whiteners','bellow',''); -INSERT INTO t2 VALUES (47,016301,37,'eschew','erases','bills',''); -INSERT INTO t2 VALUES (48,016302,37,'quitter','Punjab','cupboard','FAS'); -INSERT INTO t2 VALUES (49,016303,37,'neat','Merritt','sureties','FAS'); -INSERT INTO t2 VALUES (50,016304,37,'Steinberg','Quixotism','puddings',''); -INSERT INTO t2 VALUES (51,018001,37,'jarring','sweetish','tapestry',''); -INSERT INTO t2 VALUES (52,018002,37,'tinily','dogging','fetters',''); -INSERT INTO t2 VALUES (53,018003,37,'balled','scornfully','bivalves',''); -INSERT INTO t2 VALUES (54,018004,37,'persist','bellow','incurring',''); -INSERT INTO t2 VALUES (55,018005,37,'attainments','bills','Adolph',''); -INSERT INTO t2 VALUES (56,018007,37,'fanatic','cupboard','pithed',''); -INSERT INTO t2 VALUES (57,018008,37,'measures','sureties','emergency',''); -INSERT INTO t2 VALUES (58,018009,37,'rightfulness','puddings','Miles',''); -INSERT INTO t2 VALUES (59,018010,37,'capably','tapestry','trimmings',''); -INSERT INTO t2 VALUES (60,018012,37,'impulsive','fetters','tragedies','W'); -INSERT INTO t2 VALUES (61,018013,37,'starlet','bivalves','skulking','W'); -INSERT INTO t2 VALUES (62,018014,37,'terminators','incurring','flint',''); -INSERT INTO t2 VALUES (63,018015,37,'untying','Adolph','flopping','W'); -INSERT INTO t2 VALUES (64,018016,37,'announces','pithed','relaxing','FAS'); -INSERT INTO t2 VALUES (65,018017,37,'featherweight','emergency','offload','FAS'); -INSERT INTO t2 VALUES (66,018018,37,'pessimist','Miles','suites','W'); -INSERT INTO t2 VALUES (67,018019,37,'daughter','trimmings','lists','FAS'); -INSERT INTO t2 VALUES (68,018020,37,'decliner','tragedies','animized','FAS'); -INSERT INTO t2 VALUES (69,018021,37,'lawgiver','skulking','multilayer','W'); -INSERT INTO t2 VALUES (70,018022,37,'stated','flint','standardizes','FAS'); -INSERT INTO t2 VALUES (71,018023,37,'readable','flopping','Judas',''); -INSERT INTO t2 VALUES (72,018024,37,'attrition','relaxing','vacuuming','W'); -INSERT INTO t2 VALUES (73,018025,37,'cascade','offload','dentally','W'); -INSERT INTO t2 VALUES (74,018026,37,'motors','suites','humanness','W'); -INSERT INTO t2 VALUES (75,018027,37,'interrogate','lists','inch','W'); -INSERT INTO t2 VALUES (76,018028,37,'pests','animized','Weissmuller','W'); -INSERT INTO t2 VALUES (77,018029,37,'stairway','multilayer','irresponsibly','W'); -INSERT INTO t2 VALUES (78,018030,37,'dopers','standardizes','luckily','FAS'); -INSERT INTO t2 VALUES (79,018032,37,'testicle','Judas','culled','W'); -INSERT INTO t2 VALUES (80,018033,37,'Parsifal','vacuuming','medical','FAS'); -INSERT INTO t2 VALUES (81,018034,37,'leavings','dentally','bloodbath','FAS'); -INSERT INTO t2 VALUES (82,018035,37,'postulation','humanness','subschema','W'); -INSERT INTO t2 VALUES (83,018036,37,'squeaking','inch','animals','W'); -INSERT INTO t2 VALUES (84,018037,37,'contrasted','Weissmuller','Micronesia',''); -INSERT INTO t2 VALUES (85,018038,37,'leftover','irresponsibly','repetitions',''); -INSERT INTO t2 VALUES (86,018039,37,'whiteners','luckily','Antares',''); -INSERT INTO t2 VALUES (87,018040,37,'erases','culled','ventilate','W'); -INSERT INTO t2 VALUES (88,018041,37,'Punjab','medical','pityingly',''); -INSERT INTO t2 VALUES (89,018042,37,'Merritt','bloodbath','interdependent',''); -INSERT INTO t2 VALUES (90,018043,37,'Quixotism','subschema','Graves','FAS'); -INSERT INTO t2 VALUES (91,018044,37,'sweetish','animals','neonatal',''); -INSERT INTO t2 VALUES (92,018045,37,'dogging','Micronesia','scribbled','FAS'); -INSERT INTO t2 VALUES (93,018046,37,'scornfully','repetitions','chafe','W'); -INSERT INTO t2 VALUES (94,018048,37,'bellow','Antares','honoring',''); -INSERT INTO t2 VALUES (95,018049,37,'bills','ventilate','realtor',''); -INSERT INTO t2 VALUES (96,018050,37,'cupboard','pityingly','elite',''); -INSERT INTO t2 VALUES (97,018051,37,'sureties','interdependent','funereal',''); -INSERT INTO t2 VALUES (98,018052,37,'puddings','Graves','abrogating',''); -INSERT INTO t2 VALUES (99,018053,50,'tapestry','neonatal','sorters',''); -INSERT INTO t2 VALUES (100,018054,37,'fetters','scribbled','Conley',''); -INSERT INTO t2 VALUES (101,018055,37,'bivalves','chafe','lectured',''); -INSERT INTO t2 VALUES (102,018056,37,'incurring','honoring','Abraham',''); -INSERT INTO t2 VALUES (103,018057,37,'Adolph','realtor','Hawaii','W'); -INSERT INTO t2 VALUES (104,018058,37,'pithed','elite','cage',''); -INSERT INTO t2 VALUES (105,018059,36,'emergency','funereal','hushes',''); -INSERT INTO t2 VALUES (106,018060,37,'Miles','abrogating','Simla',''); -INSERT INTO t2 VALUES (107,018061,37,'trimmings','sorters','reporters',''); -INSERT INTO t2 VALUES (108,018101,37,'tragedies','Conley','Dutchman','FAS'); -INSERT INTO t2 VALUES (109,018102,37,'skulking','lectured','descendants','FAS'); -INSERT INTO t2 VALUES (110,018103,37,'flint','Abraham','groupings','FAS'); -INSERT INTO t2 VALUES (111,018104,37,'flopping','Hawaii','dissociate',''); -INSERT INTO t2 VALUES (112,018201,37,'relaxing','cage','coexist','W'); -INSERT INTO t2 VALUES (113,018202,37,'offload','hushes','Beebe',''); -INSERT INTO t2 VALUES (114,018402,37,'suites','Simla','Taoism',''); -INSERT INTO t2 VALUES (115,018403,37,'lists','reporters','Connally',''); -INSERT INTO t2 VALUES (116,018404,37,'animized','Dutchman','fetched','FAS'); -INSERT INTO t2 VALUES (117,018405,37,'multilayer','descendants','checkpoints','FAS'); -INSERT INTO t2 VALUES (118,018406,37,'standardizes','groupings','rusting',''); -INSERT INTO t2 VALUES (119,018409,37,'Judas','dissociate','galling',''); -INSERT INTO t2 VALUES (120,018601,37,'vacuuming','coexist','obliterates',''); -INSERT INTO t2 VALUES (121,018602,37,'dentally','Beebe','traitor',''); -INSERT INTO t2 VALUES (122,018603,37,'humanness','Taoism','resumes','FAS'); -INSERT INTO t2 VALUES (123,018801,37,'inch','Connally','analyzable','FAS'); -INSERT INTO t2 VALUES (124,018802,37,'Weissmuller','fetched','terminator','FAS'); -INSERT INTO t2 VALUES (125,018803,37,'irresponsibly','checkpoints','gritty','FAS'); -INSERT INTO t2 VALUES (126,018804,37,'luckily','rusting','firearm','W'); -INSERT INTO t2 VALUES (127,018805,37,'culled','galling','minima',''); -INSERT INTO t2 VALUES (128,018806,37,'medical','obliterates','Selfridge',''); -INSERT INTO t2 VALUES (129,018807,37,'bloodbath','traitor','disable',''); -INSERT INTO t2 VALUES (130,018808,37,'subschema','resumes','witchcraft','W'); -INSERT INTO t2 VALUES (131,018809,37,'animals','analyzable','betroth','W'); -INSERT INTO t2 VALUES (132,018810,37,'Micronesia','terminator','Manhattanize',''); -INSERT INTO t2 VALUES (133,018811,37,'repetitions','gritty','imprint',''); -INSERT INTO t2 VALUES (134,018812,37,'Antares','firearm','peeked',''); -INSERT INTO t2 VALUES (135,019101,37,'ventilate','minima','swelling',''); -INSERT INTO t2 VALUES (136,019102,37,'pityingly','Selfridge','interrelationships','W'); -INSERT INTO t2 VALUES (137,019103,37,'interdependent','disable','riser',''); -INSERT INTO t2 VALUES (138,019201,37,'Graves','witchcraft','Gandhian','W'); -INSERT INTO t2 VALUES (139,030501,37,'neonatal','betroth','peacock','A'); -INSERT INTO t2 VALUES (140,030502,50,'scribbled','Manhattanize','bee','A'); -INSERT INTO t2 VALUES (141,030503,37,'chafe','imprint','kanji',''); -INSERT INTO t2 VALUES (142,030504,37,'honoring','peeked','dental',''); -INSERT INTO t2 VALUES (143,031901,37,'realtor','swelling','scarf','FAS'); -INSERT INTO t2 VALUES (144,036001,37,'elite','interrelationships','chasm','A'); -INSERT INTO t2 VALUES (145,036002,37,'funereal','riser','insolence','A'); -INSERT INTO t2 VALUES (146,036004,37,'abrogating','Gandhian','syndicate',''); -INSERT INTO t2 VALUES (147,036005,37,'sorters','peacock','alike',''); -INSERT INTO t2 VALUES (148,038001,37,'Conley','bee','imperial','A'); -INSERT INTO t2 VALUES (149,038002,37,'lectured','kanji','convulsion','A'); -INSERT INTO t2 VALUES (150,038003,37,'Abraham','dental','railway','A'); -INSERT INTO t2 VALUES (151,038004,37,'Hawaii','scarf','validate','A'); -INSERT INTO t2 VALUES (152,038005,37,'cage','chasm','normalizes','A'); -INSERT INTO t2 VALUES (153,038006,37,'hushes','insolence','comprehensive',''); -INSERT INTO t2 VALUES (154,038007,37,'Simla','syndicate','chewing',''); -INSERT INTO t2 VALUES (155,038008,37,'reporters','alike','denizen',''); -INSERT INTO t2 VALUES (156,038009,37,'Dutchman','imperial','schemer',''); -INSERT INTO t2 VALUES (157,038010,37,'descendants','convulsion','chronicle',''); -INSERT INTO t2 VALUES (158,038011,37,'groupings','railway','Kline',''); -INSERT INTO t2 VALUES (159,038012,37,'dissociate','validate','Anatole',''); -INSERT INTO t2 VALUES (160,038013,37,'coexist','normalizes','partridges',''); -INSERT INTO t2 VALUES (161,038014,37,'Beebe','comprehensive','brunch',''); -INSERT INTO t2 VALUES (162,038015,37,'Taoism','chewing','recruited',''); -INSERT INTO t2 VALUES (163,038016,37,'Connally','denizen','dimensions','W'); -INSERT INTO t2 VALUES (164,038017,37,'fetched','schemer','Chicana','W'); -INSERT INTO t2 VALUES (165,038018,37,'checkpoints','chronicle','announced',''); -INSERT INTO t2 VALUES (166,038101,37,'rusting','Kline','praised','FAS'); -INSERT INTO t2 VALUES (167,038102,37,'galling','Anatole','employing',''); -INSERT INTO t2 VALUES (168,038103,37,'obliterates','partridges','linear',''); -INSERT INTO t2 VALUES (169,038104,37,'traitor','brunch','quagmire',''); -INSERT INTO t2 VALUES (170,038201,37,'resumes','recruited','western','A'); -INSERT INTO t2 VALUES (171,038202,37,'analyzable','dimensions','relishing',''); -INSERT INTO t2 VALUES (172,038203,37,'terminator','Chicana','serving','A'); -INSERT INTO t2 VALUES (173,038204,37,'gritty','announced','scheduling',''); -INSERT INTO t2 VALUES (174,038205,37,'firearm','praised','lore',''); -INSERT INTO t2 VALUES (175,038206,37,'minima','employing','eventful',''); -INSERT INTO t2 VALUES (176,038208,37,'Selfridge','linear','arteriole','A'); -INSERT INTO t2 VALUES (177,042801,37,'disable','quagmire','disentangle',''); -INSERT INTO t2 VALUES (178,042802,37,'witchcraft','western','cured','A'); -INSERT INTO t2 VALUES (179,046101,37,'betroth','relishing','Fenton','W'); -INSERT INTO t2 VALUES (180,048001,37,'Manhattanize','serving','avoidable','A'); -INSERT INTO t2 VALUES (181,048002,37,'imprint','scheduling','drains','A'); -INSERT INTO t2 VALUES (182,048003,37,'peeked','lore','detectably','FAS'); -INSERT INTO t2 VALUES (183,048004,37,'swelling','eventful','husky',''); -INSERT INTO t2 VALUES (184,048005,37,'interrelationships','arteriole','impelling',''); -INSERT INTO t2 VALUES (185,048006,37,'riser','disentangle','undoes',''); -INSERT INTO t2 VALUES (186,048007,37,'Gandhian','cured','evened',''); -INSERT INTO t2 VALUES (187,048008,37,'peacock','Fenton','squeezes',''); -INSERT INTO t2 VALUES (188,048101,37,'bee','avoidable','destroyer','FAS'); -INSERT INTO t2 VALUES (189,048102,37,'kanji','drains','rudeness',''); -INSERT INTO t2 VALUES (190,048201,37,'dental','detectably','beaner','FAS'); -INSERT INTO t2 VALUES (191,048202,37,'scarf','husky','boorish',''); -INSERT INTO t2 VALUES (192,048203,37,'chasm','impelling','Everhart',''); -INSERT INTO t2 VALUES (193,048204,37,'insolence','undoes','encompass','A'); -INSERT INTO t2 VALUES (194,048205,37,'syndicate','evened','mushrooms',''); -INSERT INTO t2 VALUES (195,048301,37,'alike','squeezes','Alison','A'); -INSERT INTO t2 VALUES (196,048302,37,'imperial','destroyer','externally','FAS'); -INSERT INTO t2 VALUES (197,048303,37,'convulsion','rudeness','pellagra',''); -INSERT INTO t2 VALUES (198,048304,37,'railway','beaner','cult',''); -INSERT INTO t2 VALUES (199,048305,37,'validate','boorish','creek','A'); -INSERT INTO t2 VALUES (200,048401,37,'normalizes','Everhart','Huffman',''); -INSERT INTO t2 VALUES (201,048402,37,'comprehensive','encompass','Majorca','FAS'); -INSERT INTO t2 VALUES (202,048403,37,'chewing','mushrooms','governing','A'); -INSERT INTO t2 VALUES (203,048404,37,'denizen','Alison','gadfly','FAS'); -INSERT INTO t2 VALUES (204,048405,37,'schemer','externally','reassigned','FAS'); -INSERT INTO t2 VALUES (205,048406,37,'chronicle','pellagra','intentness','W'); -INSERT INTO t2 VALUES (206,048407,37,'Kline','cult','craziness',''); -INSERT INTO t2 VALUES (207,048408,37,'Anatole','creek','psychic',''); -INSERT INTO t2 VALUES (208,048409,37,'partridges','Huffman','squabbled',''); -INSERT INTO t2 VALUES (209,048410,37,'brunch','Majorca','burlesque',''); -INSERT INTO t2 VALUES (210,048411,37,'recruited','governing','capped',''); -INSERT INTO t2 VALUES (211,048412,37,'dimensions','gadfly','extracted','A'); -INSERT INTO t2 VALUES (212,048413,37,'Chicana','reassigned','DiMaggio',''); -INSERT INTO t2 VALUES (213,048601,37,'announced','intentness','exclamation','FAS'); -INSERT INTO t2 VALUES (214,048602,37,'praised','craziness','subdirectory',''); -INSERT INTO t2 VALUES (215,048603,37,'employing','psychic','fangs',''); -INSERT INTO t2 VALUES (216,048604,37,'linear','squabbled','buyer','A'); -INSERT INTO t2 VALUES (217,048801,37,'quagmire','burlesque','pithing','A'); -INSERT INTO t2 VALUES (218,050901,37,'western','capped','transistorizing','A'); -INSERT INTO t2 VALUES (219,051201,37,'relishing','extracted','nonbiodegradable',''); -INSERT INTO t2 VALUES (220,056002,37,'serving','DiMaggio','dislocate',''); -INSERT INTO t2 VALUES (221,056003,37,'scheduling','exclamation','monochromatic','FAS'); -INSERT INTO t2 VALUES (222,056004,37,'lore','subdirectory','batting',''); -INSERT INTO t2 VALUES (223,056102,37,'eventful','fangs','postcondition','A'); -INSERT INTO t2 VALUES (224,056203,37,'arteriole','buyer','catalog','FAS'); -INSERT INTO t2 VALUES (225,056204,37,'disentangle','pithing','Remus',''); -INSERT INTO t2 VALUES (226,058003,37,'cured','transistorizing','devices','A'); -INSERT INTO t2 VALUES (227,058004,37,'Fenton','nonbiodegradable','bike','A'); -INSERT INTO t2 VALUES (228,058005,37,'avoidable','dislocate','qualify',''); -INSERT INTO t2 VALUES (229,058006,37,'drains','monochromatic','detained',''); -INSERT INTO t2 VALUES (230,058007,37,'detectably','batting','commended',''); -INSERT INTO t2 VALUES (231,058101,37,'husky','postcondition','civilize',''); -INSERT INTO t2 VALUES (232,058102,37,'impelling','catalog','Elmhurst',''); -INSERT INTO t2 VALUES (233,058103,37,'undoes','Remus','anesthetizing',''); -INSERT INTO t2 VALUES (234,058105,37,'evened','devices','deaf',''); -INSERT INTO t2 VALUES (235,058111,37,'squeezes','bike','Brigham',''); -INSERT INTO t2 VALUES (236,058112,37,'destroyer','qualify','title',''); -INSERT INTO t2 VALUES (237,058113,37,'rudeness','detained','coarse',''); -INSERT INTO t2 VALUES (238,058114,37,'beaner','commended','combinations',''); -INSERT INTO t2 VALUES (239,058115,37,'boorish','civilize','grayness',''); -INSERT INTO t2 VALUES (240,058116,37,'Everhart','Elmhurst','innumerable','FAS'); -INSERT INTO t2 VALUES (241,058117,37,'encompass','anesthetizing','Caroline','A'); -INSERT INTO t2 VALUES (242,058118,37,'mushrooms','deaf','fatty','FAS'); -INSERT INTO t2 VALUES (243,058119,37,'Alison','Brigham','eastbound',''); -INSERT INTO t2 VALUES (244,058120,37,'externally','title','inexperienced',''); -INSERT INTO t2 VALUES (245,058121,37,'pellagra','coarse','hoarder','A'); -INSERT INTO t2 VALUES (246,058122,37,'cult','combinations','scotch','W'); -INSERT INTO t2 VALUES (247,058123,37,'creek','grayness','passport','A'); -INSERT INTO t2 VALUES (248,058124,37,'Huffman','innumerable','strategic','FAS'); -INSERT INTO t2 VALUES (249,058125,37,'Majorca','Caroline','gated',''); -INSERT INTO t2 VALUES (250,058126,37,'governing','fatty','flog',''); -INSERT INTO t2 VALUES (251,058127,37,'gadfly','eastbound','Pipestone',''); -INSERT INTO t2 VALUES (252,058128,37,'reassigned','inexperienced','Dar',''); -INSERT INTO t2 VALUES (253,058201,37,'intentness','hoarder','Corcoran',''); -INSERT INTO t2 VALUES (254,058202,37,'craziness','scotch','flyers','A'); -INSERT INTO t2 VALUES (255,058303,37,'psychic','passport','competitions','W'); -INSERT INTO t2 VALUES (256,058304,37,'squabbled','strategic','suppliers','FAS'); -INSERT INTO t2 VALUES (257,058602,37,'burlesque','gated','skips',''); -INSERT INTO t2 VALUES (258,058603,37,'capped','flog','institutes',''); -INSERT INTO t2 VALUES (259,058604,37,'extracted','Pipestone','troop','A'); -INSERT INTO t2 VALUES (260,058605,37,'DiMaggio','Dar','connective','W'); -INSERT INTO t2 VALUES (261,058606,37,'exclamation','Corcoran','denies',''); -INSERT INTO t2 VALUES (262,058607,37,'subdirectory','flyers','polka',''); -INSERT INTO t2 VALUES (263,060401,36,'fangs','competitions','observations','FAS'); -INSERT INTO t2 VALUES (264,061701,36,'buyer','suppliers','askers',''); -INSERT INTO t2 VALUES (265,066201,36,'pithing','skips','homeless','FAS'); -INSERT INTO t2 VALUES (266,066501,36,'transistorizing','institutes','Anna',''); -INSERT INTO t2 VALUES (267,068001,36,'nonbiodegradable','troop','subdirectories','W'); -INSERT INTO t2 VALUES (268,068002,36,'dislocate','connective','decaying','FAS'); -INSERT INTO t2 VALUES (269,068005,36,'monochromatic','denies','outwitting','W'); -INSERT INTO t2 VALUES (270,068006,36,'batting','polka','Harpy','W'); -INSERT INTO t2 VALUES (271,068007,36,'postcondition','observations','crazed',''); -INSERT INTO t2 VALUES (272,068008,36,'catalog','askers','suffocate',''); -INSERT INTO t2 VALUES (273,068009,36,'Remus','homeless','provers','FAS'); -INSERT INTO t2 VALUES (274,068010,36,'devices','Anna','technically',''); -INSERT INTO t2 VALUES (275,068011,36,'bike','subdirectories','Franklinizations',''); -INSERT INTO t2 VALUES (276,068202,36,'qualify','decaying','considered',''); -INSERT INTO t2 VALUES (277,068302,36,'detained','outwitting','tinnily',''); -INSERT INTO t2 VALUES (278,068303,36,'commended','Harpy','uninterruptedly',''); -INSERT INTO t2 VALUES (279,068401,36,'civilize','crazed','whistled','A'); -INSERT INTO t2 VALUES (280,068501,36,'Elmhurst','suffocate','automate',''); -INSERT INTO t2 VALUES (281,068502,36,'anesthetizing','provers','gutting','W'); -INSERT INTO t2 VALUES (282,068503,36,'deaf','technically','surreptitious',''); -INSERT INTO t2 VALUES (283,068602,36,'Brigham','Franklinizations','Choctaw',''); -INSERT INTO t2 VALUES (284,068603,36,'title','considered','cooks',''); -INSERT INTO t2 VALUES (285,068701,36,'coarse','tinnily','millivolt','FAS'); -INSERT INTO t2 VALUES (286,068702,36,'combinations','uninterruptedly','counterpoise',''); -INSERT INTO t2 VALUES (287,068703,36,'grayness','whistled','Gothicism',''); -INSERT INTO t2 VALUES (288,076001,36,'innumerable','automate','feminine',''); -INSERT INTO t2 VALUES (289,076002,36,'Caroline','gutting','metaphysically','W'); -INSERT INTO t2 VALUES (290,076101,36,'fatty','surreptitious','sanding','A'); -INSERT INTO t2 VALUES (291,076102,36,'eastbound','Choctaw','contributorily',''); -INSERT INTO t2 VALUES (292,076103,36,'inexperienced','cooks','receivers','FAS'); -INSERT INTO t2 VALUES (293,076302,36,'hoarder','millivolt','adjourn',''); -INSERT INTO t2 VALUES (294,076303,36,'scotch','counterpoise','straggled','A'); -INSERT INTO t2 VALUES (295,076304,36,'passport','Gothicism','druggists',''); -INSERT INTO t2 VALUES (296,076305,36,'strategic','feminine','thanking','FAS'); -INSERT INTO t2 VALUES (297,076306,36,'gated','metaphysically','ostrich',''); -INSERT INTO t2 VALUES (298,076307,36,'flog','sanding','hopelessness','FAS'); -INSERT INTO t2 VALUES (299,076402,36,'Pipestone','contributorily','Eurydice',''); -INSERT INTO t2 VALUES (300,076501,36,'Dar','receivers','excitation','W'); -INSERT INTO t2 VALUES (301,076502,36,'Corcoran','adjourn','presumes','FAS'); -INSERT INTO t2 VALUES (302,076701,36,'flyers','straggled','imaginable','FAS'); -INSERT INTO t2 VALUES (303,078001,36,'competitions','druggists','concoct','W'); -INSERT INTO t2 VALUES (304,078002,36,'suppliers','thanking','peering','W'); -INSERT INTO t2 VALUES (305,078003,36,'skips','ostrich','Phelps','FAS'); -INSERT INTO t2 VALUES (306,078004,36,'institutes','hopelessness','ferociousness','FAS'); -INSERT INTO t2 VALUES (307,078005,36,'troop','Eurydice','sentences',''); -INSERT INTO t2 VALUES (308,078006,36,'connective','excitation','unlocks',''); -INSERT INTO t2 VALUES (309,078007,36,'denies','presumes','engrossing','W'); -INSERT INTO t2 VALUES (310,078008,36,'polka','imaginable','Ruth',''); -INSERT INTO t2 VALUES (311,078101,36,'observations','concoct','tying',''); -INSERT INTO t2 VALUES (312,078103,36,'askers','peering','exclaimers',''); -INSERT INTO t2 VALUES (313,078104,36,'homeless','Phelps','synergy',''); -INSERT INTO t2 VALUES (314,078105,36,'Anna','ferociousness','Huey','W'); -INSERT INTO t2 VALUES (315,082101,36,'subdirectories','sentences','merging',''); -INSERT INTO t2 VALUES (316,083401,36,'decaying','unlocks','judges','A'); -INSERT INTO t2 VALUES (317,084001,36,'outwitting','engrossing','Shylock','W'); -INSERT INTO t2 VALUES (318,084002,36,'Harpy','Ruth','Miltonism',''); -INSERT INTO t2 VALUES (319,086001,36,'crazed','tying','hen','W'); -INSERT INTO t2 VALUES (320,086102,36,'suffocate','exclaimers','honeybee','FAS'); -INSERT INTO t2 VALUES (321,086201,36,'provers','synergy','towers',''); -INSERT INTO t2 VALUES (322,088001,36,'technically','Huey','dilutes','W'); -INSERT INTO t2 VALUES (323,088002,36,'Franklinizations','merging','numerals','FAS'); -INSERT INTO t2 VALUES (324,088003,36,'considered','judges','democracy','FAS'); -INSERT INTO t2 VALUES (325,088004,36,'tinnily','Shylock','Ibero-',''); -INSERT INTO t2 VALUES (326,088101,36,'uninterruptedly','Miltonism','invalids',''); -INSERT INTO t2 VALUES (327,088102,36,'whistled','hen','behavior',''); -INSERT INTO t2 VALUES (328,088103,36,'automate','honeybee','accruing',''); -INSERT INTO t2 VALUES (329,088104,36,'gutting','towers','relics','A'); -INSERT INTO t2 VALUES (330,088105,36,'surreptitious','dilutes','rackets',''); -INSERT INTO t2 VALUES (331,088106,36,'Choctaw','numerals','Fischbein','W'); -INSERT INTO t2 VALUES (332,088201,36,'cooks','democracy','phony','W'); -INSERT INTO t2 VALUES (333,088203,36,'millivolt','Ibero-','cross','FAS'); -INSERT INTO t2 VALUES (334,088204,36,'counterpoise','invalids','cleanup',''); -INSERT INTO t2 VALUES (335,088302,37,'Gothicism','behavior','conspirator',''); -INSERT INTO t2 VALUES (336,088303,37,'feminine','accruing','label','FAS'); -INSERT INTO t2 VALUES (337,088305,37,'metaphysically','relics','university',''); -INSERT INTO t2 VALUES (338,088402,37,'sanding','rackets','cleansed','FAS'); -INSERT INTO t2 VALUES (339,088501,36,'contributorily','Fischbein','ballgown',''); -INSERT INTO t2 VALUES (340,088502,36,'receivers','phony','starlet',''); -INSERT INTO t2 VALUES (341,088503,36,'adjourn','cross','aqueous',''); -INSERT INTO t2 VALUES (342,098001,58,'straggled','cleanup','portrayal','A'); -INSERT INTO t2 VALUES (343,098002,58,'druggists','conspirator','despising','W'); -INSERT INTO t2 VALUES (344,098003,58,'thanking','label','distort','W'); -INSERT INTO t2 VALUES (345,098004,58,'ostrich','university','palmed',''); -INSERT INTO t2 VALUES (346,098005,58,'hopelessness','cleansed','faced',''); -INSERT INTO t2 VALUES (347,098006,58,'Eurydice','ballgown','silverware',''); -INSERT INTO t2 VALUES (348,141903,29,'excitation','starlet','assessor',''); -INSERT INTO t2 VALUES (349,098008,58,'presumes','aqueous','spiders',''); -INSERT INTO t2 VALUES (350,098009,58,'imaginable','portrayal','artificially',''); -INSERT INTO t2 VALUES (351,098010,58,'concoct','despising','reminiscence',''); -INSERT INTO t2 VALUES (352,098011,58,'peering','distort','Mexican',''); -INSERT INTO t2 VALUES (353,098012,58,'Phelps','palmed','obnoxious',''); -INSERT INTO t2 VALUES (354,098013,58,'ferociousness','faced','fragile',''); -INSERT INTO t2 VALUES (355,098014,58,'sentences','silverware','apprehensible',''); -INSERT INTO t2 VALUES (356,098015,58,'unlocks','assessor','births',''); -INSERT INTO t2 VALUES (357,098016,58,'engrossing','spiders','garages',''); -INSERT INTO t2 VALUES (358,098017,58,'Ruth','artificially','panty',''); -INSERT INTO t2 VALUES (359,098018,58,'tying','reminiscence','anteater',''); -INSERT INTO t2 VALUES (360,098019,58,'exclaimers','Mexican','displacement','A'); -INSERT INTO t2 VALUES (361,098020,58,'synergy','obnoxious','drovers','A'); -INSERT INTO t2 VALUES (362,098021,58,'Huey','fragile','patenting','A'); -INSERT INTO t2 VALUES (363,098022,58,'merging','apprehensible','far','A'); -INSERT INTO t2 VALUES (364,098023,58,'judges','births','shrieks',''); -INSERT INTO t2 VALUES (365,098024,58,'Shylock','garages','aligning','W'); -INSERT INTO t2 VALUES (366,098025,37,'Miltonism','panty','pragmatism',''); -INSERT INTO t2 VALUES (367,106001,36,'hen','anteater','fevers','W'); -INSERT INTO t2 VALUES (368,108001,36,'honeybee','displacement','reexamines','A'); -INSERT INTO t2 VALUES (369,108002,36,'towers','drovers','occupancies',''); -INSERT INTO t2 VALUES (370,108003,36,'dilutes','patenting','sweats','FAS'); -INSERT INTO t2 VALUES (371,108004,36,'numerals','far','modulators',''); -INSERT INTO t2 VALUES (372,108005,36,'democracy','shrieks','demand','W'); -INSERT INTO t2 VALUES (373,108007,36,'Ibero-','aligning','Madeira',''); -INSERT INTO t2 VALUES (374,108008,36,'invalids','pragmatism','Viennese','W'); -INSERT INTO t2 VALUES (375,108009,36,'behavior','fevers','chillier','W'); -INSERT INTO t2 VALUES (376,108010,36,'accruing','reexamines','wildcats','FAS'); -INSERT INTO t2 VALUES (377,108011,36,'relics','occupancies','gentle',''); -INSERT INTO t2 VALUES (378,108012,36,'rackets','sweats','Angles','W'); -INSERT INTO t2 VALUES (379,108101,36,'Fischbein','modulators','accuracies',''); -INSERT INTO t2 VALUES (380,108102,36,'phony','demand','toggle',''); -INSERT INTO t2 VALUES (381,108103,36,'cross','Madeira','Mendelssohn','W'); -INSERT INTO t2 VALUES (382,108111,50,'cleanup','Viennese','behaviorally',''); -INSERT INTO t2 VALUES (383,108105,36,'conspirator','chillier','Rochford',''); -INSERT INTO t2 VALUES (384,108106,36,'label','wildcats','mirror','W'); -INSERT INTO t2 VALUES (385,108107,36,'university','gentle','Modula',''); -INSERT INTO t2 VALUES (386,108108,50,'cleansed','Angles','clobbering',''); -INSERT INTO t2 VALUES (387,108109,36,'ballgown','accuracies','chronography',''); -INSERT INTO t2 VALUES (388,108110,36,'starlet','toggle','Eskimoizeds',''); -INSERT INTO t2 VALUES (389,108201,36,'aqueous','Mendelssohn','British','W'); -INSERT INTO t2 VALUES (390,108202,36,'portrayal','behaviorally','pitfalls',''); -INSERT INTO t2 VALUES (391,108203,36,'despising','Rochford','verify','W'); -INSERT INTO t2 VALUES (392,108204,36,'distort','mirror','scatter','FAS'); -INSERT INTO t2 VALUES (393,108205,36,'palmed','Modula','Aztecan',''); -INSERT INTO t2 VALUES (394,108301,36,'faced','clobbering','acuity','W'); -INSERT INTO t2 VALUES (395,108302,36,'silverware','chronography','sinking','W'); -INSERT INTO t2 VALUES (396,112101,36,'assessor','Eskimoizeds','beasts','FAS'); -INSERT INTO t2 VALUES (397,112102,36,'spiders','British','Witt','W'); -INSERT INTO t2 VALUES (398,113701,36,'artificially','pitfalls','physicists','FAS'); -INSERT INTO t2 VALUES (399,116001,36,'reminiscence','verify','folksong','A'); -INSERT INTO t2 VALUES (400,116201,36,'Mexican','scatter','strokes','FAS'); -INSERT INTO t2 VALUES (401,116301,36,'obnoxious','Aztecan','crowder',''); -INSERT INTO t2 VALUES (402,116302,36,'fragile','acuity','merry',''); -INSERT INTO t2 VALUES (403,116601,36,'apprehensible','sinking','cadenced',''); -INSERT INTO t2 VALUES (404,116602,36,'births','beasts','alimony','A'); -INSERT INTO t2 VALUES (405,116603,36,'garages','Witt','principled','A'); -INSERT INTO t2 VALUES (406,116701,36,'panty','physicists','golfing',''); -INSERT INTO t2 VALUES (407,116702,36,'anteater','folksong','undiscovered',''); -INSERT INTO t2 VALUES (408,118001,36,'displacement','strokes','irritates',''); -INSERT INTO t2 VALUES (409,118002,36,'drovers','crowder','patriots','A'); -INSERT INTO t2 VALUES (410,118003,36,'patenting','merry','rooms','FAS'); -INSERT INTO t2 VALUES (411,118004,36,'far','cadenced','towering','W'); -INSERT INTO t2 VALUES (412,118005,36,'shrieks','alimony','displease',''); -INSERT INTO t2 VALUES (413,118006,36,'aligning','principled','photosensitive',''); -INSERT INTO t2 VALUES (414,118007,36,'pragmatism','golfing','inking',''); -INSERT INTO t2 VALUES (415,118008,36,'fevers','undiscovered','gainers',''); -INSERT INTO t2 VALUES (416,118101,36,'reexamines','irritates','leaning','A'); -INSERT INTO t2 VALUES (417,118102,36,'occupancies','patriots','hydrant','A'); -INSERT INTO t2 VALUES (418,118103,36,'sweats','rooms','preserve',''); -INSERT INTO t2 VALUES (419,118202,36,'modulators','towering','blinded','A'); -INSERT INTO t2 VALUES (420,118203,36,'demand','displease','interactions','A'); -INSERT INTO t2 VALUES (421,118204,36,'Madeira','photosensitive','Barry',''); -INSERT INTO t2 VALUES (422,118302,36,'Viennese','inking','whiteness','A'); -INSERT INTO t2 VALUES (423,118304,36,'chillier','gainers','pastimes','W'); -INSERT INTO t2 VALUES (424,118305,36,'wildcats','leaning','Edenization',''); -INSERT INTO t2 VALUES (425,118306,36,'gentle','hydrant','Muscat',''); -INSERT INTO t2 VALUES (426,118307,36,'Angles','preserve','assassinated',''); -INSERT INTO t2 VALUES (427,123101,36,'accuracies','blinded','labeled',''); -INSERT INTO t2 VALUES (428,123102,36,'toggle','interactions','glacial','A'); -INSERT INTO t2 VALUES (429,123301,36,'Mendelssohn','Barry','implied','W'); -INSERT INTO t2 VALUES (430,126001,36,'behaviorally','whiteness','bibliographies','W'); -INSERT INTO t2 VALUES (431,126002,36,'Rochford','pastimes','Buchanan',''); -INSERT INTO t2 VALUES (432,126003,36,'mirror','Edenization','forgivably','FAS'); -INSERT INTO t2 VALUES (433,126101,36,'Modula','Muscat','innuendo','A'); -INSERT INTO t2 VALUES (434,126301,36,'clobbering','assassinated','den','FAS'); -INSERT INTO t2 VALUES (435,126302,36,'chronography','labeled','submarines','W'); -INSERT INTO t2 VALUES (436,126402,36,'Eskimoizeds','glacial','mouthful','A'); -INSERT INTO t2 VALUES (437,126601,36,'British','implied','expiring',''); -INSERT INTO t2 VALUES (438,126602,36,'pitfalls','bibliographies','unfulfilled','FAS'); -INSERT INTO t2 VALUES (439,126702,36,'verify','Buchanan','precession',''); -INSERT INTO t2 VALUES (440,128001,36,'scatter','forgivably','nullified',''); -INSERT INTO t2 VALUES (441,128002,36,'Aztecan','innuendo','affects',''); -INSERT INTO t2 VALUES (442,128003,36,'acuity','den','Cynthia',''); -INSERT INTO t2 VALUES (443,128004,36,'sinking','submarines','Chablis','A'); -INSERT INTO t2 VALUES (444,128005,36,'beasts','mouthful','betterments','FAS'); -INSERT INTO t2 VALUES (445,128007,36,'Witt','expiring','advertising',''); -INSERT INTO t2 VALUES (446,128008,36,'physicists','unfulfilled','rubies','A'); -INSERT INTO t2 VALUES (447,128009,36,'folksong','precession','southwest','FAS'); -INSERT INTO t2 VALUES (448,128010,36,'strokes','nullified','superstitious','A'); -INSERT INTO t2 VALUES (449,128011,36,'crowder','affects','tabernacle','W'); -INSERT INTO t2 VALUES (450,128012,36,'merry','Cynthia','silk','A'); -INSERT INTO t2 VALUES (451,128013,36,'cadenced','Chablis','handsomest','A'); -INSERT INTO t2 VALUES (452,128014,36,'alimony','betterments','Persian','A'); -INSERT INTO t2 VALUES (453,128015,36,'principled','advertising','analog','W'); -INSERT INTO t2 VALUES (454,128016,36,'golfing','rubies','complex','W'); -INSERT INTO t2 VALUES (455,128017,36,'undiscovered','southwest','Taoist',''); -INSERT INTO t2 VALUES (456,128018,36,'irritates','superstitious','suspend',''); -INSERT INTO t2 VALUES (457,128019,36,'patriots','tabernacle','relegated',''); -INSERT INTO t2 VALUES (458,128020,36,'rooms','silk','awesome','W'); -INSERT INTO t2 VALUES (459,128021,36,'towering','handsomest','Bruxelles',''); -INSERT INTO t2 VALUES (460,128022,36,'displease','Persian','imprecisely','A'); -INSERT INTO t2 VALUES (461,128023,36,'photosensitive','analog','televise',''); -INSERT INTO t2 VALUES (462,128101,36,'inking','complex','braking',''); -INSERT INTO t2 VALUES (463,128102,36,'gainers','Taoist','true','FAS'); -INSERT INTO t2 VALUES (464,128103,36,'leaning','suspend','disappointing','FAS'); -INSERT INTO t2 VALUES (465,128104,36,'hydrant','relegated','navally','W'); -INSERT INTO t2 VALUES (466,128106,36,'preserve','awesome','circus',''); -INSERT INTO t2 VALUES (467,128107,36,'blinded','Bruxelles','beetles',''); -INSERT INTO t2 VALUES (468,128108,36,'interactions','imprecisely','trumps',''); -INSERT INTO t2 VALUES (469,128202,36,'Barry','televise','fourscore','W'); -INSERT INTO t2 VALUES (470,128203,36,'whiteness','braking','Blackfoots',''); -INSERT INTO t2 VALUES (471,128301,36,'pastimes','true','Grady',''); -INSERT INTO t2 VALUES (472,128302,36,'Edenization','disappointing','quiets','FAS'); -INSERT INTO t2 VALUES (473,128303,36,'Muscat','navally','floundered','FAS'); -INSERT INTO t2 VALUES (474,128304,36,'assassinated','circus','profundity','W'); -INSERT INTO t2 VALUES (475,128305,36,'labeled','beetles','Garrisonian','W'); -INSERT INTO t2 VALUES (476,128307,36,'glacial','trumps','Strauss',''); -INSERT INTO t2 VALUES (477,128401,36,'implied','fourscore','cemented','FAS'); -INSERT INTO t2 VALUES (478,128502,36,'bibliographies','Blackfoots','contrition','A'); -INSERT INTO t2 VALUES (479,128503,36,'Buchanan','Grady','mutations',''); -INSERT INTO t2 VALUES (480,128504,36,'forgivably','quiets','exhibits','W'); -INSERT INTO t2 VALUES (481,128505,36,'innuendo','floundered','tits',''); -INSERT INTO t2 VALUES (482,128601,36,'den','profundity','mate','A'); -INSERT INTO t2 VALUES (483,128603,36,'submarines','Garrisonian','arches',''); -INSERT INTO t2 VALUES (484,128604,36,'mouthful','Strauss','Moll',''); -INSERT INTO t2 VALUES (485,128702,36,'expiring','cemented','ropers',''); -INSERT INTO t2 VALUES (486,128703,36,'unfulfilled','contrition','bombast',''); -INSERT INTO t2 VALUES (487,128704,36,'precession','mutations','difficultly','A'); -INSERT INTO t2 VALUES (488,138001,36,'nullified','exhibits','adsorption',''); -INSERT INTO t2 VALUES (489,138002,36,'affects','tits','definiteness','FAS'); -INSERT INTO t2 VALUES (490,138003,36,'Cynthia','mate','cultivation','A'); -INSERT INTO t2 VALUES (491,138004,36,'Chablis','arches','heals','A'); -INSERT INTO t2 VALUES (492,138005,36,'betterments','Moll','Heusen','W'); -INSERT INTO t2 VALUES (493,138006,36,'advertising','ropers','target','FAS'); -INSERT INTO t2 VALUES (494,138007,36,'rubies','bombast','cited','A'); -INSERT INTO t2 VALUES (495,138008,36,'southwest','difficultly','congresswoman','W'); -INSERT INTO t2 VALUES (496,138009,36,'superstitious','adsorption','Katherine',''); -INSERT INTO t2 VALUES (497,138102,36,'tabernacle','definiteness','titter','A'); -INSERT INTO t2 VALUES (498,138103,36,'silk','cultivation','aspire','A'); -INSERT INTO t2 VALUES (499,138104,36,'handsomest','heals','Mardis',''); -INSERT INTO t2 VALUES (500,138105,36,'Persian','Heusen','Nadia','W'); -INSERT INTO t2 VALUES (501,138201,36,'analog','target','estimating','FAS'); -INSERT INTO t2 VALUES (502,138302,36,'complex','cited','stuck','A'); -INSERT INTO t2 VALUES (503,138303,36,'Taoist','congresswoman','fifteenth','A'); -INSERT INTO t2 VALUES (504,138304,36,'suspend','Katherine','Colombo',''); -INSERT INTO t2 VALUES (505,138401,29,'relegated','titter','survey','A'); -INSERT INTO t2 VALUES (506,140102,29,'awesome','aspire','staffing',''); -INSERT INTO t2 VALUES (507,140103,29,'Bruxelles','Mardis','obtain',''); -INSERT INTO t2 VALUES (508,140104,29,'imprecisely','Nadia','loaded',''); -INSERT INTO t2 VALUES (509,140105,29,'televise','estimating','slaughtered',''); -INSERT INTO t2 VALUES (510,140201,29,'braking','stuck','lights','A'); -INSERT INTO t2 VALUES (511,140701,29,'true','fifteenth','circumference',''); -INSERT INTO t2 VALUES (512,141501,29,'disappointing','Colombo','dull','A'); -INSERT INTO t2 VALUES (513,141502,29,'navally','survey','weekly','A'); -INSERT INTO t2 VALUES (514,141901,29,'circus','staffing','wetness',''); -INSERT INTO t2 VALUES (515,141902,29,'beetles','obtain','visualized',''); -INSERT INTO t2 VALUES (516,142101,29,'trumps','loaded','Tannenbaum',''); -INSERT INTO t2 VALUES (517,142102,29,'fourscore','slaughtered','moribund',''); -INSERT INTO t2 VALUES (518,142103,29,'Blackfoots','lights','demultiplex',''); -INSERT INTO t2 VALUES (519,142701,29,'Grady','circumference','lockings',''); -INSERT INTO t2 VALUES (520,143001,29,'quiets','dull','thugs','FAS'); -INSERT INTO t2 VALUES (521,143501,29,'floundered','weekly','unnerves',''); -INSERT INTO t2 VALUES (522,143502,29,'profundity','wetness','abut',''); -INSERT INTO t2 VALUES (523,148001,29,'Garrisonian','visualized','Chippewa','A'); -INSERT INTO t2 VALUES (524,148002,29,'Strauss','Tannenbaum','stratifications','A'); -INSERT INTO t2 VALUES (525,148003,29,'cemented','moribund','signaled',''); -INSERT INTO t2 VALUES (526,148004,29,'contrition','demultiplex','Italianizes','A'); -INSERT INTO t2 VALUES (527,148005,29,'mutations','lockings','algorithmic','A'); -INSERT INTO t2 VALUES (528,148006,29,'exhibits','thugs','paranoid','FAS'); -INSERT INTO t2 VALUES (529,148007,29,'tits','unnerves','camping','A'); -INSERT INTO t2 VALUES (530,148009,29,'mate','abut','signifying','A'); -INSERT INTO t2 VALUES (531,148010,29,'arches','Chippewa','Patrice','W'); -INSERT INTO t2 VALUES (532,148011,29,'Moll','stratifications','search','A'); -INSERT INTO t2 VALUES (533,148012,29,'ropers','signaled','Angeles','A'); -INSERT INTO t2 VALUES (534,148013,29,'bombast','Italianizes','semblance',''); -INSERT INTO t2 VALUES (535,148023,36,'difficultly','algorithmic','taxed',''); -INSERT INTO t2 VALUES (536,148015,29,'adsorption','paranoid','Beatrice',''); -INSERT INTO t2 VALUES (537,148016,29,'definiteness','camping','retrace',''); -INSERT INTO t2 VALUES (538,148017,29,'cultivation','signifying','lockout',''); -INSERT INTO t2 VALUES (539,148018,29,'heals','Patrice','grammatic',''); -INSERT INTO t2 VALUES (540,148019,29,'Heusen','search','helmsman',''); -INSERT INTO t2 VALUES (541,148020,29,'target','Angeles','uniform','W'); -INSERT INTO t2 VALUES (542,148021,29,'cited','semblance','hamming',''); -INSERT INTO t2 VALUES (543,148022,29,'congresswoman','taxed','disobedience',''); -INSERT INTO t2 VALUES (544,148101,29,'Katherine','Beatrice','captivated','A'); -INSERT INTO t2 VALUES (545,148102,29,'titter','retrace','transferals','A'); -INSERT INTO t2 VALUES (546,148201,29,'aspire','lockout','cartographer','A'); -INSERT INTO t2 VALUES (547,148401,29,'Mardis','grammatic','aims','FAS'); -INSERT INTO t2 VALUES (548,148402,29,'Nadia','helmsman','Pakistani',''); -INSERT INTO t2 VALUES (549,148501,29,'estimating','uniform','burglarized','FAS'); -INSERT INTO t2 VALUES (550,148502,29,'stuck','hamming','saucepans','A'); -INSERT INTO t2 VALUES (551,148503,29,'fifteenth','disobedience','lacerating','A'); -INSERT INTO t2 VALUES (552,148504,29,'Colombo','captivated','corny',''); -INSERT INTO t2 VALUES (553,148601,29,'survey','transferals','megabytes','FAS'); -INSERT INTO t2 VALUES (554,148602,29,'staffing','cartographer','chancellor',''); -INSERT INTO t2 VALUES (555,150701,29,'obtain','aims','bulk','A'); -INSERT INTO t2 VALUES (556,152101,29,'loaded','Pakistani','commits','A'); -INSERT INTO t2 VALUES (557,152102,29,'slaughtered','burglarized','meson','W'); -INSERT INTO t2 VALUES (558,155202,36,'lights','saucepans','deputies',''); -INSERT INTO t2 VALUES (559,155203,29,'circumference','lacerating','northeaster','A'); -INSERT INTO t2 VALUES (560,155204,29,'dull','corny','dipole',''); -INSERT INTO t2 VALUES (561,155205,29,'weekly','megabytes','machining','0'); -INSERT INTO t2 VALUES (562,156001,29,'wetness','chancellor','therefore',''); -INSERT INTO t2 VALUES (563,156002,29,'visualized','bulk','Telefunken',''); -INSERT INTO t2 VALUES (564,156102,29,'Tannenbaum','commits','salvaging',''); -INSERT INTO t2 VALUES (565,156301,29,'moribund','meson','Corinthianizes','A'); -INSERT INTO t2 VALUES (566,156302,29,'demultiplex','deputies','restlessly','A'); -INSERT INTO t2 VALUES (567,156303,29,'lockings','northeaster','bromides',''); -INSERT INTO t2 VALUES (568,156304,29,'thugs','dipole','generalized','A'); -INSERT INTO t2 VALUES (569,156305,29,'unnerves','machining','mishaps',''); -INSERT INTO t2 VALUES (570,156306,29,'abut','therefore','quelling',''); -INSERT INTO t2 VALUES (571,156501,29,'Chippewa','Telefunken','spiritual','A'); -INSERT INTO t2 VALUES (572,158001,29,'stratifications','salvaging','beguiles','FAS'); -INSERT INTO t2 VALUES (573,158002,29,'signaled','Corinthianizes','Trobriand','FAS'); -INSERT INTO t2 VALUES (574,158101,29,'Italianizes','restlessly','fleeing','A'); -INSERT INTO t2 VALUES (575,158102,29,'algorithmic','bromides','Armour','A'); -INSERT INTO t2 VALUES (576,158103,29,'paranoid','generalized','chin','A'); -INSERT INTO t2 VALUES (577,158201,29,'camping','mishaps','provers','A'); -INSERT INTO t2 VALUES (578,158202,29,'signifying','quelling','aeronautic','A'); -INSERT INTO t2 VALUES (579,158203,29,'Patrice','spiritual','voltage','W'); -INSERT INTO t2 VALUES (580,158204,29,'search','beguiles','sash',''); -INSERT INTO t2 VALUES (581,158301,29,'Angeles','Trobriand','anaerobic','A'); -INSERT INTO t2 VALUES (582,158302,29,'semblance','fleeing','simultaneous','A'); -INSERT INTO t2 VALUES (583,158303,29,'taxed','Armour','accumulating','A'); -INSERT INTO t2 VALUES (584,158304,29,'Beatrice','chin','Medusan','A'); -INSERT INTO t2 VALUES (585,158305,29,'retrace','provers','shouted','A'); -INSERT INTO t2 VALUES (586,158306,29,'lockout','aeronautic','freakish',''); -INSERT INTO t2 VALUES (587,158501,29,'grammatic','voltage','index','FAS'); -INSERT INTO t2 VALUES (588,160301,29,'helmsman','sash','commercially',''); -INSERT INTO t2 VALUES (589,166101,50,'uniform','anaerobic','mistiness','A'); -INSERT INTO t2 VALUES (590,166102,50,'hamming','simultaneous','endpoint',''); -INSERT INTO t2 VALUES (591,168001,29,'disobedience','accumulating','straight','A'); -INSERT INTO t2 VALUES (592,168002,29,'captivated','Medusan','flurried',''); -INSERT INTO t2 VALUES (593,168003,29,'transferals','shouted','denotative','A'); -INSERT INTO t2 VALUES (594,168101,29,'cartographer','freakish','coming','FAS'); -INSERT INTO t2 VALUES (595,168102,29,'aims','index','commencements','FAS'); -INSERT INTO t2 VALUES (596,168103,29,'Pakistani','commercially','gentleman',''); -INSERT INTO t2 VALUES (597,168104,29,'burglarized','mistiness','gifted',''); -INSERT INTO t2 VALUES (598,168202,29,'saucepans','endpoint','Shanghais',''); -INSERT INTO t2 VALUES (599,168301,29,'lacerating','straight','sportswriting','A'); -INSERT INTO t2 VALUES (600,168502,29,'corny','flurried','sloping','A'); -INSERT INTO t2 VALUES (601,168503,29,'megabytes','denotative','navies',''); -INSERT INTO t2 VALUES (602,168601,29,'chancellor','coming','leaflet','A'); -INSERT INTO t2 VALUES (603,173001,40,'bulk','commencements','shooter',''); -INSERT INTO t2 VALUES (604,173701,40,'commits','gentleman','Joplin','FAS'); -INSERT INTO t2 VALUES (605,173702,40,'meson','gifted','babies',''); -INSERT INTO t2 VALUES (606,176001,40,'deputies','Shanghais','subdivision','FAS'); -INSERT INTO t2 VALUES (607,176101,40,'northeaster','sportswriting','burstiness','W'); -INSERT INTO t2 VALUES (608,176201,40,'dipole','sloping','belted','FAS'); -INSERT INTO t2 VALUES (609,176401,40,'machining','navies','assails','FAS'); -INSERT INTO t2 VALUES (610,176501,40,'therefore','leaflet','admiring','W'); -INSERT INTO t2 VALUES (611,176601,40,'Telefunken','shooter','swaying','0'); -INSERT INTO t2 VALUES (612,176602,40,'salvaging','Joplin','Goldstine','FAS'); -INSERT INTO t2 VALUES (613,176603,40,'Corinthianizes','babies','fitting',''); -INSERT INTO t2 VALUES (614,178001,40,'restlessly','subdivision','Norwalk','W'); -INSERT INTO t2 VALUES (615,178002,40,'bromides','burstiness','weakening','W'); -INSERT INTO t2 VALUES (616,178003,40,'generalized','belted','analogy','FAS'); -INSERT INTO t2 VALUES (617,178004,40,'mishaps','assails','deludes',''); -INSERT INTO t2 VALUES (618,178005,40,'quelling','admiring','cokes',''); -INSERT INTO t2 VALUES (619,178006,40,'spiritual','swaying','Clayton',''); -INSERT INTO t2 VALUES (620,178007,40,'beguiles','Goldstine','exhausts',''); -INSERT INTO t2 VALUES (621,178008,40,'Trobriand','fitting','causality',''); -INSERT INTO t2 VALUES (622,178101,40,'fleeing','Norwalk','sating','FAS'); -INSERT INTO t2 VALUES (623,178102,40,'Armour','weakening','icon',''); -INSERT INTO t2 VALUES (624,178103,40,'chin','analogy','throttles',''); -INSERT INTO t2 VALUES (625,178201,40,'provers','deludes','communicants','FAS'); -INSERT INTO t2 VALUES (626,178202,40,'aeronautic','cokes','dehydrate','FAS'); -INSERT INTO t2 VALUES (627,178301,40,'voltage','Clayton','priceless','FAS'); -INSERT INTO t2 VALUES (628,178302,40,'sash','exhausts','publicly',''); -INSERT INTO t2 VALUES (629,178401,40,'anaerobic','causality','incidentals','FAS'); -INSERT INTO t2 VALUES (630,178402,40,'simultaneous','sating','commonplace',''); -INSERT INTO t2 VALUES (631,178403,40,'accumulating','icon','mumbles',''); -INSERT INTO t2 VALUES (632,178404,40,'Medusan','throttles','furthermore','W'); -INSERT INTO t2 VALUES (633,178501,40,'shouted','communicants','cautioned','W'); -INSERT INTO t2 VALUES (634,186002,37,'freakish','dehydrate','parametrized','A'); -INSERT INTO t2 VALUES (635,186102,37,'index','priceless','registration','A'); -INSERT INTO t2 VALUES (636,186201,40,'commercially','publicly','sadly','FAS'); -INSERT INTO t2 VALUES (637,186202,40,'mistiness','incidentals','positioning',''); -INSERT INTO t2 VALUES (638,186203,40,'endpoint','commonplace','babysitting',''); -INSERT INTO t2 VALUES (639,186302,37,'straight','mumbles','eternal','A'); -INSERT INTO t2 VALUES (640,188007,37,'flurried','furthermore','hoarder',''); -INSERT INTO t2 VALUES (641,188008,37,'denotative','cautioned','congregates',''); -INSERT INTO t2 VALUES (642,188009,37,'coming','parametrized','rains',''); -INSERT INTO t2 VALUES (643,188010,37,'commencements','registration','workers','W'); -INSERT INTO t2 VALUES (644,188011,37,'gentleman','sadly','sags','A'); -INSERT INTO t2 VALUES (645,188012,37,'gifted','positioning','unplug','W'); -INSERT INTO t2 VALUES (646,188013,37,'Shanghais','babysitting','garage','A'); -INSERT INTO t2 VALUES (647,188014,37,'sportswriting','eternal','boulder','A'); -INSERT INTO t2 VALUES (648,188015,37,'sloping','hoarder','hollowly','A'); -INSERT INTO t2 VALUES (649,188016,37,'navies','congregates','specifics',''); -INSERT INTO t2 VALUES (650,188017,37,'leaflet','rains','Teresa',''); -INSERT INTO t2 VALUES (651,188102,37,'shooter','workers','Winsett',''); -INSERT INTO t2 VALUES (652,188103,37,'Joplin','sags','convenient','A'); -INSERT INTO t2 VALUES (653,188202,37,'babies','unplug','buckboards','FAS'); -INSERT INTO t2 VALUES (654,188301,40,'subdivision','garage','amenities',''); -INSERT INTO t2 VALUES (655,188302,40,'burstiness','boulder','resplendent','FAS'); -INSERT INTO t2 VALUES (656,188303,40,'belted','hollowly','priding','FAS'); -INSERT INTO t2 VALUES (657,188401,37,'assails','specifics','configurations',''); -INSERT INTO t2 VALUES (658,188402,37,'admiring','Teresa','untidiness','A'); -INSERT INTO t2 VALUES (659,188503,37,'swaying','Winsett','Brice','W'); -INSERT INTO t2 VALUES (660,188504,37,'Goldstine','convenient','sews','FAS'); -INSERT INTO t2 VALUES (661,188505,37,'fitting','buckboards','participated',''); -INSERT INTO t2 VALUES (662,190701,37,'Norwalk','amenities','Simon','FAS'); -INSERT INTO t2 VALUES (663,190703,50,'weakening','resplendent','certificates',''); -INSERT INTO t2 VALUES (664,191701,37,'analogy','priding','Fitzpatrick',''); -INSERT INTO t2 VALUES (665,191702,37,'deludes','configurations','Evanston','A'); -INSERT INTO t2 VALUES (666,191703,37,'cokes','untidiness','misted',''); -INSERT INTO t2 VALUES (667,196001,37,'Clayton','Brice','textures','A'); -INSERT INTO t2 VALUES (668,196002,37,'exhausts','sews','save',''); -INSERT INTO t2 VALUES (669,196003,37,'causality','participated','count',''); -INSERT INTO t2 VALUES (670,196101,37,'sating','Simon','rightful','A'); -INSERT INTO t2 VALUES (671,196103,37,'icon','certificates','chaperone',''); -INSERT INTO t2 VALUES (672,196104,37,'throttles','Fitzpatrick','Lizzy','A'); -INSERT INTO t2 VALUES (673,196201,37,'communicants','Evanston','clenched','A'); -INSERT INTO t2 VALUES (674,196202,37,'dehydrate','misted','effortlessly',''); -INSERT INTO t2 VALUES (675,196203,37,'priceless','textures','accessed',''); -INSERT INTO t2 VALUES (676,198001,37,'publicly','save','beaters','A'); -INSERT INTO t2 VALUES (677,198003,37,'incidentals','count','Hornblower','FAS'); -INSERT INTO t2 VALUES (678,198004,37,'commonplace','rightful','vests','A'); -INSERT INTO t2 VALUES (679,198005,37,'mumbles','chaperone','indulgences','FAS'); -INSERT INTO t2 VALUES (680,198006,37,'furthermore','Lizzy','infallibly','A'); -INSERT INTO t2 VALUES (681,198007,37,'cautioned','clenched','unwilling','FAS'); -INSERT INTO t2 VALUES (682,198008,37,'parametrized','effortlessly','excrete','FAS'); -INSERT INTO t2 VALUES (683,198009,37,'registration','accessed','spools','A'); -INSERT INTO t2 VALUES (684,198010,37,'sadly','beaters','crunches','FAS'); -INSERT INTO t2 VALUES (685,198011,37,'positioning','Hornblower','overestimating','FAS'); -INSERT INTO t2 VALUES (686,198012,37,'babysitting','vests','ineffective',''); -INSERT INTO t2 VALUES (687,198013,37,'eternal','indulgences','humiliation','A'); -INSERT INTO t2 VALUES (688,198014,37,'hoarder','infallibly','sophomore',''); -INSERT INTO t2 VALUES (689,198015,37,'congregates','unwilling','star',''); -INSERT INTO t2 VALUES (690,198017,37,'rains','excrete','rifles',''); -INSERT INTO t2 VALUES (691,198018,37,'workers','spools','dialysis',''); -INSERT INTO t2 VALUES (692,198019,37,'sags','crunches','arriving',''); -INSERT INTO t2 VALUES (693,198020,37,'unplug','overestimating','indulge',''); -INSERT INTO t2 VALUES (694,198021,37,'garage','ineffective','clockers',''); -INSERT INTO t2 VALUES (695,198022,37,'boulder','humiliation','languages',''); -INSERT INTO t2 VALUES (696,198023,50,'hollowly','sophomore','Antarctica','A'); -INSERT INTO t2 VALUES (697,198024,37,'specifics','star','percentage',''); -INSERT INTO t2 VALUES (698,198101,37,'Teresa','rifles','ceiling','A'); -INSERT INTO t2 VALUES (699,198103,37,'Winsett','dialysis','specification',''); -INSERT INTO t2 VALUES (700,198105,37,'convenient','arriving','regimented','A'); -INSERT INTO t2 VALUES (701,198106,37,'buckboards','indulge','ciphers',''); -INSERT INTO t2 VALUES (702,198201,37,'amenities','clockers','pictures','A'); -INSERT INTO t2 VALUES (703,198204,37,'resplendent','languages','serpents','A'); -INSERT INTO t2 VALUES (704,198301,53,'priding','Antarctica','allot','A'); -INSERT INTO t2 VALUES (705,198302,53,'configurations','percentage','realized','A'); -INSERT INTO t2 VALUES (706,198303,53,'untidiness','ceiling','mayoral','A'); -INSERT INTO t2 VALUES (707,198304,53,'Brice','specification','opaquely','A'); -INSERT INTO t2 VALUES (708,198401,37,'sews','regimented','hostess','FAS'); -INSERT INTO t2 VALUES (709,198402,37,'participated','ciphers','fiftieth',''); -INSERT INTO t2 VALUES (710,198403,37,'Simon','pictures','incorrectly',''); -INSERT INTO t2 VALUES (711,202101,37,'certificates','serpents','decomposition','FAS'); -INSERT INTO t2 VALUES (712,202301,37,'Fitzpatrick','allot','stranglings',''); -INSERT INTO t2 VALUES (713,202302,37,'Evanston','realized','mixture','FAS'); -INSERT INTO t2 VALUES (714,202303,37,'misted','mayoral','electroencephalography','FAS'); -INSERT INTO t2 VALUES (715,202304,37,'textures','opaquely','similarities','FAS'); -INSERT INTO t2 VALUES (716,202305,37,'save','hostess','charges','W'); -INSERT INTO t2 VALUES (717,202601,37,'count','fiftieth','freest','FAS'); -INSERT INTO t2 VALUES (718,202602,37,'rightful','incorrectly','Greenberg','FAS'); -INSERT INTO t2 VALUES (719,202605,37,'chaperone','decomposition','tinting',''); -INSERT INTO t2 VALUES (720,202606,37,'Lizzy','stranglings','expelled','W'); -INSERT INTO t2 VALUES (721,202607,37,'clenched','mixture','warm',''); -INSERT INTO t2 VALUES (722,202901,37,'effortlessly','electroencephalography','smoothed',''); -INSERT INTO t2 VALUES (723,202902,37,'accessed','similarities','deductions','FAS'); -INSERT INTO t2 VALUES (724,202903,37,'beaters','charges','Romano','W'); -INSERT INTO t2 VALUES (725,202904,37,'Hornblower','freest','bitterroot',''); -INSERT INTO t2 VALUES (726,202907,37,'vests','Greenberg','corset',''); -INSERT INTO t2 VALUES (727,202908,37,'indulgences','tinting','securing',''); -INSERT INTO t2 VALUES (728,203101,37,'infallibly','expelled','environing','FAS'); -INSERT INTO t2 VALUES (729,203103,37,'unwilling','warm','cute',''); -INSERT INTO t2 VALUES (730,203104,37,'excrete','smoothed','Crays',''); -INSERT INTO t2 VALUES (731,203105,37,'spools','deductions','heiress','FAS'); -INSERT INTO t2 VALUES (732,203401,37,'crunches','Romano','inform','FAS'); -INSERT INTO t2 VALUES (733,203402,37,'overestimating','bitterroot','avenge',''); -INSERT INTO t2 VALUES (734,203404,37,'ineffective','corset','universals',''); -INSERT INTO t2 VALUES (735,203901,37,'humiliation','securing','Kinsey','W'); -INSERT INTO t2 VALUES (736,203902,37,'sophomore','environing','ravines','FAS'); -INSERT INTO t2 VALUES (737,203903,37,'star','cute','bestseller',''); -INSERT INTO t2 VALUES (738,203906,37,'rifles','Crays','equilibrium',''); -INSERT INTO t2 VALUES (739,203907,37,'dialysis','heiress','extents','0'); -INSERT INTO t2 VALUES (740,203908,37,'arriving','inform','relatively',''); -INSERT INTO t2 VALUES (741,203909,37,'indulge','avenge','pressure','FAS'); -INSERT INTO t2 VALUES (742,206101,37,'clockers','universals','critiques','FAS'); -INSERT INTO t2 VALUES (743,206201,37,'languages','Kinsey','befouled',''); -INSERT INTO t2 VALUES (744,206202,37,'Antarctica','ravines','rightfully','FAS'); -INSERT INTO t2 VALUES (745,206203,37,'percentage','bestseller','mechanizing','FAS'); -INSERT INTO t2 VALUES (746,206206,37,'ceiling','equilibrium','Latinizes',''); -INSERT INTO t2 VALUES (747,206207,37,'specification','extents','timesharing',''); -INSERT INTO t2 VALUES (748,206208,37,'regimented','relatively','Aden',''); -INSERT INTO t2 VALUES (749,208001,37,'ciphers','pressure','embassies',''); -INSERT INTO t2 VALUES (750,208002,37,'pictures','critiques','males','FAS'); -INSERT INTO t2 VALUES (751,208003,37,'serpents','befouled','shapelessly','FAS'); -INSERT INTO t2 VALUES (752,208004,37,'allot','rightfully','genres','FAS'); -INSERT INTO t2 VALUES (753,208008,37,'realized','mechanizing','mastering',''); -INSERT INTO t2 VALUES (754,208009,37,'mayoral','Latinizes','Newtonian',''); -INSERT INTO t2 VALUES (755,208010,37,'opaquely','timesharing','finishers','FAS'); -INSERT INTO t2 VALUES (756,208011,37,'hostess','Aden','abates',''); -INSERT INTO t2 VALUES (757,208101,37,'fiftieth','embassies','teem',''); -INSERT INTO t2 VALUES (758,208102,37,'incorrectly','males','kiting','FAS'); -INSERT INTO t2 VALUES (759,208103,37,'decomposition','shapelessly','stodgy','FAS'); -INSERT INTO t2 VALUES (760,208104,37,'stranglings','genres','scalps','FAS'); -INSERT INTO t2 VALUES (761,208105,37,'mixture','mastering','feed','FAS'); -INSERT INTO t2 VALUES (762,208110,37,'electroencephalography','Newtonian','guitars',''); -INSERT INTO t2 VALUES (763,208111,37,'similarities','finishers','airships',''); -INSERT INTO t2 VALUES (764,208112,37,'charges','abates','store',''); -INSERT INTO t2 VALUES (765,208113,37,'freest','teem','denounces',''); -INSERT INTO t2 VALUES (766,208201,37,'Greenberg','kiting','Pyle','FAS'); -INSERT INTO t2 VALUES (767,208203,37,'tinting','stodgy','Saxony',''); -INSERT INTO t2 VALUES (768,208301,37,'expelled','scalps','serializations','FAS'); -INSERT INTO t2 VALUES (769,208302,37,'warm','feed','Peruvian','FAS'); -INSERT INTO t2 VALUES (770,208305,37,'smoothed','guitars','taxonomically','FAS'); -INSERT INTO t2 VALUES (771,208401,37,'deductions','airships','kingdom','A'); -INSERT INTO t2 VALUES (772,208402,37,'Romano','store','stint','A'); -INSERT INTO t2 VALUES (773,208403,37,'bitterroot','denounces','Sault','A'); -INSERT INTO t2 VALUES (774,208404,37,'corset','Pyle','faithful',''); -INSERT INTO t2 VALUES (775,208501,37,'securing','Saxony','Ganymede','FAS'); -INSERT INTO t2 VALUES (776,208502,37,'environing','serializations','tidiness','FAS'); -INSERT INTO t2 VALUES (777,208503,37,'cute','Peruvian','gainful','FAS'); -INSERT INTO t2 VALUES (778,208504,37,'Crays','taxonomically','contrary','FAS'); -INSERT INTO t2 VALUES (779,208505,37,'heiress','kingdom','Tipperary','FAS'); -INSERT INTO t2 VALUES (780,210101,37,'inform','stint','tropics','W'); -INSERT INTO t2 VALUES (781,210102,37,'avenge','Sault','theorizers',''); -INSERT INTO t2 VALUES (782,210103,37,'universals','faithful','renew','0'); -INSERT INTO t2 VALUES (783,210104,37,'Kinsey','Ganymede','already',''); -INSERT INTO t2 VALUES (784,210105,37,'ravines','tidiness','terminal',''); -INSERT INTO t2 VALUES (785,210106,37,'bestseller','gainful','Hegelian',''); -INSERT INTO t2 VALUES (786,210107,37,'equilibrium','contrary','hypothesizer',''); -INSERT INTO t2 VALUES (787,210401,37,'extents','Tipperary','warningly','FAS'); -INSERT INTO t2 VALUES (788,213201,37,'relatively','tropics','journalizing','FAS'); -INSERT INTO t2 VALUES (789,213203,37,'pressure','theorizers','nested',''); -INSERT INTO t2 VALUES (790,213204,37,'critiques','renew','Lars',''); -INSERT INTO t2 VALUES (791,213205,37,'befouled','already','saplings',''); -INSERT INTO t2 VALUES (792,213206,37,'rightfully','terminal','foothill',''); -INSERT INTO t2 VALUES (793,213207,37,'mechanizing','Hegelian','labeled',''); -INSERT INTO t2 VALUES (794,216101,37,'Latinizes','hypothesizer','imperiously','FAS'); -INSERT INTO t2 VALUES (795,216103,37,'timesharing','warningly','reporters','FAS'); -INSERT INTO t2 VALUES (796,218001,37,'Aden','journalizing','furnishings','FAS'); -INSERT INTO t2 VALUES (797,218002,37,'embassies','nested','precipitable','FAS'); -INSERT INTO t2 VALUES (798,218003,37,'males','Lars','discounts','FAS'); -INSERT INTO t2 VALUES (799,218004,37,'shapelessly','saplings','excises','FAS'); -INSERT INTO t2 VALUES (800,143503,50,'genres','foothill','Stalin',''); -INSERT INTO t2 VALUES (801,218006,37,'mastering','labeled','despot','FAS'); -INSERT INTO t2 VALUES (802,218007,37,'Newtonian','imperiously','ripeness','FAS'); -INSERT INTO t2 VALUES (803,218008,37,'finishers','reporters','Arabia',''); -INSERT INTO t2 VALUES (804,218009,37,'abates','furnishings','unruly',''); -INSERT INTO t2 VALUES (805,218010,37,'teem','precipitable','mournfulness',''); -INSERT INTO t2 VALUES (806,218011,37,'kiting','discounts','boom','FAS'); -INSERT INTO t2 VALUES (807,218020,37,'stodgy','excises','slaughter','A'); -INSERT INTO t2 VALUES (808,218021,50,'scalps','Stalin','Sabine',''); -INSERT INTO t2 VALUES (809,218022,37,'feed','despot','handy','FAS'); -INSERT INTO t2 VALUES (810,218023,37,'guitars','ripeness','rural',''); -INSERT INTO t2 VALUES (811,218024,37,'airships','Arabia','organizer',''); -INSERT INTO t2 VALUES (812,218101,37,'store','unruly','shipyard','FAS'); -INSERT INTO t2 VALUES (813,218102,37,'denounces','mournfulness','civics','FAS'); -INSERT INTO t2 VALUES (814,218103,37,'Pyle','boom','inaccuracy','FAS'); -INSERT INTO t2 VALUES (815,218201,37,'Saxony','slaughter','rules','FAS'); -INSERT INTO t2 VALUES (816,218202,37,'serializations','Sabine','juveniles','FAS'); -INSERT INTO t2 VALUES (817,218203,37,'Peruvian','handy','comprised','W'); -INSERT INTO t2 VALUES (818,218204,37,'taxonomically','rural','investigations',''); -INSERT INTO t2 VALUES (819,218205,37,'kingdom','organizer','stabilizes','A'); -INSERT INTO t2 VALUES (820,218301,37,'stint','shipyard','seminaries','FAS'); -INSERT INTO t2 VALUES (821,218302,37,'Sault','civics','Hunter','A'); -INSERT INTO t2 VALUES (822,218401,37,'faithful','inaccuracy','sporty','FAS'); -INSERT INTO t2 VALUES (823,218402,37,'Ganymede','rules','test','FAS'); -INSERT INTO t2 VALUES (824,218403,37,'tidiness','juveniles','weasels',''); -INSERT INTO t2 VALUES (825,218404,37,'gainful','comprised','CERN',''); -INSERT INTO t2 VALUES (826,218407,37,'contrary','investigations','tempering',''); -INSERT INTO t2 VALUES (827,218408,37,'Tipperary','stabilizes','afore','FAS'); -INSERT INTO t2 VALUES (828,218409,37,'tropics','seminaries','Galatean',''); -INSERT INTO t2 VALUES (829,218410,37,'theorizers','Hunter','techniques','W'); -INSERT INTO t2 VALUES (830,226001,37,'renew','sporty','error',''); -INSERT INTO t2 VALUES (831,226002,37,'already','test','veranda',''); -INSERT INTO t2 VALUES (832,226003,37,'terminal','weasels','severely',''); -INSERT INTO t2 VALUES (833,226004,37,'Hegelian','CERN','Cassites','FAS'); -INSERT INTO t2 VALUES (834,226005,37,'hypothesizer','tempering','forthcoming',''); -INSERT INTO t2 VALUES (835,226006,37,'warningly','afore','guides',''); -INSERT INTO t2 VALUES (836,226007,37,'journalizing','Galatean','vanish','FAS'); -INSERT INTO t2 VALUES (837,226008,37,'nested','techniques','lied','A'); -INSERT INTO t2 VALUES (838,226203,37,'Lars','error','sawtooth','FAS'); -INSERT INTO t2 VALUES (839,226204,37,'saplings','veranda','fated','FAS'); -INSERT INTO t2 VALUES (840,226205,37,'foothill','severely','gradually',''); -INSERT INTO t2 VALUES (841,226206,37,'labeled','Cassites','widens',''); -INSERT INTO t2 VALUES (842,226207,37,'imperiously','forthcoming','preclude',''); -INSERT INTO t2 VALUES (843,226208,37,'reporters','guides','Jobrel',''); -INSERT INTO t2 VALUES (844,226209,37,'furnishings','vanish','hooker',''); -INSERT INTO t2 VALUES (845,226210,37,'precipitable','lied','rainstorm',''); -INSERT INTO t2 VALUES (846,226211,37,'discounts','sawtooth','disconnects',''); -INSERT INTO t2 VALUES (847,228001,37,'excises','fated','cruelty',''); -INSERT INTO t2 VALUES (848,228004,37,'Stalin','gradually','exponentials','A'); -INSERT INTO t2 VALUES (849,228005,37,'despot','widens','affective','A'); -INSERT INTO t2 VALUES (850,228006,37,'ripeness','preclude','arteries',''); -INSERT INTO t2 VALUES (851,228007,37,'Arabia','Jobrel','Crosby','FAS'); -INSERT INTO t2 VALUES (852,228008,37,'unruly','hooker','acquaint',''); -INSERT INTO t2 VALUES (853,228009,37,'mournfulness','rainstorm','evenhandedly',''); -INSERT INTO t2 VALUES (854,228101,37,'boom','disconnects','percentage',''); -INSERT INTO t2 VALUES (855,228108,37,'slaughter','cruelty','disobedience',''); -INSERT INTO t2 VALUES (856,228109,37,'Sabine','exponentials','humility',''); -INSERT INTO t2 VALUES (857,228110,37,'handy','affective','gleaning','A'); -INSERT INTO t2 VALUES (858,228111,37,'rural','arteries','petted','A'); -INSERT INTO t2 VALUES (859,228112,37,'organizer','Crosby','bloater','A'); -INSERT INTO t2 VALUES (860,228113,37,'shipyard','acquaint','minion','A'); -INSERT INTO t2 VALUES (861,228114,37,'civics','evenhandedly','marginal','A'); -INSERT INTO t2 VALUES (862,228115,37,'inaccuracy','percentage','apiary','A'); -INSERT INTO t2 VALUES (863,228116,37,'rules','disobedience','measures',''); -INSERT INTO t2 VALUES (864,228117,37,'juveniles','humility','precaution',''); -INSERT INTO t2 VALUES (865,228118,37,'comprised','gleaning','repelled',''); -INSERT INTO t2 VALUES (866,228119,37,'investigations','petted','primary','FAS'); -INSERT INTO t2 VALUES (867,228120,37,'stabilizes','bloater','coverings',''); -INSERT INTO t2 VALUES (868,228121,37,'seminaries','minion','Artemia','A'); -INSERT INTO t2 VALUES (869,228122,37,'Hunter','marginal','navigate',''); -INSERT INTO t2 VALUES (870,228201,37,'sporty','apiary','spatial',''); -INSERT INTO t2 VALUES (871,228206,37,'test','measures','Gurkha',''); -INSERT INTO t2 VALUES (872,228207,37,'weasels','precaution','meanwhile','A'); -INSERT INTO t2 VALUES (873,228208,37,'CERN','repelled','Melinda','A'); -INSERT INTO t2 VALUES (874,228209,37,'tempering','primary','Butterfield',''); -INSERT INTO t2 VALUES (875,228210,37,'afore','coverings','Aldrich','A'); -INSERT INTO t2 VALUES (876,228211,37,'Galatean','Artemia','previewing','A'); -INSERT INTO t2 VALUES (877,228212,37,'techniques','navigate','glut','A'); -INSERT INTO t2 VALUES (878,228213,37,'error','spatial','unaffected',''); -INSERT INTO t2 VALUES (879,228214,37,'veranda','Gurkha','inmate',''); -INSERT INTO t2 VALUES (880,228301,37,'severely','meanwhile','mineral',''); -INSERT INTO t2 VALUES (881,228305,37,'Cassites','Melinda','impending','A'); -INSERT INTO t2 VALUES (882,228306,37,'forthcoming','Butterfield','meditation','A'); -INSERT INTO t2 VALUES (883,228307,37,'guides','Aldrich','ideas',''); -INSERT INTO t2 VALUES (884,228308,37,'vanish','previewing','miniaturizes','W'); -INSERT INTO t2 VALUES (885,228309,37,'lied','glut','lewdly',''); -INSERT INTO t2 VALUES (886,228310,37,'sawtooth','unaffected','title',''); -INSERT INTO t2 VALUES (887,228311,37,'fated','inmate','youthfulness',''); -INSERT INTO t2 VALUES (888,228312,37,'gradually','mineral','creak','FAS'); -INSERT INTO t2 VALUES (889,228313,37,'widens','impending','Chippewa',''); -INSERT INTO t2 VALUES (890,228314,37,'preclude','meditation','clamored',''); -INSERT INTO t2 VALUES (891,228401,65,'Jobrel','ideas','freezes',''); -INSERT INTO t2 VALUES (892,228402,65,'hooker','miniaturizes','forgivably','FAS'); -INSERT INTO t2 VALUES (893,228403,65,'rainstorm','lewdly','reduce','FAS'); -INSERT INTO t2 VALUES (894,228404,65,'disconnects','title','McGovern','W'); -INSERT INTO t2 VALUES (895,228405,65,'cruelty','youthfulness','Nazis','W'); -INSERT INTO t2 VALUES (896,228406,65,'exponentials','creak','epistle','W'); -INSERT INTO t2 VALUES (897,228407,65,'affective','Chippewa','socializes','W'); -INSERT INTO t2 VALUES (898,228408,65,'arteries','clamored','conceptions',''); -INSERT INTO t2 VALUES (899,228409,65,'Crosby','freezes','Kevin',''); -INSERT INTO t2 VALUES (900,228410,65,'acquaint','forgivably','uncovering',''); -INSERT INTO t2 VALUES (901,230301,37,'evenhandedly','reduce','chews','FAS'); -INSERT INTO t2 VALUES (902,230302,37,'percentage','McGovern','appendixes','FAS'); -INSERT INTO t2 VALUES (903,230303,37,'disobedience','Nazis','raining',''); -INSERT INTO t2 VALUES (904,018062,37,'humility','epistle','infest',''); -INSERT INTO t2 VALUES (905,230501,37,'gleaning','socializes','compartment',''); -INSERT INTO t2 VALUES (906,230502,37,'petted','conceptions','minting',''); -INSERT INTO t2 VALUES (907,230503,37,'bloater','Kevin','ducks',''); -INSERT INTO t2 VALUES (908,230504,37,'minion','uncovering','roped','A'); -INSERT INTO t2 VALUES (909,230505,37,'marginal','chews','waltz',''); -INSERT INTO t2 VALUES (910,230506,37,'apiary','appendixes','Lillian',''); -INSERT INTO t2 VALUES (911,230507,37,'measures','raining','repressions','A'); -INSERT INTO t2 VALUES (912,230508,37,'precaution','infest','chillingly',''); -INSERT INTO t2 VALUES (913,230509,37,'repelled','compartment','noncritical',''); -INSERT INTO t2 VALUES (914,230901,37,'primary','minting','lithograph',''); -INSERT INTO t2 VALUES (915,230902,37,'coverings','ducks','spongers',''); -INSERT INTO t2 VALUES (916,230903,37,'Artemia','roped','parenthood',''); -INSERT INTO t2 VALUES (917,230904,37,'navigate','waltz','posed',''); -INSERT INTO t2 VALUES (918,230905,37,'spatial','Lillian','instruments',''); -INSERT INTO t2 VALUES (919,230906,37,'Gurkha','repressions','filial',''); -INSERT INTO t2 VALUES (920,230907,37,'meanwhile','chillingly','fixedly',''); -INSERT INTO t2 VALUES (921,230908,37,'Melinda','noncritical','relives',''); -INSERT INTO t2 VALUES (922,230909,37,'Butterfield','lithograph','Pandora',''); -INSERT INTO t2 VALUES (923,230910,37,'Aldrich','spongers','watering','A'); -INSERT INTO t2 VALUES (924,230911,37,'previewing','parenthood','ungrateful',''); -INSERT INTO t2 VALUES (925,230912,37,'glut','posed','secures',''); -INSERT INTO t2 VALUES (926,230913,37,'unaffected','instruments','chastisers',''); -INSERT INTO t2 VALUES (927,230914,37,'inmate','filial','icon',''); -INSERT INTO t2 VALUES (928,231304,37,'mineral','fixedly','reuniting','A'); -INSERT INTO t2 VALUES (929,231305,37,'impending','relives','imagining','A'); -INSERT INTO t2 VALUES (930,231306,37,'meditation','Pandora','abiding','A'); -INSERT INTO t2 VALUES (931,231307,37,'ideas','watering','omnisciently',''); -INSERT INTO t2 VALUES (932,231308,37,'miniaturizes','ungrateful','Britannic',''); -INSERT INTO t2 VALUES (933,231309,37,'lewdly','secures','scholastics','A'); -INSERT INTO t2 VALUES (934,231310,37,'title','chastisers','mechanics','A'); -INSERT INTO t2 VALUES (935,231311,37,'youthfulness','icon','humidly','A'); -INSERT INTO t2 VALUES (936,231312,37,'creak','reuniting','masterpiece',''); -INSERT INTO t2 VALUES (937,231313,37,'Chippewa','imagining','however',''); -INSERT INTO t2 VALUES (938,231314,37,'clamored','abiding','Mendelian',''); -INSERT INTO t2 VALUES (939,231315,37,'freezes','omnisciently','jarred',''); -INSERT INTO t2 VALUES (940,232102,37,'forgivably','Britannic','scolds',''); -INSERT INTO t2 VALUES (941,232103,37,'reduce','scholastics','infatuate',''); -INSERT INTO t2 VALUES (942,232104,37,'McGovern','mechanics','willed','A'); -INSERT INTO t2 VALUES (943,232105,37,'Nazis','humidly','joyfully',''); -INSERT INTO t2 VALUES (944,232106,37,'epistle','masterpiece','Microsoft',''); -INSERT INTO t2 VALUES (945,232107,37,'socializes','however','fibrosities',''); -INSERT INTO t2 VALUES (946,232108,37,'conceptions','Mendelian','Baltimorean',''); -INSERT INTO t2 VALUES (947,232601,37,'Kevin','jarred','equestrian',''); -INSERT INTO t2 VALUES (948,232602,37,'uncovering','scolds','Goodrich',''); -INSERT INTO t2 VALUES (949,232603,37,'chews','infatuate','apish','A'); -INSERT INTO t2 VALUES (950,232605,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (5950,1232605,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (5951,1232606,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (5952,1232607,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (5953,1232608,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (5954,1232609,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (951,232606,37,'raining','joyfully','Tropez',''); -INSERT INTO t2 VALUES (952,232607,37,'infest','Microsoft','nouns',''); -INSERT INTO t2 VALUES (953,232608,37,'compartment','fibrosities','distracting',''); -INSERT INTO t2 VALUES (954,232609,37,'minting','Baltimorean','mutton',''); -INSERT INTO t2 VALUES (955,236104,37,'ducks','equestrian','bridgeable','A'); -INSERT INTO t2 VALUES (956,236105,37,'roped','Goodrich','stickers','A'); -INSERT INTO t2 VALUES (957,236106,37,'waltz','apish','transcontinental','A'); -INSERT INTO t2 VALUES (958,236107,37,'Lillian','Adlerian','amateurish',''); -INSERT INTO t2 VALUES (959,236108,37,'repressions','Tropez','Gandhian',''); -INSERT INTO t2 VALUES (960,236109,37,'chillingly','nouns','stratified',''); -INSERT INTO t2 VALUES (961,236110,37,'noncritical','distracting','chamberlains',''); -INSERT INTO t2 VALUES (962,236111,37,'lithograph','mutton','creditably',''); -INSERT INTO t2 VALUES (963,236112,37,'spongers','bridgeable','philosophic',''); -INSERT INTO t2 VALUES (964,236113,37,'parenthood','stickers','ores',''); -INSERT INTO t2 VALUES (965,238005,37,'posed','transcontinental','Carleton',''); -INSERT INTO t2 VALUES (966,238006,37,'instruments','amateurish','tape','A'); -INSERT INTO t2 VALUES (967,238007,37,'filial','Gandhian','afloat','A'); -INSERT INTO t2 VALUES (968,238008,37,'fixedly','stratified','goodness','A'); -INSERT INTO t2 VALUES (969,238009,37,'relives','chamberlains','welcoming',''); -INSERT INTO t2 VALUES (970,238010,37,'Pandora','creditably','Pinsky','FAS'); -INSERT INTO t2 VALUES (971,238011,37,'watering','philosophic','halting',''); -INSERT INTO t2 VALUES (972,238012,37,'ungrateful','ores','bibliography',''); -INSERT INTO t2 VALUES (973,238013,37,'secures','Carleton','decoding',''); -INSERT INTO t2 VALUES (974,240401,41,'chastisers','tape','variance','A'); -INSERT INTO t2 VALUES (975,240402,41,'icon','afloat','allowed','A'); -INSERT INTO t2 VALUES (976,240901,41,'reuniting','goodness','dire','A'); -INSERT INTO t2 VALUES (977,240902,41,'imagining','welcoming','dub','A'); -INSERT INTO t2 VALUES (978,241801,41,'abiding','Pinsky','poisoning',''); -INSERT INTO t2 VALUES (979,242101,41,'omnisciently','halting','Iraqis','A'); -INSERT INTO t2 VALUES (980,242102,41,'Britannic','bibliography','heaving',''); -INSERT INTO t2 VALUES (981,242201,41,'scholastics','decoding','population','A'); -INSERT INTO t2 VALUES (982,242202,41,'mechanics','variance','bomb','A'); -INSERT INTO t2 VALUES (983,242501,41,'humidly','allowed','Majorca','A'); -INSERT INTO t2 VALUES (984,242502,41,'masterpiece','dire','Gershwins',''); -INSERT INTO t2 VALUES (985,246201,41,'however','dub','explorers',''); -INSERT INTO t2 VALUES (986,246202,41,'Mendelian','poisoning','libretto','A'); -INSERT INTO t2 VALUES (987,246203,41,'jarred','Iraqis','occurred',''); -INSERT INTO t2 VALUES (988,246204,41,'scolds','heaving','Lagos',''); -INSERT INTO t2 VALUES (989,246205,41,'infatuate','population','rats',''); -INSERT INTO t2 VALUES (990,246301,41,'willed','bomb','bankruptcies','A'); -INSERT INTO t2 VALUES (991,246302,41,'joyfully','Majorca','crying',''); -INSERT INTO t2 VALUES (992,248001,41,'Microsoft','Gershwins','unexpected',''); -INSERT INTO t2 VALUES (993,248002,41,'fibrosities','explorers','accessed','A'); -INSERT INTO t2 VALUES (994,248003,41,'Baltimorean','libretto','colorful','A'); -INSERT INTO t2 VALUES (995,248004,41,'equestrian','occurred','versatility','A'); -INSERT INTO t2 VALUES (996,248005,41,'Goodrich','Lagos','cosy',''); -INSERT INTO t2 VALUES (997,248006,41,'apish','rats','Darius','A'); -INSERT INTO t2 VALUES (998,248007,41,'Adlerian','bankruptcies','mastering','A'); -INSERT INTO t2 VALUES (999,248008,41,'Tropez','crying','Asiaticizations','A'); -INSERT INTO t2 VALUES (1000,248009,41,'nouns','unexpected','offerers','A'); -INSERT INTO t2 VALUES (1001,248010,41,'distracting','accessed','uncles','A'); -INSERT INTO t2 VALUES (1002,248011,41,'mutton','colorful','sleepwalk',''); -INSERT INTO t2 VALUES (1003,248012,41,'bridgeable','versatility','Ernestine',''); -INSERT INTO t2 VALUES (1004,248013,41,'stickers','cosy','checksumming',''); -INSERT INTO t2 VALUES (1005,248014,41,'transcontinental','Darius','stopped',''); -INSERT INTO t2 VALUES (1006,248015,41,'amateurish','mastering','sicker',''); -INSERT INTO t2 VALUES (1007,248016,41,'Gandhian','Asiaticizations','Italianization',''); -INSERT INTO t2 VALUES (1008,248017,41,'stratified','offerers','alphabetic',''); -INSERT INTO t2 VALUES (1009,248018,41,'chamberlains','uncles','pharmaceutic',''); -INSERT INTO t2 VALUES (1010,248019,41,'creditably','sleepwalk','creator',''); -INSERT INTO t2 VALUES (1011,248020,41,'philosophic','Ernestine','chess',''); -INSERT INTO t2 VALUES (1012,248021,41,'ores','checksumming','charcoal',''); -INSERT INTO t2 VALUES (1013,248101,41,'Carleton','stopped','Epiphany','A'); -INSERT INTO t2 VALUES (1014,248102,41,'tape','sicker','bulldozes','A'); -INSERT INTO t2 VALUES (1015,248201,41,'afloat','Italianization','Pygmalion','A'); -INSERT INTO t2 VALUES (1016,248202,41,'goodness','alphabetic','caressing','A'); -INSERT INTO t2 VALUES (1017,248203,41,'welcoming','pharmaceutic','Palestine','A'); -INSERT INTO t2 VALUES (1018,248204,41,'Pinsky','creator','regimented','A'); -INSERT INTO t2 VALUES (1019,248205,41,'halting','chess','scars','A'); -INSERT INTO t2 VALUES (1020,248206,41,'bibliography','charcoal','realest','A'); -INSERT INTO t2 VALUES (1021,248207,41,'decoding','Epiphany','diffusing','A'); -INSERT INTO t2 VALUES (1022,248208,41,'variance','bulldozes','clubroom','A'); -INSERT INTO t2 VALUES (1023,248209,41,'allowed','Pygmalion','Blythe','A'); -INSERT INTO t2 VALUES (1024,248210,41,'dire','caressing','ahead',''); -INSERT INTO t2 VALUES (1025,248211,50,'dub','Palestine','reviver',''); -INSERT INTO t2 VALUES (1026,250501,34,'poisoning','regimented','retransmitting','A'); -INSERT INTO t2 VALUES (1027,250502,34,'Iraqis','scars','landslide',''); -INSERT INTO t2 VALUES (1028,250503,34,'heaving','realest','Eiffel',''); -INSERT INTO t2 VALUES (1029,250504,34,'population','diffusing','absentee',''); -INSERT INTO t2 VALUES (1030,250505,34,'bomb','clubroom','aye',''); -INSERT INTO t2 VALUES (1031,250601,34,'Majorca','Blythe','forked','A'); -INSERT INTO t2 VALUES (1032,250602,34,'Gershwins','ahead','Peruvianizes',''); -INSERT INTO t2 VALUES (1033,250603,34,'explorers','reviver','clerked',''); -INSERT INTO t2 VALUES (1034,250604,34,'libretto','retransmitting','tutor',''); -INSERT INTO t2 VALUES (1035,250605,34,'occurred','landslide','boulevard',''); -INSERT INTO t2 VALUES (1036,251001,34,'Lagos','Eiffel','shuttered',''); -INSERT INTO t2 VALUES (1037,251002,34,'rats','absentee','quotes','A'); -INSERT INTO t2 VALUES (1038,251003,34,'bankruptcies','aye','Caltech',''); -INSERT INTO t2 VALUES (1039,251004,34,'crying','forked','Mossberg',''); -INSERT INTO t2 VALUES (1040,251005,34,'unexpected','Peruvianizes','kept',''); -INSERT INTO t2 VALUES (1041,251301,34,'accessed','clerked','roundly',''); -INSERT INTO t2 VALUES (1042,251302,34,'colorful','tutor','features','A'); -INSERT INTO t2 VALUES (1043,251303,34,'versatility','boulevard','imaginable','A'); -INSERT INTO t2 VALUES (1044,251304,34,'cosy','shuttered','controller',''); -INSERT INTO t2 VALUES (1045,251305,34,'Darius','quotes','racial',''); -INSERT INTO t2 VALUES (1046,251401,34,'mastering','Caltech','uprisings','A'); -INSERT INTO t2 VALUES (1047,251402,34,'Asiaticizations','Mossberg','narrowed','A'); -INSERT INTO t2 VALUES (1048,251403,34,'offerers','kept','cannot','A'); -INSERT INTO t2 VALUES (1049,251404,34,'uncles','roundly','vest',''); -INSERT INTO t2 VALUES (1050,251405,34,'sleepwalk','features','famine',''); -INSERT INTO t2 VALUES (1051,251406,34,'Ernestine','imaginable','sugars',''); -INSERT INTO t2 VALUES (1052,251801,34,'checksumming','controller','exterminated','A'); -INSERT INTO t2 VALUES (1053,251802,34,'stopped','racial','belays',''); -INSERT INTO t2 VALUES (1054,252101,34,'sicker','uprisings','Hodges','A'); -INSERT INTO t2 VALUES (1055,252102,34,'Italianization','narrowed','translatable',''); -INSERT INTO t2 VALUES (1056,252301,34,'alphabetic','cannot','duality','A'); -INSERT INTO t2 VALUES (1057,252302,34,'pharmaceutic','vest','recording','A'); -INSERT INTO t2 VALUES (1058,252303,34,'creator','famine','rouses','A'); -INSERT INTO t2 VALUES (1059,252304,34,'chess','sugars','poison',''); -INSERT INTO t2 VALUES (1060,252305,34,'charcoal','exterminated','attitude',''); -INSERT INTO t2 VALUES (1061,252306,34,'Epiphany','belays','dusted',''); -INSERT INTO t2 VALUES (1062,252307,34,'bulldozes','Hodges','encompasses',''); -INSERT INTO t2 VALUES (1063,252308,34,'Pygmalion','translatable','presentation',''); -INSERT INTO t2 VALUES (1064,252309,34,'caressing','duality','Kantian',''); -INSERT INTO t2 VALUES (1065,256001,34,'Palestine','recording','imprecision','A'); -INSERT INTO t2 VALUES (1066,256002,34,'regimented','rouses','saving',''); -INSERT INTO t2 VALUES (1067,256003,34,'scars','poison','maternal',''); -INSERT INTO t2 VALUES (1068,256004,34,'realest','attitude','hewed',''); -INSERT INTO t2 VALUES (1069,256005,34,'diffusing','dusted','kerosene',''); -INSERT INTO t2 VALUES (1070,258001,34,'clubroom','encompasses','Cubans',''); -INSERT INTO t2 VALUES (1071,258002,34,'Blythe','presentation','photographers',''); -INSERT INTO t2 VALUES (1072,258003,34,'ahead','Kantian','nymph','A'); -INSERT INTO t2 VALUES (1073,258004,34,'reviver','imprecision','bedlam','A'); -INSERT INTO t2 VALUES (1074,258005,34,'retransmitting','saving','north','A'); -INSERT INTO t2 VALUES (1075,258006,34,'landslide','maternal','Schoenberg','A'); -INSERT INTO t2 VALUES (1076,258007,34,'Eiffel','hewed','botany','A'); -INSERT INTO t2 VALUES (1077,258008,34,'absentee','kerosene','curs',''); -INSERT INTO t2 VALUES (1078,258009,34,'aye','Cubans','solidification',''); -INSERT INTO t2 VALUES (1079,258010,34,'forked','photographers','inheritresses',''); -INSERT INTO t2 VALUES (1080,258011,34,'Peruvianizes','nymph','stiller',''); -INSERT INTO t2 VALUES (1081,258101,68,'clerked','bedlam','t1','A'); -INSERT INTO t2 VALUES (1082,258102,68,'tutor','north','suite','A'); -INSERT INTO t2 VALUES (1083,258103,34,'boulevard','Schoenberg','ransomer',''); -INSERT INTO t2 VALUES (1084,258104,68,'shuttered','botany','Willy',''); -INSERT INTO t2 VALUES (1085,258105,68,'quotes','curs','Rena','A'); -INSERT INTO t2 VALUES (1086,258106,68,'Caltech','solidification','Seattle','A'); -INSERT INTO t2 VALUES (1087,258107,68,'Mossberg','inheritresses','relaxes','A'); -INSERT INTO t2 VALUES (1088,258108,68,'kept','stiller','exclaim',''); -INSERT INTO t2 VALUES (1089,258109,68,'roundly','t1','implicated','A'); -INSERT INTO t2 VALUES (1090,258110,68,'features','suite','distinguish',''); -INSERT INTO t2 VALUES (1091,258111,68,'imaginable','ransomer','assayed',''); -INSERT INTO t2 VALUES (1092,258112,68,'controller','Willy','homeowner',''); -INSERT INTO t2 VALUES (1093,258113,68,'racial','Rena','and',''); -INSERT INTO t2 VALUES (1094,258201,34,'uprisings','Seattle','stealth',''); -INSERT INTO t2 VALUES (1095,258202,34,'narrowed','relaxes','coinciding','A'); -INSERT INTO t2 VALUES (1096,258203,34,'cannot','exclaim','founder','A'); -INSERT INTO t2 VALUES (1097,258204,34,'vest','implicated','environing',''); -INSERT INTO t2 VALUES (1098,258205,34,'famine','distinguish','jewelry',''); -INSERT INTO t2 VALUES (1099,258301,34,'sugars','assayed','lemons','A'); -INSERT INTO t2 VALUES (1100,258401,34,'exterminated','homeowner','brokenness','A'); -INSERT INTO t2 VALUES (1101,258402,34,'belays','and','bedpost','A'); -INSERT INTO t2 VALUES (1102,258403,34,'Hodges','stealth','assurers','A'); -INSERT INTO t2 VALUES (1103,258404,34,'translatable','coinciding','annoyers',''); -INSERT INTO t2 VALUES (1104,258405,34,'duality','founder','affixed',''); -INSERT INTO t2 VALUES (1105,258406,34,'recording','environing','warbling',''); -INSERT INTO t2 VALUES (1106,258407,34,'rouses','jewelry','seriously',''); -INSERT INTO t2 VALUES (1107,228123,37,'poison','lemons','boasted',''); -INSERT INTO t2 VALUES (1108,250606,34,'attitude','brokenness','Chantilly',''); -INSERT INTO t2 VALUES (1109,208405,37,'dusted','bedpost','Iranizes',''); -INSERT INTO t2 VALUES (1110,212101,37,'encompasses','assurers','violinist',''); -INSERT INTO t2 VALUES (1111,218206,37,'presentation','annoyers','extramarital',''); -INSERT INTO t2 VALUES (1112,150401,37,'Kantian','affixed','spates',''); -INSERT INTO t2 VALUES (1113,248212,41,'imprecision','warbling','cloakroom',''); -INSERT INTO t2 VALUES (1114,128026,00,'saving','seriously','gazer',''); -INSERT INTO t2 VALUES (1115,128024,00,'maternal','boasted','hand',''); -INSERT INTO t2 VALUES (1116,128027,00,'hewed','Chantilly','tucked',''); -INSERT INTO t2 VALUES (1117,128025,00,'kerosene','Iranizes','gems',''); -INSERT INTO t2 VALUES (1118,128109,00,'Cubans','violinist','clinker',''); -INSERT INTO t2 VALUES (1119,128705,00,'photographers','extramarital','refiner',''); -INSERT INTO t2 VALUES (1120,126303,00,'nymph','spates','callus',''); -INSERT INTO t2 VALUES (1121,128308,00,'bedlam','cloakroom','leopards',''); -INSERT INTO t2 VALUES (1122,128204,00,'north','gazer','comfortingly',''); -INSERT INTO t2 VALUES (1123,128205,00,'Schoenberg','hand','generically',''); -INSERT INTO t2 VALUES (1124,128206,00,'botany','tucked','getters',''); -INSERT INTO t2 VALUES (1125,128207,00,'curs','gems','sexually',''); -INSERT INTO t2 VALUES (1126,118205,00,'solidification','clinker','spear',''); -INSERT INTO t2 VALUES (1127,116801,00,'inheritresses','refiner','serums',''); -INSERT INTO t2 VALUES (1128,116803,00,'stiller','callus','Italianization',''); -INSERT INTO t2 VALUES (1129,116804,00,'t1','leopards','attendants',''); -INSERT INTO t2 VALUES (1130,116802,00,'suite','comfortingly','spies',''); -INSERT INTO t2 VALUES (1131,128605,00,'ransomer','generically','Anthony',''); -INSERT INTO t2 VALUES (1132,118308,00,'Willy','getters','planar',''); -INSERT INTO t2 VALUES (1133,113702,00,'Rena','sexually','cupped',''); -INSERT INTO t2 VALUES (1134,113703,00,'Seattle','spear','cleanser',''); -INSERT INTO t2 VALUES (1135,112103,00,'relaxes','serums','commuters',''); -INSERT INTO t2 VALUES (1136,118009,00,'exclaim','Italianization','honeysuckle',''); -INSERT INTO t2 VALUES (5136,1118009,00,'exclaim','Italianization','honeysuckle',''); -INSERT INTO t2 VALUES (1137,138011,00,'implicated','attendants','orphanage',''); -INSERT INTO t2 VALUES (1138,138010,00,'distinguish','spies','skies',''); -INSERT INTO t2 VALUES (1139,138012,00,'assayed','Anthony','crushers',''); -INSERT INTO t2 VALUES (1140,068304,00,'homeowner','planar','Puritan',''); -INSERT INTO t2 VALUES (1141,078009,00,'and','cupped','squeezer',''); -INSERT INTO t2 VALUES (1142,108013,00,'stealth','cleanser','bruises',''); -INSERT INTO t2 VALUES (1143,084004,00,'coinciding','commuters','bonfire',''); -INSERT INTO t2 VALUES (1144,083402,00,'founder','honeysuckle','Colombo',''); -INSERT INTO t2 VALUES (1145,084003,00,'environing','orphanage','nondecreasing',''); -INSERT INTO t2 VALUES (1146,088504,00,'jewelry','skies','innocents',''); -INSERT INTO t2 VALUES (1147,088005,00,'lemons','crushers','masked',''); -INSERT INTO t2 VALUES (1148,088007,00,'brokenness','Puritan','file',''); -INSERT INTO t2 VALUES (1149,088006,00,'bedpost','squeezer','brush',''); -INSERT INTO t2 VALUES (1150,148025,00,'assurers','bruises','mutilate',''); -INSERT INTO t2 VALUES (1151,148024,00,'annoyers','bonfire','mommy',''); -INSERT INTO t2 VALUES (1152,138305,00,'affixed','Colombo','bulkheads',''); -INSERT INTO t2 VALUES (1153,138306,00,'warbling','nondecreasing','undeclared',''); -INSERT INTO t2 VALUES (1154,152701,00,'seriously','innocents','displacements',''); -INSERT INTO t2 VALUES (1155,148505,00,'boasted','masked','nieces',''); -INSERT INTO t2 VALUES (1156,158003,00,'Chantilly','file','coeducation',''); -INSERT INTO t2 VALUES (1157,156201,00,'Iranizes','brush','brassy',''); -INSERT INTO t2 VALUES (1158,156202,00,'violinist','mutilate','authenticator',''); -INSERT INTO t2 VALUES (1159,158307,00,'extramarital','mommy','Washoe',''); -INSERT INTO t2 VALUES (1160,158402,00,'spates','bulkheads','penny',''); -INSERT INTO t2 VALUES (1161,158401,00,'cloakroom','undeclared','Flagler',''); -INSERT INTO t2 VALUES (1162,068013,00,'gazer','displacements','stoned',''); -INSERT INTO t2 VALUES (1163,068012,00,'hand','nieces','cranes',''); -INSERT INTO t2 VALUES (1164,068203,00,'tucked','coeducation','masterful',''); -INSERT INTO t2 VALUES (1165,088205,00,'gems','brassy','biracial',''); -INSERT INTO t2 VALUES (1166,068704,00,'clinker','authenticator','steamships',''); -INSERT INTO t2 VALUES (1167,068604,00,'refiner','Washoe','windmills',''); -INSERT INTO t2 VALUES (1168,158502,00,'callus','penny','exploit',''); -INSERT INTO t2 VALUES (1169,123103,00,'leopards','Flagler','riverfront',''); -INSERT INTO t2 VALUES (1170,148026,00,'comfortingly','stoned','sisterly',''); -INSERT INTO t2 VALUES (1171,123302,00,'generically','cranes','sharpshoot',''); -INSERT INTO t2 VALUES (1172,076503,00,'getters','masterful','mittens',''); -INSERT INTO t2 VALUES (1173,126304,00,'sexually','biracial','interdependency',''); -INSERT INTO t2 VALUES (1174,068306,00,'spear','steamships','policy',''); -INSERT INTO t2 VALUES (1175,143504,00,'serums','windmills','unleashing',''); -INSERT INTO t2 VALUES (1176,160201,00,'Italianization','exploit','pretenders',''); -INSERT INTO t2 VALUES (1177,148028,00,'attendants','riverfront','overstatements',''); -INSERT INTO t2 VALUES (1178,148027,00,'spies','sisterly','birthed',''); -INSERT INTO t2 VALUES (1179,143505,00,'Anthony','sharpshoot','opportunism',''); -INSERT INTO t2 VALUES (1180,108014,00,'planar','mittens','showroom',''); -INSERT INTO t2 VALUES (1181,076104,00,'cupped','interdependency','compromisingly',''); -INSERT INTO t2 VALUES (1182,078106,00,'cleanser','policy','Medicare',''); -INSERT INTO t2 VALUES (1183,126102,00,'commuters','unleashing','corresponds',''); -INSERT INTO t2 VALUES (1184,128029,00,'honeysuckle','pretenders','hardware',''); -INSERT INTO t2 VALUES (1185,128028,00,'orphanage','overstatements','implant',''); -INSERT INTO t2 VALUES (1186,018410,00,'skies','birthed','Alicia',''); -INSERT INTO t2 VALUES (1187,128110,00,'crushers','opportunism','requesting',''); -INSERT INTO t2 VALUES (1188,148506,00,'Puritan','showroom','produced',''); -INSERT INTO t2 VALUES (1189,123303,00,'squeezer','compromisingly','criticizes',''); -INSERT INTO t2 VALUES (1190,123304,00,'bruises','Medicare','backer',''); -INSERT INTO t2 VALUES (1191,068504,00,'bonfire','corresponds','positively',''); -INSERT INTO t2 VALUES (1192,068305,00,'Colombo','hardware','colicky',''); -INSERT INTO t2 VALUES (1193,000000,00,'nondecreasing','implant','thrillingly',''); select t2.fld3 from t2 where companynr = 58 and fld3 like "%imaginable%"; fld3 imaginable @@ -1687,16 +488,6 @@ price2 double(11,0), key (period), key (name) ); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1001,"Iranizes",37,5987435,234724); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1002,"violinist",37,28357832,8723648); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1003,"extramarital",37,39654943,235872); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1004,"spates",78,726498,72987523); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1005,"cloakroom",78,98439034,823742); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1006,"gazer",101,834598,27348324); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1007,"hand",154,983543950,29837423); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1008,"tucked",311,234298,3275892); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1009,"gems",447,2374834,9872392); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1010,"clinker",512,786542,76234234); create temporary table tmp type = myisam select * from t3; insert into t3 select * from tmp; insert into tmp select * from t3; @@ -2499,18 +1290,6 @@ companyname char(30) NOT NULL default '', PRIMARY KEY (companynr), UNIQUE KEY companyname(companyname) ) TYPE=MyISAM MAX_ROWS=50 PACK_KEYS=1 COMMENT='companynames'; -INSERT INTO t4 (companynr, companyname) VALUES (29,'company 1'); -INSERT INTO t4 (companynr, companyname) VALUES (34,'company 2'); -INSERT INTO t4 (companynr, companyname) VALUES (36,'company 3'); -INSERT INTO t4 (companynr, companyname) VALUES (37,'company 4'); -INSERT INTO t4 (companynr, companyname) VALUES (40,'company 5'); -INSERT INTO t4 (companynr, companyname) VALUES (41,'company 6'); -INSERT INTO t4 (companynr, companyname) VALUES (53,'company 7'); -INSERT INTO t4 (companynr, companyname) VALUES (58,'company 8'); -INSERT INTO t4 (companynr, companyname) VALUES (65,'company 9'); -INSERT INTO t4 (companynr, companyname) VALUES (68,'company 10'); -INSERT INTO t4 (companynr, companyname) VALUES (50,'company 11'); -INSERT INTO t4 (companynr, companyname) VALUES (00,'Unknown'); select STRAIGHT_JOIN t2.companynr,companyname from t4,t2 where t2.companynr=t4.companynr group by t2.companynr; companynr companyname 00 Unknown diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result index c4e5984d360..1ee1368d029 100644 --- a/mysql-test/r/select_safe.result +++ b/mysql-test/r/select_safe.result @@ -70,7 +70,7 @@ insert into t1 values (null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(nu explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; table type possible_keys key key_len ref rows Extra t1 ALL b NULL NULL NULL 21 -t2 ALL b NULL NULL NULL 16 Using where +t2 ref b b 21 t1.b 6 Using where set MAX_SEEKS_FOR_KEY=1; explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test index 9884c88b420..3e23fa1a3f2 100644 --- a/mysql-test/t/select.test +++ b/mysql-test/t/select.test @@ -40,6 +40,7 @@ CREATE TABLE t2 ( # Populate table # +--disable_query_log INSERT INTO t2 VALUES (1,000001,00,'Omaha','teethe','neat',''); INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W'); INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring',''); @@ -1239,6 +1240,7 @@ INSERT INTO t2 VALUES (1190,123304,00,'bruises','Medicare','backer',''); INSERT INTO t2 VALUES (1191,068504,00,'bonfire','corresponds','positively',''); INSERT INTO t2 VALUES (1192,068305,00,'Colombo','hardware','colicky',''); INSERT INTO t2 VALUES (1193,000000,00,'nondecreasing','implant','thrillingly',''); +--enable_query_log # # Search with a key @@ -1364,6 +1366,7 @@ create table t3 ( key (name) ); +--disable_query_log INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1001,"Iranizes",37,5987435,234724); INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1002,"violinist",37,28357832,8723648); INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1003,"extramarital",37,39654943,235872); @@ -1374,6 +1377,7 @@ INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1007,"hand",154,9835 INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1008,"tucked",311,234298,3275892); INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1009,"gems",447,2374834,9872392); INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1010,"clinker",512,786542,76234234); +--enable_query_log create temporary table tmp type = myisam select * from t3; @@ -1496,6 +1500,7 @@ create table t4 ( UNIQUE KEY companyname(companyname) ) TYPE=MyISAM MAX_ROWS=50 PACK_KEYS=1 COMMENT='companynames'; +--disable_query_log INSERT INTO t4 (companynr, companyname) VALUES (29,'company 1'); INSERT INTO t4 (companynr, companyname) VALUES (34,'company 2'); INSERT INTO t4 (companynr, companyname) VALUES (36,'company 3'); @@ -1508,6 +1513,7 @@ INSERT INTO t4 (companynr, companyname) VALUES (65,'company 9'); INSERT INTO t4 (companynr, companyname) VALUES (68,'company 10'); INSERT INTO t4 (companynr, companyname) VALUES (50,'company 11'); INSERT INTO t4 (companynr, companyname) VALUES (00,'Unknown'); +--enable_query_log # # Test of stright join to force a full join. diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index b0d63f1d6d8..c521c4cfdcb 100755 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -114,37 +114,16 @@ done # Convert argument file from unix to DOS text # -if [ `which recode` ] -then - - print_debug "Using 'recode' to convert from unix to dos text" - - unix_to_dos() - { - for arg do - print_debug "Replacing LF -> CRLF from '$arg'" - - chmod u+w $arg - recode lat1..ibmpc $arg - done - } - -else - - print_debug "Using 'sed' to convert from unix to dos text" - - unix_to_dos() - { - for arg do - print_debug "Replacing LF -> CRLF from '$arg'" - - sed -e 's/$/\r/' $arg > $arg.tmp - rm -f $arg - mv $arg.tmp $arg - done - } +unix_to_dos() +{ + for arg do + print_debug "Replacing LF -> CRLF from '$arg'" -fi + cat $arg | awk '{sub(/$/,"\r");print}' > $arg.tmp + rm -f $arg + mv $arg.tmp $arg + done +} # @@ -169,6 +148,28 @@ find $BASE \( -name "*.dsp" -o -name "*.dsw" \) -and -not -path \*SCCS\* -print ) # +# Process version tags in InstallShield files +# + +vreplace() +{ + for arg do + unix_to_dos $arg + cat $arg | sed -e 's!@''VERSION''@!@VERSION@!' > $arg.tmp + rm -f $arg + mv $arg.tmp $arg + done +} + +for d in 4.0.XX-gpl 4.0.XX-pro 4.0.XX-classic +do + cd $BASE/InstallShield/$d/String\ Tables/0009-English + vreplace value.shl + cd ../../Setup\ Files/Compressed\ Files/Language\ Independent/OS\ Independent + vreplace infolist.txt +done + +# # Move all error message files to root directory # diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6f6d21f1f8b..d537dccc5a6 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2133,33 +2133,43 @@ find_best(JOIN *join,table_map rest_tables,uint idx,double record_count, s->table->used_keys && best_key) && !(s->table->force_index && best_key)) { // Check full join - ha_rows rnd_records= s->found_records; - if (s->on_expr) - { - tmp=rows2double(rnd_records); // Can't use read cache - } - else - { - tmp=(double) s->read_time; - /* Calculate time to read previous rows through cache */ - tmp*=(1.0+floor((double) cache_record_length(join,idx)* - record_count / - (double) thd->variables.join_buff_size)); - } - - /* - If there is a restriction on the table, assume that 25% of the - rows can be skipped on next part. - This is to force tables that this table depends on before this - table - */ - if (found_constrain) - rnd_records-= rnd_records/4; + /* Estimate cost of reading table. */ + tmp= (double) s->read_time; + if (s->on_expr) // Can't use join cache + { + /* We have to read the whole table for each record */ + tmp*= record_count; + } + else + { + /* We read the table as many times as join buffer becomes full. */ + tmp*= (1.0 + floor((double) cache_record_length(join,idx) * + record_count / + (double) thd->variables.join_buff_size)); + } + /* + We estimate the cost of making full cortesian product between + rows in the scanned table and generated records as + record_count*s->records/TIME_FOR_COMPARE. Taking into account + cost of evaluating WHERE clause for s->found_records is not + necessary because it costs much less than the cost mentioned + above. + */ if (best == DBL_MAX || - (tmp + record_count/(double) TIME_FOR_COMPARE*rnd_records < + (tmp + record_count/(double) TIME_FOR_COMPARE*s->records < best + record_count/(double) TIME_FOR_COMPARE*records)) { + /* + If there is a restriction on the table, assume that 25% of the + rows can be skipped on next part. + This is to force tables that this table depends on before this + table + */ + ha_rows rnd_records= s->found_records; + if (found_constrain) + rnd_records-= rnd_records/4; + /* If the table has a range (s->quick is set) make_join_select() will ensure that this will be used |
