diff options
462 files changed, 14948 insertions, 4049 deletions
diff --git a/.bzrignore b/.bzrignore index 492a91ee534..0e2ef25bf2e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -7,6 +7,7 @@ *.la *.lo *.o +*.reject *.spec */*_pure_*warnings */.pure @@ -152,6 +153,8 @@ client/mysqlbinlog client/mysqlcheck client/mysqldump client/mysqlimport +client/mysqlmanager-pwgen +client/mysqlmanagerc client/mysqlshow client/mysqltest client/mysys_priv.h @@ -203,6 +206,17 @@ libmysqld/backup_dir libmysqld/convert.cc libmysqld/derror.cc libmysqld/errmsg.c +libmysqld/examples/completion_hash.cc +libmysqld/examples/completion_hash.h +libmysqld/examples/my_readline.h +libmysqld/examples/mysql +libmysqld/examples/mysql.cc +libmysqld/examples/mysqltest +libmysqld/examples/mysqltest.c +libmysqld/examples/readline.cc +libmysqld/examples/sql_string.cc +libmysqld/examples/sql_string.h +libmysqld/examples/test-gdbinit libmysqld/field.cc libmysqld/field_conv.cc libmysqld/filesort.cc @@ -288,6 +302,8 @@ linked_libmysqldex_sources linked_server_sources linked_tools_sources locked +myisam/FT1.MYD +myisam/FT1.MYI myisam/ft_dump myisam/ft_eval myisam/ft_test1 @@ -326,6 +342,7 @@ scripts/make_binary_distribution scripts/msql2mysql scripts/mysql_config scripts/mysql_convert_table_format +scripts/mysql_explain_log scripts/mysql_find_rows scripts/mysql_fix_privilege_tables scripts/mysql_install_db @@ -402,15 +419,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -libmysqld/examples/completion_hash.cc -libmysqld/examples/completion_hash.h -libmysqld/examples/my_readline.h -libmysqld/examples/mysql.cc -libmysqld/examples/mysqltest.c -libmysqld/examples/readline.cc -libmysqld/examples/sql_string.cc -libmysqld/examples/sql_string.h -libmysqld/examples/mysql -libmysqld/examples/mysqltest -myisam/FT1.MYD -myisam/FT1.MYI diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max new file mode 100755 index 00000000000..238156d0b63 --- /dev/null +++ b/BUILD/compile-ia64-debug-max @@ -0,0 +1,13 @@ +gmake -k clean || true +/bin/rm -f */.deps/*.P config.cache + +aclocal && autoheader && aclocal && automake && autoconf +(cd bdb/dist && sh s_all) +(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +if [ -d gemini ] +then + (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) +fi + +CC=ecc CFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" CXX=ecc CXXFLAGS="-w1 -DEXTRA_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -O2" ./configure --prefix=/usr/local/mysql --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static --with-debug --with-innodb --with-embedded-server +gmake diff --git a/BUILD/compile-pentium-max b/BUILD/compile-pentium-max index 55f88ef4748..9838e6a287b 100755 --- a/BUILD/compile-pentium-max +++ b/BUILD/compile-pentium-max @@ -8,6 +8,6 @@ extra_configs="$pentium_configs" strip=yes extra_configs="$extra_configs --with-innodb --with-berkeley-db \ - --enable-thread-safe-client" + --enable-thread-safe-client --with-openssl --with-vio" . "$path/FINISH.sh" diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 81a2ba694f7..981f46c3256 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,3 +1,5 @@ +Administrator@fred. +Miguel@light.local Sinisa@sinisa.nasamreza.org davida@isil.mysql.com heikki@donna.mysql.fi @@ -26,5 +28,6 @@ tim@threads.polyesthetic.msg tim@white.box tim@work.mysql.com tonu@hundin.mysql.fi +tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps index cb7bb999513..ad3868733fa 100755 --- a/Build-tools/Do-all-build-steps +++ b/Build-tools/Do-all-build-steps @@ -65,6 +65,7 @@ aclocal; autoheader; aclocal; automake; autoconf --enable-thread-safe-client \ --with-berkeley-db \ --with-innodb \ + --with-vio \ --without-pstack \ --with-extra-tools \ --with-embedded-server diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 4cf2477f5bd..9409e3752df 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -4,10 +4,10 @@ use Getopt::Long; $opt_distribution=$opt_user=$opt_result=$opt_config_options=$opt_config_env=""; $opt_dbd_options=$opt_perl_options=$opt_suffix=""; $opt_tmp=$version_suffix=""; -$opt_help=$opt_Information=$opt_no_delete=$opt_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=0; +$opt_help=$opt_Information=$opt_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=0; $opt_innodb=$opt_bdb=0; -GetOptions("Information","help","distribution=s","user=s","result=s","no-delete","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip") || usage(); +GetOptions("Information","help","distribution=s","user=s","result=s","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip") || usage(); usage() if ($opt_help || $opt_Information); usage() if (!$opt_distribution); @@ -105,14 +105,31 @@ $|=1; safe_cd("$host"); if ($opt_stage == 0 && ! $opt_use_old_distribution) { + my ($name); safe_system("gunzip < $opt_distribution | $tar xf -"); + + # Fix file times; This is needed because the time for files may be + # in the future + system("touch timestamp; find $var -newer timestamp -print | xargs touch; rm -f timestamp"); + sleep(2); + # Ensure that files we don't want to rebuild are newer than other files + foreach $name ("configure", + "Docs/include.texi", + "Docs/*.html", "Docs/manual.txt", "Docs/mysql.info", + "sql/sql_yacc.h", "sql/sql_yacc.cc") + { + system("touch $name"); + } } + safe_cd($ver); if ($opt_stage <= 1) { $opt_config_options.=" --with-low-memory" if ($opt_with_low_memory); # Fix files if this is in another timezone than work.mysql.com unlink("config.cache"); + unlink("bdb/build_unix/config.cache"); + unlink("innobase/config.cache"); log_system("$make clean") if ($opt_use_old_distribution); if ($opt_static_server) { @@ -143,7 +160,7 @@ if ($opt_stage <= 1) if ($opt_stage <= 2) { - unlink($opt_distribution) if (!$opt_delete && !$opt_use_old_distribution); + unlink($opt_distribution) if ($opt_delete && !$opt_use_old_distribution); safe_system("$make"); } diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm index 138953ab188..046ba93a1dd 100755 --- a/Build-tools/Do-rpm +++ b/Build-tools/Do-rpm @@ -210,7 +210,7 @@ if [ $? != 0 ]; then tail $log fi -if [ ! x$local_build=x1 ]; then +if [ x$local_build != x1 ]; then # Build perl RPM (we currently need to be root to do this and that is # not possible) @@ -228,5 +228,3 @@ if [ ! x$local_build=x1 ]; then #scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS fi ) > $log 2>&1 - - diff --git a/Docs/Flags/belgium.eps b/Docs/Flags/belgium.eps Binary files differindex 9d2fdcf2295..295021fae58 100644 --- a/Docs/Flags/belgium.eps +++ b/Docs/Flags/belgium.eps diff --git a/Docs/Flags/belgium.gif b/Docs/Flags/belgium.gif Binary files differindex 2bceaef6afc..2bceaef6afc 100755..100644 --- a/Docs/Flags/belgium.gif +++ b/Docs/Flags/belgium.gif diff --git a/Docs/Flags/mexico.eps b/Docs/Flags/mexico.eps new file mode 100644 index 00000000000..907642cfec2 --- /dev/null +++ b/Docs/Flags/mexico.eps @@ -0,0 +1,258 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: Adobe Photoshop Version 5.5 +%%Title: mexico.eps +%%CreationDate: Fri Sep 21 2001 22:25:39 +%%BoundingBox: 0 0 32 22 +%%HiResBoundingBox: 0 0 32 22 +%%SuppressDotGainCompensation +%%EndComments +%%BeginProlog +%%EndProlog +%%BeginSetup +%%EndSetup +%ImageData: 32 22 8 3 1 32 2 "beginimage" +%BeginPhotoshop: 1362 +% 3842494D03ED000000000010004800000001000200480000000100023842494D +% 040D000000000004000000783842494D03F30000000000080000000000000000 +% 3842494D040A00000000000100003842494D271000000000000A000100000000 +% 000000023842494D03F5000000000048002F66660001006C6666000600000000 +% 0001002F6666000100A1999A0006000000000001003200000001005A00000006 +% 000000000001003500000001002D000000060000000000013842494D03F80000 +% 000000700000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF03E80000 +% 0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF03E800000000FFFF +% FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF03E800000000FFFFFFFFFFFF +% FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF03E800003842494D0408000000000010 +% 000000010000024000000240000000003842494D041400000000000400000001 +% 3842494D040C0000000003D30000000100000020000000160000006000000840 +% 000003B700180001FFD8FFE000104A46494600010201004800480000FFEE000E +% 41646F626500648000000001FFDB0084000C08080809080C09090C110B0A0B11 +% 150F0C0C0F1518131315131318110C0C0C0C0C0C110C0C0C0C0C0C0C0C0C0C0C +% 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C010D0B0B0D0E0D100E0E10140E0E0E +% 14140E0E0E0E14110C0C0C0C0C11110C0C0C0C0C0C110C0C0C0C0C0C0C0C0C0C +% 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0CFFC0001108001600200301220002 +% 1101031101FFDD00040002FFC4013F0000010501010101010100000000000000 +% 030001020405060708090A0B0100010501010101010100000000000000010002 +% 030405060708090A0B1000010401030204020507060805030C33010002110304 +% 211231054151611322718132061491A1B14223241552C16233347282D1430725 +% 9253F0E1F163733516A2B283264493546445C2A3743617D255E265F2B384C3D3 +% 75E3F3462794A485B495C4D4E4F4A5B5C5D5E5F55666768696A6B6C6D6E6F637 +% 475767778797A7B7C7D7E7F71100020201020404030405060707060535010002 +% 1103213112044151617122130532819114A1B14223C152D1F0332462E1728292 +% 435315637334F1250616A2B283072635C2D2449354A317644555367465E2F2B3 +% 84C3D375E3F34694A485B495C4D4E4F4A5B5C5D5E5F55666768696A6B6C6D6E6 +% F62737475767778797A7B7C7FFDA000C03010002110311003F00C0E9FD3F01F8 +% 18CF7E354E73AA61738B1A4925AD924ED5DF7D48FAB9F57B2BA55B664F4BC3BD +% E321CD0EB28ADE40D951DBB9EC3E2B88E9BFF2762FFC4D7FF52D5D5626366E5F +% D4DCBC6C663ACAECC87FACDAC6E798AE934D6DAFD3BFD8EBB66F7B2B7FFA2FD1 +% 5175F9B8791CAE490E625649AE3D2DC3E42723CE484A4787D7B9B5FF00C62743 +% FABD8FF57F1B27A7F4FC3A4DB92C8BA8A6A6EE63ABB9FA59533DD5BBDAE5E6B9 +% 38D8EDC7B48A9808638821A2661779D7FA6E574BFA974E1DDEA1ADB9ED7566D9 +% 6B8175377AF5328F7FA74D776ED967ABFACD9EB5FF00CCBEABAFE1F2BFA2DDFD +% 477E42AD649C8E489D4588E8FA0FC371E33C84CF0C654725488ECFFFD0C0E9F9 +% 37370319A312D7015300703541F6B7DC375CD72EFBEA4754CDABA55ADAFA4666 +% 40390E3BEB7E2000ECABDBFA7CEA5FFF0045785A4B2F94E1FBC9AE1FD2DB8EFF +% 00E738BC8F0FDEE55C37EBF97DCE2FF9DE97DABFC64752CCBFA1D0CB7A565E2B +% 465308B2D7629693E9DFECFD5B3721FBBFB0BCCF26D79C7B41A5E0163B525903 +% 4F2B160A4ACE6AF746DD3F79EEFE1BC7F709571D7EB3E5F6B87FE7FADFFFD900 +% 3842494D03FD000000000006010000000000 +%EndPhotoshop +gsave % EPS gsave +/hascolor +/deviceinfo where +{pop deviceinfo /Colors known +{deviceinfo /Colors get exec 1 gt} +{false} ifelse} +{/statusdict where +{pop statusdict /processcolors known +{statusdict /processcolors get exec 1 gt} +{false} ifelse} +{false} ifelse} +ifelse +def +40 dict begin +/_image systemdict /image get def +/_setgray systemdict /setgray get def +/_currentgray systemdict /currentgray get def +/_settransfer systemdict /settransfer get def +/_currenttransfer systemdict /currenttransfer get def +/blank 0 _currenttransfer exec +1 _currenttransfer exec eq def +/negative blank +{0 _currenttransfer exec 0.5 lt} +{0 _currenttransfer exec 1 _currenttransfer exec gt} +ifelse def +/inverted? negative def +/level2 systemdict /languagelevel known +{languagelevel 2 ge} {false} ifelse def +/level3 systemdict /languagelevel known +{languagelevel 3 ge} {false} ifelse def +/foureq {4 index eq 8 1 roll +4 index eq 8 1 roll +4 index eq 8 1 roll +4 index eq 8 1 roll +pop pop pop pop and and and} def +hascolor {/band 0 def} {/band 5 def} ifelse +/setcmykcolor where {pop +1 0 0 0 setcmykcolor _currentgray 1 exch sub +0 1 0 0 setcmykcolor _currentgray 1 exch sub +0 0 1 0 setcmykcolor _currentgray 1 exch sub +0 0 0 1 setcmykcolor _currentgray 1 exch sub +4 {4 copy} repeat +1 0 0 0 foureq {/band 1 store} if +0 1 0 0 foureq {/band 2 store} if +0 0 1 0 foureq {/band 3 store} if +0 0 0 1 foureq {/band 4 store} if +0 0 0 0 foureq {/band 6 store} if} if +blank {/band 6 store} if +gsave % Image Header gsave +/rows 22 def +/cols 32 def +32 22 scale +level2 { +band 0 eq { +/DeviceRGB +} {/DeviceGray} ifelse +setcolorspace currentdict /PhotoshopDuotoneColorSpace undef currentdict /PhotoshopDuotoneAltColorSpace undef } if +/picstr1 32 string def +/picstr2 32 string def +/picstr3 32 string def +/picstr4 32 string def +/readdata {currentfile exch readhexstring pop} def +/image2 level2 {/image load def} {{begin +Width Height BitsPerComponent ImageMatrix +Decode length 2 eq +{/DataSource load image} if +Decode length 6 eq +{DataSource 0 get DataSource 1 get DataSource 2 get +true 3 colorimage} if +Decode length 8 eq +{DataSource 0 get DataSource 1 get +DataSource 2 get DataSource 3 get +true 4 colorimage} if +end} def} ifelse +/_image2 level2 {/_image load def} {{begin +Width Height BitsPerComponent ImageMatrix +/DataSource load _image end} def} ifelse +/beginimage { +band 0 eq band 4 eq or band 5 eq or +{image2} +{negative {{pop 0}} {{pop 1}} ifelse +_settransfer _image2} ifelse +} def +12 dict begin +/ImageType 1 def +/Width cols def +/Height rows def +/ImageMatrix [cols 0 0 rows neg 0 rows] def +/BitsPerComponent 8 def +band 0 eq +{/Decode [0 1 0 1 0 1] def +/MultipleDataSources true def +/DataSource [ +{picstr1 readdata} +{picstr2 readdata} +{picstr3 readdata picstr4 readdata pop} +] def} +{/Decode [0 1] def +/DataSource { +picstr1 readdata pop +picstr2 readdata pop +picstr3 readdata pop +picstr4 readdata +} def} +ifelse +currentdict end +%%BeginBinary: 5821 +beginimage +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFF94FFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFF42FFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFF00FFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFF53FFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFF6B427B5AFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFF6B183929FFFFFF0000000000000000000000 +0000000000000000000000FFFFFF73000000FFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFF6C224733FFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFF319C397B6BFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFF9C42213931FFFF0000000000000000000000 +0000000000000000000000FFFFFF0000000000FFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFF6B5625473DFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFF8C6B39945A63FFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFF8431184A2931FFFF0000000000000000000000 +0000000000000000000000FFFF840000001010FFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFF863D1F58353CFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFF00FF94637B94FFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFF5AFF4A294A94FFFF0000000000000000000000 +0000000000000000000000FFFF10FF00000094FFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFF37FF58365194FFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FF21FF1810EFEFB518FFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FF73FF6B7B9CEFAD84FF0000000000000000000000 +0000000000000000000000FF00FF000800EFA500FF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFF4EFF464EA4EFAF55FF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFF21FF9494FF21FFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFF73FF4242FF63FFFF0000000000000000000000 +0000000000000000000000FFFF00FF0000FF00FFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFF4EFF5353FF44FFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFF2121D621FFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFF6373DE63FFFFFF0000000000000000000000 +0000000000000000000000FFFFFF0000CE00FFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFF444EDA44FFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000FFFFFFFFFFFFFFFFFFFFC6C6C6C6C6C6C6C6C6C600 +00B5B5B5B5B5B5B5B5B5B5FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +0000000000000000000000FFFFFFFFFFFFFFFFFFFF0000000000000000000000 +006B6B6B6B6B6B6B6B6B6BFFFFFFFFFFFFFFFFFFFF3B3B3B3B3B3B3B3B3B3B00 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 + +%%EndBinary +grestore end % Image Trailer grestore +grestore % EPS grestore diff --git a/Docs/Flags/mexico.gif b/Docs/Flags/mexico.gif Binary files differnew file mode 100644 index 00000000000..96a0f2a5bc7 --- /dev/null +++ b/Docs/Flags/mexico.gif diff --git a/Docs/Flags/mexico.txt b/Docs/Flags/mexico.txt new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Docs/Flags/mexico.txt diff --git a/Docs/Flags/philippines.eps b/Docs/Flags/philippines.eps Binary files differindex d71deb30170..8d0ca0f91ec 100755..100644 --- a/Docs/Flags/philippines.eps +++ b/Docs/Flags/philippines.eps diff --git a/Docs/Flags/philippines.gif b/Docs/Flags/philippines.gif Binary files differindex 2f2a17a852d..2f2a17a852d 100755..100644 --- a/Docs/Flags/philippines.gif +++ b/Docs/Flags/philippines.gif diff --git a/Docs/Flags/turkey.eps b/Docs/Flags/turkey.eps Binary files differindex 29ca34f0800..17cfb962d0c 100644 --- a/Docs/Flags/turkey.eps +++ b/Docs/Flags/turkey.eps diff --git a/Docs/Flags/turkey.gif b/Docs/Flags/turkey.gif Binary files differindex 99715c01b04..99715c01b04 100755..100644 --- a/Docs/Flags/turkey.gif +++ b/Docs/Flags/turkey.gif diff --git a/Docs/manual.ja.texi b/Docs/manual.ja.texi index d3ee43acd29..dea7046b538 100644 --- a/Docs/manual.ja.texi +++ b/Docs/manual.ja.texi @@ -3187,7 +3187,7 @@ encounter per year, but we are as always very flexible towards our customers! @c @image{Flags/estonia} Estonia [Tradenet] @ @c @uref{http://mysql.tradenet.ee, WWW} @item -@c EMAIL: tonu@spamm.ee (Tonu Samuel) +@c EMAIL: tonu@spam.ee (Tonu Samuel) @image{Flags/estonia} Estonia [OKinteractive] @ @uref{http://mysql.mirror.ok.ee, WWW} @item diff --git a/Docs/manual.texi b/Docs/manual.texi index df07f391112..f9f12d00d00 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -1,4 +1,4 @@ -input texinfo @c -*-texinfo-*- +\input texinfo @c -*-texinfo-*- @c Copyright 1997-2001 TcX AB, Detron HB and MySQL Finland AB @c @c ********************************************************* @@ -219,7 +219,7 @@ The @code{mysqlbug} script should be used to generate bug reports. For source distributions, the @code{mysqlbug} script can be found in the @file{scripts} directory. For binary distributions, @code{mysqlbug} can be found in the @file{bin} directory. If you have found a sensitive -security bug in MySQL, you should send an email to +security bug in MySQL, you should send an e-mail to @email{security@@mysql.com}. @cindex errors, reporting @@ -239,7 +239,7 @@ MySQL, see @ref{MySQL-Books}. @menu * MySQL and MySQL AB:: MySQL, MySQL AB, and Open Source * MySQL Information Sources:: MySQL Information Sources -* Licensing and Support:: MySQL Licensing and Support +* Licensing and Support:: MySQL Support and Licensing * Compatibility:: How Standards-compatible Is MySQL? * Comparisons:: How MySQL Compares to Other Databases * TODO:: MySQL and the future (The TODO) @@ -317,15 +317,15 @@ us. MySQL is very fast, reliable, and easy to use. If that is what you are looking for, you should give it a try. MySQL also has a -very practical set of features developed in very close cooperation with +practical set of features developed in close cooperation with our users. You can find a performance comparison of MySQL to some other database managers on our benchmark page. @xref{MySQL Benchmarks}. -MySQL was originally developed to handle very large databases +MySQL was originally developed to handle large databases much faster than existing solutions and has been successfully used in highly demanding production environments for several years. Though -under constant development, MySQL today offers a rich and very +under constant development, MySQL today offers a rich and useful set of functions. The connectivity, speed, and security make MySQL highly suited for accessing databases on the Internet. @@ -366,16 +366,20 @@ to the MySQL server source code and the MySQL trademark. A significant amount of revenues from our services goes to developing MySQL. @xref{What-is}. +@menu +* Contact information:: Contact information +@end menu + MySQL AB has been profitable providing MySQL from the start. We don't get any outside funding, but have earned all our money ourselves. -We are searching after partners that would like to support our development -of MySQL so that we could accelerate the development pace. If you -are interested in doing this, you can email @email{partner@@mysql.com} about -this! +We are searching for partners that would like to support our development +of MySQL so that we can accelerate the pace of development. If you +are interested in doing this, please e-mail @email{partner@@mysql.com}! -MySQL AB has currently 20+ people -(@uref{http://www.mysql.com/development/team.html}) on its payroll and is growing rapidly. +MySQL AB currently has over twenty people +(@uref{http://www.mysql.com/development/team.html}) +on its payroll and is growing rapidly. Our main sources of income are: @@ -385,21 +389,21 @@ Our main sources of income are: Commercial high quality support for MySQL provided by the MySQL developers themselves. If you are interested in purchasing a support contract, please visit @uref{https://order.mysql.com/} to view our -support options or to order support. +support options and order support. @item Consulting services. We have developers and consultants in 12 countries and partners in many other countries that can help you with almost any MySQL related issues. If you need consulting services, please -email a good description of your needs to @email{info@@mysql.com}! If we +e-mail a good description of your needs to @email{info@@mysql.com}! If we can't handle this ourselves we can usually find a partner or a developer that can help you with your problems. @item -We sell licenses for using MySQL as an embedded database. -@xref{Cost}. If you have a commercial product for which you need a fast, +Licensing MySQL for use as an embedded database. @xref{Licensing policy}. +If you have a commercial product for which you need a fast, high quality database, but you can't afford to make your product Open Source, -you can buy the right to use the MySQL server under a normal +you can buy the right to use the MySQL server under a commercial copyright. If you are interested in this you can buy MySQL licenses at @uref{https://order.mysql.com/} or contact us at @email{licensing@@mysql.com}. @@ -407,26 +411,26 @@ at @email{licensing@@mysql.com}. @item Advertising. @uref{http://www.mysql.com/} is a very popular web site with more than 10,000,000 page views per months (January 2001). By putting a -banner on this you are guaranteed to reach a lot of potential customers -in the Open source, Linux and database community. If you are interested -in this email @email{advertising@@mysql.com}. +banner on this site you are guaranteed to reach a lot of potential customers +in the open source, Linux and database communities. If you are interested +in this e-mail @email{advertising@@mysql.com}. @item We are building a partner program to be able to provide MySQL services in every country. If you are interested in becoming a partner of MySQL AB please visit -@uref{http://www.mysql.com/information/partners.html} or email +@uref{http://www.mysql.com/information/partners.html} or e-mail @email{partner@@mysql.com}. @item We provide MySQL training through our partner programs. For more -information, please email @email{info@@mysql.com}. +information, please e-mail @email{info@@mysql.com}. @item The MySQL brand has, since 1995, been associated with speed and reliability, and is known to be something you can depend upon. If you are interested in using the MySQL trademark in your marketing, you -can email @email{info@@mysql.com} about this. +can e-mail @email{info@@mysql.com} about this. @end itemize The MySQL core values show our dedication to MySQL and @@ -436,13 +440,13 @@ We want MySQL to be: @itemize @bullet @item -The best and the most used database in the world. +The best and the most widely used database in the world. @item Available and affordable for all. @item Easy to use. @item -Continuously improved while remaining fast and safe. +Continuously improving while remaining fast and safe. @item Fun to use and improve. @item @@ -459,13 +463,56 @@ Aim to be good citizens. @item Prefer partners that share our values and mind-set. @item -Answer mail and give support. +Answer e-mail and provide support. @item Are a virtual company, networking with others. @item Work against software patents. @end itemize +@node Contact information, , What is MySQL AB, What is MySQL AB +@subsubsection Contact Information + +@cindex contact information +@cindex licensing, contact information +@cindex advertising, contact information +@cindex employment, contact information +@cindex partnering with MySQL +@cindex employment with MySQL +@cindex jobs at MySQL + +For commercial licensing, please contact the MySQL licensing +team. The much preferred method is by e-mail to +@email{licensing@@mysql.com}. Fax is also possible but handling of +these may take much longer (Fax +46-8-729 69 05). + +If you represent a business that is interested in partnering with +MySQL, please send e-mail to @email{partner@@mysql.com}. + +For timely, precise answers to technical questions about MySQL +you should order one of our +@uref{https://order.mysql.com/, support contracts}. +MySQL support is provided by the MySQL developers so the +standard is extremely high. + +If you are interested in placing a banner advertisement on our Web site, +please send e-mail to @email{advertising@@mysql.com}. + +If you are interested in any of the jobs listed in our +@uref{http://www.mysql.com/development/jobs/, jobs} section, please send e-mail +to @email{jobs@@mysql.com}. + +For general discussion amongst our many users, please direct your attention to +the appropriate @uref{http://www.mysql.com/documentation/lists.html, mailing +list}. + +For general information inquires, please send e-mail to +@email{info@@mysql.com}. + +For questions or comments about the workings or content of the Web site, +please send e-mail to @email{webmaster@@mysql.com}. + + @node Manual-info, Manual conventions, What is MySQL AB, MySQL and MySQL AB @subsection About This Manual @@ -481,8 +528,8 @@ and @code{dvips}. The PDF version is produced with @code{pdftex}. @cindex Texinfo This manual is written and maintained by David Axmark, Michael (Monty) -Widenius, Jeremy Cole, and Paul DuBois. For other contributors, -see @ref{Credits}. +Widenius, Jeremy Cole, Arjen Lentz, and Paul DuBois. For other +contributors, see @ref{Credits}. @node Manual conventions, History, Manual-info, MySQL and MySQL AB @@ -550,7 +597,7 @@ shell> setenv VARNAME value shell> some_command @end example -Often, database, table, and column names must be substituted into commands. To +Often database, table, and column names must be substituted into commands. To indicate that such substitution is necessary, this manual uses @code{db_name}, @code{tbl_name} and @code{col_name}. For example, you might see a statement like this: @@ -723,9 +770,11 @@ databases that contain 50,000,000 records and we know of users that uses MySQL with 60,000 tables and about 5,000,000,000 rows @item -All columns have default values. You can use @code{INSERT} to insert a -subset of a table's columns; those columns that are not explicitly given -values are set to their default values. +@cindex default values +All columns have default values. +You can use @code{INSERT} to insert a subset of a table's columns; those +columns that are not explicitly given values are set to their default +values. @item Uses GNU Automake, Autoconf, and Libtool for portability. @@ -933,10 +982,10 @@ using this with good results. @item BDB Tables -- Beta The Berkeley DB code is very stable, but we are still improving the interface between MySQL and BDB tables, so it will take some time before this -is as tested as the other table types. +is tested as well as the other table types. @item InnoDB Tables -- Beta -This is a recent addition to @code{MySQL}. They appear to work good and +This is a recent addition to @code{MySQL}. They appear to work well and can be used after some initial testing. @item Automatic recovery of MyISAM tables - Beta @@ -944,15 +993,15 @@ This only affects the new code that checks if the table was closed properly on open and executes an automatic check/repair of the table if it wasn't. @item MERGE tables -- Beta / Gamma -The usage of keys on @code{MERGE} tables is still not that tested. The -other part of the @code{MERGE} code is quite well tested. +The usage of keys on @code{MERGE} tables is still not well tested. The +other parts of the @code{MERGE} code are quite well tested. @item FULLTEXT -- Beta Text search seems to work, but is still not widely used. @end table -MySQL AB provides e-mail support for paying customers, but the +MySQL AB provides high-quality support for paying customers, but the MySQL mailing list usually provides answers to common questions. Bugs are usually fixed right away with a patch; for serious bugs, there is almost always a new release. @@ -1598,8 +1647,8 @@ FutureForum Web Discussion Software. @table @asis @item @uref{http://www.supportwizard.com/} -SupportWizard; Interactive helpdesk on the Web (This product includes a -licensed copy of MySQL.) +SupportWizard; Interactive helpdesk on the Web. This product includes a +licensed copy of MySQL. @item @uref{http://www.sonork.com/} Sonork, Instant Messenger that is not only Internet oriented. It's @@ -1664,7 +1713,7 @@ A free report writer in Java @item @uref{http://www.javaframework.de} MySQLExport - Export of MySQL create statements and data in a lot of -different formats (SQL, HTML, CVS, text, ZIP, GZIP...) +different formats (SQL, HTML, CVS, text, ZIP, GZIP...). @item @uref{http://dlabs.4t2.com} M2D, a MySQL Administration client for Windows. M2D supports @@ -1707,13 +1756,6 @@ PHP: A server-side HTML-embedded scripting language. The Midgard Application Server; a powerful Web development environment based on MySQL and PHP. -@item @uref{http://www.smartworker.org} -SmartWorker is a platform for Web application development. - -@item @uref{http://xsp.lentus.se/} -XSP: e(X)tendible (S)erver (P)ages and is a HTML embedded tag language -written in Java (previously known as XTAGS.) - @cindex dbServ @item @uref{http://www.dbServ.de/} dbServ is an extension to a web server to integrate database output into @@ -1735,28 +1777,12 @@ ForwardSQL: HTML interface to manipulate MySQL databases. @item @uref{http://www.daa.com.au/~james/www-sql/} WWW-SQL: Display database information. -@item @uref{http://www.minivend.com/minivend/} -Minivend: A Web shopping cart. - @item @uref{http://www.heitml.com/} HeiTML: A server-side extension of HTML and a 4GL language at the same time. -@item @uref{http://www.metahtml.com/} -Metahtml: A Dynamic Programming Language for WWW Applications. - -@item @uref{http://www.binevolve.com/} -VelocityGen for Perl and Tcl. - @item @uref{http://hawkeye.net/} Hawkeye Internet Server Suite. -@item @uref{http://www.fastflow.com/} -Network Database Connection For Linux - -@item @uref{http://www.wdbi.net/} -WDBI: Web browser as a universal front end to databases which supports -MySQL well. - @item @uref{http://www.webgroove.com/} WebGroove Script: HTML compiler and server-side scripting language. @@ -1769,18 +1795,9 @@ How to use MySQL with ColdFusion on Solaris. @item @uref{http://calistra.com/MySQL/} Calistra's ODBC MySQL Administrator. -@cindex Webmerger -@item @uref{http://www.webmerger.com} -Webmerger - This CGI tool interprets files and generates dynamic output -based on a set of simple tags. Ready-to-run drivers for MySQL and -PostgreSQL through ODBC. - @item @uref{http://phpclub.net/} PHPclub - Tips and tricks for PHP. -@item @uref{http://www.penguinservices.com/scripts} -MySQL and Perl Scripts. - @item @uref{http://www.widgetchuck.com} The Widgetchuck; Web Site Tools and Gadgets @@ -1797,12 +1814,6 @@ and selectable table content reviewing. @item @uref{http://www.omnis-software.com/products/studio/studio.html} OMNIS Studio is a rapid application development (RAD) tool. - -@cindex Web+ -@item @uref{http://www.webplus.com} -talentsoft Web+ 4.6 - a powerful and comprehensive development language for -use in creating web-based client/server applications without writing -complicated, low-level, and time-consuming CGI programs. @end table @subheading Database Design Tools with MySQL Support @@ -1872,9 +1883,6 @@ qpopmysql - A patch to allow POP3 authentication from a MySQL database. There's also a link to Paul Khavkine's patch for Procmail to allow any MTA to deliver to users in a MySQL database. -@item @uref{http://www.pbc.ottawa.on.ca} -Visual Basic class generator for Active X. - @item @uref{http://www.essencesw.com/Software/mysqllib.html} New Client libraries for the Mac OS Classic (Macintosh). @@ -1937,9 +1945,6 @@ A consulting company which mentions MySQL in the right company. PMP Computer Solutions. Database developers using MySQL and @code{mSQL}. -@item @uref{http://www.aewa.org/} -Airborne Early Warning Association. - @item @uref{http://www.dedserius.com/y2kmatrix/} Y2K tester. @end table @@ -1959,11 +1964,11 @@ EasySQL: An ODBC-like driver manager. @item @uref{http://www.lightlink.com/hessling/rexxsql.html} A REXX interface to SQL databases. -@item @uref{http://www.mytcl.cx/} -Tcl interface based on tcl-sql with many bugfixes. +@c @item @uref{http://www.mytcl.cx/} +@c Tcl interface based on tcl-sql with many bugfixes. @item @uref{http://www.binevolve.com/~tdarugar/tcl-sql/} -Tcl interface. +Tcl interface for MySQL. @item @uref{http://www.contrib.andrew.cmu.edu/~shadow/sql.html} SQL Reference Page with a lot of interesting links. @@ -1980,12 +1985,6 @@ Little6 Inc., An online contract and job finding site that is powered by MySQL, PHP3, and Linux. @c Added 990521 -@c EMAIL: nh@delec.com (Hillbrecht Nicole) -@item @uref{http://www.delec.com/is/products/prep/examples/BookShelf/index.html} -DELECis - A tool that makes it very easy to create an automatically generated -table documentation. They have used MySQL as an example. - -@c Added 990521 @c EMAIL: info@worldrecords.com (Jim Rota) @item @uref{http://www.worldrecords.com} World Records - A search engine for information about music that uses @@ -2007,35 +2006,13 @@ Basic telephone database using @code{DBI}/@code{DBD}. @item @uref{http://tecfa.unige.ch/guides/java/staf2x/ex/jdbc/coffee-break} JDBC examples by Daniel K. Schneider. -@item @uref{http://www.spade.com/linux/howto/PostgreSQL-HOWTO-41.html} -SQL BNF - @item @uref{http://www.ooc.com/} Object Oriented Concepts Inc; CORBA applications with examples in source. -@item @uref{http://www.pbc.ottawa.on.ca/} -DBWiz; Includes an example of how to manage cursors in VB. - -@cindex Pluribus -@item @uref{http://keilor.cs.umass.edu/pluribus/} -Pluribus is a free search engine that learns to improve -the quality of its results over time. Pluribus works by recording -which pages a user prefers among those returned for a query. A user -votes for a page by selecting it; Pluribus then uses that knowledge -to improve the quality of the results when someone else submits the -same (or similar) query. Uses PHP and MySQL. - @c EMAIL: paul@sword.damocles.com (Paul Bannister) @item @uref{http://www.stopbit.com/} Stopbit - A technology news site using MySQL and PHP. -@item @uref{http://www.linuxsupportline.com/~kalendar/} -KDE based calendar manager - The calendar manager has both single user -(file based) and multi-user (MySQL database) support. - -@item @uref{http://tim.desert.net/~tim/imger/} -Example of storing/retrieving images with MySQL and CGI. - @item @uref{http://www.penguinservices.com/scripts} Online shopping cart system. @@ -2053,9 +2030,6 @@ as BLOBs. All other information is stored on the shared MySQL server. @subheading General Database Links @table @asis -@item @uref{http://www.pcslink.com/~ej/dbweb.html} -Database Jump Site - @item @uref{http://black.hole-in-the.net/guy/webdb/} Homepage of the webdb-l (Web Databases) mailing list. @@ -2065,10 +2039,6 @@ Perl @code{DBI}/@code{DBD} modules homepage. @item @uref{http://www.student.uni-koeln.de/cygwin/} Cygwin tools. Unix on top of Windows. -@item @uref{http://dbasecentral.com/} -dbasecentral.com; Development and distribution of powerful and easy-to-use -database applications and systems. - @cindex Tek-Tips forums @cindex forums, Tek-Tips @item @uref{http://www.tek-tips.com/} @@ -2112,7 +2082,7 @@ some guidelines as to how to use them. @subsubsection The MySQL Mailing Lists @cindex mailing lists -@cindex email lists +@cindex e-mail lists To subscribe to the main MySQL mailing list, send a message to the electronic mail address @email{mysql-subscribe@@lists.mysql.com}. @@ -2242,15 +2212,15 @@ guarantee the quality on these. @table @code @item @email{mysql-france-subscribe@@yahoogroups.com} A French mailing list @item @email{list@@tinc.net} A Korean mailing list -Email @code{subscribe mysql your@@email.address} to this list. +Email @code{subscribe mysql your@@e-mail.address} to this list. @item @email{mysql-de-request@@lists.4t2.com} A German mailing list -Email @code{subscribe mysql-de your@@email.address} to this list. +Email @code{subscribe mysql-de your@@e-mail.address} to this list. You can find information about this mailing list at @uref{http://www.4t2.com/mysql}. @item @email{mysql-br-request@@listas.linkway.com.br} A Portugese mailing list -Email @code{subscribe mysql-br your@@email.address} to this list. +Email @code{subscribe mysql-br your@@e-mail.address} to this list. @item @email{mysql-alta@@elistas.net} A Spanish mailing list -Email @code{subscribe mysql your@@email.address} to this list. +Email @code{subscribe mysql your@@e-mail.address} to this list. @end table @@ -2320,7 +2290,7 @@ missing, please include it with your message! Please read this section carefully and make sure that all the information described here is included in your report. -@cindex bug reports, email address +@cindex bug reports, e-mail address The normal place to report bugs and problems is @email{mysql@@lists.mysql.com}. If you can make a test case that clearly demonstrates the bug, you should post it to the @email{bugs@@lists.mysql.com} @@ -2619,38 +2589,125 @@ Many users don't read mail with a browser! @node Licensing and Support, Compatibility, MySQL Information Sources, Introduction -@section MySQL Licensing and Support +@section MySQL Support and Licensing @cindex licensing terms @cindex support terms @menu -* Licensing policy:: MySQL licensing policy +* Support:: Support offered by MySQL AB * Copyright:: Copyrights used by MySQL +* Licensing policy:: MySQL licensing policy * Licensing examples:: Example licensing situations -* Cost:: MySQL licensing and support costs -* Support:: Types of commercial support @end menu -This section describes MySQL support and licensing -arrangements: +This section describes MySQL support and licensing arrangements: @itemize @bullet +@item Support costs and benefits +(@pxref{Support}) + @item The copyrights under which MySQL is distributed (@pxref{Copyright}) +@item When and why you should license MySQL +(@pxref{Licensing policy}) + @item Sample situations illustrating when a license is required (@pxref{Licensing examples}) -@item Support costs (@pxref{Cost}) and support benefits -(@pxref{Support}) - -@item Commercial licensing costs @end itemize -@node Licensing policy, Copyright, Licensing and Support, Licensing and Support +@node Support, Copyright, Licensing and Support, Licensing and Support +@subsection Support offered by MySQL AB + +@cindex support, types +@cindex types, of support +@cindex commercial support, types +@cindex costs, licensing and support +@cindex licensing costs +@cindex support costs +@cindex prices, licensing and support + +MySQL AB offers several commercial support options. A description +of what each level of support includes is given at +@uref{https://order.mysql.com}. If you have restricted access to the +Internet, contact our sales staff at @email{sales@@mysql.com}. + +Technical support from MySQL AB means personal answers to your +personal problems direct from the software engineers who code the +MySQL database engine. It is often very helpful to receive +quick, personally prepared answers tailored to your exact needs. +This is what MySQL AB paid technical support offers. Our pricing +model ensures that basic support is affordable even for those on +limited budgets. + +We try to take a broad and inclusive view of technical support. +Almost any problem involving MySQL is important to us if it's +important to you. Typically customers seek help on how to get +different commands and utilities to work, remove performance +bottlenecks, restore crashed systems, understand operating system +or networking impacts on MySQL, establish best practices for backup +and recovery, utilize APIs, etc. + + +@node Copyright, Licensing policy, Support, Licensing and Support +@subsection Copyrights Used by MySQL + +@cindex copyrights + +@menu +* Copyright changes:: Possible future copyright changes +@end menu + +There are several different copyrights on the MySQL distribution: + +@enumerate +@item +The MySQL-specific source needed to build the @code{mysqlclient} +library is licensed under the @code{LGPL} and the programs in the +@file{client} directory are under the @code{GPL}. Each file states at +the beginning which license it is under. + +@item The client library, and the GNU @code{getopt} library, are covered +by the ``GNU LIBRARY GENERAL PUBLIC LICENSE.'' @xref{LGPL license}. + +@item Some parts of the source (the @code{regexp} library) are covered +by a Berkeley-style copyright. + +@item +All the source in the server, and the GNU @code{readline} library, +are covered by the ``GNU GENERAL PUBLIC LICENSE.'' @xref{GPL license}. +This is also available as the file @file{COPYING} in the distributions. + +@end enumerate + +The SQL client library should be free enough that it is +possible to add MySQL support into commercial products +without a license. For this reason, we chose the LGPL license for the +client code. +@cindex licensing, free +@cindex free licensing + +This means that you can use MySQL for free with any program that uses +any of the free software licenses. MySQL is also free for any end +user for personal or company usage. + +However, if you use MySQL for something important to you, you may +want to help secure its development by purchasing licenses or a support +contract. @xref{Support}. + + +@node Copyright changes, , Copyright, Copyright +@subsubsection Copyright Changes + +Version 3.22 of MySQL is still using a more strict license. +See the documentation for that version for more information. + + +@node Licensing policy, Licensing examples, Copyright, Licensing and Support @subsection MySQL Licensing Policy @cindex licensing policy @@ -2659,13 +2716,10 @@ arrangements: @cindex General Public License, MySQL The formal terms of the GPL license can be found at @ref{GPL license}. -Basically, our licensing policy and interpretation of the GPL is as follows: +For pricing and ordering information, see +@uref{https://order.mysql.com/}. -Note that older versions of MySQL are still using a more -@uref{http://www.mysql.com/support/arrangements/mypl.html, strict license}. -See the documentation for that version for more information. If you need a -commercial MySQL license, because the GPL license doesn't suit your -application, you can buy one at @uref{https://order.mysql.com/}. +Basically, our licensing policy and interpretation of the GPL is as follows: For normal internal use, MySQL costs nothing. You do not have to pay us if you do not want to. @@ -2694,23 +2748,24 @@ source code for your copy of the MySQL server, as defined in the GPL license. @end itemize -A license is @strong{NOT} required if: +A license is @strong{not} required if: @itemize @minus @item -You do not need a license to include the client code in commercial -programs. The client part of MySQL licensed with the +You include the MySQL client code in a commercial +program. The client part of MySQL is licensed under the LGPL @code{GNU Library General Public License}. The @code{mysql} command-line -client includes code from the @code{readline} library that is under -the @code{GPL}. +client does include code from the @code{readline} library that is under +the @code{GPL}, however. + +@end itemize -@item If your use of MySQL does not require a license, but you like MySQL and want to encourage further development, you are certainly welcome to purchase a license or MySQL support anyway. +@xref{Support}. -@item If you use MySQL in a commercial context such that you profit by its use, we ask that you further the development of MySQL by purchasing some level of support. We feel that if MySQL helps @@ -2718,14 +2773,18 @@ your business, it is reasonable to ask that you help MySQL. (Otherwise, if you ask us support questions, you are not only using for free something into which we've put a lot a work, you're asking us to provide free support, too.) -@end itemize + +Note that older versions of MySQL are still using a more +@uref{http://www.mysql.com/support/arrangements/mypl.html, strict license}. +See the documentation for the specific version for more +information. For circumstances under which a MySQL license is required, you need a license per machine that runs the @code{mysqld} server. However, a multiple-CPU machine counts as a single machine, and there is no restriction on the number of MySQL servers that run on one machine, or on the number of clients concurrently connected to a server -running on that machine! +running on that machine. If you have any questions as to whether or not a license is required for your particular use of MySQL, please read this again and then @@ -2733,65 +2792,12 @@ contact us. @xref{Contact information}. If you require a MySQL license, the easiest way to pay for it is to use the license form on MySQL's secure server at -@uref{https://order.mysql.com/}. Other forms of payment are -discussed in @ref{Payment information}. - - -@node Copyright, Licensing examples, Licensing policy, Licensing and Support -@subsection Copyrights Used by MySQL - -@cindex copyrights - -@menu -* Copyright changes:: Possible future copyright changes -@end menu - -There are several different copyrights on the MySQL distribution: - -@enumerate -@item -The MySQL-specific source needed to build the -@code{mysqlclient} library is licensed under the @code{LGPL} and -programs in the @file{client} directory is GPL. Each file has a header -that shows which copyright is used for that file. - -@item The client library and the (GNU @code{getopt}) library are covered -by the ``GNU LIBRARY GENERAL PUBLIC LICENSE.'' @xref{LGPL license}. - -@item Some parts of the source (the @code{regexp} library) are covered -by a Berkeley-style copyright. - -@item -All the source in the server and the (GNU @code{readline}) library -is covered by the ``GNU GENERAL PUBLIC LICENSE.'' @xref{GPL license}. -This is also available as the file @file{COPYING} in the distributions. - -@end enumerate - -One goal is that the SQL client library should be free enough that it is -possible to add MySQL support into commercial products -without a license. For this reason, we chose the LGPL license for the -client code. -@cindex licensing, free -@cindex free licensing - -This means that you can use MySQL for free with any program that uses -any of the free software licenses. MySQL is also free for any end -user for his own or company usage. - -However, if you use MySQL for something important to you, you may -want to help secure its development by purchasing licenses or a support -contract. @xref{Support}. - - -@node Copyright changes, , Copyright, Copyright -@subsubsection Copyright Changes - -Version 3.22 of MySQL is still using a more strict license. -See the documentation for that version for more information. +@uref{https://order.mysql.com/}. +You can also get the latest pricing and ordering information by sending +an e-mail to @email{sales@@mysql.com}. -@node Licensing examples, Cost, Copyright, Licensing and Support +@node Licensing examples, , Licensing policy, Licensing and Support @subsection Example Licensing Situations @menu @@ -2876,12 +2882,12 @@ will be able to solve the problem for them (in some cases with the help from the MySQL development team). All ISPs that want to keep themselves up-to-date should subscribe -to our @code{announce} mailing list so that they can be aware of fatal issues +to our @code{announce} mailing list so that they can be aware of critical issues that may be relevant for their MySQL installations. Note that if the ISP doesn't have a license for MySQL, it should give its customers at least read access to the source of -the MySQL installation so that its customer can verify that +the MySQL installation so that its customers can verify that it is patched correctly. @@ -2891,8 +2897,8 @@ it is patched correctly. @cindex web server, running @cindex running, a web server -If you use MySQL in conjunction with a Web server on Unix, you -don't have to pay for a license. +If you use MySQL in conjunction with a Web server, you +do not have to pay for a license. This is true even if you run a commercial Web server that uses MySQL, because you are not selling an embedded MySQL @@ -2900,462 +2906,6 @@ version yourself. However, in this case we would like you to purchase MySQL support, because MySQL is helping your enterprise. -@node Cost, Support, Licensing examples, Licensing and Support -@subsection MySQL Licensing and Support Costs - -@cindex costs, licensing and support -@cindex licensing costs -@cindex support costs -@cindex prices, licensing and support - -@menu -* Payment information:: Payment information -* Contact information:: Contact information -@end menu - -Our current license prices are shown below. To make a purchase, please visit -@uref{https://order.mysql.com/}. - -If you pay by credit card, the currency is EURO (European Union Euro) so the -prices will differ slightly. - -@multitable @columnfractions .3 .3 .3 -@item @strong{Number of licenses} @tab @strong{Per copy} -@item 1-9 @tab 230 EURO -@item 10-24 @tab 138 EURO -@item 25-49 @tab 117 EURO -@item 50-99 @tab 102 EURO -@item 100-249 @tab 91 EURO -@item 250-499 @tab 76 EURO -@item 500-999 @tab 66 EURO -@end multitable - -For high volume (OEM) purchases, please contact -@email{sales@@mysql.com}. - -For OEM purchases, you must act as the middle-man for eventual problems -or extension requests from your users. We also require that OEM -customers have at least an extended e-mail support contract. Note that -OEM licenses only apply for products where the user doesn't have direct -access to the MySQL server (embedded system). In other words, -the MySQL server should only be used with the application -that was supplied you. - -If you have a low-margin, high-volume product, you can always talk to us -about other terms (for example, a percent of the sale price). If you do, -please be informative about your product, pricing, market, and any other -information that may be relevant. - -A full-price license is not a support agreement and includes very minimal -support. This means that we try to answer any relevant questions. If the -answer is in the documentation, we will direct you to the appropriate -section. If you have not purchased a license or support, we probably will -not answer at all. - -If you discover what we consider a real bug, we are likely to fix it in -any case. But if you pay for support we will notify you about the fix -status instead of just fixing it in a later release. - -More comprehensive support is sold separately. Descriptions of what each -level of support includes are given in @ref{Support}. Costs for the various -types of commercial support are shown below. Support level prices are in -EURO (European Union Euro). One EURO is about 1.06 USD. - -@multitable @columnfractions .5 .5 -@item @strong{Type of support} @tab @strong{Cost per year} -@item Basic e-mail support. @xref{Basic email support}. @tab EURO 200 -@item Extended e-mail support @xref{Extended email support}. @tab EURO 1000 -@item Login support @xref{Login support}. @tab EURO 2000 -@item Extended login support @xref{Extended login support}. @tab EURO 5000 -@item Telephone support @xref{Telephone support}. @tab EURO 12000 -@end multitable - -You may upgrade from any lower level of support to a higher level of -support for the difference in price between the two support levels. - -We do also provide telephone support (mostly emergency support but also -24/7 support). This support option doesn't however have a fixed price -but is negotiated for case to case. If you are interested in this option -you can email @email{sales@@mysql.com} and tell us about your needs. - -Note that as our sales staff is very busy, it may take some time until -your request is handled. Our support staff does however always answer -promptly to support questions! - - -@node Payment information, Contact information, Cost, Cost -@subsubsection Payment information - -@cindex payment information - -Currently we can take SWIFT payments, checks, or credit cards. - -Payment should be made to: - -@example -Postgirot Bank AB -105 06 STOCKHOLM, SWEDEN - -MySQL AB -BOX 6434 -11382 STOCKHOLM, SWEDEN - -SWIFT address: PGSI SESS -Account number: 96 77 06 - 3 -@end example - -Specify: license and/or support and your name and e-mail address. - -In Europe and Japan you can use EuroGiro (that should be less expensive) to the -same account. - -If you want to pay by check, make it payable to ``MySQL Finland AB'' and -mail it to the address below: - -@example -MySQL AB -BOX 6434, Torsgatan 21 -11382 STOCKHOLM, SWEDEN -@end example - -If you want to pay by credit card over the Internet, you can use -@uref{https://order.mysql.com/, MySQL AB's secure license form}. - -You can also print a copy of the license form, fill it in, and send it by fax -to: - -+46-8-729 69 05 - -If you want us to bill you, you can use the license form and write ``bill -us'' in the comment field. You can also mail a message to -@email{sales@@mysql.com} (@strong{not} @code{mysql@@lists.mysql.com}!) -with your company information and ask us to bill you. - - -@node Contact information, , Payment information, Cost -@subsubsection Contact Information - -@cindex contact information -@cindex licensing, contact information -@cindex advertising, contact information -@cindex employment, contact information -@cindex partnering with MySQL -@cindex employment with MySQL -@cindex jobs at MySQL - -For commercial licensing, please contact the MySQL licensing -team. The much preferred method is by e-mail to -@email{licensing@@mysql.com}. Fax is also possible but handling of -these may take much longer (Fax +46-8-729 69 05). - -If you represent a business that is interested in partnering with -MySQL, please send e-mail to @email{partner@@mysql.com}. - -For timely, precise answers to technical questions about MySQL -you should @uref{https://order.mysql.com/, order} one of our -@uref{http://www.mysql.com/support/arrangements/types.html, support contracts}. -MySQL support is provided by the MySQL developers so the -standard is extremely high. - -If you are interested in placing a banner advertisement on our Web site, -please send e-mail to @email{advertising@@mysql.com}. - -If you are interested in any of the jobs listed in our -@uref{http://www.mysql.com/development/jobs/, jobs} section, please send e-mail -to @email{jobs@@mysql.com}. - -For general discussion amongst our many users, please direct your attention to -the appropriate @uref{http://www.mysql.com/documentation/lists.html, mailing -list}. - -For general information inquires, please send e-mail to -@email{info@@mysql.com}. - -For questions or comments about the workings or content of the Web site, -please send e-mail to @email{webmaster@@mysql.com}. - - -@node Support, , Cost, Licensing and Support -@subsection Types of Commercial Support - -@cindex support, types -@cindex types, of support -@cindex commercial support, types - -@menu -* Basic email support:: Basic email support -* Extended email support:: Extended email support -* Login support:: Login support -* Extended login support:: Extended login support -* Telephone support:: Telephone support -* Table handler support:: Support for other table handlers -@end menu - -The following is true of all support options: - -@itemize @bullet -@item -The support is per year. -@item -We will fix, or provide a reasonable workaround for any repeatable bug. -@item -We will give a reasonable effort to find and fix any other MySQL related bug. -@item -The higher level of support contract the more effort we will put into finding -a solution to your problems. -@item -The following is true for all support contracts except Basic email support: - -For non-bug related things, like helping you optimize your queries or -your system, extending MySQL with new functionality, etc., we charge 200 -EURO/hour, which is deducted from your support contract. In other words, -if you have login support (2000 EURO), you can expect us to work up to -10 hours to help you with things like this. -@end itemize - - -@node Basic email support, Extended email support, Support, Support -@subsubsection Basic E-mail Support - -@cindex email, technical support -@cindex technical support, by email - -Basic e-mail support is a very inexpensive support option and should be -thought of more as a way to support our development of MySQL -than as a real support option. We at MySQL do give a lot of free -support in all the different MySQL lists, and the money we get from -basic e-mail support is largely used to make this possible. - -At this support level, the MySQL mailing lists are the preferred -means of communication. Questions normally should be mailed to the primary -mailing list (@email{mysql@@lists.mysql.com}) or one of the other regular -lists (for example, @email{win32@@lists.mysql.com} for Windows-related -MySQL questions), as someone else already may have experienced and -solved the problem you have. @xref{Asking questions}. - -However, by purchasing basic e-mail support, you also have access to the -support address @email{mysql-support@@mysql.com}, which is not available -as part of the minimal support that you get by purchasing a MySQL -license. This means that for especially critical questions, you can -cross-post your message to @email{mysql-support@@mysql.com}. (If the -message contains sensitive data, you should post only to -@email{mysql-support@@mysql.com}.) - -@strong{REMEMBER!} to ALWAYS include your registration number and expiration -date when you send a message to @email{mysql-support@@mysql.com}. - -Note that if you have encountered a critical, repeatable bug, and follow -the rules outlined in the manual section of how to report bugs and send -it to @email{bugs@@lists.mysql.com}, we promise to try to fix this as -soon as possible, regardless of your support level! @xref{Bug reports}. - -Basic e-mail support includes the following types of service: - -@itemize @bullet -@item -If your question is already answered in the manual, we will inform you of the -correct section in which you can find the answer. If the answer is not in -the manual, we will point you in the right direction to solve your problem. - -@item -We guarantee a timely answer for your e-mail messages. We can't guarantee -that we can solve any problem, but at least you will receive an answer if we -can contact you by e-mail. - -@item -We will help with unexpected problems when you install MySQL from a -binary distribution on supported platforms. This level of support does not -cover installing MySQL from a source distribution. Supported -platforms are those for which MySQL is known to work. -@xref{Which OS}. - -@item -We will help you with bugs and missing features. Any bugs that are found are -fixed for the next MySQL release. If the bug is critical for -you, we will mail you a patch for it as soon the bug is fixed. Critical -bugs always have the highest priority for us, and we ensure that they are -fixed as soon as possible. - -@item -Your suggestions for the further development of MySQL will be -taken into consideration. By taking email support you have already -helped the further development of MySQL. If you want to have -more input, upgrade to a higher level of support. - -@item -If you want us to help optimize your system, you must upgrade to a -higher level of support. -@end itemize - - -@node Extended email support, Login support, Basic email support, Support -@subsubsection Extended E-mail Support - -@cindex extended email support - -Extended e-mail support includes everything in basic e-mail support with -these additions: - -@itemize @bullet -@item -Your e-mail will be dealt with before mail from basic e-mail support users and -non-registered users. - -@item -Your suggestions for the further development of MySQL will -receive strong consideration. Simple extensions that suit the basic -goals of MySQL are implemented in a matter of days. By taking -extended e-mail support you have already helped the further development -of MySQL. - -@item -Typical situations that are covered by extended e-mail support are: - -@itemize @minus -@item -We will answer and (within reason) solve questions that relate to possible -bugs in MySQL. As soon as the bug is found and corrected, we -will mail a patch for it. - -@item -We will help with unexpected problems when you install MySQL from a -source or binary distribution on supported platforms. - -@item -We will answer questions about missing features and offer hints how to work -around them. - -@item -We will provide hints on optimizing @code{mysqld} for your situation. -@end itemize - -@item -You are allowed to influence the priority of items on the MySQL -TODO List. @xref{TODO}. This will ensure that the features you really need -will be implemented sooner than they might be otherwise. -@end itemize - - -@node Login support, Extended login support, Extended email support, Support -@subsubsection Login Support - -@cindex login support - -Login support includes everything in extended e-mail support with -these additions: - -@itemize @bullet -@item -Your e-mail will be dealt with even before e-mail from extended e-mail -support users. - -@item -Your suggestions for the further development of MySQL will -be taken into very high consideration. Realistic extensions that can be -implemented in a couple of hours and that suit the basic goals of -MySQL will be implemented as soon as possible. - -@item -If you have a very specific problem, we can try to log in on your system -to solve the problem ``in place.'' - -@item -Like any database vendor, we can't guarantee that we can rescue any data from -crashed tables, but if the worst happens, we will help you rescue as much as -possible. MySQL has proven itself very reliable, but anything is -possible due to circumstances beyond our control (for example, if your system -crashes or someone kills the server by executing a @code{kill -9} command). - -@item -We will provide hints on optimizing your system and your queries. - -@item -You are allowed to call a MySQL developer (in moderation) and -discuss your MySQL-related problems. This option is however -only to be used as a last result during an emergency after we have -failed to grasp the total problem with email. To make efficient -use of our time we need to first get all facts about the problem, -before talking on phone, to be able to work as efficiently as possible on -solving the problem. -@end itemize - - -@node Extended login support, Telephone support, Login support, Support -@subsubsection Extended Login Support - -Extended login support includes everything in login support with these -additions: - -@itemize @bullet -@item -Your e-mail has the highest possible priority. - -@item -We will actively examine your system and help you optimize it and your -queries. We may also optimize and/or extend MySQL to better -suit your needs. - -@item -You may also request special extensions just for you. For example: -@example -mysql> select MY_FUNC(col1,col2) from table; -@end example - -@item -We will provide a binary distribution of all important MySQL -releases for your system, as long as we can get an account on a -similar system. In the worst case, we may require access to your system -to be able to create a binary distribution. - -@item -If you can provide accommodations and pay for traveler fares, you can -even get a MySQL developer to visit you and offer you help with -your troubles. Extended login support entitles you to one personal -encounter per year, but we are always very flexible towards our -customers! If the visit takes 16 hours or more, the first 8 hours is -without charge. For the hours above 8 hours, you will be charged with a -rate that is at least 20 % less than our standard rates. -@end itemize - - -@node Telephone support, Table handler support, Extended login support, Support -@subsubsection Telephone Support - -Telephone support includes everything in extended login support with -these additions: - -@itemize @bullet -@item -We will provide you with a dynamic web page showing the current list of -@code{MySQL} developers that you can phone when you have a critical -problem. -@item -For non critical problem, you can request a MySQL developer to -phone back within 48 hours to discuss @code{MySQL} related issues. -@end itemize - - -@node Table handler support, , Telephone support, Support -@subsubsection Support for other table handlers - -@cindex support, BDB Tables -@cindex support, InnoDB Tables - -To get support for @code{BDB} tables, @code{InnoDB} tables you have -to pay an additional 30% on the standard support price for each of -the table handlers you would like to have support for. - -We at @code{MySQL AB} will help you create a proper bug report for the -table handler and submit it to the developers for the specific table -handler. We will also do our best to ensure that you will get a timely -answer or solution from the developers of the table handler. - -Even if we are quite confident that we can solve most problems within a -timely manner, we can't guarantee a quick solution for any problems you -can get with the different table handlers. We will however do our best -to help you get the problem solved. - - @node Compatibility, Comparisons, Licensing and Support, Introduction @section How Standards-compatible Is MySQL? @@ -3384,6 +2934,7 @@ around some differences. @node Extensions to ANSI, Differences from ANSI, Compatibility, Compatibility @subsection MySQL Extensions to ANSI SQL92 +@cindex hints MySQL includes some extensions that you probably will not find in other SQL databases. Be warned that if you use them, your code will not be portable to other SQL servers. In some cases, you can write code that @@ -4345,7 +3896,7 @@ characters in database, table and column names. @item @code{DELETE FROM merge_table} used without a @code{WHERE} will only clear the mapping for the table, not delete everything in the -mapped tables +mapped tables. @item You cannot build in another directory when using @@ -4368,6 +3919,7 @@ precision, @code{IF}, and @code{ELT()} with @code{BIGINT} or @code{DOUBLE} precision and the rest with @code{DOUBLE} precision. One should try to avoid using bigger unsigned long long values than 63 bits (9223372036854775807) for anything else than bit fields! +MySQL 4.0 has better @code{BIGINT} handling than 3.23. @item All string columns, except @code{BLOB} and @code{TEXT} columns, automatically @@ -5079,7 +4631,6 @@ database. @xref{Privileges}. @item mSQL Has a file @file{mSQL.acl} in which you can grant read/write privileges for users. -@item @end table @@ -5690,6 +5241,15 @@ implemented in the 4.0 tree. @xref{News-4.0.x}. @itemize @bullet @item +Allow users to change startup options without taking down the server. +@item +Fail safe replication. +@item +More functions for full-text search. +@xref{Fulltext Features to Appear in MySQL 4.0}. +@item +New key cache +@item New table definition file format (@code{.frm} files) This will enable us to not run out of bits when adding more table options. One will still be able to use the old @code{.frm} file format with 4.0. All newly created @@ -5698,19 +5258,6 @@ tables will, however, use the new format. The new file format will enable us to add new column types, more options for keys and @code{FOREIGN KEY} support. @item -@code{mysqld} as a library. This will have the same interface as the -standard MySQL client (with an extra function to just set up -startup parameters) but will be faster (no TCP/IP or socket overhead), -smaller and much easier to use for embedded products. - -One will be able to define at link time if one wants to use the -client/server model or a stand-alone application just by defining which -library to link with. - -The @code{mysqld} will support all standard MySQL features and -one can use it in a threaded client to run different queries in each -thread. -@item Replication should work with @code{RAND()} and user variables @code{@@var}. @item Online backup with very low performance penalty. The online backup will @@ -5720,25 +5267,14 @@ Allow @code{DELETE} on @code{MyISAM} tables to use the record cache. To do this, we need to update the threads record cache when we update the @code{.MYD} file. @item -Better replication. -@item -More functions for full-text search. -@xref{Fulltext Features to Appear in MySQL 4.0}. -@item Character set casts and syntax for handling multiple character sets. @item -Allow users to change startup options without taking down the server. -@item Help for all commands from the client. @item -Secure connections (with SSL). -@item @code{SHOW COLUMNS FROM table_name} (used by @code{mysql} client to allow expansions of column names) should not open the table, but only the definition file. This will require less memory and be much faster. @item -New key cache -@item When using @code{SET CHARACTER SET} we should translate the whole query at once and not only strings. This will enable users to use the translated characters in database, table and column names. @@ -5760,11 +5296,12 @@ of @code{analyze} is run on all sub tables. @itemize @bullet @item -Fail safe replication. -@item Subqueries. @code{select id from t where grp in (select grp from g where u > 100)} @item +Atomic multi-table updates, eg @code{update items,month set +items.price=month.price where items.id=month.id;}; +@item Derived tables. @example select a.col1, b.col2 from (select max(col1) as col1 from root_table ) a, @@ -6046,9 +5583,6 @@ if it exists and @code{INSERT} a new row if the row didn't exist. @item Implement function: @code{get_changed_tables(timeout,table1,table2,...)} @item -Atomic multi-table updates, eg @code{update items,month set -items.price=month.price where items.id=month.id;}; -@item Change reading through tables to use memmap when possible. Now only compressed tables use memmap. @item @@ -6144,8 +5678,6 @@ Nothing; In the long run we plan to be fully ANSI 92 / ANSI 99 compliant. @end itemize - - @node Installing, Tutorial, Introduction, Top @chapter MySQL Installation @@ -6523,6 +6055,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. @uref{http://mysql.kpnqwest.fi/, WWW} @item +@c EMAIL: root@omegatomic.com (John Berry) +@image{Flags/france} France [Omegatomic] @ +@uref{http://mysql.omegatomic.com/, WWW} + +@item @c Added 981208 @c EMAIL: noel@uni-bonn.de (Noel Koethe) @image{Flags/germany} Germany [Kernelnotes.de, Bonn] @ @@ -6658,7 +6195,7 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. @c @item @c EMAIL: melo@co.telenet.pt (Pedro Melo) -@c Temp out of service (email from Pedro) +@c Temp out of service (e-mail from Pedro) @c @image{Flags/portugal} Portugal [IP] @ @c @uref{http://mysql.ip.pt, WWW} @@ -6825,6 +6362,12 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. @c @uref{ftp://mysql.cyberus.ca/, FTP} @item +@c EMAIL: alagbe@servidor.unam.mx (Alfredo Aguayo) +@image{Flags/mexico} Mexico [UNAM] @ +@uref{http://mysql.unam.mx/, WWW} +@uref{ftp://mysql.unam.mx/pub/mysql/, FTP} + +@item @c EMAIL: mleber@he.net (Mike Leber) @c Added 980312 @image{Flags/usa} USA [Hurricane Electric/San Jose] @ @@ -6933,6 +6476,12 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. @uref{http://mysql.mirrortree.com/, WWW} @uref{ftp://mysql.mirrortree.com/pub/mysql/, FTP} +@item +@c EMAIL: darrinw@nixc.net (Darrin Walton) +@image{Flags/usa} USA [NIXC/Vienna, VA] @ +@uref{http://www.nixc.net/mysql/, WWW} +@uref{ftp://www.nixc.net/pub/mysql/, FTP} + @end itemize @strong{South America:} @@ -8282,8 +7831,11 @@ The initial download of the source tree may take a while, depending on the speed of your connection; be patient. @item -You will need GNU @code{autoconf}, @code{automake}, @code{libtool}, and -@code{m4} to run the next set of commands. +You will need GNU @code{autoconf 2.13}, @code{automake 1.4}, +@code{libtool}, and @code{m4} to run the next set of commands. +Note that the new versions of @code{autoconf} (2.52) and @code{automake} +(1.5) do not work. + If you get some strange error during this stage, check that you really have @code{libtool} installed! @@ -8331,7 +7883,7 @@ You can examine the change history for the tree with all the diffs by using @code{bk sccstool}. If you see some funny diffs or code that you have a question about, do not hesitate to send e-mail to @email{internals@@lists.mysql.com}. Also, if you think you have a better idea -on how to do something, send an email to the same address with a patch. +on how to do something, send an e-mail to the same address with a patch. @code{bk diffs} will produce a patch for you after you have made changes to the source. If you do not have the time to code your idea, just send a description. @@ -9123,7 +8675,7 @@ correctly, check the log file to see if you can find out why. Log files are located in the data directory (typically @file{/usr/local/mysql/data} for a binary distribution, @file{/usr/local/var} for a source distribution, -@file{\mysql\data\mysql.err} on Windows.) Look in the data directory for +@file{\mysql\data\mysql.err} on Windows). Look in the data directory for files with names of the form @file{host_name.err} and @file{host_name.log} where @code{host_name} is the name of your server host. Then check the last few lines of these files: @@ -9343,7 +8895,7 @@ you have to use @code{mysqldump}. Old clients should work with a Version 4.0 server without any problems. The following lists tell what you have to watch out for when upgrading to -Version 4.0; +version 4.0; @itemize @bullet @item @@ -9351,7 +8903,13 @@ Version 4.0; @item The old C API functions @code{mysql_drop_db}, @code{mysql_create_db} and @code{mysql_connect} are not supported anymore, unless one compiles -MySQL with @code{USE_OLD_FUNCTIONS}. +MySQL with @code{USE_OLD_FUNCTIONS}. Instead of doing this, one should +change the client to use the new 4.0 API. +@item +In the @code{MYSQL_FIELD} structure, @code{length} and @code{max_length} has +changed from @code{unsigned int} to @code{unsigned long}. This should not +cause any other problems than some warnings if you use these to +@code{printf()} type function. @item You should use @code{TRUNCATE TABLE} when you want to delete all rows from a table and you don't care of how many rows where deleted. @@ -9360,6 +8918,15 @@ from a table and you don't care of how many rows where deleted. You will get an error if you have an active @code{LOCK TABLES} or transaction when trying to execute @code{TRUNCATE TABLE} or @code{DROP DATABASE}. +@item +You should use integers to store values in BIGINT columns (instead of using +strings as you did in MySQL 3.23). Using strings will still work, but using +integers is more efficient. +@item +Format of @code{SHOW OPEN TABLE} has changed. +@item +Multithreaded clients should use @code{mysql_thread_init()} and +@code{mysql_thread_end()}. @xref{Threaded clients}. @end itemize @node Upgrading-from-3.22, Upgrading-from-3.21, Upgrading-from-3.23, Upgrade @@ -9928,11 +9495,12 @@ that you also probably need to raise the @code{core file size} by adding @code{ulimit -c 1000000} to @code{safe_mysqld} or starting @code{safe_mysqld} with @code{--core-file-sizes=1000000}. @xref{safe_mysqld, , @code{safe_mysqld}}. -To get a core dump on Linux if @code{mysqld} dies with a SIGSEGV signal, you can -start @code{mysqld} with the @code{--core-file} option. Note that you also probably -need to raise the @code{core file size} by adding @code{ulimit -c 1000000} to -@code{safe_mysqld} or starting @code{safe_mysqld} with -@code{--core-file-sizes=1000000}. @xref{safe_mysqld, , @code{safe_mysqld}}. +To get a core dump on Linux if @code{mysqld} dies with a SIGSEGV signal, +you can start @code{mysqld} with the @code{--core-file} option. Note +that you also probably need to raise the @code{core file size} by adding +@code{ulimit -c 1000000} to @code{safe_mysqld} or starting +@code{safe_mysqld} with @code{--core-file-sizes=1000000}. +@xref{safe_mysqld, , @code{safe_mysqld}}. If you are linking your own MySQL client and get the error: @@ -10201,31 +9769,13 @@ work). You must also use the @code{egcs} C++ compiler @node Linux-IA64, , Linux-MIPS, Linux @subsubsection Linux IA64 Notes -To get MySQL to compile on Linux Ia64, we had to do the following -(we assume that this will be easier when next gcc version for ia64 is -released). - -Using @code{gcc-2.9-final}: +To get MySQL to compile on Linux Ia64, we use the following compile line: +Using @code{gcc-2.96}: @example -CFLAGS="-O2" CXX=gcc CXXFLAGS="-O2 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex +CC=gcc CFLAGS="-O3 -fno-omit-frame-pointer" CXX=gcc CXXFLAGS="-O3 -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql "--with-comment=Official MySQL binary" --with-extra-charsets=complex @end example -After @code{make} you will get an error that @code{sql/opt_range.cc} -will not compile (internal compiler error). To fix this, go to the sql -directory and type @code{make} again. Copy the compile line, but change --O2 to -O0. The file should now compile. - -Now you can do: - -@example -cd .. -make -make_install -@end example - -and @code{mysqld} should be ready to run. - On Ia64 the MySQL client binaries are using shared libraries. This means that if you install our binary distribution in some other place than @file{/usr/local/mysql} you need to either modify @file{/etc/ld.so.conf} @@ -10402,7 +9952,7 @@ all other cases if the client has TCP/IP installed. The host name specifies which protocol is used: @multitable @columnfractions .3 .7 -@strong{Host name} @tab @strong{Protocol} +@item @strong{Host name} @tab @strong{Protocol} @item NULL (none) @tab On NT, try named pipes first; if that doesn't work, use TCP/IP. On Win95/Win98, TCP/IP is used. @item . @tab Named pipes @item localhost @tab TCP/IP to current host @@ -11188,6 +10738,7 @@ crash when @code{make} tries to run @code{lint} on C++ files. * OpenBSD 2.8:: OpenBSD 2.8 Notes @end menu +This section contains notes on OpenBSD. @node OpenBSD 2.5, OpenBSD 2.8, OpenBSD, BSD Notes @subsubsection OpenBSD 2.5 Notes @@ -11219,6 +10770,7 @@ usage, and crashes. * BSDI4:: BSD/OS 4.x notes @end menu +This section contains notes on BSD/OS. @node BSDI2, BSDI3, BSDI, BSD Notes @subsubsection BSD/OS Version 2.x Notes @@ -11619,7 +11171,7 @@ the IBM C compiler). If you are using @code{gcc} or @code{egcs} to compile MySQL, you @strong{MUST} use the @code{-fno-exceptions} flag, as the exception handling in @code{gcc}/@code{egcs} is not thread safe! (This is tested with -@code{egcs} 1.1.). There are also some known problems with IBM's assembler, +@code{egcs} 1.1.) There are also some known problems with IBM's assembler, which may cause it to generate bad code when used with gcc. We recommend the following @code{configure} line with @code{egcs} and @@ -11886,7 +11438,7 @@ Please submit a full bug report. To fix this you should change to the @code{sql} directory and do a ``cut and paste'' of the last @code{gcc} line, but change @code{-O3} to @code{-O0} (or add @code{-O0} immediately after @code{gcc} if you don't -have any @code{-O} option on your compile line.) After this is done you +have any @code{-O} option on your compile line). After this is done you can just change back to the top-level directly and run @code{make} again. @@ -12838,7 +12390,7 @@ this may be different than what you are used to.) @item Claws @tab Gwen @tab cat @tab m @tab 1994-03-17 @tab @item Buffy @tab Harold @tab dog @tab f @tab 1989-05-13 @tab @item Fang @tab Benny @tab dog @tab m @tab 1990-08-27 @tab -@item Bowser @tab Diane @tab dog @tab m @tab 1989-08-31 @tab 1995-07-29 +@item Bowser @tab Diane @tab dog @tab m @tab 1998-08-31 @tab 1995-07-29 @item Chirpy @tab Gwen @tab bird @tab f @tab 1998-09-11 @tab @item Whistler @tab Gwen @tab bird @tab @tab 1997-12-09 @tab @item Slim @tab Benny @tab snake @tab m @tab 1996-04-29 @tab @@ -13998,8 +13550,8 @@ MySQL. Some of the examples use the table @code{shop} to hold the price of each article (item number) for certain traders (dealers). Supposing that each -trader has a single fixed price per article, then (@code{item}, -@code{trader}) is a primary key for the records. +trader has a single fixed price per article, then (@code{article}, +@code{dealer}) is a primary key for the records. Start the command line tool @code{mysql} and select a database: @@ -14208,7 +13760,7 @@ splitting of the concatenated column in the client. @subsection Using user variables You can use MySQL user variables to remember results without -having to store them in a temporary variables in the client. +having to store them in temporary variables in the client. @xref{Variables}. For example, to find the articles with the highest and lowest price you @@ -14237,7 +13789,7 @@ You don't need foreign keys to join 2 tables. The only thing MySQL doesn't do is @code{CHECK} to make sure that the keys you use really exist in the table(s) you're referencing and it -doesn't automatically delete rows from table with a foreign key +doesn't automatically delete rows from a table with a foreign key definition. If you use your keys like normal, it'll work just fine: @@ -14319,8 +13871,8 @@ SELECT s.* FROM persons p, shirts s @cindex keys, searching on two MySQL doesn't yet optimize when you search on two different -keys combined with @code{OR} (Searching on one key with different @code{OR} -parts is optimized quite good): +keys combined with @code{OR} (searching on one key with different @code{OR} +parts is optimized quite well): @example SELECT field1_index, field2_index FROM test_table WHERE field1_index = '1' @@ -14329,7 +13881,7 @@ OR field2_index = '1' The reason is that we haven't yet had time to come up with an efficient way to handle this in the general case. (The @code{AND} handling is, -in comparison, now completely general and works very well). +in comparison, now completely general and works very well.) For the moment you can solve this very efficiently by using a @code{TEMPORARY} table. This type of optimization is also very good if @@ -14345,7 +13897,7 @@ SELECT * from tmp; DROP TABLE tmp; @end example -The above way to solve this query is in effect an @code{UNION} of two queries. +The above way to solve this query is in effect a @code{UNION} of two queries. @node Calculating days, , Searching on two keys, Examples @@ -14741,6 +14293,17 @@ FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' ESCAPED BY '\\' @cindex options, command-line @cindex mysqld options +In most cases you should manage mysqld options through option files. +@xref{Option files}. + +@code{mysqld} and @code{mysqld.server} reads options from the +@code{mysqld} and @code{server} groups. @code{mysqld_safe} read options +from the @code{mysqld}, @code{server}, @code{mysqld_safe} and +@code{safe_mysqld} groups. An embedded MySQL server usually reads +options from the @code{server}, @code{embedded} and +@code{xxxxx_SERVER}, where @code{xxxxx} is the name of the application. + + @code{mysqld} accepts the following command-line options: @table @code @@ -14857,7 +14420,7 @@ also set this explicitely to @code{""} if you want to disable this option. If this option is used, @code{mysqld} will on open check if the table is marked as crashed or if if the table wasn't closed properly. (The last option only works if you are running with -@code{--skip-locking}). If this is the case @code{mysqld} will run +@code{--skip-locking}.) If this is the case @code{mysqld} will run check on the table. If the table was corrupted, @code{mysqld} will attempt to repair it. @@ -14915,7 +14478,7 @@ command, if the user doesn't have @code{INSERT} privilege to the @item --skip-concurrent-insert Turn off the ability to select and insert at the same time on @code{MyISAM} tables. (This is only to be used if you think you have found a bug in this -feature). +feature.) @item --skip-delay-key-write Ignore the @code{delay_key_write} option for all tables. @@ -15057,8 +14620,9 @@ Options specified on the command line or in option files take precedence over environment variable values. @xref{Environment variables}. The following programs support option files: @code{mysql}, -@code{mysqladmin}, @code{mysqld}, @code{mysqldump}, @code{mysqlimport}, -@code{mysql.server}, @code{myisamchk}, and @code{myisampack}. +@code{mysqladmin}, @code{mysqld}, @code{mysqld_safe}, @code{mysql.server}, +@code{mysqldump}, @code{mysqlimport}, @code{mysqlshow}, @code{mysqlcheck}, +@code{myisamchk}, and @code{myisampack}. You can use option files to specify any long option that a program supports! Run the program with @code{--help} to get a list of available options. @@ -15220,28 +14784,28 @@ servers: At least the following options should be different per server: -@table @code +@itemize @item port=# @item socket=path @item pid-file=path -@end table +@end itemize The following options should be different, if they are used: -@table @code +@itemize @item log=path @item log-bin=path @item log-update=path @item log-isam=path @item bdb-logdir=path -@end table +@end itemize If you want more performance, you can also specify the following differently: -@table @code +@itemize @item tmpdir=path @item bdb-tmpdir=path -@end table +@end itemize @xref{Command-line options}. @@ -15577,7 +15141,7 @@ Users of Java JDBC: Do not transmit plain (unencrypted) data over the Internet. These data are accessible to everyone who has the time and ability to intercept it and use it for their own purposes. Instead, use an encrypted protocol such as SSL or -SSH. MySQL supports internal SSL connections as of Version 3.23.9. +SSH. MySQL supports internal SSL connections as of Version 4.0.0. SSH port-forwarding can be used to create an encrypted (and compressed) tunnel for the communication. @item @@ -15590,7 +15154,7 @@ shell> tcpdump -l -i eth0 -w - src or dst port 3306 | strings @end example (This works under Linux and should work with small modifications under -other systems). Warning: If you do not see data this doesn't always +other systems.) Warning: If you do not see data this doesn't always actually mean that it is encrypted. If you need high security, you should consult with a security expert. @end itemize @@ -15620,6 +15184,10 @@ to make things much harder. To make things even more secure you should use @uref{http://www.ssh.com}. With this, you can get an encrypted TCP/IP connection between a MySQL server and a MySQL client. +If you are using MySQL 4.0, you can also use internal openssl support. +@xref{Secure connections}. + + To make a MySQL system secure, you should strongly consider the following suggestions: @@ -15668,8 +15236,8 @@ For more details, see @ref{Changing MySQL user, , Changing MySQL user}. @item -Don't support symlinks to tables (This can be disabled with the -@code{--skip-symlink} option. This is especially important if you run +Don't support symlinks to tables (this can be disabled with the +@code{--skip-symlink} option). This is especially important if you run @code{mysqld} as root as anyone that has write access to the mysqld data directories could then delete any file in the system! @xref{Symbolic links to tables}. @@ -16115,7 +15683,7 @@ currently executing queries, including queries that set or change passwords. Privileges on the @code{mysql} database can be used to change passwords and other access privilege information. (Passwords are stored encrypted, so a malicious user cannot simply read them to know the plain -text password). If they can access the @code{mysql.user} password +text password.) If they can access the @code{mysql.user} password column, they can use it to log into the MySQL server for the given user. (With sufficient privileges, the same user can replace a password with a different one.) @@ -16311,7 +15879,7 @@ MySQL does not store passwords in plaintext form for anyone to see. Rather, the password supplied by a user who is attempting to connect is encrypted (using the @code{PASSWORD()} function). The encrypted password is then used when the client/server is checking if -the password is correct (This is done without the encrypted password +the password is correct. (This is done without the encrypted password ever traveling over the connection.) Note that from MySQL's point of view the encrypted password is the REAL password, so you should not give anyone access to it! In particular, don't give normal users @@ -16959,6 +16527,7 @@ to restart @code{mysqld} with @code{--skip-grant-tables} to run * Adding users:: Adding New Users to MySQL * Passwords:: Setting Up Passwords * Password security:: Keeping Your Password Secure +* Secure connections:: Using Secure Connections @end menu @@ -16979,7 +16548,11 @@ GRANT priv_type [(column_list)] [, priv_type [(column_list)] ...] ON @{tbl_name | * | *.* | db_name.*@} TO user_name [IDENTIFIED BY 'password'] [, user_name [IDENTIFIED BY 'password'] ...] - [REQUIRE @{SSL|X509@} [ISSUER issuer] [SUBJECT subject]] + [REQUIRE + [@{SSL| X509@}] + [CIPHER cipher [AND]] + [ISSUER issuer [AND]] + [SUBJECT subject]] [WITH GRANT OPTION] REVOKE priv_type [(column_list)] [, priv_type [(column_list)] ...] @@ -17202,6 +16775,7 @@ dropped only with explicit @code{REVOKE} commands or by manipulating the MySQL grant tables. @end itemize +For a description of using @code{REQUIRE}, see @xref{Secure connections}. @node User names, Privilege changes, GRANT, User Account Management @subsection MySQL User Names and Passwords @@ -17242,7 +16816,7 @@ knowing your 'scrambled' password is enough to be able to connect to the MySQL server! @end itemize -MySQL users and they privileges are normally created with the +MySQL users and their privileges are normally created with the @code{GRANT} command. @xref{GRANT}. When you login to a MySQL server with a command line client you @@ -17268,13 +16842,14 @@ mysql -u monty -p database_name Note that in the last example the password is @strong{NOT} 'database_name'. -If you want to use the @code{-p} option to supply a password you should do like this: +If you want to use the @code{-p} option to supply a password you should do so +like this: @example mysql -u monty -pguess database_name @end example -On some system the library call that MySQL uses to prompt for a +On some systems, the library call that MySQL uses to prompt for a password will automatically cut the password to 8 characters. Internally MySQL doesn't have any limit for the length of the password. @@ -17695,7 +17270,7 @@ your Unix password and your MySQL password are the same, that Unix password file. @xref{User names}. -@node Password security, , Passwords, User Account Management +@node Password security, Secure connections, Passwords, User Account Management @subsection Keeping Your Password Secure It is inadvisable to specify your password in a way that exposes it to @@ -17771,6 +17346,169 @@ All in all, the safest methods are to have the client program prompt for the password or to specify the password in a properly protected @file{.my.cnf} file. +@node Secure connections, , Password security, User Account Management +@subsection Using Secure Connections + +@cindex openssl +@cindex SSL and X509 Basics + +@menu +* Secure basics:: Basics +* Secure requirements:: Requirements +* Secure GRANT:: GRANT OPTIONS +@end menu + +@node Secure basics, Secure requirements, Secure connections, Secure connections +@subsubsection Basics + +MySQL has support for SSL encrypted connetions. To understand how MySQL +uses SSL we need to explain some basics about SSL and X509. People who +are already aware of it can skip this chapter. + +By default, MySQL uses unencrypted connections between client and +server. This means that someone could watch all your traffic and look at +the data being sent/received. Actually, they could even change the data +while it is in transit between client and server. Sometimes you need to +move really secret data over public networks and in such a case using an +unencrypted connection is unacceptable. + +SSL is a protocol which uses different encryption algorithms to ensure +that data which comes from public network can be trusted. It has +mechanisms to detect any change, loss or replay of data. SSL also +incorpores algorithms to recognize and provide identity verification +using the X509 standard. + +@cindex What is encryption +Encryption is the way to make any kind of data unreadable. In fact, +today's practice requires many additional security elements from +encryption algorithms. They should resist many kind of known attacks +like just messing with order of encrypted messages or replaying data +twice. + +@cindex What is X509/Certificate? +X509 is a standard that makes it possible to identify someone in the +Internet. It is most commonly used in e-commerce applications. In basic +terms, there should be some company called "Certificate Authority" which +assigns electronic certificates to anyone who needs them. Certificates +rely on asymmetric encryption algorithms which have two encryption keys +- public and secret. A certificate owner can prove his identity by +showing his certificate to other party. A certificate consists of his +owner's public key. Any data encrypted with this public key can only be +decrypted using the corresponding secret key, which is held by the owner +of the certificate. + +MySQL doesn't use encrypted on connections by default, because this +would make the client/server protocol much slower. Any kind of +additional functionality requires computer to do additional work and +encrypting data is CPU-intensive operation require time and can delay +MySQL main tasks. By default MySQL is tuned to be fast as possible. + +If you need more information about SSL/X509/encryption, you should use +your favourite internet search engine and search for keywords you are +interested in. + +@node Secure requirements, Secure GRANT, Secure basics, Secure connections +@subsubsection Requirements + +To get secure connections to work with MySQL you must do the following: + +@enumerate +@item +Install the openssh library. We have tested MySQL with openssl 0.9.6. +@uref{http://www.openssh.org}. +@item +Configure MySQL with @code{--with-vio --with-openssl}. +@item +If you are using an old MySQL installation, you have to update your +@code{mysql.user} table with some new columns. You can do this by +running the @code{mysql_fix_privilege_tables.sh} script. +@item +You can check if a running mysqld server supports @code{openssl} by +examining if @code{show variables like 'have_openssl'} returns @code{YES}. +@end enumerate + + +@node Secure GRANT, , Secure requirements, Secure connections +@subsubsection GRANT options + +@cindex SSL related options +@findex REQUIRE GRANT option +@findex GRANT statemenet + +MySQL can check x509 certificate attributes additionally to most used +username/password scheme. All the usual options are still required +(username, password, IP address mask, database/table name). + +There are different possibilities to limit connections: + +@itemize @bullet +@item +Without any SSL/X509 options all kind of encrypted/unencrypted +connections are allowed if username and password are valid. + +@item +@code{REQUIRE SSL} option makes SSL encrypted connection must. Note that +this requirement can be omitted of there are any other ACL record which +allows non-SSL connection. + +@example +GRANT ALL PRIVILEGES ON test.* TO root@@localhost IDENTIFIED BY +"goodsecret" REQUIRE SSL +@end example + +@item +@code{REQUIRE X509} Requiring X509 certificate means that client +should have valid certificate but we do not care about exact +certificate, issuer or subject. Only restriction is it should be +possible to verify its signature with some of our CA certificates. + +@example +GRANT ALL PRIVILEGES ON test.* TO root@@localhost IDENTIFIED BY "goodsecret" REQUIRE X509 +@end example + +@item +@code{REQUIRE ISSUER issuer} makes connection more restrictive: now +client must present valid x509 certificate issued by CA "issuer". Using +x509 certificates always implies encryption, so option "SSL" is not +neccessary anymore. + +@example +GRANT ALL PRIVILEGES ON test.* TO root@@localhost IDENTIFIED BY "goodsecret" REQUIRE ISSUER "C=FI, ST=Some-State, L=Helsinki, O=MySQL Finland AB, CN=Tonu Samuel/Email=tonu@@mysql.com" +@end example + +@item +@code{REQUIRE SUBJECT subject} requires clients to have valid x509 +certificate with subject "subject" on it. If client have valid +certificate but having different "subject" then connection is still not +allowed. + +@example +GRANT ALL PRIVILEGES ON test.* TO root@@localhost IDENTIFIED BY "goodsecret" REQUIRE SUBJECT "C=EE, ST=Some-State, L=Tallinn, O=MySQL demo client certificate, CN=Tonu Samuel/Email=tonu@@mysql.com" +@end example + +@item +@code{REQUIRE CIPHER cipher} is needed to assure enough strong ciphers +and keylengths to be used. SSL himself can be weak if old algorithms +with short encryption keys are used. Using this option we can ask for +some exact cipher to allow connection. + +@example +GRANT ALL PRIVILEGES ON test.* TO root@@localhost IDENTIFIED BY "goodsecret" REQUIRE CIPHER "EDH-RSA-DES-CBC3-SHA" +@end example + +Also it is allowed to combine those options with each other like this: + +@example +GRANT ALL PRIVILEGES ON test.* TO root@@localhost IDENTIFIED BY "goodsecret" +REQUIRE SUBJECT "C=EE, ST=Some-State, L=Tallinn, O=MySQL demo client certificate, CN=Tonu Samuel/Email=tonu@@mysql.com" +AND ISSUER "C=FI, ST=Some-State, L=Helsinki, O=MySQL Finland AB, CN=Tonu Samuel/Email=tonu@@mysql.com" +AND CIPHER "EDH-RSA-DES-CBC3-SHA" +@end example + +But it is not allowed to use any of options twice. Only different +options can be mixed. +@end itemize + @node Disaster Prevention, Database Administration, User Account Management, MySQL Database Administration @section Disaster Prevention and Recovery @@ -17839,8 +17577,8 @@ you executed @code{mysqldump}. If you have to restore something, try to recover your tables using @code{REPAIR TABLE} or @code{myisamchk -r} first. That should work in 99.9% of all cases. If @code{myisamchk} fails, try the following -procedure: (This will only work if you have started MySQL with -@code{--log-update}. @xref{Update log}.): +procedure (this will only work if you have started MySQL with +@code{--log-update}, @pxref{Update log}): @enumerate @item @@ -18025,18 +17763,18 @@ the indexes and not in the data part. All of the above check types checks the indexes throughly and should thus find most errors. If you just want to check a table that you assume is ok, you should use -no check options or the @code{QUICK} option. The later should be used +no check options or the @code{QUICK} option. The latter should be used when you are in a hurry and can take the very small risk that -@code{QUICK} didn't find an error in the data file (In most cases +@code{QUICK} didn't find an error in the data file. (In most cases MySQL should find, under normal usage, any error in the data file. If this happens then the table will be marked as 'corrupted', -in which case the table can't be used until it's repaired). +in which case the table can't be used until it's repaired.) @code{FAST} and @code{CHANGED} are mostly intended to be used from a script (for example to be executed from cron) if you want to check your table from time to time. In most cases you @code{FAST} is to be prefered over @code{CHANGED}. (The only case when it isn't is when you suspect a -bug you have found a bug in the @code{MyISAM} code.). +bug you have found a bug in the @code{MyISAM} code.) @code{EXTENDED} is only to be used after you have run a normal check but still get strange errors from a table when MySQL tries to @@ -18496,7 +18234,7 @@ index file is truncated at start, so one usually ignore this space. This space is needed on the same disk as the original index file! @item When using @code{--recover} or @code{--sort-recover} -(but not when using @code{--safe-recover}, you will need space for a +(but not when using @code{--safe-recover}), you will need space for a sort buffer for: @code{(largest_key + row_pointer_length)*number_of_rows * 2}. You can check the length of the keys and the row_pointer_length with @@ -18820,11 +18558,11 @@ and the server, because the server does all the work when you use @code{myisamchk} also has a number of other options you can use to improve the performance of a table: -@table @code +@itemize @item -S, --sort-index @item -R index_num, --sort-records=index_num @item -a, --analyze -@end table +@end itemize For a full description of the option. @xref{myisamchk syntax}. @@ -18905,7 +18643,7 @@ myisamchk -r --silent --sort-index -O sort_buffer_size=16M */*.MYI To get a description of a table or statistics about it, use the commands shown below. We explain some of the information in more detail later: -@table @code +@itemize @bullet @item myisamchk -d tbl_name Runs @code{myisamchk} in ``describe mode'' to produce a description of your table. If you start the MySQL server using the @@ -18924,7 +18662,7 @@ must read the whole table. @item myisamchk -eiv tbl_name This is like @code{-eis}, but tells you what is being done. -@end table +@end itemize @cindex examples, @code{myisamchk} output @cindex @code{myisamchk}, example output @@ -19070,7 +18808,7 @@ Explanations for the types of information @code{myisamchk} produces are given below. The ``keyfile'' is the index file. ``Record'' and ``row'' are synonymous: -@table @code +@itemize @bullet @item ISAM file Name of the ISAM (index) file. @@ -19130,7 +18868,7 @@ Other possible values are @code{Compressed} and @code{Packed}. A list of all keys in the table. For each key, some low-level information is presented: -@table @code +@itemize @minus @item Key This key's number. @@ -19164,7 +18902,7 @@ records there are per value for this key. A unique key always has a value of 1. This may be updated after a table is loaded (or greatly changed) with @code{myisamchk -a}. If this is not updated at all, a default value of 30 is given. -@end table +@end itemize @item In the first example above, the 9th key is a multi-part key with two parts. @@ -19230,7 +18968,7 @@ the sum of all such losses, in bytes. When the dynamic table format is used, record fragments are linked with pointers (4 to 7 bytes each). @code{Linkdata} is the sum of the amount of storage used by all such pointers. -@end table +@end itemize If a table has been compressed with @code{myisampack}, @code{myisamchk -d} prints additional information about each table column. See @@ -19360,7 +19098,7 @@ error message @code{Host ... is blocked}. When more than connection to the MySQL server, MySQL assumes something is wrong and blocks the host from further connection requests. Flushing the host tables allows the host to attempt to connect -again. @xref{Blocked host}.) You can start @code{mysqld} with +again. @xref{Blocked host}. You can start @code{mysqld} with @code{-O max_connection_errors=999999999} to avoid this error message. @item @code{LOGS} @tab Closes and reopens all log files. @@ -19778,6 +19516,10 @@ joins that don't use keys properly. @item If @code{Threads_created} is big, you may want to increase the @code{thread_cache_size} variable. +@item +If @code{Created_tmp_disk_tables} is big, you may want to increase the +@code{tmp_table_size} variable to get the temporary tables memory based +instead of disk based. @end itemize @@ -19824,7 +19566,7 @@ differ somewhat: | have_bdb | YES | | have_innodb | YES | | have_raid | YES | -| have_ssl | NO | +| have_openssl | NO | | init_file | | | interactive_timeout | 28800 | | join_buffer_size | 131072 | @@ -19886,7 +19628,7 @@ indicates 16 megabytes. The case of suffix letters does not matter; @code{16M} and @code{16m} are equivalent: @cindex variables, values -@table @code +@itemize @item @code{ansi_mode}. Is @code{ON} if @code{mysqld} was started with @code{--ansi}. @xref{ANSI mode}. @@ -19954,10 +19696,10 @@ The default character set. The supported character sets. @item @code{concurrent_inserts} -If @code{ON} (the default), MySQL will allow you to use @code{INSERT} -on @code{MyISAM} tables at the same time as you run @code{SELECT} queries -on them. You can turn this option off by starting @code{mysqld} with @code{--safe} -or @code{--skip-new}. +If @code{ON} (the default), MySQL will allow you to use @code{INSERT} on +@code{MyISAM} tables at the same time as you run @code{SELECT} queries +on them. You can turn this option off by starting @code{mysqld} with +@code{--safe} or @code{--skip-new}. @cindex timeout @item @code{connect_timeout} @@ -20011,7 +19753,7 @@ if @code{--skip-bdb} is used. if @code{--skip-innodb} is used. @item @code{have_raid} @code{YES} if @code{mysqld} supports the @code{RAID} option. -@item @code{have_ssl} +@item @code{have_openssl} @code{YES} if @code{mysqld} supports SSL (encryption) on the client/server protocol. @@ -20264,19 +20006,13 @@ operations. @item @code{table_cache} The number of open tables for all threads. Increasing this value increases the number of file descriptors that @code{mysqld} requires. -MySQL needs two file descriptors for each unique open table. -See below for comments on file descriptor limits. You can check if you -need to increase the table cache by checking the @code{Opened_tables} -variable. @xref{SHOW}. If this variable is big and you don't do -@code{FLUSH TABLES} a lot (which just forces all tables to be closed and -reopenend), then you should increase the value of this variable. - -Make sure that your operating system can handle the number of open file -descriptors implied by the @code{table_cache} setting. If @code{table_cache} -is set too high, MySQL may run out of file descriptors and refuse -connections, fail to perform queries, and be very unreliable. +You can check if you need to increase the table cache by checking the +@code{Opened_tables} variable. @xref{SHOW}. If this variable is big and +you don't do @code{FLUSH TABLES} a lot (which just forces all tables to +be closed and reopenend), then you should increase the value of this +variable. -For information about how the table cache works, see @ref{Table cache}. +For more information about the table cache, see @ref{Table cache}. @item @code{table_type} The default table type @@ -20322,7 +20058,7 @@ The version number for the server. @item @code{wait_timeout} The number of seconds the server waits for activity on a connection before closing it. See also @code{interactive_timeout}. -@end table +@end itemize The manual section that describes tuning MySQL contains some information of how to tune the above variables. @xref{Server parameters}. @@ -20418,6 +20154,7 @@ Create Table: CREATE TABLE t ( * Character arrays:: The character definition arrays * String collating:: String Collating Support * Multi-byte characters:: Multi-byte Character Support +* Problems with character sets:: @end menu @@ -20587,7 +20324,7 @@ Assign an unique number to it. @item Create the file @file{sql/share/charsets/MYSET.conf}. -(You can use @file{sql/share/charsets/latin1.conf} as a base for this). +(You can use @file{sql/share/charsets/latin1.conf} as a base for this.) The syntax for the file very simple: @@ -20751,7 +20488,7 @@ the maximum ratio the strings may grow during @code{my_strxfrm_MYSET} (it must be a positive integer). -@node Multi-byte characters, , String collating, Localization +@node Multi-byte characters, Problems with character sets, String collating, Localization @subsection Multi-byte Character Support @cindex characters, multi-byte @@ -20770,6 +20507,41 @@ You must specify the @code{mbmaxlen_MYSET=N} value in the special comment at the top of the source file. @code{N} should be set to the size in bytes of the largest character in the set. +@node Problems with character sets, , Multi-byte characters, Localization +@subsection Problems With Character Sets + +If you try to use a character set that is not compiled into your binary, +you can run into a couple of different problems: + +@itemize @bullet +@item +Your program has a wrong path to where the character sets are stored. +(Default @file{/usr/local/mysql/share/mysql/charsets}). +This can be fixed by using the @code{--character-sets-dir} +option to the program in question. +@item +The character set is a multi-byte-character set that can't be loaded +dynamicly. In this case you have to recompiled the program with the +support for the character set. +@item +The character set is a dynamic character set, but you don't have a +configure file for it. In this case you should install the configure +file for the character set from a new MySQL distribution. +@item +Your @file{Index} file doesn't contain the name for the character set. + +@example +ERROR 1105: File '/usr/local/share/mysql/charsets/?.conf' not found +(Errcode: 2) +@end example + +In this case you should either get a new @code{Index} file or add +by hand the name of any missing character sets. +@end itemize + +For MyISAM tables, you can check the character set name and number for a +table with @code{myisamchk -dvv table_name}. + @node Server-Side Scripts, Client-Side Scripts, Localization, MySQL Database Administration @section MySQL Server-Side Scripts and Utilities @@ -20945,7 +20717,7 @@ Most of the options to @code{safe_mysqld} are the same as the options to @code{safe_mysqld} supports the following options: -@table @code +@itemize @item --basedir=path @item --core-file-size=# Size of the core file @code{mysqld} should be able to create. Passed to @code{ulimit -c}. @@ -20972,7 +20744,7 @@ Number of files @code{mysqld} should be able to open. Passed to @code{ulimit -n} @item --timezone=# Set the timezone (the @code{TZ}) variable to the value of this parameter. @item --user=# -@end table +@end itemize The @code{safe_mysqld} script is written so that it normally is able to start a server that was installed from either a source or a binary version of @@ -21052,7 +20824,7 @@ list. Anything after a white space is ignored. @code{mysqld_multi} supports the following options: -@table @code +@itemize @cindex config-file option @item --config-file=... Alternative config file. NOTE: This will not affect this program's own @@ -21097,7 +20869,7 @@ MySQL user for @code{mysqladmin}. @cindex version option @item --version Print the version number and exit. -@end table +@end itemize Some notes about @code{mysqld_multi}: @@ -21117,7 +20889,7 @@ shell> mysql -u root -S /tmp/mysql.sock -proot_password -e @xref{Privileges}. @end example You will have to do the above for each @code{mysqld} running in each -data directory, that you have (just change the socket, -S=...) +data directory, that you have (just change the socket, -S=...). @item @code{pid-file} is very important, if you are using @code{safe_mysqld} to start @code{mysqld} (e.g. --mysqld=safe_mysqld) Every @code{mysqld} @@ -21153,7 +20925,7 @@ more flexibility. The order in which the @code{mysqlds} are started or stopped depends on the order in which they appear in the config file. @item When you want to refer to a certain group using GNR with this program, -just use the number in the end of the group name ( [mysqld# <== ). +just use the number in the end of the group name ([mysqld# <== ). @item You may want to use option '--user' for @code{mysqld}, but in order to do this you need to be root when you start the @code{mysqld_multi} @@ -21270,7 +21042,7 @@ file. It is permissible to omit the @file{.MYI} extension. @code{myisampack} supports the following options: -@table @code +@itemize @bullet @item -b, --backup Make a backup of the table as @code{tbl_name.OLD}. @@ -21324,7 +21096,7 @@ Wait and retry if table is in use. If the @code{mysqld} server was invoked with the @code{--skip-locking} option, it is not a good idea to invoke @code{myisampack} if the table might be updated during the packing process. -@end table +@end itemize @cindex examples, compressed tables The sequence of commands shown below illustrates a typical table compression @@ -21645,7 +21417,7 @@ mysql> show variables like "have_%"; | have_innodb | NO | | have_isam | YES | | have_raid | NO | -| have_ssl | NO | +| have_openssl | NO | +---------------+-------+ @end example @@ -21924,7 +21696,7 @@ Continue even if we get a SQL error. @cindex @code{no-named-commands}, @code{mysql} option @item -g, --no-named-commands Named commands are disabled. Use \* form only, or use named commands -only in the beginning of a line ending with a semicolon (;). Since +only in the beginning of a line ending with a semicolon (@samp{;}). Since Version 10.9, the client now starts with this option ENABLED by default! With the -g option, long format commands will still work from the first line, however. @@ -22578,7 +22350,7 @@ tables. output. The above line will be added otherwise, if --databases or --all-databases option was given. @item -t, --no-create-info -Don't write table creation information (The @code{CREATE TABLE} statement.) +Don't write table creation information (the @code{CREATE TABLE} statement). @item -d, --no-data Don't write any row information for the table. This is very useful if you just want to get a dump of the structure for a table! @@ -23028,7 +22800,7 @@ switch to a new log) by executing @code{FLUSH LOGS}. @xref{FLUSH}. @code{mysqld} writes all errors to the stderr, which the @code{safe_mysqld} script redirects to a file called @code{'hostname'.err}. (On Windows, @code{mysqld} writes this directly -to @file{\mysql\data\mysql.err}). +to @file{\mysql\data\mysql.err}.) This contains information indicating when @code{mysqld} was started and stopped and also any critical errors found when running. If @code{mysqld} @@ -23280,7 +23052,7 @@ The above command does the following: @itemize @bullet @item If standard logging (@code{--log}) or slow query logging -(@code{--log-slow-queries}) is used, closes and reopens the log file. +(@code{--log-slow-queries}) is used, closes and reopens the log file (@file{mysql.log} and @file{`hostname`-slow.log} as default). @item If update logging (@code{--log-update}) is used, closes the update log and @@ -23340,7 +23112,7 @@ Starting in Version 3.23.15, MySQL supports one-way replication internally. One server acts as the master, while the other acts as the slave. Note that one server could play the roles of master in one pair and slave in the other. The master server keeps a binary log of updates -(@xref{Binary log}.) and an index file to binary logs to keep track of +(@pxref{Binary log}) and an index file to binary logs to keep track of log rotation. The slave, upon connecting, informs the master where it left off since the last successfully propagated update, catches up on the updates, and then blocks and waits for the master to notify it of @@ -23361,7 +23133,7 @@ master. @xref{Backup}. MySQL replication is based on the server keeping track of all changes to your database (updates, deletes, etc) in the binary -log. (@xref{Binary log}.) and the slave server(s) reading the saved +log (@pxref{Binary log}) and the slave server(s) reading the saved queries from the master server's binary log so that the slave can execute the same queries on its copy of the data. @@ -23916,10 +23688,9 @@ logs. In pre 3.23.26 versions the command was called is a comma-separated list of @code{master_def} where @code{master_def} is one of the following: @code{MASTER_HOST}, @code{MASTER_USER}, @code{MASTER_PASSWORD}, @code{MASTER_PORT}, @code{MASTER_CONNECT_RETRY}, -@code{MASTER_LOG_FILE}, @code{MASTER_LOG_POS}. Example: +@code{MASTER_LOG_FILE}, @code{MASTER_LOG_POS}. For example: @example - CHANGE MASTER TO MASTER_HOST='master2.mycompany.com', MASTER_USER='replication', @@ -23927,7 +23698,6 @@ CHANGE MASTER TO MASTER_PORT=3306, MASTER_LOG_FILE='master2-bin.001', MASTER_LOG_POS=4; - @end example You only need to specify the values that need to be changed. The values that @@ -24443,6 +24213,37 @@ takes more effort and hardware. We are also working on some extensions to solve this problem for some common application niches. +MySQL can work with both transactional and not transactional tables. To +be able to work smoothly with not transactional tables (which can't +rollback if something goes wrong), MySQL has the following rules: + +@cindex default values +@itemize @bullet +@item +All columns has default values. +@item +If you insert a 'wrong' value in a column like a @code{NULL} in a +@code{NOT NULL} column or a too big numerical value in a numerical +column, MySQL will instead of giving an error instead set the column to +the 'best possible value'. For numerical values this is 0, the smallest +possible values or the largest possible value. For strings this is +either the empty string or the longest possible string that can be in +the column. +@item +All calculated expressions returns a value that can be used instead of +signaling an error condition. For example 1/0 returns @code{NULL} +@end itemize + +The reason for the above rules is that we can't check these conditions +before the query starts to execute. If we encounter a problem after +updating a few rows, we can't just rollback as the table type may not +support this. We can't stop because in that case the update would be +'half done' which is probably the worst possible scenario. In this case +it's better to 'do the best you can' and then continue as if nothing +happened. + +The above means that one should not use MySQL to check fields content, +but one should do this in the application. @node Portability, Internal use, Design Limitations, Optimize Overview @subsection Portability @@ -24605,7 +24406,7 @@ multi-threaded tests to the benchmark suite. For example, (run on the same NT 4.0 machine): @multitable @columnfractions .6 .2 .2 -@strong{Reading 2000000 rows by index} @tab @strong{Seconds} @tab @strong{Seconds} +@item @strong{Reading 2000000 rows by index} @tab @strong{Seconds} @tab @strong{Seconds} @item mysql @tab 367 @tab 249 @item mysql_odbc @tab 464 @item db2_odbc @tab 1206 @@ -24617,7 +24418,7 @@ For example, (run on the same NT 4.0 machine): @end multitable @multitable @columnfractions .6 .2 .2 -@strong{Inserting (350768) rows} @tab @strong{Seconds} @tab @strong{Seconds} +@item @strong{Inserting (350768) rows} @tab @strong{Seconds} @tab @strong{Seconds} @item mysql @tab 381 @tab 206 @item mysql_odbc @tab 619 @item db2_odbc @tab 3460 @@ -25175,7 +24976,7 @@ To help MySQL optimize queries better, run @code{myisamchk --analyze} on a table after it has been loaded with relevant data. This updates a value for each index part that indicates the average number of rows that have the same value. (For unique indexes, this is always 1, -of course.). MySQL will use this to decide which index to +of course.) MySQL will use this to decide which index to choose when you connect two tables with 'a non-constant expression'. You can check the result from the @code{analyze} run by doing @code{SHOW INDEX FROM table_name} and examining the @code{Cardinality} column. @@ -26278,7 +26079,7 @@ would be available. Some of the cases where this happens are: @item If the use of the index would require MySQL to access more than 30 % of the rows in the table. (In this case a table scan is -probably much faster, as this will require us to do much fewer seeks). +probably much faster, as this will require us to do much fewer seeks.) Note that if such a query uses @code{LIMIT} to only retrieve part of the rows, MySQL will use an index anyway, as it can much more quickly find the few rows to return in the result. @@ -26346,7 +26147,7 @@ supported. See @ref{Fulltext Search} for details. MySQL can create indexes on multiple columns. An index may consist of up to 15 columns. (On @code{CHAR} and @code{VARCHAR} columns you -can also use a prefix of the column as a part of an index). +can also use a prefix of the column as a part of an index.) A multiple-column index can be considered a sorted array containing values that are created by concatenating the values of the indexed columns. @@ -26424,6 +26225,16 @@ at least @code{200 * n}, where @code{n} is the maximum number of tables in a join. You also need to reserve some extra file descriptors for temporary tables and files. +Make sure that your operating system can handle the number of open file +descriptors implied by the @code{table_cache} setting. If +@code{table_cache} is set too high, MySQL may run out of file +descriptors and refuse connections, fail to perform queries, and be very +unreliable. You also have to take into account that the MyISAM table +handler needs two file descriptors for each unique open table. You can +in increase the number of file descriptors available for MySQL with +the @code{--open-files-limit=#} startup option. @xref{Not enough file +handles}. + The cache of open tables can grow to a maximum of @code{table_cache} (default 64; this can be changed with the @code{-O table_cache=#} option to @code{mysqld}). A table is never closed, except when the @@ -26455,6 +26266,12 @@ use of the table takes only one file descriptor. The extra descriptor for the first open is used for the index file; this descriptor is shared among all threads. +If you are opening a table with the @code{HANDLER table_name OPEN} +statement, a dedicated table object is allocated for the thread. +This table object is not shared by other threads an will not be closed +until the thread calls @code{HANDLER table_name CLOSE} or the thread dies. +@xref{HANDLER}. + You can check if your table cache is too small by checking the mysqld variable @code{opened_tables}. If this is quite big, even if you haven't done a lot of @code{FLUSH TABLES}, you should increase your table @@ -26740,7 +26557,7 @@ when we tested them, neither was sufficiently bug free to allow MySQL to be compiled with optimizations on. When you compile MySQL you should only include support for the -character sets that you are going to use. (Option @code{--with-charset=xxx}). +character sets that you are going to use. (Option @code{--with-charset=xxx}.) The standard MySQL binary distributions are compiled with support for all character sets. @@ -26763,7 +26580,7 @@ the resulting binary can be up to 4 % faster. @item If you connect using TCP/IP rather than Unix sockets, the result is 7.5% slower on the same computer. (If you are connection to @code{localhost}, -MySQL will, by default, use sockets). +MySQL will, by default, use sockets.) @item If you connect using TCP/IP from another computer over a 100M Ethernet, @@ -27464,7 +27281,7 @@ A tab character. ASCII(26) (Control-Z). This character can be encoded to allow you to go around the problem that ASCII(26) stands for END-OF-FILE on Windows. (ASCII(26) will cause problems if you try to use -@code{mysql database < filename}). +@code{mysql database < filename}.) @findex \\ (escape) @findex escape (\\) @@ -28110,14 +27927,23 @@ values, so you shouldn't use unsigned big integers larger than @code{9223372036854775807} (63 bits) except with bit functions! If you do that, some of the last digits in the result may be wrong because of rounding errors when converting the @code{BIGINT} to a @code{DOUBLE}. + +MySQL 4.0 can handle @code{BIGINT} in the following cases: +@itemize @bullet +@item +Use integers to store big unsigned values in a @code{BIGINT} column. +@item +In @code{MIN(big_int_column)} and @code{MAX(big_int_column)}. +@item +When using operators (@code{+}, @code{-}, @code{*} etc) where +both operands are integers. +@end itemize + @item You can always store an exact integer value in a @code{BIGINT} column by storing it as a string, as there is in this case there will be no intermediate double representation. @item -In MySQL 4.0 you can use integers to store big unsigned values in a -@code{BIGINT} string. -@item @samp{-}, @samp{+}, and @samp{*} will use @code{BIGINT} arithmetic when both arguments are @code{INTEGER} values! This means that if you multiply two big integers (or results from functions that return @@ -28258,7 +28084,7 @@ are @code{1901} to @code{2155}, @code{0000} in the 4-digit year format, and 1970-2069 if you use the 2-digit format (70-69). MySQL displays @code{YEAR} values in @code{YYYY} format, but allows you to assign values to @code{YEAR} columns using either strings or numbers. (The @code{YEAR} type is -new in MySQL Version 3.22.). @xref{YEAR}. +new in MySQL Version 3.22.) @xref{YEAR}. @tindex NATIONAL CHAR @tindex NCHAR @@ -28286,6 +28112,13 @@ column that only can take 2 values: A @code{CHAR(0)}, that is not defined as @code{NOT NULL}, will only occupy one bit and can only take 2 values: @code{NULL} or @code{""}. @xref{CHAR}. +@tindex BOOL +@tindex BIT +@item BIT +@itemx BOOL +@itemx CHAR +These three are synonyms for @code{CHAR(1)}. + @tindex CHARACTER VARYING @tindex CHAR VARYING @tindex VARCHAR @@ -28895,7 +28728,7 @@ You can specify @code{TIME} values in a variety of formats: @itemize @bullet @item As a string in @code{'D HH:MM:SS.fraction'} format. (Note that -MySQL doesn't yet store the fraction for the time column). One +MySQL doesn't yet store the fraction for the time column.) One can also use one of the following ``relaxed'' syntax: @code{HH:MM:SS.fraction}, @code{HH:MM:SS}, @code{HH:MM}, @code{D HH:MM:SS}, @@ -31101,7 +30934,8 @@ mysql> select ATAN(-2); @end example @findex ATAN2() -@item ATAN2(Y,X) +@item ATAN(Y,X) +@itemx ATAN2(Y,X) Returns the arc tangent of the two variables @code{X} and @code{Y}. It is similar to calculating the arc tangent of @code{Y / X}, except that the signs of both arguments are used to determine the quadrant of the @@ -31109,7 +30943,7 @@ result: @example mysql> select ATAN(-2,2); -> -0.785398 -mysql> select ATAN(PI(),0); +mysql> select ATAN2(PI(),0); -> 1.570796 @end example @@ -32315,6 +32149,18 @@ MySQL will also, in this case, prefer sorting to doing a temporary table with a key on the @code{GROUP BY} elements. @item +@code{SQL_BUFFER_RESULT} will force the result to be put into a temporary +table. This will help MySQL free the table locks early and will help +in cases where it takes a long time to send the result set to the client. + +@item +@code{SQL_SMALL_RESULT}, a MySQL-specific option, can be used +with @code{GROUP BY} or @code{DISTINCT} to tell the optimizer that the +result set will be small. In this case, MySQL will use fast +temporary tables to store the resulting table instead of using sorting. In +MySQL Version 3.23 this shouldn't normally be needed. + +@item @cindex @code{GROUP BY}, extensions to ANSI SQL If you use @code{GROUP BY}, the output rows will be sorted according to the @code{GROUP BY} as if you would have had an @code{ORDER BY} over all the fields @@ -32333,11 +32179,13 @@ read the @code{GROUP BY} description. @xref{Group by functions}. @item +@cindex hints @code{SQL_BUFFER_RESULT} will force the result to be put into a temporary table. This will help MySQL free the table locks early and will help in cases where it takes a long time to send the result set to the client. @item +@cindex hints @code{SQL_SMALL_RESULT}, a MySQL-specific option, can be used with @code{GROUP BY} or @code{DISTINCT} to tell the optimizer that the result set will be small. In this case, MySQL will use fast @@ -32345,6 +32193,7 @@ temporary tables to store the resulting table instead of using sorting. In MySQL Version 3.23 this shouldn't normally be needed. @item +@cindex hints @code{STRAIGHT_JOIN} forces the optimizer to join the tables in the order in which they are listed in the @code{FROM} clause. You can use this to speed up a query if the optimizer joins the tables in non-optimal order. @@ -32562,11 +32411,13 @@ portable across databases, it's recommended to use @code{LEFT JOIN} instead of @code{RIGHT JOIN}. @item +@cindex hints @code{STRAIGHT_JOIN} is identical to @code{JOIN}, except that the left table is always read before the right table. This can be used for those (few) cases where the join optimizer puts the tables in the wrong order. @item +@cindex hints As of MySQL Version 3.23.12, you can give hints about which index MySQL should use when retrieving information from a table. This is useful if @code{EXPLAIN} shows that MySQL is @@ -32665,11 +32516,18 @@ If you specify no column list for @code{INSERT ... VALUES} or @code{INSERT the columns in the table, use @code{DESCRIBE tbl_name} to find out. @item +@cindex default values Any column not explicitly given a value is set to its default value. For example, if you specify a column list that doesn't name all the columns in the table, unnamed columns are set to their default values. Default value assignment is described in @ref{CREATE TABLE, , @code{CREATE TABLE}}. +MySQL always has a default value for all fields. This is something +that is imposed on MySQL to be able to work with both transactional +and not transactional tables. + +Our view is that checking of fields content should be done in the +application and not in the database server. @item An @code{expression} may refer to any column that was set earlier in a value list. For example, you can say this: @@ -33799,19 +33657,20 @@ reference_option: RESTRICT | CASCADE | SET NULL | NO ACTION | SET DEFAULT table_options: - TYPE = @{BDB | HEAP | ISAM | InnoDB | MERGE | MYISAM @} + TYPE = @{BDB | HEAP | ISAM | InnoDB | MERGE | MRG_MYISAM | MYISAM @} or AUTO_INCREMENT = # or AVG_ROW_LENGTH = # or CHECKSUM = @{0 | 1@} or COMMENT = "string" or MAX_ROWS = # or MIN_ROWS = # -or PACK_KEYS = @{0 | 1@} +or PACK_KEYS = @{0 | 1 | DEFAULT@} or PASSWORD = "string" or DELAY_KEY_WRITE = @{0 | 1@} or ROW_FORMAT= @{ default | dynamic | fixed | compressed @} or RAID_TYPE= @{1 | STRIPED | RAID0 @} RAID_CHUNKS=# RAID_CHUNKSIZE=# or UNION = (table_name,[table_name...]) +or INSERT_METHOD= @{NO | FIRST | LAST @} or DATA DIRECTORY="directory" or INDEX DIRECTORY="directory" @@ -33833,7 +33692,7 @@ you create a table. A temporary table will automatically be deleted if a connection dies and the name is per connection. This means that two different connections can both use the same temporary table name without conflicting with each other or with an existing table of the same name. (The existing table -is hidden until the temporary table is deleted). +is hidden until the temporary table is deleted.) In MySQL Version 3.23 or later, you can use the keywords @code{IF NOT EXISTS} so that an error does not occur if the table already @@ -33909,6 +33768,7 @@ as setting it to @code{NULL}, because @code{0} is a valid @code{TIMESTAMP} value. @item +@cindex default values If no @code{DEFAULT} value is specified for a column, MySQL automatically assigns one. @@ -34045,6 +33905,7 @@ The different table types are: @item ISAM @tab The original table handler. @xref{ISAM}. @item InnoDB @tab Transaction-safe tables with row locking. @xref{InnoDB}. @item MERGE @tab A collection of MyISAM tables used as one table. @xref{MERGE}. +@item MRG_MERGE @tab An alias for MERGE tables @item MyISAM @tab The new binary portable table handler that is replacing ISAM. @xref{MyISAM}. @end multitable @xref{Table types}. @@ -34066,10 +33927,10 @@ The options work for all table types, if not otherwise indicated: @item @code{COMMENT} @tab A 60-character comment for your table. @item @code{MAX_ROWS} @tab Max number of rows you plan to store in the table. @item @code{MIN_ROWS} @tab Minimum number of rows you plan to store in the table. -@item @code{PACK_KEYS} @tab Set this to 1 if you want to have a smaller index. This usually makes updates slower and reads faster (MyISAM, ISAM). +@item @code{PACK_KEYS} @tab Set this to 1 if you want to have a smaller index. This usually makes updates slower and reads faster (MyISAM, ISAM). Setting this to 0 will disable all packing of keys. Setting this to @code{DEFAULT} (MySQL 4.0) will tell the table handler to only pack long @code{CHAR}/@code{VARCHAR} columns. @item @code{PASSWORD} @tab Encrypt the @code{.frm} file with a password. This option doesn't do anything in the standard MySQL version. @item @code{DELAY_KEY_WRITE} @tab Set this to 1 if want to delay key table updates until the table is closed (MyISAM). -@item @code{ROW_FORMAT} @tab Defines how the rows should be stored. Currently you can only use the DYNAMIC and STATIC options for MyISAM tables. +@item @code{ROW_FORMAT} @tab Defines how the rows should be stored. Currently this option only works with MyISAM tables, which supports the @code{DYNAMIC} and @code{FIXED} row formats. @xref{MyISAM table formats}. @end multitable When you use a @code{MyISAM} table, MySQL uses the product of @@ -34088,13 +33949,13 @@ many numbers that are the same. Prefix compression means that every key needs one extra byte to indicate how many bytes of the previous key are the same for the next key (note that the pointer to the row is stored in high-byte-first-order directly after the key, to improve -compression.) This means that if you have many equal keys on two rows +compression). This means that if you have many equal keys on two rows in a row, all following 'same' keys will usually only take 2 bytes (including the pointer to the row). Compare this to the ordinary case where the following keys will take storage_size_for_key + pointer_size (usually 4). On the other hand, if all keys are totally different, you will lose 1 byte per key, if the key isn't a -key that can have @code{NULL} values (In this case the packed key length will +key that can have @code{NULL} values. (In this case the packed key length will be stored in the same byte that is used to mark if a key is @code{NULL}.) @item @@ -34154,13 +34015,13 @@ original tables, MySQL will not allow concurrent inserts during @code{CREATE TABLE .... SELECT}. @item The @code{RAID_TYPE} option will help you to break the 2G/4G limit for -the MyISAM data file (not the index file) on -operating systems that don't support big files. You can get also more speed -from the I/O bottleneck by putting @code{RAID} directories on different -physical disks. @code{RAID_TYPE} will work on any OS, as long as you have -configured MySQL with @code{--with-raid}. For now the only allowed -@code{RAID_TYPE} is @code{STRIPED} (@code{1} and @code{RAID0} are aliases -for this). +the MyISAM data file (not the index file) on operating systems that +don't support big files. +You can get more speed from the I/O bottleneck by putting +@code{RAID} directories on different physical disks. @code{RAID_TYPE} +will work on any OS, as long as you have configured MySQL with +@code{--with-raid}. For now the only allowed @code{RAID_TYPE} is +@code{STRIPED} (@code{1} and @code{RAID0} are aliases for this). If you specify @code{RAID_TYPE=STRIPED} for a @code{MyISAM} table, @code{MyISAM} will create @code{RAID_CHUNKS} subdirectories named 00, @@ -34176,6 +34037,12 @@ tables as one. This only works with MERGE tables. @xref{MERGE}. For the moment you need to have @code{SELECT}, @code{UPDATE}, and @code{DELETE} privileges on the tables you map to a @code{MERGE} table. All mapped tables must be in the same database as the @code{MERGE} table. + +@item +If you want to insert data in a @code{MERGE} table, you have to specify with +@code{INSERT_METHOD} into with table the row should be inserted. +@xref{MERGE}. + @item In the created table the @code{PRIMARY} key will be placed first, followed by all @code{UNIQUE} keys and then the normal keys. This helps the @@ -34185,10 +34052,12 @@ detect duplicated @code{UNIQUE} keys. @item By using @code{DATA DIRECTORY="directory"} or @code{INDEX DIRECTORY="directory"} you can specify where the table handler should -put it's table and index files. This only works for @code{MyISAM} tables -in @code{MySQL} 4.0, when you are not using the @code{--skip-symlink} -option. @xref{Symbolic links to tables}. +put it's table and index files. Note that the directory should be a full +path to the directory (not relative path). +This only works for @code{MyISAM} tables in @code{MySQL} 4.0, when you +are not using the @code{--skip-symlink} option. @xref{Symbolic links to +tables}. @end itemize @@ -34630,7 +34499,7 @@ columns. For @code{CHAR} and @code{VARCHAR} columns, indexes can be created that use only part of a column, using @code{col_name(length)} syntax. (On -@code{BLOB} and @code{TEXT} columns the length is required). The +@code{BLOB} and @code{TEXT} columns the length is required.) The statement shown below creates an index using the first 10 characters of the @code{name} column: @@ -34999,6 +34868,8 @@ interface, bypassing SQL optimizer. Thus, it is faster then SELECT. The first form of @code{HANDLER} statement opens a table, making in accessible via the following @code{HANDLER ... READ} routines. +This table object is not shared by other threads an will not be closed +until the thread calls @code{HANDLER table_name CLOSE} or the thread dies. The second form fetches one (or, specified by @code{LIMIT} clause) row where the index specified complies to the condition and @code{WHERE} @@ -35017,8 +34888,8 @@ in data file) matching @code{WHERE} condition. It is faster than The last form closes the table, opened with @code{HANDLER ... OPEN}. @code{HANDLER} is somewhat low-level statement, for example it does not -provide consistency. That is @code{HANDLER ... OPEN} does @strong{not} -takes a snapshot of the table, and does @strong{not} locks the table. The +provide consistency. That is @code{HANDLER ... OPEN} does @strong{NOT} +takes a snapshot of the table, and does @strong{NOT} locks the table. The above means, that after @code{HANDLER ... OPEN} table data can be modified (by this or other thread) and these modifications may appear only partially in @code{HANDLER ... NEXT} or @code{HANDLER ... PREV} scans. @@ -35183,7 +35054,7 @@ The argument to @code{AGAINST} must be a constant string. Unfortunately, full-text search has no user-tunable parameters yet, although adding some is very high on the TODO. However, if you have a -MySQL source distribution (@xref{Installing source}.), you can +MySQL source distribution (@pxref{Installing source}), you can somewhat alter the full-text search behavior. Note that full-text search was carefully tuned for the best searching @@ -35325,7 +35196,7 @@ You can convert tables between different types with the @code{ALTER TABLE} statement. @xref{ALTER TABLE, , @code{ALTER TABLE}}. Note that MySQL supports two different kinds of -tables. Transaction-safe tables (@code{BDB}, @code{InnoDB} +tables: transaction-safe tables (@code{BDB} and @code{InnoDB}) and not transaction-safe tables (@code{HEAP}, @code{ISAM}, @code{MERGE}, and @code{MyISAM}). @@ -35581,6 +35452,13 @@ high-byte first. automatically depending on the type of columns you are using. The third, compressed tables, can only be created with the @code{myisampack} tool. +When you @code{CREATE} or @code{ALTER} a table you can for tables that +doesn't have @code{BLOB}'s force the table format to @code{DYNAMIC} or +@code{FIXED} with the @code{ROW_FORMAT=#} table option. In the future +you will be able to compress/decompress tables by specifying +@code{ROW_FORMAT=compressed | default} to @code{ALTER TABLE}. +@xref{CREATE TABLE}. + @menu * Static format:: Static (Fixed-length) table characteristics * Dynamic format:: Dynamic table characteristics @@ -35846,9 +35724,9 @@ In other words, the only ways this can go out of sync are: The @code{MyISAM} tables are copied without a @code{LOCK} and @code{FLUSH TABLES}. @item -MySQL has crashed between an update and the final close +MySQL has crashed between an update and the final close. (Note that the table may still be ok, as MySQL always issues writes -for everything between each statement). +for everything between each statement.) @item Someone has done a @code{myisamchk --repair} or @code{myisamchk --update-state}on a table that was in use by @code{mysqld}. @@ -35871,15 +35749,15 @@ is not signaled to the other servers. @code{MERGE} tables are new in MySQL Version 3.23.25. The code is still in gamma, but should be resonable stable. -A @code{MERGE} table is a collection of identical @code{MyISAM} tables -that can be used as one. You can only @code{SELECT}, @code{DELETE}, and -@code{UPDATE} from the collection of tables. If you @code{DROP} the -@code{MERGE} table, you are only dropping the @code{MERGE} -specification. +A @code{MERGE} table (also known as a @code{MRG_MyISAM} table) is a +collection of identical @code{MyISAM} tables that can be used as one. +You can only @code{SELECT}, @code{DELETE}, and @code{UPDATE} from the +collection of tables. If you @code{DROP} the @code{MERGE} table, you +are only dropping the @code{MERGE} specification. Note that @code{DELETE FROM merge_table} used without a @code{WHERE} will only clear the mapping for the table, not delete everything in the -mapped tables. (We plan to fix this in 4.0). +mapped tables. (We plan to fix this in 4.1). With identical tables we mean that all tables are created with identical column and key information. You can't put a MERGE over tables where the @@ -35939,11 +35817,12 @@ The disadvantages with @code{MERGE} tables are: @itemize @bullet @item -You can't use @code{INSERT} on @code{MERGE} tables, as MySQL -can't know in which of the tables we should insert the row. -@item You can only use identical @code{MyISAM} tables for a @code{MERGE} table. @item +@code{AUTO_INCREMENT} columns are not automaticly updated on @code{INSERT}. +@item +@code{REPLACE} doesn't work. +@item @code{MERGE} tables uses more file descriptors. If you are using a @strong{MERGE} that maps over 10 tables and 10 users are using this, you are using 10*10 + 10 file descriptors. (10 data files for 10 users @@ -35965,6 +35844,14 @@ mapped by a @code{MERGE} table that is 'open'. If you do this, the get unexpected results. @end itemize +When you create a @code{MERGE} table you have to specify with +@code{UNION(list-of-tables)} which tables you want to use as +one. Optionally you can specify with @code{INSERT_METHOD} if you want +insert for the @code{MERGE} table to happen in the first or last table +in the @code{UNION} list. If you don't specify @code{INSERT_METHOD} or +specify @code{NO}, then all @code{INSERT} commands on the @code{MERGE} +table will return an error. + The following example shows you how to use @code{MERGE} tables: @example @@ -35972,7 +35859,7 @@ CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, message CHAR(20)); CREATE TABLE t2 (a INT AUTO_INCREMENT PRIMARY KEY, message CHAR(20)); INSERT INTO t1 (message) VALUES ("Testing"),("table"),("t1"); INSERT INTO t2 (message) VALUES ("Testing"),("table"),("t2"); -CREATE TABLE total (a INT NOT NULL, message CHAR(20), KEY(a)) TYPE=MERGE UNION=(t1,t2); +CREATE TABLE total (a INT NOT NULL, message CHAR(20), KEY(a)) TYPE=MERGE UNION=(t1,t2) INSERT_METHOD=LAST; @end example Note that we didn't create a @code{UNIQUE} or @code{PRIMARY KEY} in the @@ -36183,7 +36070,7 @@ problem. As this is a two stage operation, any problems with BDB tables may take a little longer for us to fix than for other table handlers. However, as the BerkeleyDB code itself has been used by many other applications than MySQL, we don't envision any big problems with -this. @xref{Table handler support}. +this. @xref{Support}. @node BDB install, BDB start, BDB overview, BDB @@ -38815,13 +38702,13 @@ same order as they appear in the @strong{MyODBC} connect screen: @item 32 @tab Simulate a ODBC 1.0 driver in some context. @item 64 @tab Ignore use of database name in 'database.table.column'. @item 128 @tab Force use of ODBC manager cursors (experimental). -@item 256 @tab Disable the use of extended fetch (experimental) +@item 256 @tab Disable the use of extended fetch (experimental). @item 512 @tab Pad CHAR fields to full column length. @item 1024 @tab SQLDescribeCol() will return fully qualifed column names @item 2048 @tab Use the compressed server/client protocol @item 4096 @tab Tell server to ignore space after function name and before @code{'('} (needed by PowerBuilder). This will make all function names keywords! @item 8192 @tab Connect with named pipes to a @code{mysqld} server running on NT. -@item 16384 @tab Change LONGLONG columns to INT columns (Some applications can't handle LONGLONG). +@item 16384 @tab Change LONGLONG columns to INT columns (some applications can't handle LONGLONG). @item 32768 @tab Return 'user' as Table_qualifier and Table_owner from SQLTables (experimental) @item 65536 @tab Read parameters from the @code{client} and @code{odbc} groups from @file{my.cnf} @item 131072 @tab Add some extra safety checks (should not bee needed but...) @@ -38902,19 +38789,37 @@ Note that if you are using MySQL Version 3.22, you must to apply the MDAC patch and use MyODBC 2.50.32 or 2.50.34 and above to go around this problem. @item -Set the ``Return matching rows'' MyODBC option field when connecting to -MySQL. -@item -You should have a primary key in the table. If not, new or updated rows -may show up as @code{#Deleted#}. +For all Access versions, you should enable the MyODBC option flag +@code{Return matching rows}. For Access 2.0, you should additionally enable +@code{Simulate ODBC 1.0}. @item You should have a timestamp in all tables you want to be able to update. For maximum portability @code{TIMESTAMP(14)} or simple @code{TIMESTAMP} is recommended instead of other @code{TIMESTAMP(X)} variations. @item -Only use double float fields. Access fails when comparing with single floats. -The symptom usually is that new or updated rows may show up as @code{#Deleted#} -or that you can't find or update rows. +You should have a primary key in the table. If not, new or updated rows +may show up as @code{#DELETED#}. +@item +Only use @code{DOUBLE} float fields. Access fails when comparing with +single floats. The symptom usually is that new or updated rows may show +up as @code{#DELETED#} or that you can't find or update rows. +@item +If you are linking a table through MyODBC, which has @code{BIGINT} as +one of the column, then the results will be displayed as @code{#DELETED}. The +work around solution is: +@itemize @bullet +@item +Have one more dummy column with @code{TIMESTAMP} as the data type, preferably +@code{TIMESTAMP(14)}. +@item +Check the @code{'Change BIGINT columns to INT'} in connection options dialog in +ODBC DSN Administrator +@item +Delete the table link from access and re-create it. +@end itemize + +It still displays the previous records as @code{#DELETED#}, but newly +added/updated records will be displayed properly. @item If you still get the error @code{Another user has changed your data} after adding a @code{TIMESTAMP} column, the following trick may help you: @@ -38925,6 +38830,10 @@ set the @code{DefaultValue} property for the @code{TIMESTAMP} column to @code{NOW()}. It may be a good idea to hide the @code{TIMESTAMP} column from view so your users are not confused. @item +In some cases, Access may generate illegal SQL queries that +MySQL can't understand. You can fix this by selecting +@code{"Query|SQLSpecific|Pass-Through"} from the Access menu. +@item Access on NT will report @code{BLOB} columns as @code{OLE OBJECTS}. If you want to have @code{MEMO} columns instead, you should change the column to @code{TEXT} with @code{ALTER TABLE}. @@ -38932,19 +38841,9 @@ column to @code{TEXT} with @code{ALTER TABLE}. Access can't always handle @code{DATE} columns properly. If you have a problem with these, change the columns to @code{DATETIME}. @item -In some cases, Access may generate illegal SQL queries that -MySQL can't understand. You can fix this by selecting -@code{"Query|SQLSpecific|Pass-Through"} from the Access menu. -@item -If you have in Access a column defined as BYTE, Access will try to export this -as @code{TINYINT} instead of @code{TINYINT UNSIGNED}. This will give you -problems if you have values > 127 in the column! -@item -If you are using Access 7.0, You should use the option flag @code{Return -matching rows}. -@item -If you are using Access 2.0, You should use the option flags @code{Return -matching rows} and @code{Simulate ODBC 1.0}. +If you have in Access a column defined as @code{BYTE}, Access will try +to export this as @code{TINYINT} instead of @code{TINYINT UNSIGNED}. +This will give you problems if you have values > 127 in the column! @end itemize @cindex ADO program @@ -39265,7 +39164,7 @@ likely it is that we can fix the problem! * C API function overview:: C API Function Overview * C API functions:: C API Function Descriptions * C Thread functions:: C Thread Functions -* C Embedded Server functions:: C Embedded Server Functions +* C Embedded Server func:: C Embedded Server Function Descriptions * C API problems:: Common questions and problems when using the C API * Building clients:: Building Client Programs * Threaded clients:: How to Make a Threaded Client @@ -41959,19 +41858,19 @@ The connection to the server was lost during the query. An unknown error occurred. @end table -@node C Thread functions, C Embedded Server functions, C API functions, C +@node C Thread functions, C Embedded Server func, C API functions, C @subsection C Threaded Function Descriptions You need to use the following functions when you want to create a threaded client. @xref{Threaded clients}. @menu -* my_init():: @code{my_init()} -* mysql_thread_init():: @code{mysql_thread_init()} -* mysql_thread_end():: @code{mysql_thread_end()} +* my_init:: @code{my_init()} +* mysql_thread_init:: @code{mysql_thread_init()} +* mysql_thread_end:: @code{mysql_thread_end()} @end menu -@node my_init(), mysql_thread_init(), C Thread functions, C Thread functions +@node my_init, mysql_thread_init, C Thread functions, C Thread functions @subsubsection @code{my_init()} @findex @code{my_init()} @@ -41990,7 +41889,7 @@ This is automatically called by @code{mysql_init()}, none. -@node mysql_thread_init(), mysql_thread_end(), my_init(), C Thread functions +@node mysql_thread_init, mysql_thread_end, my_init, C Thread functions @subsubsection @code{mysql_thread_init()} @findex @code{mysql_thread_init()} @@ -42006,7 +41905,7 @@ This is automatically called by @code{my_init()} and @code{mysql_connect()}. none. -@node mysql_thread_end(), , mysql_thread_init(), C Thread functions +@node mysql_thread_end, , mysql_thread_init, C Thread functions @subsubsection @code{mysql_thread_end()} @findex @code{mysql_thread_end()} @@ -42023,7 +41922,7 @@ library. It must be called explicitly to avoid a memory leak. none. -@node C Embedded Server functions, C API problems, C Thread functions, C +@node C Embedded Server func, C API problems, C Thread functions, C @subsection C Embedded Server Function Descriptions You must use the following functions if you want to allow your @@ -42036,16 +41935,16 @@ possible to choose between using the embedded MySQL server and a stand-alone server without modifying any code. @menu -* mysql_server_init():: -* mysql_server_end():: +* mysql_server_init:: @code{mysql_server_init()} +* mysql_server_end:: @code{mysql_server_end()} @end menu -@node mysql_server_init(), mysql_server_end(), C Embedded Server functions, C Embedded Server functions +@node mysql_server_init, mysql_server_end, C Embedded Server func, C Embedded Server func @subsubsection @code{mysql_server_init()} @findex @code{mysql_server_init()} -@code{void mysql_server_init(int argc, const char **argv, const char **groups)} +@code{int mysql_server_init(int argc, char **argv, char **groups)} @subsubheading Description @@ -42053,7 +41952,8 @@ This function @strong{must} be called once in the program before calling any other MySQL function. It starts up the server and initializes any subsystems (@code{mysys}, InnoDB, etc.) that the server uses. If this function is not called, the program will -crash. +crash. If you are using the DBUG package that comes with MySQL, +you should call this after you have called @code{MY_INIT()}. The @code{argc} and @code{argv} arguments are analogous to the arguments to @code{main()}. The first element of @code{argv} @@ -42064,8 +41964,8 @@ command-line arguments for the server. The @code{NULL}-terminated list of strings in @code{groups} selects which groups in the option files will be active. @xref{Option files}. For convenience, @code{groups} may be -@code{NULL}, in which case the @code{[server]} group will be -active. +@code{NULL}, in which case the @code{[server]} and @code{[emedded]} groups +will be active. @subsubheading Example @@ -42079,6 +41979,7 @@ static char *server_args[] = @{ "--set-variable=key_buffer_size=32M" @}; static char *server_groups[] = @{ + "embedded", "server", "this_program_SERVER", (char *)NULL @@ -42098,9 +41999,9 @@ int main(void) @{ @subsubheading Return Values -none. +0 if ok, 1 if an error occurred. -@node mysql_server_end(), , mysql_server_init(), C Embedded Server functions +@node mysql_server_end, , mysql_server_init, C Embedded Server func @subsubsection @code{mysql_server_end()} @findex @code{mysql_server_end()} @@ -42114,7 +42015,7 @@ all other MySQL functions. It shuts down the embedded server. none. -@node C API problems, Building clients, C Embedded Server functions, C +@node C API problems, Building clients, C Embedded Server func, C @subsection Common questions and problems when using the C API @tindex @code{mysql_query()} @@ -42290,7 +42191,7 @@ For clients that use MySQL header files, you may need to specify a files. -@node Threaded clients, libmysqld , Building clients, C +@node Threaded clients, libmysqld, Building clients, C @subsection How to Make a Threaded Client @cindex clients, threaded @@ -42411,6 +42312,9 @@ included the thread libraries on the link/compile line. @menu * libmysqld overview:: Overview of the Embedded MySQL Server Library * libmysqld compiling:: Compiling Programs with @code{libmysqld} +* libmysqld restrictions:: +* libmysqld options:: +* libmysqld TODO:: * libmysqld example:: A Simple Embedded Server Example * libmysqld licensing:: Licensing the Embedded Server @end menu @@ -42423,21 +42327,100 @@ full-featured MySQL server inside the client application. The main benefits are increased speed and more simple management for embedded applications. -@node libmysqld compiling, libmysqld example, libmysqld overview, libmysqld -@subsubsection Compiling Programs with @code{libmysqld} +The API is identical for the embedded MySQL version and MySQL +client/server version. To change an old threaded application to use the +embedded library, on normall only have to add calls to the following +functions: + +@multitable @columnfractions .25 .7 +@item @code{mysql_server_init()} @tab Should be called before any other other MySQL function is called, preferably early in the @code{main()} function. +@item @code{mysql_server_end()} @tab Should be called before doing an exit of your program. +@item @code{mysql_thread_init()} @tab Should be called in all threads you are created that will access MySQL. +@item @code{mysql_thread_end()} @tab Should be called before calling @code{pthread_exit()} +@end multitable + +and link your code with @code{libmysqld.a} instead of @code{libmysqlclient.a}. -Currently, all of the support libraries must be explicitly -listed when linking with @code{-lmysqld}. In the future, -@code{mysql_config --libmysqld-libs} will name the libraries to -make this easier. Also, all of the supporting libraries will -probably be incorporated into libmysqld at some time to simplify -this even more. +The above @code{mysql_server_xxx} functions are also included in +@code{libmysqld.a} to allow you to change between the embedded and the +client/server version by just linking your application with the right +library. @xref{mysql_server_init}. + + +@node libmysqld compiling, libmysqld restrictions, libmysqld overview, libmysqld +@subsubsection Compiling Programs with @code{libmysqld} +When you link your program with @code{libmysqld}, you must also include +the system specific @code{pthread} libraries and some libraries that +@code{mysqld} uses. You can get the full list of libraries by executing +@code{mysql_config --libmysqld-libs}. + The correct flags for compiling and linking a threaded program must be used, even if you do not directly call any thread functions in your code. -@node libmysqld example, libmysqld licensing, libmysqld compiling, libmysqld +@node libmysqld restrictions, libmysqld options, libmysqld compiling, libmysqld +@subsubsection Restrictions when using the Embedded MySQL Server + +The embedded server has the following limitations: +(Some of these limitations can be changed by editing the @code{mysql_embed.h} +include files and recompiling MySQL) + +@itemize @bullet +@item +No support for ISAM tables. (This is mainly done to make the library smaller) +@item +No UDF functions. +@item +No stack trace on core dump. +@item +No internal RAID support. +@end itemize + +@node libmysqld options, libmysqld TODO, libmysqld restrictions, libmysqld +@subsubsection Using option files with the embedded server + +The following is the recommended way to use option files to make it easy +to switch between a client/server application and one where MySQL is +embedded. @xref{Option files}. + +@itemize @bullet +@item +Put common options in the @code{[server]} section. These will be read by +both MySQL versions. +@item +Put client/server specific options in the @code{[mysqld]} section. +@item +Put embedded MySQL specific options in the @code{[embedded]} section. +@item +Put application specific options in a @code{[ApplicationName_SERVER]} +section. +@end itemize + +@node libmysqld TODO, libmysqld example, libmysqld options, libmysqld +@subsubsection Things left to do in Embedded Server (TODO) + +@cindex TODO, embedded server + +@itemize @bullet +@item +Currently we only provide a static version of the @code{mysqld} library, +in the future we will also provide a shared library for this. +@item +We are going to provide options to leave out some parts of MySQL to make +the library smaller. +@item +There is still a lot of speed optimization to do. +@item +Errors are written to stderr. We will add an option to specify a +filename for these. +@item +We have to change InnoDB to not be so verbose when using in the embedded +version. +@end itemize + + +@node libmysqld example, libmysqld licensing, libmysqld TODO, libmysqld @subsubsection A Simple Embedded Server Example This example program and makefile should work without any @@ -42481,7 +42464,7 @@ main(int argc, char **argv) /* This must be called before any other mysql functions. * * You can use mysql_server_init(0, NULL, NULL), and it will - * initialize the server using groups = @{ "server", NULL @}. + * initialize the server using groups = @{ "server", "embedded", NULL @}. * * In your $HOME/.my.cnf file, you probably want to put: @@ -42679,79 +42662,9 @@ else LDLIBS += -lpthread endif +# Standard libraries. This example assumes MySQL is in /usr/local/mysql -# Standard libraries - -embed_libs := \ - $m/libmysqld/.libs/libmysqld.a \ - $m/isam/libnisam.a \ - $m/myisam/libmyisam.a \ - $m/heap/libheap.a \ - $m/merge/libmerge.a \ - $m/myisammrg/libmyisammrg.a - - -# Optionally-built libraries - -ifneq (,$(shell test -r $m/innobase/usr/libusr.a && echo "yes")) -embed_libs += \ - $m/innobase/usr/libusr.a \ - $m/innobase/odbc/libodbc.a \ - $m/innobase/srv/libsrv.a \ - $m/innobase/que/libque.a \ - $m/innobase/srv/libsrv.a \ - $m/innobase/dict/libdict.a \ - $m/innobase/ibuf/libibuf.a \ - $m/innobase/row/librow.a \ - $m/innobase/pars/libpars.a \ - $m/innobase/btr/libbtr.a \ - $m/innobase/trx/libtrx.a \ - $m/innobase/read/libread.a \ - $m/innobase/usr/libusr.a \ - $m/innobase/buf/libbuf.a \ - $m/innobase/ibuf/libibuf.a \ - $m/innobase/eval/libeval.a \ - $m/innobase/log/liblog.a \ - $m/innobase/fsp/libfsp.a \ - $m/innobase/fut/libfut.a \ - $m/innobase/fil/libfil.a \ - $m/innobase/lock/liblock.a \ - $m/innobase/mtr/libmtr.a \ - $m/innobase/page/libpage.a \ - $m/innobase/rem/librem.a \ - $m/innobase/thr/libthr.a \ - $m/innobase/com/libcom.a \ - $m/innobase/sync/libsync.a \ - $m/innobase/data/libdata.a \ - $m/innobase/mach/libmach.a \ - $m/innobase/ha/libha.a \ - $m/innobase/dyn/libdyn.a \ - $m/innobase/mem/libmem.a \ - $m/innobase/sync/libsync.a \ - $m/innobase/ut/libut.a \ - $m/innobase/os/libos.a \ - $m/innobase/ut/libut.a -endif - -ifneq (,$(shell test -r $m/bdb/build_unix/libdb.a && echo "yes")) -embed_libs += $m/bdb/build_unix/libdb.a -endif - - -# Support libraries - -embed_libs += \ - $m/mysys/libmysys.a \ - $m/strings/libmystrings.a \ - $m/dbug/libdbug.a \ - $m/regex/libregex.a - - -# Optionally built support libraries - -ifneq (,$(shell test -r $m/readline/libreadline.a && echo "yes")) -embed_libs += $m/readline/libreadline.a -endif +embed_libs := -L/usr/local/mysql/lib/mysql/ -lmysqld # This works for simple one-file test programs sources := $(wildcard *.c) @@ -42764,7 +42677,7 @@ clean: rm -f $(targets) $(objects) *.core @end example -@node libmysqld licensing, , libmysqld example, libmysqld +@node libmysqld licensing, , libmysqld example, libmysqld @subsubsection Licensing the Embedded Server The MySQL source code is covered by the GNU GPL license @@ -42800,7 +42713,7 @@ Two APIs are available in the MySQL You can compile the MySQL Windows source with Borland C++ 5.02. (The Windows source includes only projects for Microsoft VC++, for -Borland C++ you have to do the project files yourself). +Borland C++ you have to do the project files yourself.) One known problem with Borland C++ is that it uses a different structure alignment than VC++. This means that you will run into problems if you @@ -42965,6 +42878,10 @@ functions}. For the UDF mechanism to work, functions must be written in C or C++, your operating system must support dynamic loading and you must have compiled @code{mysqld} dynamically (not statically). +Note that to make @code{AGGREGATE} work, you must have a +@code{mysql.func} table that contains the column @code{type}. If this +is not the case, you should run the script +@code{mysql_fix_privilege_tables} to get this fixed. @node Adding UDF, Adding native function, CREATE FUNCTION, Adding functions @@ -42995,7 +42912,7 @@ you are using @code{--with-mysqld-ldflags=-all-static} If you want to use an UDF that needs to access symbols from @code{mysqld} (like the @code{methaphone} example in @file{sql/udf_example.cc} that uses @code{default_charset_info}), you must link the program with -@code{-rdynamic}. (see @code{man dlopen}). +@code{-rdynamic} (see @code{man dlopen}). For each function that you want to use in SQL statements, you should define corresponding C (or C++) functions. In the discussion below, the name @@ -43129,6 +43046,10 @@ digits. For real functions, the default is 13 plus the number of decimals indicated by @code{initid->decimals}. (For numeric functions, the length includes any sign or decimal point characters.) +If you want to return a blob, you can set this to 65K or 16M; This +memory is not allocated but used to decide which column type to use if +there is a need to temporary store the data. + @item char *ptr A pointer that the function can use for its own purposes. For example, functions can use @code{initid->ptr} to communicate allocated memory @@ -43269,7 +43190,8 @@ terminal screen. The return value of the main function @code{xxx()} is the function value, for @code{long long} and @code{double} functions. A string functions should return a pointer to the result and store the length of the string in the -@code{length} arguments. @code{result} is a buffer at least 255 bytes long. +@code{length} arguments. + Set these to the contents and length of the return value. For example: @example @@ -43277,8 +43199,12 @@ memcpy(result, "result string", 13); *length = 13; @end example -If your string functions that needs to return a string longer than 255 -bytes, you must allocate the space for it with @code{malloc()} in your +The @code{result} buffer that is passed to the calc function is 255 byte +big. If your result fits in this, you don't have to worry about memory +allocation for results. + +If your string function needs to return a string longer than 255 bytes, +you must allocate the space for it with @code{malloc()} in your @code{xxx_init()} function or your @code{xxx()} function and free it in your @code{xxx_deinit()} function. You can store the allocated memory in the @code{ptr} slot in the @code{UDF_INIT} structure for reuse by @@ -43383,6 +43309,7 @@ mysql> CREATE FUNCTION myfunc_double RETURNS REAL SONAME "udf_example.so"; mysql> CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "udf_example.so"; mysql> CREATE FUNCTION lookup RETURNS STRING SONAME "udf_example.so"; mysql> CREATE FUNCTION reverse_lookup RETURNS STRING SONAME "udf_example.so"; +mysql> CREATE AGGREGATE FUNCTION avgcost RETURNS REAL SONAME "udf_example.so"; @end example Functions can be deleted using @code{DROP FUNCTION}: @@ -43393,6 +43320,7 @@ mysql> DROP FUNCTION myfunc_double; mysql> DROP FUNCTION myfunc_int; mysql> DROP FUNCTION lookup; mysql> DROP FUNCTION reverse_lookup; +mysql> DROP FUNCTION avgcost; @end example The @code{CREATE FUNCTION} and @code{DROP FUNCTION} statements update the @@ -43485,7 +43413,7 @@ can take a look at @code{Item_func_mod::fix_length_and_dec} for a typical example of how to do this. @end enumerate -All functions must be thread safe (In other words, don't use any global or +All functions must be thread safe (in other words, don't use any global or static variables in the functions without protecting them with mutexes). If you want to return @code{NULL}, from @code{::val()}, @code{::val_int()} @@ -43715,7 +43643,7 @@ The tests are located in @code{mysql-test/t/*.test} A test case consists of @code{;} terminated statements and is similar to the input of @code{mysql} command line client. A statement by default is a query to be sent to MySQL server, unless it is recognized as internal -command ( eg. @code{sleep} ). +command (eg. @code{sleep}). @item All queries that produce results, e.g. @code{SELECT}, @code{SHOW}, @@ -44589,7 +44517,7 @@ number 256 to affect the number of file descriptors available to @code{ulimit} (and @code{open-files-limit}) can increase the number of file descriptors, but only up to the limit imposed by the operating system. There is also a 'hard' limit that can only be overrided if you -start @code{safe_mysqld} or @code{mysqld} as root (Just remember that +start @code{safe_mysqld} or @code{mysqld} as root (just remember that you need to also use the @code{--user=..} option in this case). If you need to increase the OS limit on the number of file descriptors available to each process, consult the documentation for your operating @@ -45803,8 +45731,6 @@ support MySQL} @item @uref{http://online.dn.ru, Internet information server} -@item @uref{http://www.stopbit.com, A technology news site} - @item @uref{http://www.worldnetla.net, WorldNet Communications - An Internet Services Provider} @item @uref{http://www.netizen.com.au/, Netizen: Australian-based Web consultancy} @@ -45852,7 +45778,7 @@ the MySQL database @item @uref{http://io.incluso.com, Ionline - online publication:} MySQL, PHP, Java, Web programming, DB development -@item @uref{http://www.baboo.com, BaBoo(Browse and bookmark). Free Web-based bookmark manager and Calendar} +@item @uref{http://www.baboo.com, BaBoo (Browse and Bookmark). Free Web-based bookmark manager and Calendar} @item @uref{http://www.courses.pjc.cc.fl.us/Schedule/index.php, Course Schedule System at Pensacola Junior College} @@ -46196,7 +46122,7 @@ MySQL C++ API. By Satish @email{spitfire@@pn3.vsnl.net.in}. Inspired by Roland Haenel's C++ API and Ed Carp's MyC library. @item @uref{http://www.mysql.com/download_mysql++.html, mysql++} -MySQL C++ API (More than just a wrapper library.) Originally by +MySQL C++ API (more than just a wrapper library). Originally by @email{kevina@@clark.net}. Nowadays maintained by Sinisa at MySQL AB. @item @uref{http://nelsonjr.homepage.com/NJrAPI,NJrAPI} @@ -46223,7 +46149,7 @@ With source code. By Matthias Fichtner. A library to use MySQL with Delphi}. @item @uref{http://www.geocities.com/CapeCanaveral/2064/mysql.html, Delphi TDataset-component}. -@item + @item @uref{http://www.mysql.com/Downloads/Contrib/Win32/SBMySQL50Share.exe, Delphi 5 Shareware MySQL Dataset Components} @end itemize @@ -46513,7 +46439,7 @@ newest version from @uref{http://civeng.com/sqldemo/, the home site}. @item @uref{http://myadmin.cheapnet.net/, MyAdmin home page} A Web-based MySQL administrator by Mike Machado. -@item @uref{http://www.mysql.com/Downloads/Contrib/phpMyAdmin_2.0.1.tar.gz,phpMyAdmin_2.0.1.tar.gz} +@item @uref{http://www.mysql.com/Downloads/Contrib/phpMyAdmin_2.2.0.tar.gz,phpMyAdmin_2.2.0.tar.gz} A set of PHP3-scripts to adminstrate MySQL over the WWW. @item @uref{http://www.phpwizard.net/projects/phpMyAdmin/, phpMyAdmin home page} @@ -46946,7 +46872,7 @@ handlers with index compression and different record formats). The @code{HEAP} library. A memory table system with our superior full dynamic hashing. In use since 1981 and published around 1984. @item -The @code{replace} program (look into it, it's COOL!). +The @code{replace} program (take a look at it, it's @strong{COOL}!). @item @strong{MyODBC}, the ODBC driver for Windows95. @item @@ -46978,7 +46904,7 @@ Lots of testing of new features. @item Our in-house ``free'' software lawyer. @item -Mailing list maintainer (who never has the time to do it right...) +Mailing list maintainer (who never has the time to do it right...). @item Our original portability code (more than 10 years old now). Nowadays only some parts of @code{mysys} are left. @@ -47014,9 +46940,9 @@ Maintainer of mysql++. @item Our security expert. @item -Vio interface (The foundation for the encrypted client/server protocol). +Vio interface (the foundation for the encrypted client/server protocol). @item -MySQL Filesystem (A way to use MySQL databases as files +MySQL Filesystem (a way to use MySQL databases as files and directories). @item The CASE Expression. @@ -47107,7 +47033,7 @@ Jonas Norrman - Handles licensing questions sent to @email{info@@mysql.com}. @item Erik Granberg - Handles MySQL partners (and a lot of other stuff). @item -Allan Larsson (The BOSS for TCX DataKonsult AB). +Allan Larsson (the BOSS for TCX DataKonsult AB). @end table @@ -47302,6 +47228,9 @@ Configure updates for Tru64, large file support and better TCP wrappers support. @item John Birrell Emulation of pthread_mutex() for OS/2. +@item Benjamin Pflugmann +Extended @code{MERGE} tables to handle @code{INSERTS}. Active member +on the MySQL mailing lists. @end table Other contributors, bugfinders, and testers: James H. Thompson, Maurizio @@ -47428,16 +47357,18 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}. @itemize @bullet @item -Added documentation for @code{libmysqld}, the embedded -MySQL server library. Also added example programs (a -@code{mysql} client and @code{mysqltest} test program) which use -@code{libmysqld}. +Added documentation for @code{libmysqld}, the embedded MySQL server +library. Also added example programs (a @code{mysql} client and +@code{mysqltest} test program) which use @code{libmysqld}. @item Removed @code{my_thread_init()} and @code{my_thread_end()} from mysql_com.h, and added @code{mysql_thread_init()} and @code{mysql_thread_end()} to mysql.h. @item -Fixed handling of big unsigned bigint constants. +Secure connections (with SSL). +@item +Unsigned @code{BIGINT} constants now work. @code{MIN()} and @code{MAX()} +now handles signed and unsigned @code{BIGINT} numbers correctly. @item New character set @code{latin_de} which provides correct German sorting. @item @@ -47448,45 +47379,44 @@ the number of deleted rows. @code{DROP DATABASE} now executes a @code{DROP TABLE} on all tables in the database, which fixes a problem with InnoDB tables. @item -Changed @code{WEEK(#,0)} to match the calender in the USA. +Added support for @code{UNION}. @item -Cleaned up global lock handling for @code{FLUSH TABLES WITH READ LOCK} +A new @code{HANDLER} interface to @code{MyISAM} tables. @item -Fixed problem with @code{DATETIME = constant} in @code{WHERE} optimization. +Added support for @code{INSERT} on @code{MERGE} tables. Patch from +Benjamin Pflugmann. +@item +Changed @code{WEEK(#,0)} to match the calender in the USA. +@item +@code{COUNT(DISTINCT)} is about 30% faster. @item Speed up all internal list handling. @item -Added support for @code{UNION}. +Speed up @code{IS NULL()} and some other internal primitives. @item -Allow ANSI SQL syntax @code{X'hexadecimal-number'} +Creating full text indexes are now much faster. @item Tree-like cache to speed up bulk inserts and @code{myisam_bulk_insert_tree_size} variable. @item -Added @code{ALTER TABLE table_name DISABLE KEYS} and -@code{ALTER TABLE table_name ENABLE KEYS} commands. +Searching on packed (@code{CHAR}/@code{VARCHAR}) keys are now much faster. @item -@code{LOAD DATA FROM MASTER} "auto-magically" sets up a slave. +Optimized queries of type: +@code{SELECT DISTINCT * from table_name ORDER by key_part1 LIMIT #} @item -Renamed @code{safe_mysqld} to @code{mysqld_safe}. +@code{SHOW CREATE TABLE} now shows all table attributes. @item -Allow one to use @code{IN} instead of @code{FROM} in @code{SHOW} commands. +@code{ORDER BY ... DESC} can now use keys. @item -@code{SHOW INDEXES} is now a synonym for @code{SHOW INDEX}. +@code{LOAD DATA FROM MASTER} "auto-magically" sets up a slave. +@item +Renamed @code{safe_mysqld} to @code{mysqld_safe}. @item Added support for symbolic links to @code{MyISAM} tables. Symlink handling is now enabled by default for Windows. @item @code{LOAD DATA FROM MASTER} "auto-magically" sets up a slave. @item -A new @code{HANDLER} interface to @code{MyISAM} tables. -@item -@code{COUNT(DISTINCT)} is about 30% faster. -@item -Creating full text indexes are now much faster. -@item -Searching on packed (@code{CHAR}/@code{VARCHAR}) keys are now much faster. -@item Added @code{SQL_CALC_FOUND_ROWS} and @code{FOUND_ROWS()}. This makes it possible to know how many rows a query would have returned without a @code{LIMIT} clause. @@ -47499,8 +47429,24 @@ Added @code{IDENTITY} as a synonym for @code{AUTO_INCREMENT} (like Sybase). @item Added @code{ORDER BY} syntax to @code{UPDATE} and @code{DELETE}. @item -Optimized queries of type: -@code{SELECT DISTINCT * from table_name ORDER by key_part1 LIMIT #} +@code{SHOW INDEXES} is now a synonym for @code{SHOW INDEX}. +@item +Added @code{ALTER TABLE table_name DISABLE KEYS} and +@code{ALTER TABLE table_name ENABLE KEYS} commands. +@item +Allow one to use @code{IN} instead of @code{FROM} in @code{SHOW} commands. +@item +Allow ANSI SQL syntax @code{X'hexadecimal-number'} +@item +Cleaned up global lock handling for @code{FLUSH TABLES WITH READ LOCK} +@item +Fixed problem with @code{DATETIME = constant} in @code{WHERE} optimization. +@item +Added options @code{--master-data} and @code{--no-autocommit} to +@code{mysqldump} (Thanks to Brian Aker for this). +@item +Added script @code{mysql_explain_log.sh} to distribution. +(Thanks to mobile.de). @end itemize @@ -47546,6 +47492,7 @@ users use this code as the rest of the code and because of this we are not yet 100% confident in this code. @menu +* News-3.23.44:: Changes in release 3.23.44 * News-3.23.43:: Changes in release 3.23.43 * News-3.23.42:: Changes in release 3.23.42 * News-3.23.41:: Changes in release 3.23.41 @@ -47593,21 +47540,44 @@ not yet 100% confident in this code. * News-3.23.0:: Changes in release 3.23.0 @end menu -@node News-3.23.43, News-3.23.42, News-3.23.x, News-3.23.x +@node News-3.23.44, News-3.23.43, News-3.23.x, News-3.23.x +@appendixsubsec Changes in release 3.23.44 +@itemize @bullet +@item +When using replications, aborted queries that contained @code{%} could cause +a core dum. +@item +TCP_NODELAY was not used on some systems. (Speed problem). +@end itemize + +@node News-3.23.43, News-3.23.42, News-3.23.44, News-3.23.x @appendixsubsec Changes in release 3.23.43 @itemize @bullet @item +Fixed a bug in @code{INSERT DELAYED} and @code{FLUSH TABLES} introduced +in 3.23.42. +@item +Fixed unlikely bug, which returned non-matching rows, in @code{SELECT} with +many tables and multi-column indexes and 'range' type. +@item +Fixed an unlikely core-dump bug when doing @code{EXPLAIN SELECT} when using +many tables and @code{ORDER BY}. +@item +Fixed bug in @code{LOAD DATA FROM MASTER} when using table with +@code{CHECKSUM=1}. +@item Added unique error message when one gets a DEADLOCK during a transaction with -BDB tables. +@code{BDB} tables. @item Fixed problem with @code{BDB} tables and @code{UNIQUE} columns defined as @code{NULL}. @item -Fixed problem with @code{myisampack} when using pre-space filled CHAR columns. +Fixed problem with @code{myisampack} when using pre-space filled @code{CHAR} +columns. @item Applied patch from Yuri Dario for OS2. @item -Fixed bug in @code{--safe-user-create} +Fixed bug in @code{--safe-user-create}. @end itemize @node News-3.23.42, News-3.23.41, News-3.23.43, News-3.23.x @@ -47941,7 +47911,7 @@ Fixed bug when thread creation failed (could happen when doing a LOT of connections in a short time). @item Fixed some problems with @code{FLUSH TABLES} and @code{TEMPORARY} tables. -(Problem with freeing the key cache and error @code{Can't reopen table...}). +(Problem with freeing the key cache and error @code{Can't reopen table...}.) @item Fixed a problem in Innobase with other character sets than @code{latin1} and another problem when using many columns. @@ -47963,7 +47933,7 @@ Fixed a bug in @code{CONCAT_WS()} where it returned wrong results. @item Changed @code{CREATE ... INSERT} and @code{INSERT ... SELECT} to not allow concurrent inserts as this could make the binary log hard to repeat. -(Concurrent inserts are enabled if you are not using the binary or update log). +(Concurrent inserts are enabled if you are not using the binary or update log.) @item Changed some macros to be able to use fast mutex with glibc 2.2. @end itemize @@ -48290,7 +48260,7 @@ Allow hex constants in the @code{--fields-*-by} and Added option @code{--safe-show-database} to @code{mysqld}. @item Added @code{have_bdb}, @code{have_gemini}, @code{have_innobase}, -@code{have_raid} and @code{have_ssl} to @code{SHOW VARIABLES} to make it +@code{have_raid} and @code{have_openssl} to @code{SHOW VARIABLES} to make it easy to test for supported extensions. @item Added option @code{--open-files-limit} to @code{mysqld}. @@ -48892,8 +48862,8 @@ More variables in @code{SHOW SLAVE STATUS} and @code{SHOW MASTER STATUS}. @item @code{SLAVE STOP} now will not return until the slave thread actually exits. @item -Full text search via the @code{MATCH} function and @code{FULLTEXT} index type. -(For MyISAM files). This makes @code{FULLTEXT} a reserved word. +Full text search via the @code{MATCH} function and @code{FULLTEXT} index type +(for MyISAM files). This makes @code{FULLTEXT} a reserved word. @end itemize @@ -48966,13 +48936,13 @@ Fixed @code{chown} warning in @code{safe_mysqld}. Fixed a bug in @code{ORDER BY} that was introduced in 3.23.19. @item Only optimize the @code{DELETE FROM tbl_name} to do a drop+create of -the table if we are in @code{AUTOCOMMIT} mode. (Needed for BDB tables). +the table if we are in @code{AUTOCOMMIT} mode (needed for BDB tables). @item Added extra checks to avoid index corruption when the @code{ISAM}/@code{MyISAM} index files gets full during an @code{INSERT}/@code{UPDATE}. @item @code{myisamchk} didn't correctly update row checksum when used with -@code{-ro} (This only gave an warning in subsequent runs). +@code{-ro} (this only gave an warning in subsequent runs). @item Fixed bug in @code{REPAIR TABLE} so that it works with tables without indexes. @item @@ -49075,7 +49045,7 @@ Added 4 sample @code{my.cnf} example files in the @file{support-files} directory. @item Fixed @code{duplicated key} problem when doing big @code{GROUP BY}'s. -(This bug was probably introduced in 3.23.15). +(This bug was probably introduced in 3.23.15.) @item Changed syntax for @code{INNER JOIN} to match ANSI SQL. @item @@ -49378,7 +49348,7 @@ Added variables @code{select_limit} and @code{max_join_size} to @code{mysql}. Added sql variables: @code{SQL_MAX_JOIN_SIZE} and @code{SQL_SAFE_UPDATES}. @item Added @code{READ LOCAL} lock that doesn't lock the table for concurrent -inserts. (This is used by @code{mysqldump}). +inserts. (This is used by @code{mysqldump}.) @item Changed that @code{LOCK TABLES ... READ} doesn't anymore allow concurrent inserts. @@ -49439,7 +49409,7 @@ is many keys to choose from. @item Changed optimizer to prefer a range key instead of a ref key when the range key can uses more columns than the ref key (which only can use -columns with =). For example, the following type of queries should now +columns with @code{=}). For example, the following type of queries should now be faster: @code{SELECT * from key_part_1=const and key_part_2 > const2} @item Fixed bug that a change of all @code{VARCHAR} columns to @code{CHAR} columns @@ -49742,7 +49712,7 @@ an empty value list to insert a row in which each column is set to its default value. @item Changed @code{SUBSTRING(text FROM pos)} to conform to ANSI SQL. (Before this -construct returned the rightmost 'pos' characters). +construct returned the rightmost 'pos' characters.) @item @code{SUM()} with @code{GROUP BY} returned 0 on some systems. @item @@ -49914,7 +49884,7 @@ You can specify a netmask using the @code{IP/NETMASK} syntax. @item If you compare a @code{NOT NULL DATE/DATETIME} column with @code{IS NULL}, this is changed to a compare against @code{0} to satisfy some ODBC -applications. (By @email{shreeve@@uci.edu}). +applications. (By @email{shreeve@@uci.edu}.) @item @code{NULL IN (...)} now returns @code{NULL} instead of @code{0}. This will ensure that @code{null_column NOT IN (...)} doesn't match @@ -49925,10 +49895,10 @@ Fix storage of floating-point values in @code{TIME} columns. Changed parsing of @code{TIME} strings to be more strict. Now the fractional second part is detected (and currently skipped). The following formats are supported: -@table @code +@itemize @item [[DAYS] [H]H:]MM:]SS[.fraction] @item [[[[[H]H]H]H]MM]SS[.fraction] -@end table +@end itemize @item Detect (and ignore) second fraction part from @code{DATETIME}. @item @@ -50191,7 +50161,7 @@ Fixed core dump with empty @code{BLOB/TEXT} column to @code{REVERSE()}. Extended @code{/*! */} with version numbers. @item Changed @code{SUBSTRING(text FROM pos)} to conform to ANSI SQL. (Before this -construct returned the rightmost 'pos' characters). +construct returned the rightmost 'pos' characters.) @item Fixed problem with @code{LOCK TABLES} combined with @code{DELETE FROM table} @item @@ -50312,7 +50282,7 @@ Fixed a problem with @code{Host '...' is not allowed to connect to this MySQL server} after one had inserted a new MySQL user with a @code{GRANT} command. @item -Changed to use @code{TCP_NODELAY} also on Linux (Should give faster TCP/IP +Changed to use @code{TCP_NODELAY} also on Linux (should give faster TCP/IP connections). @end itemize @@ -50590,7 +50560,7 @@ Changed @code{+}, @code{-} (sign and minus), @code{*}, @code{/}, @code{%}, Fixed a bug in @code{ALTER TABLE} that caused @code{mysqld} to crash. @item MySQL now always reports the conflicting key values when a -duplicate key entry occurs. (Before this was only reported for @code{INSERT}). +duplicate key entry occurs. (Before this was only reported for @code{INSERT}.) @item New syntax: @code{INSERT INTO tbl_name SET col_name=value, col_name=value, ...} @item @@ -51330,7 +51300,7 @@ Fixed problem in range optimizer (core dump) for a very complex query. Fixed problem when using @code{MIN(integer)} or @code{MAX(integer)} in @code{GROUP BY}. @item -Fixed bug on Alpha when using integer keys. (Other keys worked on Alpha). +Fixed bug on Alpha when using integer keys. (Other keys worked on Alpha.) @item Fixed bug in @code{WEEK("XXXX-xx-01")}. @end itemize @@ -52040,7 +52010,7 @@ Added @code{--pid-file=#} option to @code{mysqld}. @item Added date formatting to @code{FROM_UNIXTIME()}, originally by Zeev Suraski. @item -Fixed bug in @code{BETWEEN} in range optimizer (Did only test = of the first +Fixed bug in @code{BETWEEN} in range optimizer (did only test = of the first argument). @item Added machine-dependent files for MIT-pthreads i386-SCO. There is probably @@ -53397,7 +53367,7 @@ in the @code{mysql} mail archive, you should report the bug to online at the @uref{http://www.mysql.com/documentation/, MySQL documentation page}. -If you have started @code{mysqld} with @code{--with-myisam-recover}, +If you have started @code{mysqld} with @code{myisam-recover}, MySQL will automatically check and try to repair @code{MyISAM} tables if they are marked as 'not closed properly' or 'crashed'. If this happens, MySQL will write an entry in the @@ -53652,8 +53622,8 @@ Copy on demand is in many case much better than page or row level locking; The worst case does, however, use much more memory than when using normal locks. -Instead of using row level locks one can use application level locks. -(Like get_lock/release_lock in MySQL). This works of course +Instead of using row level locks one can use application level locks +(like get_lock/release_lock in MySQL). This works of course only in well-behaved applications. In many cases one can do an educated guess which locking type is best @@ -53836,7 +53806,7 @@ really ``thread aware''. @node Environment variables, Regexp, Porting, Top -@appendix Environment Variables +@appendix Environment Variables @cindex environment variables, list of @@ -54166,7 +54136,7 @@ Unireg is currently only available in Swedish and Finnish. The price tag for Unireg is 10,000 Swedish kr (about $1500 US), but this includes support. Unireg is distributed as a binary. (But all the ISAM -sources can be found in MySQL). Usually we compile the binary for the +sources can be found in MySQL.) Usually we compile the binary for the customer at their site. All new development is concentrated to MySQL. diff --git a/acinclude.m4 b/acinclude.m4 index 95df3903c32..79caa4338ac 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -663,7 +663,7 @@ if test "$cpu_vendor" = "AuthenticAMD"; then fi elif test "$cpu_vendor" = "GenuineIntel"; then if test $cpu_family>=6; then - cpu_set=" pentiumpro pentium i486 i386"; + cpu_set="pentiumpro pentium i486 i386"; elif test $cpu_family=5; then cpu_set="pentium i486 i386"; elif test $cpu_family=4; then @@ -682,16 +682,15 @@ done if test "$mysql_cv_cpu" = "unknown" then CFLAGS="$ac_save_CFLAGS" - AC_MSG_RESULT(none) + AC_MSG_RESULT(none) else - AC_MSG_RESULT($mysql_cv_cpu) + AC_MSG_RESULT($mysql_cv_cpu) fi ])) AC_DEFUN(MYSQL_CHECK_VIO, [ AC_ARG_WITH([vio], - [\ - --with-vio Include the Virtual IO support], + [ --with-vio Include the Virtual IO support], [vio="$withval"], [vio=no]) @@ -708,30 +707,55 @@ AC_DEFUN(MYSQL_CHECK_VIO, [ AC_SUBST([vio_libs]) ]) +AC_DEFUN(MYSQL_FIND_OPENSSL, [ + for d in /usr/ssl/include /usr/local/ssl/include /usr/include/openssl \ +/usr/include/ssl /opt/ssl/include /opt/openssl/include ; do + if test -f $d/ssl.h ; then + OPENSSL_INCLUDE=$d + fi + done + + for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \ +/usr/lib /opt/ssl/lib /opt/openssl/lib ; do + if test -f $d/libssl.a ; then + OPENSSL_LIB=$d + fi + done + + if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then + echo "Could not find an installation of OpenSSL" + if test -n "$OPENSSL_LIB" ; then + if test "$IS_LINUX" = "true"; then + echo "Looks like you've forgotted to install OpenSSL development RPM" + fi + fi + exit 1 + fi + +]) AC_DEFUN(MYSQL_CHECK_OPENSSL, [ AC_MSG_CHECKING(for OpenSSL) AC_ARG_WITH([openssl], - [\ - --with-openssl Include the OpenSSL support], + [ --with-openssl Include the OpenSSL support], [openssl="$withval"], [openssl=no]) + openssl_libs="" + openssl_includes="" if test "$openssl" = "yes" then - if test -n "$vio_dir" - then - AC_MSG_RESULT(yes) - openssl_libs="-lssl -lcrypto -L/usr/local/ssl/lib" - openssl_includes="-I/usr/local/ssl/include" - else - AC_MSG_ERROR([OpenSSL requires Virtual IO support (--with-vio)]) - fi + MYSQL_FIND_OPENSSL + #force VIO use + vio_dir="vio" + vio_libs="../vio/libvio.la" + AC_DEFINE(HAVE_VIO) + AC_MSG_RESULT(yes) + openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto" + openssl_includes="-I$OPENSSL_INCLUDE" AC_DEFINE(HAVE_OPENSSL) else AC_MSG_RESULT(no) - openssl_libs="" - openssl_includes="" fi NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs" AC_SUBST(openssl_libs) @@ -750,23 +774,27 @@ dnl Call MYSQL_CHECK_ORBIT even if mysqlfs == no, so that @orbit_*@ dnl get substituted. MYSQL_CHECK_ORBIT + AC_MSG_CHECKING(if we should build MySQLFS) + fs_dirs="" if test "$mysqlfs" = "yes" then if test -n "$orbit_exec_prefix" then fs_dirs=fs + AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([mysqlfs requires ORBit, the CORBA ORB]) + AC_MSG_RESULT(disabled because ORBIT, the CORBA ORB, was not found) fi else - fs_dirs= + AC_MSG_RESULT([no]) fi AC_SUBST([fs_dirs]) ]) AC_DEFUN(MYSQL_CHECK_ORBIT, [ AC_MSG_CHECKING(for ORBit) -if test `which orbit-config` +orbit_config_path=`which orbit-config` +if test -n "$orbit_config_path" then orbit_exec_prefix=`orbit-config --exec-prefix` orbit_includes=`orbit-config --cflags server` @@ -852,6 +880,7 @@ dnl echo "DBG2: [$mode] bdb='$bdb'; incl='$bdb_includes'; lib='$bdb_libs'" no ) bdb_includes= bdb_libs= + bdb_libs_with_path= ;; supplied-two ) MYSQL_CHECK_INSTALLED_BDB([$bdb_includes], [$bdb_libs]) @@ -881,6 +910,7 @@ dnl echo "DBG2: [$mode] bdb='$bdb'; incl='$bdb_includes'; lib='$bdb_libs'" esac bdb_includes= bdb_libs= + bdb_libs_with_path= ;; esac ;; @@ -909,6 +939,7 @@ dnl echo "DBG3: [$mode] bdb='$bdb'; incl='$bdb_includes'; lib='$bdb_libs'" AC_SUBST(bdb_includes) AC_SUBST(bdb_libs) + AC_SUBST(bdb_libs_with_path) ]) AC_DEFUN([MYSQL_CHECK_INSTALLED_BDB], [ @@ -929,6 +960,7 @@ dnl echo ["MYSQL_CHECK_INSTALLED_BDB ($1) ($2)"] MYSQL_TOP_BUILDDIR([lib]) bdb_includes="-I$inc" bdb_libs="-L$lib -ldb" + bdb_libs_with_path="$lib/libdb.a" ]) LDFLAGS="$save_LDFLAGS" else @@ -957,6 +989,7 @@ dnl echo ["MYSQL_CHECK_BDB_DIR ($1)"] MYSQL_TOP_BUILDDIR([dir]) bdb_includes="-I$dir/build_unix" bdb_libs="-L$dir/build_unix -ldb" + bdb_libs_with_path="$dir/build_unix/libdb.a" else bdb_dir_ok="$bdb_version_ok" fi @@ -1053,9 +1086,9 @@ dnl --------------------------------------------------------------------------- AC_DEFUN([MYSQL_CHECK_INNODB], [ AC_ARG_WITH([innodb], [\ - --with-innodb Use Innodb], + --without-innodb Do not include the InnoDB table handler], [innodb="$withval"], - [innodb=no]) + [innodb=yes]) AC_MSG_CHECKING([for Innodb]) @@ -1068,6 +1101,7 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [ AC_DEFINE(HAVE_INNOBASE_DB) have_innodb="yes" innodb_includes="-I../innobase/include" + innodb_system_libs="" dnl Some libs are listed several times, in order for gcc to sort out dnl circular references. innodb_libs="\ @@ -1108,7 +1142,7 @@ dnl circular references. \$(top_builddir)/innobase/os/libos.a\ \$(top_builddir)/innobase/ut/libut.a" - AC_CHECK_LIB(rt, aio_read, [innodb_libs="$innodb_libs -lrt"]) + AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"]) ;; * ) AC_MSG_RESULT([Not using Innodb]) @@ -1117,6 +1151,7 @@ dnl circular references. AC_SUBST(innodb_includes) AC_SUBST(innodb_libs) + AC_SUBST(innodb_system_libs) ]) dnl --------------------------------------------------------------------------- @@ -1131,7 +1166,7 @@ dnl --------------------------------------------------------------------------- AC_DEFUN([MYSQL_CHECK_GEMINI], [ AC_ARG_WITH([gemini], [\ - --with-gemini[=DIR] Use Gemini DB located in DIR], + --with-gemini[=DIR] Use Gemini DB located in DIR], [gemini="$withval"], [gemini=no]) @@ -1152,8 +1187,7 @@ dnl echo "DBG_GEM1: gemini='$gemini'" gemini_libs="\ ../gemini/api/libapi.a\ ../gemini/db/libdb.a\ - ../gemini/dbut/libdbut.a\ - ../gemini/vst/libvst.a" + ../gemini/dbut/libdbut.a" AC_MSG_RESULT([Using Gemini DB]) ;; esac @@ -1251,7 +1285,7 @@ changequote([, ])dnl AC_DEFUN(AC_SYS_LARGEFILE, [AC_REQUIRE([AC_CANONICAL_HOST]) AC_ARG_ENABLE(largefile, - [ --disable-large-files Omit support for large files]) + [ --disable-largefile Omit support for large files]) if test "$enable_largefile" != no; then AC_CHECK_TOOL(GETCONF, getconf) AC_SYS_LARGEFILE_FLAGS(CFLAGS) diff --git a/client/Makefile.am b/client/Makefile.am index d5b80ac5f4c..8763486d3e2 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -19,13 +19,13 @@ INCLUDES = -I$(srcdir)/../include $(openssl_includes) \ -I../include -I$(srcdir)/.. -I$(top_srcdir) \ -I.. -noinst_HEADERS = client_priv.h LIBS = @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ - mysqldump mysqlimport mysqltest mysqlbinlog + mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen noinst_PROGRAMS = insert_test select_test thread_test -noinst_HEADERS = sql_string.h completion_hash.h my_readline.h +noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \ + client_priv.h mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS) mysql_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) @@ -36,14 +36,16 @@ mysqldump_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) mysqlimport_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -mysqltest_SOURCES= mysqltest.c +mysqltest_SOURCES= mysqltest.c mysqltest_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -mysqlbinlog_SOURCES = mysqlbinlog.cc +mysqlbinlog_SOURCES = mysqlbinlog.cc mysqlbinlog_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -sql_src= log_event.h log_event.cc +mysqlmanagerc_SOURCES = mysqlmanagerc.c +mysqlmanagerc_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) +sql_src=log_event.h log_event.cc # Fix for mit-threads -DEFS= -DUNDEF_THREADS_HACK +DEFS = -DUNDEF_THREADS_HACK link_sources: for f in $(sql_src) ; do \ diff --git a/client/client_priv.h b/client/client_priv.h index 64ded3ed7f3..b015e378127 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -19,6 +19,7 @@ #include <my_global.h> #include <my_sys.h> #include <m_string.h> +#include <mysql_embed.h> #include <mysql.h> #include <errmsg.h> #include <getopt.h> diff --git a/client/completion_hash.cc b/client/completion_hash.cc index 74ff3083197..26504fdf5fe 100644 --- a/client/completion_hash.cc +++ b/client/completion_hash.cc @@ -47,10 +47,12 @@ int completion_hash_init(HashTable *ht, uint nSize) ht->arBuckets = (Bucket **) my_malloc(nSize* sizeof(Bucket *), MYF(MY_ZEROFILL | MY_WME)); - if (!ht->arBuckets) { + if (!ht->arBuckets) + { ht->initialized = 0; return FAILURE; } + init_alloc_root(&ht->mem_root, 8192, 0); ht->pHashFunction = hashpjw; ht->nTableSize = nSize; ht->initialized = 1; @@ -78,8 +80,7 @@ int completion_hash_update(HashTable *ht, char *arKey, uint nKeyLength, if (!memcmp(p->arKey, arKey, nKeyLength)) { entry *n; - n = (entry *) my_malloc(sizeof(entry), - MYF(MY_WME)); + n = (entry *) alloc_root(&ht->mem_root,sizeof(entry)); n->pNext = p->pData; n->str = str; p->pData = n; @@ -91,20 +92,16 @@ int completion_hash_update(HashTable *ht, char *arKey, uint nKeyLength, p = p->pNext; } - p = (Bucket *) my_malloc(sizeof(Bucket),MYF(MY_WME)); - - if (!p) { + if (!(p = (Bucket *) alloc_root(&ht->mem_root, sizeof(Bucket)))) return FAILURE; - } + p->arKey = arKey; p->nKeyLength = nKeyLength; p->h = h; - p->pData = (entry*) my_malloc(sizeof(entry),MYF(MY_WME)); - if (!p->pData) { - my_free((gptr) p,MYF(0)); + if (!(p->pData = (entry*) alloc_root(&ht->mem_root, sizeof(entry)))) return FAILURE; - } + p->pData->str = str; p->pData->pNext = 0; p->count = 1; @@ -209,24 +206,7 @@ Bucket *find_longest_match(HashTable *ht, char *str, uint length, void completion_hash_clean(HashTable *ht) { - uint i; - entry *e, *t; - Bucket *b, *tmp; - - for (i=0; i<ht->nTableSize; i++) { - b = ht->arBuckets[i]; - while (b) { - e = b->pData; - while (e) { - t = e; - e = e->pNext; - my_free((gptr) t,MYF(0)); - } - tmp = b; - b = b->pNext; - my_free((gptr) tmp,MYF(0)); - } - } + free_root(&ht->mem_root,MYF(0)); bzero((char*) ht->arBuckets,ht->nTableSize*sizeof(Bucket *)); } @@ -241,9 +221,7 @@ void completion_hash_free(HashTable *ht) void add_word(HashTable *ht,char *str) { int i; - int length= (int) strlen(str); - - for (i=1; i<=length; i++) { + char *pos=str; + for (i=1; *pos; i++, pos++) completion_hash_update(ht, str, i, str); - } } diff --git a/client/completion_hash.h b/client/completion_hash.h index 583a42bbbe5..45b1ef2f4c9 100644 --- a/client/completion_hash.h +++ b/client/completion_hash.h @@ -22,26 +22,29 @@ #define FAILURE 1 #include <sys/types.h> +#include <my_sys.h> typedef struct _entry { char *str; struct _entry *pNext; } entry; -typedef struct bucket { - uint h; /* Used for numeric indexing */ - char *arKey; - uint nKeyLength; - uint count; - entry *pData; - struct bucket *pNext; +typedef struct bucket +{ + uint h; /* Used for numeric indexing */ + char *arKey; + uint nKeyLength; + uint count; + entry *pData; + struct bucket *pNext; } Bucket; typedef struct hashtable { - uint nTableSize; - uint initialized; - uint(*pHashFunction) (char *arKey, uint nKeyLength); - Bucket **arBuckets; + uint nTableSize; + uint initialized; + MEM_ROOT mem_root; + uint(*pHashFunction) (char *arKey, uint nKeyLength); + Bucket **arBuckets; } HashTable; extern int completion_hash_init(HashTable *ht, uint nSize); @@ -54,4 +57,4 @@ extern void completion_hash_clean(HashTable *ht); extern int completion_hash_exists(HashTable *ht, char *arKey, uint nKeyLength); extern void completion_hash_free(HashTable *ht); -#endif /* _HASH_ */ +#endif /* _HASH_ */ diff --git a/client/mysql.cc b/client/mysql.cc index 6c947d90d76..67b97e30ea5 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -24,6 +24,7 @@ * Jani Tolonen <jani@mysql.com> * Matt Wagner <mwagner@mysql.com> * Jeremy Cole <jcole@mysql.com> + * Tonu Samuel <tonu@mysql.com> * **/ @@ -74,7 +75,6 @@ extern "C" { #endif #undef bcmp // Fix problem with new readline -#undef bzero #if defined( __WIN__) || defined(OS2) #include <conio.h> #else @@ -137,6 +137,7 @@ static const char *xmlmeta[] = { static char default_pager[FN_REFLEN]; char pager[FN_REFLEN], outfile[FN_REFLEN]; FILE *PAGER, *OUTFILE; +MEM_ROOT hash_mem_root; #include "sslopt-vars.h" @@ -243,7 +244,8 @@ static COMMANDS commands[] = { }; static const char *load_default_groups[]= { "mysql","client",0 }; -static const char *server_default_groups[]= { "server", "mysql_SERVER", 0 }; +static const char *server_default_groups[]= +{ "server", "embedded", "mysql_SERVER", 0 }; #ifdef HAVE_READLINE extern "C" void add_history(char *command); /* From readline directory */ @@ -271,7 +273,6 @@ int main(int argc,char *argv[]) { char buff[80]; - mysql_server_init(0, NULL, server_default_groups); MY_INIT(argv[0]); DBUG_ENTER("main"); DBUG_PROCESS(argv[0]); @@ -302,7 +303,10 @@ int main(int argc,char *argv[]) !(status.line_buff=batch_readline_init(max_allowed_packet+512,stdin))) exit(1); glob_buffer.realloc(512); - completion_hash_init(&ht,50); + mysql_server_init(0, NULL, (char**) server_default_groups); + completion_hash_init(&ht, 128); + init_alloc_root(&hash_mem_root, 16384, 0); + bzero((char*) &mysql, sizeof(mysql)); if (sql_connect(current_host,current_db,current_user,opt_password, opt_silent)) { @@ -326,11 +330,13 @@ int main(int argc,char *argv[]) put_info((char*) glob_buffer.ptr(),INFO_INFO); #ifdef HAVE_OPENSSL - if(mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_)) { + if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_)) + { sprintf((char*) glob_buffer.ptr(), - "SSL cipher in use is %s\n", SSL_get_cipher(mysql.net.vio->ssl_)); + "SSL cipher in use is %s\n", SSL_get_cipher(mysql.net.vio->ssl_)); put_info((char*) glob_buffer.ptr(),INFO_INFO); - } else + } + else put_info("SSL is not in use\n",INFO_INFO); #endif /* HAVE_OPENSSL */ @@ -365,7 +371,6 @@ int main(int argc,char *argv[]) if (opt_outfile) end_tee(); mysql_end(0); - mysql_server_end(); #ifndef _lint DBUG_RETURN(0); // Keep compiler happy #endif @@ -373,13 +378,7 @@ int main(int argc,char *argv[]) sig_handler mysql_end(int sig) { - if (connected) - mysql_close(&mysql); -#ifdef HAVE_OPENSSL - else - mysql_ssl_clear(&mysql); /* SSL data structres should be freed - even if connection was not made */ -#endif + mysql_close(&mysql); #ifdef HAVE_READLINE if (!status.batch && !quick && !opt_html && !opt_xml) { @@ -390,6 +389,8 @@ sig_handler mysql_end(int sig) } batch_readline_end(status.line_buff); completion_hash_free(&ht); + free_root(&hash_mem_root,MYF(0)); + #endif if (sig >= 0) put_info(sig ? "Aborted" : "Bye", INFO_RESULT); @@ -401,6 +402,7 @@ sig_handler mysql_end(int sig) my_free(current_db,MYF(MY_ALLOW_ZERO_PTR)); my_free(current_host,MYF(MY_ALLOW_ZERO_PTR)); my_free(current_user,MYF(MY_ALLOW_ZERO_PTR)); + mysql_server_end(); my_end(info_flag ? MY_CHECK_ERROR | MY_GIVE_INFO : 0); exit(status.exit_status); } @@ -970,7 +972,7 @@ static bool add_line(String &buffer,char *line,char *in_string) { // mSQL or postgreSQL style command ? if (!(inchar = (uchar) *++pos)) break; // readline adds one '\' - if (*in_string || inchar == 'N') + if (*in_string || inchar == 'N') // \N is short for NULL { // Don't allow commands in string *out++='\\'; *out++= (char) inchar; @@ -1172,7 +1174,8 @@ static char *new_command_generator(char *text,int state) static void build_completion_hash(bool skip_rehash,bool write_info) { COMMANDS *cmd=commands; - static MYSQL_RES *databases=0,*tables=0,*fields; + MYSQL_RES *databases=0,*tables=0; + MYSQL_RES *fields; static char ***field_names= 0; MYSQL_ROW database_row,table_row; MYSQL_FIELD *sql_field; @@ -1183,16 +1186,11 @@ static void build_completion_hash(bool skip_rehash,bool write_info) if (status.batch || quick || !current_db) DBUG_VOID_RETURN; // We don't need completion in batches - completion_hash_clean(&ht); if (tables) { mysql_free_result(tables); tables=0; } - if (databases) { - mysql_free_result(databases); - databases=0; - } /* hash SQL commands */ while (cmd->name) { @@ -1202,16 +1200,28 @@ static void build_completion_hash(bool skip_rehash,bool write_info) if (skip_rehash) DBUG_VOID_RETURN; + /* Free old used memory */ + if (field_names) + field_names=0; + completion_hash_clean(&ht); + free_root(&hash_mem_root,MYF(0)); + /* hash MySQL functions (to be implemented) */ /* hash all database names */ - if (mysql_query(&mysql,"show databases")==0) { + if (mysql_query(&mysql,"show databases") == 0) + { if (!(databases = mysql_store_result(&mysql))) put_info(mysql_error(&mysql),INFO_INFO); else { while ((database_row=mysql_fetch_row(databases))) - add_word(&ht,(char*) database_row[0]); + { + char *str=strdup_root(&hash_mem_root, (char*) database_row[0]); + if (str) + add_word(&ht,(char*) str); + } + mysql_free_result(databases); } } /* hash all table names */ @@ -1229,22 +1239,13 @@ You can turn off this feature to get a quicker startup with -A\n\n"); } while ((table_row=mysql_fetch_row(tables))) { - if (!completion_hash_exists(&ht,(char*) table_row[0], - (uint) strlen((const char*) table_row[0]))) - add_word(&ht,table_row[0]); - } - } - } - if (field_names) { - for (i=0; field_names[i]; i++) { - for (j=0; field_names[i][j]; j++) { - my_free(field_names[i][j],MYF(0)); + char *str=strdup_root(&hash_mem_root, (char*) table_row[0]); + if (str && + !completion_hash_exists(&ht,(char*) str, (uint) strlen(str))) + add_word(&ht,str); } - my_free((gptr) field_names[i],MYF(0)); } - my_free((gptr) field_names,MYF(0)); } - field_names=0; /* hash all field names, both with the table prefix and without it */ if (!tables) /* no tables */ @@ -1252,36 +1253,37 @@ You can turn off this feature to get a quicker startup with -A\n\n"); DBUG_VOID_RETURN; } mysql_data_seek(tables,0); - field_names = (char ***) my_malloc(sizeof(char **) * - (uint) (mysql_num_rows(tables)+1), - MYF(MY_WME)); - if (!field_names) + if (!(field_names= (char ***) alloc_root(&hash_mem_root,sizeof(char **) * + (uint) (mysql_num_rows(tables)+1)))) + { + mysql_free_result(tables); DBUG_VOID_RETURN; + } i=0; while ((table_row=mysql_fetch_row(tables))) { if ((fields=mysql_list_fields(&mysql,(const char*) table_row[0],NullS))) { num_fields=mysql_num_fields(fields); - field_names[i] = (char **) my_malloc(sizeof(char *)*(num_fields*2+1), - MYF(0)); - if (!field_names[i]) - { - continue; - } + if (!(field_names[i] = (char **) alloc_root(&hash_mem_root, + sizeof(char *) * + (num_fields*2+1)))) + break; field_names[i][num_fields*2]='\0'; j=0; while ((sql_field=mysql_fetch_field(fields))) { sprintf(buf,"%s.%s",table_row[0],sql_field->name); - field_names[i][j] = my_strdup(buf,MYF(0)); + field_names[i][j] = strdup_root(&hash_mem_root,buf); add_word(&ht,field_names[i][j]); - field_names[i][num_fields+j] = my_strdup(sql_field->name,MYF(0)); + field_names[i][num_fields+j] = strdup_root(&hash_mem_root, + sql_field->name); if (!completion_hash_exists(&ht,field_names[i][num_fields+j], (uint) strlen(field_names[i][num_fields+j]))) add_word(&ht,field_names[i][num_fields+j]); j++; } + mysql_free_result(fields); } else { @@ -1291,6 +1293,7 @@ You can turn off this feature to get a quicker startup with -A\n\n"); } i++; } + mysql_free_result(tables); field_names[i]=0; // End pointer DBUG_VOID_RETURN; } @@ -2208,16 +2211,8 @@ static int sql_real_connect(char *host,char *database,char *user,char *password, uint silent) { - if (connected) - { /* if old is open, close it first */ - mysql_close(&mysql); - connected= 0; - } -#ifdef HAVE_OPENSSL - else - mysql_ssl_clear(&mysql); /* SSL data structres should be freed - even if connection was not made */ -#endif + mysql_close(&mysql); + connected= 0; mysql_init(&mysql); if (opt_connect_timeout) { @@ -2230,7 +2225,7 @@ sql_real_connect(char *host,char *database,char *user,char *password, #ifdef HAVE_OPENSSL if (opt_use_ssl) mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, - opt_ssl_capath); + opt_ssl_capath, opt_ssl_cipher); #endif if (safe_updates) { @@ -2569,7 +2564,7 @@ static void mysql_end_timer(ulong start_time,char *buff) strmov(strend(buff),")"); } -#ifndef EMBEDDED_SERVER +#ifndef EMBEDDED_LIBRARY /* Keep sql_string library happy */ gptr sql_alloc(unsigned int Size) @@ -2581,4 +2576,4 @@ void sql_element_free(void *ptr) { my_free((gptr) ptr,MYF(0)); } -#endif /* EMBEDDED_SERVER */ +#endif /* EMBEDDED_LIBRARY */ diff --git a/client/mysqladmin.c b/client/mysqladmin.c index ca568a914f2..7cddcfc8e04 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -23,7 +23,7 @@ #include <my_pthread.h> /* because of signal() */ #endif -#define ADMIN_VERSION "8.21" +#define ADMIN_VERSION "8.22" #define MAX_MYSQL_VAR 64 #define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */ #define MAX_TRUNC_LENGTH 3 @@ -51,7 +51,7 @@ static void print_version(void); static void usage(void); static my_bool sql_connect(MYSQL *mysql,const char *host, const char *user, const char *password,uint wait); -static my_bool execute_commands(MYSQL *mysql,int argc, char **argv); +static int execute_commands(MYSQL *mysql,int argc, char **argv); static int drop_db(MYSQL *mysql,const char *db); static sig_handler endprog(int signal_number); static void nice_time(ulong sec,char *buff); @@ -265,7 +265,7 @@ int main(int argc,char *argv[]) #ifdef HAVE_OPENSSL if (opt_use_ssl) mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, - opt_ssl_capath); + opt_ssl_capath, opt_ssl_cipher); #endif /* HAVE_OPENSSL */ if (sql_connect(&mysql,host,user,opt_password,option_wait)) error = 1; @@ -275,16 +275,24 @@ int main(int argc,char *argv[]) while (!interrupted) { new_line = 0; - if (execute_commands(&mysql,argc,commands) && !option_force) + if ((error=execute_commands(&mysql,argc,commands))) { - if (option_wait && !interrupted) + if (error > 0) + break; /* Wrong command error */ + if (!option_force) { - mysql_close(&mysql); - if (!sql_connect(&mysql,host,user,opt_password,option_wait)) - continue; /* Retry */ + if (option_wait && !interrupted) + { + mysql_close(&mysql); + if (!sql_connect(&mysql,host,user,opt_password,option_wait)) + { + sleep(1); /* Don't retry too rapidly */ + continue; /* Retry */ + } + } + error=1; + break; } - error=1; - break; } if (interval) { @@ -301,7 +309,7 @@ int main(int argc,char *argv[]) my_free(user,MYF(MY_ALLOW_ZERO_PTR)); free_defaults(argv); my_end(0); - exit(error); + exit(error ? 1 : 0); return 0; } @@ -383,8 +391,14 @@ static my_bool sql_connect(MYSQL *mysql,const char *host, const char *user, } } +/* + Execute a command. + Return 0 on ok + -1 on retryable error + 1 on fatal error +*/ -static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) +static int execute_commands(MYSQL *mysql,int argc, char **argv) { char *status; @@ -404,7 +418,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"CREATE DATABASE failed; error: '%-.200s'", MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } argc--; argv++; break; @@ -417,7 +431,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) return 1; } if (drop_db(mysql,argv[1])) - return 1; + return -1; argc--; argv++; break; } @@ -433,7 +447,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"shutdown failed; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } mysql_close(mysql); /* Close connection to avoid error messages */ if (got_pidfile) @@ -450,7 +464,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"reload failed; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } break; case ADMIN_REFRESH: @@ -461,7 +475,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } break; case ADMIN_FLUSH_THREADS: @@ -469,7 +483,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } break; case ADMIN_VER: @@ -513,7 +527,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"process list failed; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } print_header(result); while ((row=mysql_fetch_row(result))) @@ -552,7 +566,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) } argc--; argv++; if (error) - return error; + return -1; break; } case ADMIN_DEBUG: @@ -560,7 +574,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"debug failed; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } break; case ADMIN_VARIABLES: @@ -574,7 +588,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"unable to show variables; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } print_header(res); while ((row=mysql_fetch_row(res))) @@ -596,7 +610,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0, "unable to show status; error: '%s'", MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } if (!opt_vertical) print_header(res); @@ -646,7 +660,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } break; } @@ -656,7 +670,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } break; } @@ -666,7 +680,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } break; } @@ -676,7 +690,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"refresh failed; error: '%s'",MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } break; } @@ -684,7 +698,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { char buff[128],crypted_pw[33]; - if(argc < 2) + if (argc < 2) { my_printf_error(0,"Too few arguments to change password",MYF(ME_BELL)); return 1; @@ -699,13 +713,13 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0, "Can't turn off logging; error: '%s'", MYF(ME_BELL),mysql_error(mysql)); - return 1; + return -1; } if (mysql_query(mysql,buff)) { my_printf_error(0,"unable to change password; error: '%s'", MYF(ME_BELL),mysql_error(mysql)); - return 1; + return -1; } argc--; argv++; break; @@ -716,7 +730,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0, "Error starting slave: %s", MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } else puts("Slave started"); @@ -726,7 +740,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0, "Error stopping slave: %s", MYF(ME_BELL), mysql_error(mysql)); - return 1; + return -1; } else puts("Slave stopped"); @@ -751,7 +765,7 @@ static my_bool execute_commands(MYSQL *mysql,int argc, char **argv) { my_printf_error(0,"mysqld doesn't answer to ping, error: '%s'", MYF(ME_BELL),mysql_error(mysql)); - return 1; + return -1; } } mysql->reconnect=1; /* Automatic reconnect is default */ @@ -914,7 +928,7 @@ static void print_header(MYSQL_RES *result) putchar('|'); while ((field = mysql_fetch_field(result))) { - printf(" %-*s|",field->max_length+1,field->name); + printf(" %-*s|",(int) field->max_length+1,field->name); } putchar('\n'); print_top(result); @@ -969,11 +983,11 @@ static void print_relative_row(MYSQL_RES *result, MYSQL_ROW cur, uint row) mysql_field_seek(result, 0); field = mysql_fetch_field(result); - printf("| %-*s|", field->max_length + 1, cur[0]); + printf("| %-*s|", (int) field->max_length + 1, cur[0]); field = mysql_fetch_field(result); tmp = cur[1] ? strtoull(cur[1], NULL, 0) : (ulonglong) 0; - printf(" %-*s|\n", field->max_length + 1, + printf(" %-*s|\n", (int) field->max_length + 1, llstr((tmp - last_values[row]), buff)); last_values[row] = tmp; } diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index ac2f3e4efda..8cb1b82753e 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -23,15 +23,6 @@ #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES) -#ifndef OS2 -extern "C" -{ - int simple_command(MYSQL *mysql,enum enum_server_command command, - const char *arg, uint length, my_bool skipp_check); - uint net_safe_read(MYSQL* mysql); -} -#endif - char server_version[SERVER_VERSION_LENGTH]; uint32 server_id = 0; @@ -321,6 +312,7 @@ static void dump_remote_log_entries(const char* logname) for(;;) { + const char *error; len = net_safe_read(mysql); if (len == packet_error) die("Error reading packet from server: %s", mysql_error(mysql)); @@ -330,8 +322,8 @@ static void dump_remote_log_entries(const char* logname) len, net->read_pos[5])); Log_event * ev = Log_event::read_log_event( (const char*) net->read_pos + 1 , - len - 1); - if(ev) + len - 1, &error); + if (ev) { ev->print(result_file, short_form, last_db); if(ev->get_type_code() == LOAD_EVENT) diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 0f7bfb37ecf..75190e34267 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -591,7 +591,7 @@ static int dbConnect(char *host, char *user, char *passwd) #ifdef HAVE_OPENSSL if (opt_use_ssl) mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, - opt_ssl_capath); + opt_ssl_capath, opt_ssl_cipher); #endif if (!(sock = mysql_real_connect(&mysql_connection, host, user, passwd, NULL, opt_mysql_port, opt_mysql_unix_port, 0))) diff --git a/client/mysqldump.c b/client/mysqldump.c index 9d80fd9a6c9..894286f8896 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -18,26 +18,22 @@ ** ** The author's original notes follow :- ** -** ****************************************************** -** * * -** * AUTHOR: Igor Romanenko (igor@frog.kiev.ua) * -** * DATE: December 3, 1994 * -** * WARRANTY: None, expressed, impressed, implied * -** * or other * -** * STATUS: Public domain * -** * Adapted and optimized for MySQL by * -** * Michael Widenius, Sinisa Milivojevic, Jani Tolonen * -** * -w --where added 9/10/98 by Jim Faucette * -** * slave code by David Saez Padros <david@ols.es> * -** * * -** ****************************************************** -*/ -/* SSL by -** Andrei Errapart <andreie@no.spam.ee> -** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee> +** AUTHOR: Igor Romanenko (igor@frog.kiev.ua) +** DATE: December 3, 1994 +** WARRANTY: None, expressed, impressed, implied +** or other +** STATUS: Public domain +** Adapted and optimized for MySQL by +** Michael Widenius, Sinisa Milivojevic, Jani Tolonen +** -w --where added 9/10/98 by Jim Faucette +** slave code by David Saez Padros <david@ols.es> +** master/autocommit code by Brian Aker <brian@tangent.org> +** SSL by +** Andrei Errapart <andreie@no.spam.ee> +** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee> **/ -#define DUMP_VERSION "8.16" +#define DUMP_VERSION "8.17" #include <my_global.h> #include <my_sys.h> @@ -73,7 +69,7 @@ static my_bool verbose=0,tFlag=0,cFlag=0,dFlag=0,quick=0, extended_insert = 0, lock_tables=0,ignore_errors=0,flush_logs=0,replace=0, ignore=0,opt_drop=0,opt_keywords=0,opt_lock=0,opt_compress=0, opt_delayed=0,create_options=0,opt_quoted=0,opt_databases=0, - opt_alldbs=0,opt_create_db=0,opt_first_slave=0; + opt_alldbs=0,opt_create_db=0,opt_first_slave=0, opt_autocommit=0, opt_master_data; static MYSQL mysql_connection,*sock=0; static char insert_pat[12 * 1024],*opt_password=0,*current_user=0, *current_host=0,*path=0,*fields_terminated=0, @@ -89,7 +85,8 @@ FILE *md_result_file; enum md_options {OPT_FTB=256, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_KEYWORDS, OPT_LOCKS, OPT_DROP, OPT_OPTIMIZE, OPT_DELAYED, - OPT_TABLES, MD_OPT_CHARSETS_DIR, MD_OPT_DEFAULT_CHARSET}; + OPT_TABLES, MD_OPT_CHARSETS_DIR, MD_OPT_DEFAULT_CHARSET, + OPT_AUTOCOMMIT, OPT_MASTER_DATA}; static struct option long_options[] = { @@ -117,6 +114,8 @@ static struct option long_options[] = {"host", required_argument, 0, 'h'}, {"lines-terminated-by", required_argument, 0, (int) OPT_LTB}, {"lock-tables", no_argument, 0, 'l'}, + {"master-data", no_argument, 0, OPT_MASTER_DATA}, + {"no-autocommit", no_argument, 0, OPT_AUTOCOMMIT}, {"no-create-db", no_argument, 0, 'n'}, {"no-create-info", no_argument, 0, 't'}, {"no-data", no_argument, 0, 'd'}, @@ -205,11 +204,15 @@ static void usage(void) --add-locks Add locks around insert statements.\n\ --allow-keywords Allow creation of column names that are keywords.\n\ --delayed-insert Insert rows with INSERT DELAYED.\n\ + --master-data This will cause the master position and filename to \n\ + be appended to your output. This will automagically \n\ + enable --first-slave.\n\ -F, --flush-logs Flush logs file in server before starting dump.\n\ -f, --force Continue even if we get an sql-error.\n\ -h, --host=... Connect to host.\n"); puts("\ -l, --lock-tables Lock all tables for read.\n\ + --no-autocommit Wrap tables with autocommit/commit statements.\n\ -n, --no-create-db 'CREATE DATABASE /*!32312 IF NOT EXISTS*/ db_name;'\n\ will not be put in the output. The above line will\n\ be added otherwise, if --databases or\n\ @@ -249,6 +252,7 @@ puts("\ -v, --verbose Print info about the various stages.\n\ -V, --version Output version information and exit.\n\ -w, --where= dump only selected records; QUOTES mandatory!\n\ + -x, --first-slave Locks all tables across all databases.\n\ EXAMPLES: \"--where=user=\'jimf\'\" \"-wuserid>1\" \"-wuserid<1\"\n\ Use -T (--tab=...) with --fields-...\n\ --fields-terminated-by=...\n\ @@ -274,7 +278,7 @@ puts("\ static void write_heder(FILE *sql_file, char *db_name) { - fprintf(sql_file, "-- MySQL dump %s\n#\n", DUMP_VERSION); + fprintf(sql_file, "-- MySQL dump %s\n--\n", DUMP_VERSION); fprintf(sql_file, "-- Host: %s Database: %s\n", current_host ? current_host : "localhost", db_name ? db_name : ""); fputs("---------------------------------------------------------\n", @@ -298,6 +302,13 @@ static int get_options(int *argc,char ***argv) long_options, &option_index)) != EOF) { switch(c) { + case OPT_MASTER_DATA: + opt_master_data=1; + opt_first_slave=1; + break; + case OPT_AUTOCOMMIT: + opt_autocommit=1; + break; case 'a': create_options=1; break; @@ -523,7 +534,7 @@ static int dbConnect(char *host, char *user,char *passwd) #ifdef HAVE_OPENSSL if (opt_use_ssl) mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, - opt_ssl_capath); + opt_ssl_capath, opt_ssl_cipher); #endif if (!(sock= mysql_real_connect(&mysql_connection,host,user,passwd, NULL,opt_mysql_port,opt_mysql_unix_port, @@ -632,8 +643,7 @@ static uint getTableStructure(char *table, char* db) if (path) { char filename[FN_REFLEN], tmp_path[FN_REFLEN]; - strmov(tmp_path,path); - convert_dirname(tmp_path); + convert_dirname(tmp_path,path,NullS); sql_file= my_fopen(fn_format(filename, table, tmp_path, ".sql", 4), O_WRONLY, MYF(MY_WME)); if (!sql_file) /* If file couldn't be opened */ @@ -643,7 +653,7 @@ static uint getTableStructure(char *table, char* db) } write_heder(sql_file, db); } - fprintf(sql_file, "\n#\n# Table structure for table '%s'\n#\n\n", table); + fprintf(sql_file, "\n--\n-- Table structure for table '%s'\n--\n\n",table); if (opt_drop) fprintf(sql_file, "DROP TABLE IF EXISTS %s;\n",table_name); @@ -705,8 +715,7 @@ static uint getTableStructure(char *table, char* db) if (path) { char filename[FN_REFLEN], tmp_path[FN_REFLEN]; - strmov(tmp_path,path); - convert_dirname(tmp_path); + convert_dirname(tmp_path,path,NullS); sql_file= my_fopen(fn_format(filename, table, tmp_path, ".sql", 4), O_WRONLY, MYF(MY_WME)); if (!sql_file) /* If file couldn't be opened */ @@ -716,7 +725,7 @@ static uint getTableStructure(char *table, char* db) } write_heder(sql_file, db); } - fprintf(sql_file, "\n#\n# Table structure for table '%s'\n#\n\n", table); + fprintf(sql_file, "\n--\n-- Table structure for table '%s'\n--\n\n",table); if (opt_drop) fprintf(sql_file, "DROP TABLE IF EXISTS %s;\n",table_name); fprintf(sql_file, "CREATE TABLE %s (\n", table_name); @@ -938,8 +947,7 @@ static void dumpTable(uint numFields, char *table) if (path) { char filename[FN_REFLEN], tmp_path[FN_REFLEN]; - strmov(tmp_path, path); - convert_dirname(tmp_path); + convert_dirname(tmp_path,path,NullS); my_load_path(tmp_path, tmp_path, NULL); fn_format(filename, table, tmp_path, ".txt", 4); my_delete(filename, MYF(0)); /* 'INTO OUTFILE' doesn't work, if @@ -973,7 +981,7 @@ static void dumpTable(uint numFields, char *table) } else { - fprintf(md_result_file,"\n#\n# Dumping data for table '%s'\n", table); + fprintf(md_result_file,"\n--\n-- Dumping data for table '%s'\n--\n", table); sprintf(query, "SELECT * FROM %s", quote_name(table,table_buff)); if (where) { @@ -1014,6 +1022,9 @@ static void dumpTable(uint numFields, char *table) rownr=0; init_length=(uint) strlen(insert_pat)+4; + if (opt_autocommit) + fprintf(md_result_file, "set autocommit=0;\n"); + while ((row=mysql_fetch_row(res))) { uint i; @@ -1140,6 +1151,8 @@ static void dumpTable(uint numFields, char *table) if (opt_lock) fputs("UNLOCK TABLES;\n", md_result_file); mysql_free_result(res); + if (opt_autocommit) + fprintf(md_result_file, "commit;\n"); } } /* dumpTable */ @@ -1214,7 +1227,7 @@ static int init_dumping(char *database) { if (opt_databases || opt_alldbs) { - fprintf(md_result_file,"\n#\n# Current Database: %s\n#\n", database); + fprintf(md_result_file,"\n--\n-- Current Database: %s\n--\n", database); if (!opt_create_db) fprintf(md_result_file,"\nCREATE DATABASE /*!32312 IF NOT EXISTS*/ %s;\n", database); @@ -1242,7 +1255,7 @@ static int dump_all_tables_in_db(char *database) init_dynamic_string(&query, "LOCK TABLES ", 256, 1024); for (numrows=0 ; (table = getTableName(1)) ; numrows++) { - dynstr_append(&query, quote_name(table,table_buff)); + dynstr_append(&query, quote_name(table, table_buff)); dynstr_append(&query, " READ /*!32311 LOCAL */,"); } if (numrows && mysql_real_query(sock, query.str, query.length-1)) @@ -1284,7 +1297,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables) init_dynamic_string(&query, "LOCK TABLES ", 256, 1024); for (i=0 ; i < tables ; i++) { - dynstr_append(&query, quote_name(table_names[i],table_buff)); + dynstr_append(&query, quote_name(table_names[i], table_buff)); dynstr_append(&query, " READ /*!32311 LOCAL */,"); } if (mysql_real_query(sock, query.str, query.length-1)) @@ -1340,6 +1353,9 @@ static void print_value(FILE *file, MYSQL_RES *result, MYSQL_ROW row, int main(int argc, char **argv) { + MYSQL_ROW row; + MYSQL_RES *master; + MY_INIT(argv[0]); /* ** Check out the args @@ -1376,6 +1392,28 @@ int main(int argc, char **argv) if (opt_first_slave) { + if (opt_master_data) + { + if (mysql_query(sock, "SHOW MASTER STATUS") || + !(master = mysql_store_result(sock))) + { + my_printf_error(0, "Error: Couldn't execute 'SHOW MASTER STATUS': %s", + MYF(0), mysql_error(sock)); + } + else + { + row = mysql_fetch_row(master); + if(row[0] && row[1]) { + fprintf(md_result_file, + "\n--\n-- Position to start replication from\n--\n\n"); + fprintf(md_result_file, + "CHANGE MASTER TO MASTER_LOG_FILE='%s' ;\n", row[0]); + fprintf(md_result_file, "CHANGE MASTER TO MASTER_LOG_POS=%s ;\n", + row[1]); + } + mysql_free_result(master); + } + } if (mysql_query(sock, "FLUSH MASTER")) { my_printf_error(0, "Error: Couldn't execute 'FLUSH MASTER': %s", diff --git a/client/mysqlimport.c b/client/mysqlimport.c index d8f763b9653..1883b2a062e 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -400,7 +400,7 @@ static MYSQL *db_connect(char *host, char *database, char *user, char *passwd) #ifdef HAVE_OPENSSL if (opt_use_ssl) mysql_ssl_set(&mysql_connection, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, - opt_ssl_capath); + opt_ssl_capath, opt_ssl_cipher); #endif if (!(sock= mysql_real_connect(&mysql_connection,host,user,passwd, database,opt_mysql_port,opt_mysql_unix_port, diff --git a/client/mysqlmanager-pwgen.c b/client/mysqlmanager-pwgen.c new file mode 100644 index 00000000000..eca9bfa23ea --- /dev/null +++ b/client/mysqlmanager-pwgen.c @@ -0,0 +1,153 @@ +/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#define MANAGER_PWGEN_VERSION "1.0" + +#include <my_global.h> +#include <m_ctype.h> +#include <my_sys.h> +#include <m_string.h> +#include <mysql_version.h> +#include <errno.h> +#include <getopt.h> +#include <md5.h> + +const char* outfile=0,*user="root"; + +struct option long_options[] = +{ + {"output-file",required_argument,0,'o'}, + {"user",required_argument,0,'u'}, + {"help",no_argument,0,'?'}, + {"version",no_argument,0,'V'}, + {0,0,0,0} +}; + +static void die(const char* fmt, ...) +{ + va_list args; + DBUG_ENTER("die"); + va_start(args, fmt); + if (fmt) + { + fprintf(stderr, "%s: ", my_progname); + vfprintf(stderr, fmt, args); + fprintf(stderr, "\n"); + fflush(stderr); + } + va_end(args); + exit(1); +} + +static void print_version(void) +{ + printf("%s Ver %s Distrib %s, for %s (%s)\n",my_progname, + MANAGER_PWGEN_VERSION, + MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE); +} + +void usage() +{ + print_version(); + printf("MySQL AB, by Sasha\n"); + printf("This software comes with ABSOLUTELY NO WARRANTY\n\n"); + printf("Generates a password file to be used by mysqltest.\n\n"); + printf("Usage: %s [OPTIONS]\n", my_progname); + printf("-?,--help Display this message and exit\n\ +-V,--version Display version info\n\ +-u,--user= Put given user in the password file\n\ +-o,--output-file= Write the output to the file with the given name\n"); +} + +int parse_args(int argc, char** argv) +{ + int c,option_index=0; + while ((c=getopt_long(argc,argv,"?Vu:o:",long_options,&option_index)) + != EOF) + { + switch (c) + { + case 'o': + outfile=optarg; + break; + case 'u': + user=optarg; + break; + case '?': + usage(); + exit(0); + case 'V': + print_version(); + exit(0); + default: + usage(); + exit(1); + } + } + return 0; +} + +void get_pass(char* pw, int len) +{ + FILE* fp; + char* pw_end=pw+len; +/* /dev/random is more secure than rand() because the seed is easy to + predict, so we resort to rand() only if /dev/random is not available */ + if ((fp=fopen("/dev/random","r"))) + { + fread(pw,len,1,fp); + fclose(fp); + while (pw<pw_end) + { + *pw++='a'+((uint)*pw % 26); + } + } + else + { + srand(time(NULL)); + while (pw<pw_end) + *pw++='a'+((uint)rand() % 26); + } + *pw_end=0; +} + +int main(int argc, char** argv) +{ + FILE* fp; + my_MD5_CTX context; + uchar digest[16]; + char pw[17]; + uint i; + + MY_INIT(argv[0]); + parse_args(argc,argv); + if (!outfile) + die("Missing --output-file"); + + if (!(fp=fopen(outfile,"w"))) + die("Could not open '%s'(errno=%d)",outfile,errno); + get_pass(pw,sizeof(pw)-1); + my_MD5Init(&context); + my_MD5Update(&context,pw,sizeof(pw)-1); + my_MD5Final(digest,&context); + fprintf(fp,"%s:",user); + for (i=0;i<sizeof(digest);i++) + fprintf(fp,"%02x",digest[i]); + fprintf(fp,"\n"); + fclose(fp); + printf("%s\n",pw); + return 0; +} diff --git a/client/mysqlmanagerc.c b/client/mysqlmanagerc.c new file mode 100644 index 00000000000..66b77e237e2 --- /dev/null +++ b/client/mysqlmanagerc.c @@ -0,0 +1,192 @@ +/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#define MANAGER_CLIENT_VERSION "1.0" + +#include <my_global.h> +#include <my_sys.h> +#include <m_string.h> +#include <mysql.h> +#include <mysql_version.h> +#include <m_ctype.h> +#ifdef OS2 +#include <config-os2.h> +#else +#include <my_config.h> +#endif +#include <my_dir.h> +#include <hash.h> +#include <mysqld_error.h> +#include <stdio.h> +#include <stdlib.h> +#include <getopt.h> +#include <stdarg.h> +#include <sys/stat.h> +#include <unistd.h> +#include <errno.h> +#include <violite.h> + +#ifndef MYSQL_MANAGER_PORT +#define MYSQL_MANAGER_PORT 23546 +#endif + +static void die(const char* fmt, ...); + +const char* user="root",*host="localhost"; +char* pass=0; +int quiet=0; +uint port=MYSQL_MANAGER_PORT; +static const char *load_default_groups[]= { "mysqlmanagerc",0 }; +char** default_argv; +MYSQL_MANAGER *manager; +FILE* fp, *fp_out; + +struct option long_options[] = +{ + {"host",required_argument,0,'h'}, + {"user",required_argument,0,'u'}, + {"password",optional_argument,0,'p',}, + {"port",required_argument,0,'P'}, + {"help",no_argument,0,'?'}, + {"version",no_argument,0,'V'}, + {"quiet",no_argument,0,'q'}, + {0,0,0,0} +}; + +static void die(const char* fmt, ...) +{ + va_list args; + DBUG_ENTER("die"); + va_start(args, fmt); + if (fmt) + { + fprintf(stderr, "%s: ", my_progname); + vfprintf(stderr, fmt, args); + fprintf(stderr, "\n"); + fflush(stderr); + } + va_end(args); + exit(1); +} + +static void print_version(void) +{ + printf("%s Ver %s Distrib %s, for %s (%s)\n",my_progname, + MANAGER_CLIENT_VERSION, + MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE); +} + +void usage() +{ + print_version(); + printf("MySQL AB, by Sasha\n"); + printf("This software comes with ABSOLUTELY NO WARRANTY\n\n"); + printf("Command-line client for MySQL manager daemon.\n\n"); + printf("Usage: %s [OPTIONS] < command_file\n", my_progname); + printf("\n\ + -?, --help Display this help and exit.\n"); + printf("\ + -h, --host=... Connect to host.\n\ + -u, --user=... User for login.\n\ + -p[password], --password[=...]\n\ + Password to use when connecting to server.\n\ + -P, --port=... Port number to use for connection.\n\ + -q, --quiet, --silent Suppress all normal output.\n\ + -V, --version Output version information and exit.\n\ + --no-defaults Don't read default options from any options file.\n\n"); +} +int parse_args(int argc, char **argv) +{ + int c, option_index = 0; + my_bool tty_password=0; + + load_defaults("my",load_default_groups,&argc,&argv); + default_argv= argv; + + while ((c = getopt_long(argc, argv, "h:p::u:P:?Vq", + long_options, &option_index)) != EOF) + { + switch (c) + { + case 'h': + host=optarg; + break; + case 'u': + user=optarg; + break; + case 'p': + if (optarg) + { + my_free(pass,MYF(MY_ALLOW_ZERO_PTR)); + pass=my_strdup(optarg,MYF(MY_FAE)); + while (*optarg) *optarg++= 'x'; /* Destroy argument */ + } + else + tty_password=1; + break; + case 'P': + port=atoi(optarg); + break; + case 'q': + quiet=1; + break; + case 'V': + print_version(); + exit(0); + case '?': + usage(); + exit(0); + default: + usage(); + exit(1); + } + } + return 0; +} +int main(int argc, char** argv) +{ + MY_INIT(argv[0]); + fp=stdin; + fp_out=stdout; + parse_args(argc,argv); + if (!(manager=mysql_manager_init(0))) + die("Failed in mysql_manager_init()"); + if (!mysql_manager_connect(manager,host,user,pass,port)) + die("Could not connect to MySQL manager: %s(%d)",manager->last_error, + manager->last_errno); + for (;!feof(fp);) + { + char buf[4096]; + if (!fgets(buf,sizeof(buf),fp)) + break; + if (!quiet) + fprintf(fp_out,"<<%s",buf); + if (mysql_manager_command(manager,buf,strlen(buf))) + die("Error in command: %s(%d)",manager->last_error,manager->last_errno); + while (!manager->eof) + { + if (mysql_manager_fetch_line(manager,buf,sizeof(buf))) + die("Error fetching result line: %s(%d)", manager->last_error, + manager->last_errno); + if (!quiet) + fprintf(fp_out,">>%s\n",buf); + } + } + mysql_manager_close(manager); + return 0; +} + + diff --git a/client/mysqlshow.c b/client/mysqlshow.c index 8bce1203df8..5ac0d24821e 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -87,7 +87,7 @@ int main(int argc, char **argv) #ifdef HAVE_OPENSSL if (opt_use_ssl) mysql_ssl_set(&mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca, - opt_ssl_capath); + opt_ssl_capath, opt_ssl_cipher); #endif if (!(mysql_real_connect(&mysql,host,user,opt_password, argv[0],opt_mysql_port,opt_mysql_unix_port, @@ -713,7 +713,7 @@ static void print_res_header(MYSQL_RES *result) putchar('|'); while ((field = mysql_fetch_field(result))) { - printf(" %-*s|",field->max_length+1,field->name); + printf(" %-*s|",(int) field->max_length+1,field->name); } putchar('\n'); print_res_top(result); diff --git a/client/mysqltest.c b/client/mysqltest.c index 1361dc843ed..1374a276231 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -43,22 +43,18 @@ **********************************************************************/ -#define MTEST_VERSION "1.10" +#define MTEST_VERSION "1.11" #include <my_global.h> +#include <mysql_embed.h> #include <my_sys.h> #include <m_string.h> #include <mysql.h> #include <mysql_version.h> +#include <mysqld_error.h> #include <m_ctype.h> -#ifdef OS2 -#include <config-os2.h> -#else - #include <my_config.h> -#endif #include <my_dir.h> #include <hash.h> -#include <mysqld_error.h> #include <stdio.h> #include <stdlib.h> #include <getopt.h> @@ -84,12 +80,23 @@ * the server - to solve the problem, we try again * after some sleep if connection fails the first * time */ +#ifndef MYSQL_MANAGER_PORT +#define MYSQL_MANAGER_PORT 23546 +#endif + +enum {OPT_MANAGER_USER=256,OPT_MANAGER_HOST,OPT_MANAGER_PASSWD, + OPT_MANAGER_PORT,OPT_MANAGER_WAIT_TIMEOUT}; static int record = 0, verbose = 0, silent = 0, opt_sleep=0; static char *db = 0, *pass=0; -const char* user = 0, *host = 0, *unix_sock = 0; -static int port = 0, opt_big_test=0; +const char* user = 0, *host = 0, *unix_sock = 0, *opt_basedir="./"; +static int port = 0, opt_big_test=0, opt_compress=0; static uint start_lineno, *lineno; +const char* manager_user="root",*manager_host="localhost"; +char *manager_pass=0; +int manager_port=MYSQL_MANAGER_PORT; +int manager_wait_timeout=3; +MYSQL_MANAGER* manager=0; static char **default_argv; static const char *load_default_groups[]= { "mysqltest","client",0 }; @@ -127,6 +134,8 @@ typedef struct int read_lines,current_line; } PARSER; +MYSQL_RES *last_result=0; + PARSER parser; MASTER_POS master_pos; int* block_ok; /* set to 0 if the current block should not be executed */ @@ -143,11 +152,13 @@ typedef struct int int_val; int alloced_len; int int_dirty; /* do not update string if int is updated until first read */ + int alloced; } VAR; VAR var_reg[10]; /*Perl/shell-like variable registers */ HASH var_hash; +int disable_query_log=0; struct connection cons[MAX_CONS]; struct connection* cur_con, *next_con, *cons_end; @@ -169,6 +180,8 @@ Q_DIRTY_CLOSE, Q_REPLACE, Q_PING, Q_EVAL, Q_RPL_PROBE, Q_ENABLE_RPL_PARSE, Q_DISABLE_RPL_PARSE, Q_EVAL_RESULT, +Q_ENABLE_QUERY_LOG, Q_DISABLE_QUERY_LOG, +Q_SERVER_START, Q_SERVER_STOP, Q_UNKNOWN, /* Unknown command. */ Q_COMMENT, /* Comments, ignored. */ Q_COMMENT_WITH_COMMAND @@ -200,6 +213,8 @@ const char *command_names[] = { "ping", "eval", "rpl_probe", "enable_rpl_parse", "disable_rpl_parse", "eval_result", + "enable_query_log", "disable_query_log", + "server_start", "server_stop", 0 }; @@ -222,6 +237,7 @@ void reject_dump(const char* record_file, char* buf, int size); int close_connection(struct st_query* q); VAR* var_get(const char* var_name, const char** var_name_end, int raw); int eval_expr(VAR* v, const char* p, const char** p_end); +static int read_server_arguments(const char* name); /* Definitions for replace */ @@ -243,6 +259,7 @@ static int initialize_replace_buffer(void); static void free_replace_buffer(void); static void do_eval(DYNAMIC_STRING* query_eval, const char* query); void str_to_file(const char* fname, char* str, int size); +int do_server_op(struct st_query* q,const char* op); struct st_replace *glob_replace; static char *out_buff; @@ -250,13 +267,26 @@ static uint out_length; static int eval_result = 0; /* Disable functions that only exist in MySQL 4.0 */ -#if MYSQL_VERSION_ID < 40000 -static void mysql_enable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} -static void mysql_disable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} -static int mysql_rpl_parse_enabled(MYSQL* mysql __attribute__((unused))) { return 1; } -static int mysql_rpl_probe(MYSQL *mysql __attribute__((unused))) { return 1; } +#if MYSQL_VERSION_ID < 40000 || defined(EMBEDDED_LIBRARY) +void mysql_enable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} +void mysql_disable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} +int mysql_rpl_parse_enabled(MYSQL* mysql __attribute__((unused))) { return 1; } +int mysql_rpl_probe(MYSQL *mysql __attribute__((unused))) { return 1; } #endif +#define MAX_SERVER_ARGS 20 + +static int embedded_server_arg_count=0; +static char *embedded_server_args[MAX_SERVER_ARGS]; + +static const char *embedded_server_groups[] = { + "server", + "embedded", + "mysqltest_SERVER", + NullS +}; + + static void do_eval(DYNAMIC_STRING* query_eval, const char* query) { const char* p; @@ -300,6 +330,8 @@ static void do_eval(DYNAMIC_STRING* query_eval, const char* query) static void close_cons() { DBUG_ENTER("close_cons"); + if (last_result) + mysql_free_result(last_result); for (--next_con; next_con >= cons; --next_con) { mysql_close(&next_con->mysql); @@ -310,17 +342,23 @@ static void close_cons() static void close_files() { - do + DBUG_ENTER("close_files"); + for (; cur_file != file_stack ; cur_file--) { if (*cur_file != stdin && *cur_file) my_fclose(*cur_file,MYF(0)); - } while (cur_file-- != file_stack); + } + DBUG_VOID_RETURN; } static void free_used_memory() { uint i; DBUG_ENTER("free_used_memory"); +#ifndef EMBEDDED_LIBRARY + if (manager) + mysql_manager_close(manager); +#endif close_cons(); close_files(); hash_free(&var_hash); @@ -336,10 +374,13 @@ static void free_used_memory() if(var_reg[i].alloced_len) my_free(var_reg[i].str_val, MYF(MY_WME)); } + while (embedded_server_arg_count > 1) + my_free(embedded_server_args[--embedded_server_arg_count],MYF(0)); delete_dynamic(&q_lines); dynstr_free(&ds_res); my_free(pass,MYF(MY_ALLOW_ZERO_PTR)); free_defaults(default_argv); + mysql_server_end(); my_end(MY_CHECK_ERROR); DBUG_VOID_RETURN; } @@ -361,6 +402,8 @@ static void die(const char* fmt, ...) exit(1); } +/* Note that we will get some memory leaks when calling this! */ + static void abort_not_supported_test() { DBUG_ENTER("abort_not_supported_test"); @@ -415,13 +458,22 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char* fname) DYNAMIC_STRING res_ds; DBUG_ENTER("dyn_string_cmp"); - if (!my_stat(fname, &stat_info, MYF(MY_WME))) + if (!test_if_hard_path(fname)) + { + strxmov(eval_file, opt_basedir, fname, NullS); + fn_format(eval_file, eval_file,"","",4); + } + else + fn_format(eval_file, fname,"","",4); + + if (!my_stat(eval_file, &stat_info, MYF(MY_WME))) die(NullS); if (!eval_result && stat_info.st_size != ds->length) DBUG_RETURN(2); if (!(tmp = (char*) my_malloc(stat_info.st_size + 1, MYF(MY_WME)))) die(NullS); - if ((fd = my_open(fname, O_RDONLY, MYF(MY_WME))) < 0) + + if ((fd = my_open(eval_file, O_RDONLY, MYF(MY_WME))) < 0) die(NullS); if (my_read(fd, (byte*)tmp, stat_info.st_size, MYF(MY_WME|MY_NABP))) die(NullS); @@ -570,9 +622,17 @@ int var_set(char* var_name, char* var_name_end, char* var_val, int open_file(const char* name) { + char buff[FN_REFLEN]; + if (!test_if_hard_path(name)) + { + strxmov(buff, opt_basedir, name, NullS); + name=buff; + } + fn_format(buff,name,"","",4); + if (*cur_file && cur_file == file_stack_end) die("Source directives are nesting too deep"); - if (!(*(cur_file+1) = my_fopen(name, O_RDONLY, MYF(MY_WME)))) + if (!(*(cur_file+1) = my_fopen(buff, O_RDONLY, MYF(MY_WME)))) die(NullS); cur_file++; *++lineno=1; @@ -580,6 +640,46 @@ int open_file(const char* name) return 0; } +#ifndef EMBEDDED_LIBRARY +int do_server_start(struct st_query* q) +{ + return do_server_op(q,"start"); +} + +int do_server_stop(struct st_query* q) +{ + return do_server_op(q,"stop"); +} + +int do_server_op(struct st_query* q,const char* op) +{ + char* p=q->first_argument; + char com_buf[256],*com_p; + com_p=strmov(com_buf,op); + com_p=strmov(com_p,"_exec "); + if (!*p) + die("Missing server name in server_%s\n",op); + while (*p && !isspace(*p)) + { + *com_p++=*p++; + } + *com_p++=' '; + com_p=int10_to_str(manager_wait_timeout,com_p,10); + *com_p++ = '\n'; + *com_p=0; + if (mysql_manager_command(manager,com_buf,(int)(com_p-com_buf))) + die("Error in command: %s(%d)",manager->last_error,manager->last_errno); + while (!manager->eof) + { + if (mysql_manager_fetch_line(manager,com_buf,sizeof(com_buf))) + die("Error fetching result line: %s(%d)", manager->last_error, + manager->last_errno); + } + + return 0; +} +#endif + int do_source(struct st_query* q) { char* p=q->first_argument, *name; @@ -623,6 +723,18 @@ int var_query_set(VAR* v, const char* p, const char** p_end) return 0; } +void var_copy(VAR* dest, VAR* src) +{ + dest->int_val=src->int_val; + dest->int_dirty=src->int_dirty; + if (dest->alloced_len < src->alloced_len && + !(dest->str_val=my_realloc(dest->str_val,src->alloced_len, + MYF(MY_WME)))) + die("Out of memory"); + dest->str_val_len=src->str_val_len; + memcpy(dest->str_val,src->str_val,src->str_val_len); +} + int eval_expr(VAR* v, const char* p, const char** p_end) { VAR* vp; @@ -630,7 +742,7 @@ int eval_expr(VAR* v, const char* p, const char** p_end) { if ((vp = var_get(p,p_end,0))) { - memcpy(v, vp, sizeof(*v)); + var_copy(v, vp); return 0; } } @@ -703,6 +815,7 @@ int do_system(struct st_query* q) if (system(expr_buf) && q->abort_on_error) die("system command '%s' failed", expr_buf); } + var_free(&v); return 0; } @@ -718,6 +831,7 @@ int do_echo(struct st_query* q) write(1, v.str_val, v.str_val_len); } write(1, "\n", 1); + var_free(&v); return 0; } @@ -743,14 +857,13 @@ int do_sync_with_master(struct st_query* q) die("At line %u: failed in %s: %d: %s", start_lineno, query_buf, mysql_errno(mysql), mysql_error(mysql)); - if(!(res = mysql_store_result(mysql))) + if(!(last_result = res = mysql_store_result(mysql))) die("line %u: mysql_store_result() retuned NULL", start_lineno); if(!(row = mysql_fetch_row(res))) die("line %u: empty result in %s", start_lineno, query_buf); if(!row[0]) die("Error on slave while syncing with master"); - mysql_free_result(res); - + mysql_free_result(res); last_result=0; if(rpl_parse) mysql_enable_rpl_parse(mysql); @@ -771,13 +884,13 @@ int do_save_master_pos() die("At line %u: failed in show master status: %d: %s", start_lineno, mysql_errno(mysql), mysql_error(mysql)); - if(!(res = mysql_store_result(mysql))) + if(!(last_result =res = mysql_store_result(mysql))) die("line %u: mysql_store_result() retuned NULL", start_lineno); if(!(row = mysql_fetch_row(res))) die("line %u: empty result in show master status", start_lineno); strncpy(master_pos.file, row[0], sizeof(master_pos.file)); master_pos.pos = strtoul(row[1], (char**) 0, 10); - mysql_free_result(res); + mysql_free_result(res); last_result=0; if(rpl_parse) mysql_enable_rpl_parse(mysql); @@ -1067,18 +1180,18 @@ int close_connection(struct st_query* q) p++; *p = 0; - for(con = cons; con < next_con; con++) + for (con = cons; con < next_con; con++) { if (!strcmp(con->name, name)) { - if(q->type == Q_DIRTY_CLOSE) + if (q->type == Q_DIRTY_CLOSE) + { + if (con->mysql.net.vio) { - if(con->mysql.net.vio) - { - vio_delete(con->mysql.net.vio); - con->mysql.net.vio = 0; - } + vio_delete(con->mysql.net.vio); + con->mysql.net.vio = 0; } + } mysql_close(&con->mysql); DBUG_RETURN(0); @@ -1111,6 +1224,19 @@ char* safe_get_param(char* str, char** arg, const char* msg) DBUG_RETURN(str); } +#ifndef EMBEDDED_LIBRARY +void init_manager() +{ + if (!(manager=mysql_manager_init(0))) + die("Failed in mysql_manager_init()"); + if (!mysql_manager_connect(manager,manager_host,manager_user, + manager_pass,manager_port)) + die("Could not connect to MySQL manager: %s(%d)",manager->last_error, + manager->last_errno); + +} +#endif + int safe_connect(MYSQL* con, const char* host, const char* user, const char* pass, const char* db, int port, const char* sock) @@ -1167,6 +1293,8 @@ int do_connect(struct st_query* q) if (!mysql_init(&next_con->mysql)) die("Failed on mysql_init()"); + if (opt_compress) + mysql_options(&next_con->mysql,MYSQL_OPT_COMPRESS,NullS); if (con_sock) con_sock=fn_format(buff, con_sock, TMPDIR, "",0); if (!con_db[0]) @@ -1194,10 +1322,10 @@ int do_done(struct st_query* q) parser.current_line = *--cur_block; } else - { - ++parser.current_line; - --cur_block; - } + { + ++parser.current_line; + --cur_block; + } return 0; } @@ -1206,7 +1334,6 @@ int do_while(struct st_query* q) char* p=q->first_argument; const char* expr_start, *expr_end; VAR v; - var_init(&v,0,0,0,0); if (cur_block == block_stack_end) die("Nesting too deeply"); if (!*block_ok) @@ -1223,6 +1350,7 @@ int do_while(struct st_query* q) expr_end = strrchr(expr_start, ')'); if (!expr_end) die("missing ')' in while"); + var_init(&v,0,0,0,0); eval_expr(&v, ++expr_start, &expr_end); *cur_block++ = parser.current_line++; if (!v.int_val) @@ -1232,6 +1360,7 @@ int do_while(struct st_query* q) } else *++block_ok = 1; + var_free(&v); return 0; } @@ -1307,15 +1436,11 @@ int read_line(char* buf, int size) { if ((*cur_file) != stdin) my_fclose(*cur_file,MYF(0)); - + cur_file--; + lineno--; if (cur_file == file_stack) return 1; - else - { - cur_file--; - lineno--; - continue; - } + continue; } switch(state) { @@ -1504,20 +1629,28 @@ int read_query(struct st_query** q_ptr) return 0; } - struct option long_options[] = { {"debug", optional_argument, 0, '#'}, {"database", required_argument, 0, 'D'}, + {"basedir", required_argument, 0, 'b'}, {"big-test", no_argument, 0, 'B'}, + {"compress", no_argument, 0, 'C'}, {"help", no_argument, 0, '?'}, {"host", required_argument, 0, 'h'}, + {"manager-user",required_argument, 0, OPT_MANAGER_USER}, + {"manager-host",required_argument, 0, OPT_MANAGER_HOST}, + {"manager-password",required_argument,0,OPT_MANAGER_PASSWD}, + {"manager-port",required_argument,0,OPT_MANAGER_PORT}, + {"manager-wait-timeout",required_argument,0,OPT_MANAGER_WAIT_TIMEOUT}, {"password", optional_argument, 0, 'p'}, {"port", required_argument, 0, 'P'}, - {"quiet", no_argument, 0, 'q'}, + {"quiet", no_argument, 0, 's'}, {"record", no_argument, 0, 'r'}, {"result-file", required_argument, 0, 'R'}, - {"silent", no_argument, 0, 'q'}, + {"server-arg", required_argument, 0, 'A'}, + {"server-file", required_argument, 0, 'F'}, + {"silent", no_argument, 0, 's'}, {"sleep", required_argument, 0, 'T'}, {"socket", required_argument, 0, 'S'}, {"test-file", required_argument, 0, 'x'}, @@ -1553,9 +1686,14 @@ void usage() -u, --user=... User for login.\n\ -p[password], --password[=...]\n\ Password to use when connecting to server.\n\ + -b, --basedir=... Basedir for tests\n\ -B, --big-test Define BIG_TEST to 1\n\ + -C, --compress Use the compressed server/client protocol\n\ -D, --database=... Database to use.\n\ -P, --port=... Port number to use for connection.\n\ + --server-arg=... Send enbedded server this as a paramenter\n\ + --server-file=... Read embedded server arguments from file\n\ + -s, --silent, --quiet Suppress all normal output.\n\ -S, --socket=... Socket file to use for connection.\n\ -t, --tmpdir=... Temporary directory where sockets are put\n\ -T, --sleep=# Sleep always this many seconds on sleep commands\n\ @@ -1563,7 +1701,6 @@ void usage() -R, --result-file=... Read/Store result from/in this file.\n\ -x, --test-file=... Read test from/in this file (default stdin).\n\ -v, --verbose Write more.\n\ - -q, --quiet, --silent Suppress all normal output.\n\ -V, --version Output version information and exit.\n\ --no-defaults Don't read default options from any options file.\n\n"); } @@ -1576,12 +1713,12 @@ int parse_args(int argc, char **argv) load_defaults("my",load_default_groups,&argc,&argv); default_argv= argv; - while((c = getopt_long(argc, argv, "h:p::u:BP:D:S:R:x:t:T:#:?rvVq", - long_options, &option_index)) != EOF) + while ((c = getopt_long(argc, argv, "A:h:p::u:b:BCF:P:D:S:R:x:t:T:#:?rvVs", + long_options, &option_index)) != EOF) { switch(c) { case '#': - DBUG_PUSH(optarg ? optarg : "d:t:O,/tmp/mysqltest.trace"); + DBUG_PUSH(optarg ? optarg : "d:t:S:i:O,/tmp/mysqltest.trace"); break; case 'v': verbose = 1; @@ -1589,6 +1726,23 @@ int parse_args(int argc, char **argv) case 'r': record = 1; break; + case (int)OPT_MANAGER_WAIT_TIMEOUT: + manager_wait_timeout=atoi(optarg); + break; + case (int)OPT_MANAGER_PORT: + manager_port=atoi(optarg); + break; + case (int)OPT_MANAGER_HOST: + manager_host=optarg; + break; + case (int)OPT_MANAGER_USER: + manager_user=optarg; + break; + case (int)OPT_MANAGER_PASSWD: + my_free(manager_pass,MYF(MY_ALLOW_ZERO_PTR)); + manager_pass=my_strdup(optarg,MYF(MY_FAE)); + while (*optarg) *optarg++= 'x'; /* Destroy argument */ + break; case 'u': user = optarg; break; @@ -1596,9 +1750,18 @@ int parse_args(int argc, char **argv) result_file = optarg; break; case 'x': - if (!(*cur_file = my_fopen(optarg, O_RDONLY, MYF(MY_WME)))) + { + char buff[FN_REFLEN]; + if (!test_if_hard_path(optarg)) + { + strxmov(buff, opt_basedir, optarg, NullS); + optarg=buff; + } + fn_format(buff,optarg,"","",4); + if (!(*++cur_file = my_fopen(buff, O_RDONLY, MYF(MY_WME)))) die("Could not open %s: errno = %d", optarg, errno); break; + } case 'p': if (optarg) { @@ -1609,9 +1772,15 @@ int parse_args(int argc, char **argv) else tty_password=1; break; + case 'b': + opt_basedir= optarg; + break; case 'B': opt_big_test=1; break; + case 'C': + opt_compress=1; + break; case 'P': port = atoi(optarg); break; @@ -1624,7 +1793,7 @@ int parse_args(int argc, char **argv) case 'h': host = optarg; break; - case 'q': + case 's': silent = 1; break; case 't': @@ -1633,6 +1802,24 @@ int parse_args(int argc, char **argv) case 'T': opt_sleep=atoi(optarg); break; + case 'A': + if (!embedded_server_arg_count) + { + embedded_server_arg_count=1; + embedded_server_args[0]= (char*) ""; + } + embedded_server_args[embedded_server_arg_count++]= + my_strdup(optarg,MYF(MY_FAE)); + if (embedded_server_arg_count == MAX_SERVER_ARGS || + !embedded_server_args[embedded_server_arg_count-1]) + { + die("Can't use server argument"); + } + break; + case 'F': + if (read_server_arguments(optarg)) + die(NullS); + break; case 'V': print_version(); exit(0); @@ -1640,6 +1827,7 @@ int parse_args(int argc, char **argv) usage(); exit(1); /* Unknown option */ default: + fprintf(stderr,"Unknown option '%c'\n",c); usage(); exit(1); } @@ -1672,9 +1860,17 @@ char* safe_str_append(char* buf, const char* str, int size) void str_to_file(const char* fname, char* str, int size) { int fd; - if ((fd = my_open(fname, O_WRONLY | O_CREAT | O_TRUNC, + char buff[FN_REFLEN]; + if (!test_if_hard_path(fname)) + { + strxmov(buff, opt_basedir, fname, NullS); + fname=buff; + } + fn_format(buff,fname,"","",4); + + if ((fd = my_open(buff, O_WRONLY | O_CREAT | O_TRUNC, MYF(MY_WME | MY_FFNF))) < 0) - die("Could not open %s: errno = %d", fname, errno); + die("Could not open %s: errno = %d", buff, errno); if (my_write(fd, (byte*)str, size, MYF(MY_WME|MY_FNABP))) die("write failed"); my_close(fd, MYF(0)); @@ -1731,14 +1927,22 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) if ((flags & QUERY_SEND) && mysql_send_query(mysql, query, query_len)) die("At line %u: unable to send query '%s'", start_lineno, query); - if(!(flags & QUERY_REAP)) - return 0; + if ((flags & QUERY_SEND) && !disable_query_log) + { + dynstr_append_mem(ds,query,query_len); + dynstr_append_mem(ds,";\n",2); + } + if (!(flags & QUERY_REAP)) + DBUG_RETURN(0); if (mysql_read_query_result(mysql) || - (!(res = mysql_store_result(mysql)) && mysql_field_count(mysql))) + (!(last_result = res = mysql_store_result(mysql)) && + mysql_field_count(mysql))) { if (q->require_file) + { abort_not_supported_test(); + } if (q->abort_on_error) die("At line %u: query '%s' failed: %d: %s", start_lineno, query, mysql_errno(mysql), mysql_error(mysql)); @@ -1747,7 +1951,17 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) for (i=0 ; q->expected_errno[i] ; i++) { if ((q->expected_errno[i] == mysql_errno(mysql))) + { + if (i == 0 && q->expected_errno[1] == 0) + { + /* Only log error if there is one possible error */ + dynstr_append(ds,mysql_error(mysql)); + dynstr_append_mem(ds,"\n",1); + } + else + dynstr_append(ds,"Got one of the listed errors\n"); goto end; /* Ok */ + } } if (i) { @@ -1839,6 +2053,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) end: if (res) mysql_free_result(res); + last_result=0; if (ds == &ds_tmp) dynstr_free(&ds_tmp); if(q->type == Q_EVAL) @@ -1891,6 +2106,7 @@ static VAR* var_init(VAR* v, const char* name, int name_len, const char* val, die("Out of memory"); tmp_var->name = (name) ? (char*)tmp_var + sizeof(*tmp_var) : 0; + tmp_var->alloced = (v == 0); if(!(tmp_var->str_val = my_malloc(val_alloc_len, MYF(MY_WME)))) die("Out of memory"); @@ -1909,7 +2125,8 @@ static VAR* var_init(VAR* v, const char* name, int name_len, const char* val, static void var_free(void* v) { my_free(((VAR*) v)->str_val, MYF(MY_WME)); - my_free((char*) v, MYF(MY_WME)); + if (((VAR*)v)->alloced) + my_free((char*) v, MYF(MY_WME)); } @@ -1935,17 +2152,6 @@ static void init_var_hash() var_from_env("BIG_TEST", opt_big_test ? "1" : "0"); } -static const char *embedded_server_args[] = { - "", /* XXX: argv[0] is program name - we should fix the API */ - "--datadir=.", - "--language=/usr/local/mysql/share/mysql/english", - "--skip-innodb", - NullS -}; -static const char *embedded_server_groups[] = { - "mysql-test-server", - NullS -}; int main(int argc, char** argv) { @@ -1953,9 +2159,10 @@ int main(int argc, char** argv) struct st_query* q; my_bool require_file=0, q_send_flag=0; char save_file[FN_REFLEN]; - mysql_server_init(sizeof(embedded_server_args) / sizeof(char *) - 1, - embedded_server_args, embedded_server_groups); MY_INIT(argv[0]); + { + DBUG_ENTER("main"); + DBUG_PROCESS(argv[0]); save_file[0]=0; TMPDIR[0]=0; @@ -1980,17 +2187,25 @@ int main(int argc, char** argv) *block_ok = 1; init_dynamic_string(&ds_res, "", 0, 65536); parse_args(argc, argv); + if (mysql_server_init(embedded_server_arg_count, + embedded_server_args, + (char**) embedded_server_groups)) + die("Can't initialize MySQL server"); init_var_hash(); - if (!*cur_file) - *cur_file = stdin; + if (cur_file == file_stack) + *++cur_file = stdin; *lineno=1; - +#ifndef EMBEDDED_LIBRARY + init_manager(); +#endif if (!( mysql_init(&cur_con->mysql))) die("Failed in mysql_init()"); + if (opt_compress) + mysql_options(&cur_con->mysql,MYSQL_OPT_COMPRESS,NullS); cur_con->name = my_strdup("default", MYF(MY_WME)); if (!cur_con->name) die("Out of memory"); - + if (safe_connect(&cur_con->mysql, host, user, pass, db, port, unix_sock)) die("Failed in mysql_real_connect(): %s", mysql_error(&cur_con->mysql)); @@ -2012,8 +2227,14 @@ int main(int argc, char** argv) case Q_RPL_PROBE: do_rpl_probe(q); break; case Q_ENABLE_RPL_PARSE: do_enable_rpl_parse(q); break; case Q_DISABLE_RPL_PARSE: do_disable_rpl_parse(q); break; + case Q_ENABLE_QUERY_LOG: disable_query_log=0; break; + case Q_DISABLE_QUERY_LOG: disable_query_log=1; break; case Q_SOURCE: do_source(q); break; case Q_SLEEP: do_sleep(q); break; +#ifndef EMBEDDED_LIBRARY + case Q_SERVER_START: do_server_start(q); break; + case Q_SERVER_STOP: do_server_stop(q); break; +#endif case Q_INC: do_inc(q); break; case Q_DEC: do_dec(q); break; case Q_ECHO: do_echo(q); break; @@ -2122,8 +2343,54 @@ int main(int argc, char** argv) free_used_memory(); exit(error ? 1 : 0); return error ? 1 : 0; /* Keep compiler happy */ + } } +/* + Read arguments for embedded server and put them into + embedded_server_args_count and embedded_server_args[] +*/ + + +static int read_server_arguments(const char* name) +{ + char argument[1024],buff[FN_REFLEN], *str=0; + FILE *file; + + if (!test_if_hard_path(name)) + { + strxmov(buff, opt_basedir, name, NullS); + name=buff; + } + fn_format(buff,name,"","",4); + + if (!embedded_server_arg_count) + { + embedded_server_arg_count=1; + embedded_server_args[0]= (char*) ""; /* Progname */ + } + if (!(file=my_fopen(buff, O_RDONLY | O_BINARY, MYF(MY_WME)))) + return 1; + while (embedded_server_arg_count < MAX_SERVER_ARGS && + (str=fgets(argument,sizeof(argument), file))) + { + *(strend(str)-1)=0; /* Remove end newline */ + if (!(embedded_server_args[embedded_server_arg_count]= + (char*) my_strdup(str,MYF(MY_WME)))) + { + my_fclose(file,MYF(0)); + return 1; + } + embedded_server_arg_count++; + } + my_fclose(file,MYF(0)); + if (str) + { + fprintf(stderr,"Too many arguments in option file: %s\n",name); + return 1; + } + return 0; +} /**************************************************************************** * Handle replacement of strings diff --git a/configure.in b/configure.in index b121d641fe4..ab2cc87d46f 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 DOT_FRM_VERSION=6 # See the libtool docs for information on how to do shared lib versions. -SHARED_LIB_VERSION=10:0:0 +SHARED_LIB_VERSION=11:0:0 # Set all version vars based on $VERSION. How do we do this more elegant ? # Remember that regexps needs to quote [ and ] since this is run through m4 @@ -699,9 +699,9 @@ int main() AC_MSG_RESULT($atom_ops) AC_ARG_WITH(pstack, - [ --without-pstack Do not use the pstack backtrace library], - [USE_PSTACK=$withval], - [USE_PSTACK=yes]) + [ --with-pstack Use the pstack backtrace library], + [ USE_PSTACK=$withval ], + [ USE_PSTACK=no ]) pstack_libs= pstack_dirs= if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386" -a "$with_mit_threads" = "no" @@ -717,7 +717,9 @@ dnl I have no idea if this is a good test - can not find docs for libiberty if test x"$have_libiberty" = xyes -a x"$have_libbfd" = xyes then pstack_dirs='$(top_srcdir)'/pstack - pstack_libs="$pstack_dirs/libpstack.a -lbfd -liberty" + pstack_libs="../pstack/libpstack.a -lbfd -liberty" + # We must link staticly when using pstack + with_mysqld_ldflags="-all-static" AC_SUBST([pstack_dirs]) AC_SUBST([pstack_libs]) AC_DEFINE([USE_PSTACK]) @@ -1750,17 +1752,20 @@ AC_ARG_WITH(embedded-server, ) AC_ARG_WITH(extra-tools, - [ --without-extra-tools Skip building utilites in the tools \ - directory.], + [ --without-extra-tools Skip building utilites in the tools directory.], [with_tools=$withval], [with_tools=yes] ) +tools_dirs="" if test "$with_tools" = "yes" then - tools_dirs="tools" -else - tools_dirs="" + if test "$THREAD_SAFE_CLIENT" = "no" + then + echo "Warning: extra-tools disabled because --enable-thread-safe-client wasn't used" + else + tools_dirs="tools" + fi fi AC_SUBST(tools_dirs) @@ -2176,7 +2181,17 @@ EOF then sql_server_dirs="innobase $sql_server_dirs" echo "CONFIGURING FOR INNODB" - (cd innobase && sh ./configure) \ + if test ! -d "innobase"; then + # This should only happen when doing a VPATH build + echo "NOTICE: I have to make the Innobase directory: `pwd`/innobase" + mkdir "innobase" || exit 1 + fi + rel_srcdir= + case "$srcdir" in + /* ) rel_srcdir="$srcdir" ;; + * ) rel_srcdir="../$srcdir" ;; + esac + (cd innobase && sh $rel_srcdir/innobase/configure) \ || AC_MSG_ERROR([could not configure INNODB]) echo "END OF INNODB CONFIGURATION" diff --git a/extra/resolveip.c b/extra/resolveip.c index fbd9fe65523..9f59a2892f6 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -20,16 +20,11 @@ #define RESOLVE_VERSION "2.0" #include <my_global.h> -#include <sys/types.h> -#include <sys/socket.h> -#ifndef HAVE_BROKEN_NETINET_INCLUDES -#include <netinet/in.h> -#endif -#include <arpa/inet.h> -#include <netdb.h> #include <m_ctype.h> +#include <my_net.h> #include <my_sys.h> #include <m_string.h> +#include <netdb.h> #include <getopt.h> #if !defined(_AIX) && !defined(HAVE_UNIXWARE7_THREADS) && !defined(HAVE_UNIXWARE7_POSIX) && !defined(h_errno) diff --git a/heap/hp_write.c b/heap/hp_write.c index 12b5c638f78..ec81d825080 100644 --- a/heap/hp_write.c +++ b/heap/hp_write.c @@ -62,6 +62,7 @@ int heap_write(HP_INFO *info, const byte *record) info->update|=HA_STATE_AKTIV; DBUG_RETURN(0); err: + DBUG_PRINT("info",("Duplicate key: %d",key)); info->errkey= key; do { diff --git a/include/Makefile.am b/include/Makefile.am index 0821afeb01d..54451e9d4f6 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -16,8 +16,8 @@ # MA 02111-1307, USA BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h -pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \ - mysqld_error.h my_list.h \ +pkginclude_HEADERS = dbug.h m_string.h my_sys.h my_list.h \ + mysql.h mysql_com.h mysqld_error.h mysql_embed.h \ my_pthread.h my_no_pthread.h raid.h errmsg.h \ my_global.h my_net.h \ sslopt-case.h sslopt-longopts.h sslopt-usage.h \ @@ -28,7 +28,7 @@ noinst_HEADERS = config-win.h \ my_dir.h mysys_err.h my_base.h \ my_nosys.h my_alarm.h queues.h \ my_tree.h hash.h thr_alarm.h thr_lock.h \ - getopt.h t_ctype.h violite.h \ + getopt.h t_ctype.h violite.h md5.h \ mysql_version.h.in # mysql_version.h are generated diff --git a/include/m_ctype.h b/include/m_ctype.h index b41323e10b9..86a67541d73 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -57,6 +57,8 @@ extern CHARSET_INFO *default_charset_info; extern CHARSET_INFO *find_compiled_charset(uint cs_number); extern CHARSET_INFO *find_compiled_charset_by_name(const char *name); extern CHARSET_INFO compiled_charsets[]; +extern uint compiled_charset_number(const char *name); +extern const char *compiled_charset_name(uint charset_number); #define MY_CHARSET_UNDEFINED 0 #define MY_CHARSET_CURRENT (default_charset_info->number) diff --git a/sql/md5.h b/include/md5.h index 6fe4e543bb0..6fe4e543bb0 100644 --- a/sql/md5.h +++ b/include/md5.h diff --git a/include/my_global.h b/include/my_global.h index 35b4ddcce16..5ba9b705660 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -454,8 +454,7 @@ typedef SOCKET_SIZE_TYPE size_socket; /* Some things that this system doesn't have */ #define ONLY_OWN_DATABASES /* We are using only databases by monty */ -#define NO_PISAM /* Not needed anymore */ -#define NO_MISAM /* Not needed anymore */ +#define HAVE_ISAM /* TO BE DELETED */ #define NO_HASH /* Not needed anymore */ #ifdef __WIN__ #define NO_DIR_LIBRARY /* Not standar dir-library */ @@ -655,6 +654,7 @@ typedef off_t os_off_t; #define socket_errno WSAGetLastError() #define SOCKET_EINTR WSAEINTR #define SOCKET_EAGAIN WSAEINPROGRESS +#define SOCKET_EWOULDBLOCK WSAEINPROGRESS #define SOCKET_ENFILE ENFILE #define SOCKET_EMFILE EMFILE #elif defined(OS2) @@ -966,4 +966,13 @@ typedef union { #define statistic_add(V,C,L) (V)+=(C) #endif +/* Macros to make switching between C and C++ mode easier */ +#ifdef __cplusplus +#define C_MODE_START extern "C" { +#define C_MODE_END } +#else +#define C_MODE_START +#define C_MODE_END +#endif + #endif /* _global_h */ diff --git a/include/my_net.h b/include/my_net.h index 6a8e98d685c..de1207bee36 100644 --- a/include/my_net.h +++ b/include/my_net.h @@ -15,14 +15,20 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -/* thread safe version of some common functions */ +/* + thread safe version of some common functions: + my_inet_ntoa -/* for thread safe my_inet_ntoa */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ + This file is also used to make handling of sockets and ioctl() + portable accross systems. -#if !defined(MSDOS) && !defined(__WIN__) && !defined(__BEOS__) +*/ + +#ifndef _my_net_h +#define _my_net_h +C_MODE_START + +#include <errno.h> #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -32,10 +38,35 @@ extern "C" { #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif -#endif /* !defined(MSDOS) && !defined(__WIN__) */ +#ifdef HAVE_POLL +#include <sys/poll.h> +#endif +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif + +#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) +#include <netinet/in_systm.h> +#include <netinet/in.h> +#include <netinet/ip.h> +#if !defined(alpha_linux_port) +#include <netinet/tcp.h> +#endif +#endif + +#if defined(__EMX__) +#include <sys/ioctl.h> +#define ioctlsocket(A,B,C) ioctl((A),(B),(void *)(C),sizeof(*(C))) +#undef HAVE_FCNTL +#endif /* defined(__EMX__) */ + +#if defined(MSDOS) || defined(__WIN__) +#define O_NONBLOCK 1 /* For emulation of fcntl() */ +#endif + +/* Thread safe or portable version of some functions */ void my_inet_ntoa(struct in_addr in, char *buf); -#ifdef __cplusplus -} +C_MODE_END #endif diff --git a/include/my_sys.h b/include/my_sys.h index b70d123a66a..8ec2fedd6f6 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -59,6 +59,9 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_WME 16 /* Write message on error */ #define MY_WAIT_IF_FULL 32 /* Wait and try again if disk full error */ #define MY_RAID 64 /* Support for RAID (not the "Johnson&Johnson"-s one ;) */ +#define MY_FULL_IO 512 /* For my_read - loop intil I/O + is complete + */ #define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */ #define MY_LINK_WARNING 32 /* my_redel() gives warning if links */ #define MY_COPYTIME 64 /* my_redel() copys time */ @@ -90,6 +93,16 @@ extern int NEAR my_errno; /* Last error in mysys */ #define ME_COLOUR2 ((2 << ME_HIGHBYTE)) #define ME_COLOUR3 ((3 << ME_HIGHBYTE)) + /* Bits in last argument to fn_format */ +#define MY_REPLACE_DIR 1 /* replace dir in name with 'dir' */ +#define MY_REPLACE_EXT 2 /* replace extension with 'ext' */ +#define MY_UNPACK_FILENAME 4 /* Unpack name (~ -> home) */ +#define MY_PACK_FILENAME 8 /* Pack name (home -> ~) */ +#define MY_RESOLVE_SYMLINKS 16 /* Resolve all symbolic links */ +#define MY_RETURN_REAL_PATH 32 /* return full path for file */ +#define MY_SAFE_PATH 64 /* Return NULL if too long path */ +#define MY_RELATIVE_PATH 128 /* name is relative to 'dir' */ + /* My seek flags */ #define MY_SEEK_SET 0 #define MY_SEEK_CUR 1 @@ -106,7 +119,8 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_WAIT_FOR_USER_TO_FIX_PANIC 60 /* in seconds */ #define MY_WAIT_GIVE_USER_A_MESSAGE 10 /* Every 10 times of prev */ #define MIN_COMPRESS_LENGTH 50 /* Don't compress small bl. */ -#define KEYCACHE_BLOCK_SIZE 1024 +#define DEFAULT_KEYCACHE_BLOCK_SIZE 1024 +#define MAX_KEYCACHE_BLOCK_SIZE 16384 /* root_alloc flags */ #define MY_KEEP_PREALLOC 1 @@ -190,9 +204,10 @@ extern char *get_charsets_dir(char *buf); /* statistics */ extern ulong _my_cache_w_requests,_my_cache_write,_my_cache_r_requests, _my_cache_read; -extern ulong _my_blocks_used,_my_blocks_changed; +extern ulong _my_blocks_used,_my_blocks_changed; +extern uint key_cache_block_size; extern ulong my_file_opened,my_stream_opened, my_tmp_file_created; -extern my_bool key_cache_inited; +extern my_bool key_cache_inited, my_init_done; /* Point to current my_message() */ extern void (*my_sigtstp_cleanup)(void), @@ -467,12 +482,12 @@ extern uint dirname_part(my_string to,const char *name); extern uint dirname_length(const char *name); #define base_name(A) (A+dirname_length(A)) extern int test_if_hard_path(const char *dir_name); -extern char *convert_dirname(my_string name); +extern char *convert_dirname(char *to, const char *from, const char *from_end); extern void to_unix_path(my_string name); extern my_string fn_ext(const char *name); extern my_string fn_same(my_string toname,const char *name,int flag); -extern my_string fn_format(my_string to,const char *name,const char *dsk, - const char *form,int flag); +extern my_string fn_format(my_string to,const char *name,const char *dir, + const char *form, uint flag); extern size_s strlength(const char *str); extern void pack_dirname(my_string to,const char *from); extern uint unpack_dirname(my_string to,const char *from); @@ -602,6 +617,7 @@ my_bool my_compress(byte *, ulong *, ulong *); my_bool my_uncompress(byte *, ulong *, ulong *); byte *my_compress_alloc(const byte *packet, ulong *len, ulong *complen); ulong checksum(const byte *mem, uint count); +uint my_bit_log2(ulong value); #if defined(_MSC_VER) && !defined(__WIN__) extern void sleep(int sec); diff --git a/include/myisam.h b/include/myisam.h index 78dbfd62cbe..36c0de5034f 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -46,6 +46,11 @@ extern "C" { /* Max extra space to use when sorting keys */ #define MI_MAX_TEMP_LENGTH 256*1024L*1024L +/* Possible values for myisam_block_size (must be power of 2) */ +#define MI_KEY_BLOCK_LENGTH 1024 /* default key block length */ +#define MI_MIN_KEY_BLOCK_LENGTH 1024 /* Min key block length */ +#define MI_MAX_KEY_BLOCK_LENGTH 16384 + #define mi_portable_sizeof_char_ptr 8 typedef uint32 ha_checksum; @@ -192,7 +197,7 @@ extern uint myisam_block_size; extern my_bool myisam_flush,myisam_delay_key_write,myisam_single_user; extern my_bool myisam_concurrent_insert; extern my_off_t myisam_max_temp_length,myisam_max_extra_temp_length; -extern uint myisam_bulk_insert_tree_size; +extern ulong myisam_bulk_insert_tree_size; /* Prototypes for myisam-functions */ diff --git a/include/myisammrg.h b/include/myisammrg.h index a797c954614..1ae825b4b94 100644 --- a/include/myisammrg.h +++ b/include/myisammrg.h @@ -34,6 +34,13 @@ extern "C" { #define MYRG_NAME_EXT ".MRG" +/* In which table to INSERT rows */ +#define MERGE_INSERT_DISABLED 0 +#define MERGE_INSERT_TO_FIRST 1 +#define MERGE_INSERT_TO_LAST 2 + +extern TYPELIB merge_insert_method; + /* Param to/from myrg_info */ typedef struct st_mymerge_info /* Struct from h_info */ @@ -44,7 +51,7 @@ typedef struct st_mymerge_info /* Struct from h_info */ ulonglong data_file_length; uint reclength; /* Recordlength */ int errkey; /* With key was dupplicated on err */ - uint options; /* HA_OPTIONS_... used */ + uint options; /* HA_OPTION_... used */ } MYMERGE_INFO; typedef struct st_myrg_table_info @@ -56,6 +63,7 @@ typedef struct st_myrg_table_info typedef struct st_myrg_info { MYRG_TABLE *open_tables,*current_table,*end_table,*last_used_table; + uint merge_insert_method; ulonglong records; /* records in tables */ ulonglong del; /* Removed records */ ulonglong data_file_length; @@ -81,10 +89,11 @@ extern int myrg_rkey(MYRG_INFO *file,byte *buf,int inx,const byte *key, extern int myrg_rrnd(MYRG_INFO *file,byte *buf,ulonglong pos); extern int myrg_rsame(MYRG_INFO *file,byte *record,int inx); extern int myrg_update(MYRG_INFO *file,const byte *old,byte *new_rec); +extern int myrg_write(MYRG_INFO *info,byte *rec); extern int myrg_status(MYRG_INFO *file,MYMERGE_INFO *x,int flag); extern int myrg_lock_database(MYRG_INFO *file,int lock_type); -extern int myrg_create(const char *name,const char **table_names, - my_bool fix_names); +extern int myrg_create(const char *name, const char **table_names, + uint insert_method, my_bool fix_names); extern int myrg_extra(MYRG_INFO *file,enum ha_extra_function function); extern ha_rows myrg_records_in_range(MYRG_INFO *info,int inx, const byte *start_key,uint start_key_len, diff --git a/include/mysql.h b/include/mysql.h index 3e3a6f35e56..439354c5d98 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -26,11 +26,9 @@ #undef __WIN__ #endif -#ifndef MYSQL_SERVER #ifdef __cplusplus extern "C" { #endif -#endif #ifndef _global_h /* If not standard header */ #include <sys/types.h> @@ -48,32 +46,15 @@ typedef char my_bool; #endif typedef char * gptr; -#ifndef ST_USED_MEM_DEFINED -#define ST_USED_MEM_DEFINED -typedef struct st_used_mem { /* struct for once_alloc */ - struct st_used_mem *next; /* Next block in use */ - unsigned int left; /* memory left in block */ - unsigned int size; /* size of block */ -} USED_MEM; -typedef struct st_mem_root { - USED_MEM *free; - USED_MEM *used; - USED_MEM *pre_alloc; - unsigned int min_malloc; - unsigned int block_size; - - void (*error_handler)(void); -} MEM_ROOT; -#endif - #ifndef my_socket_defined #ifdef __WIN__ #define my_socket SOCKET #else typedef int my_socket; -#endif -#endif -#endif +#endif /* __WIN__ */ +#endif /* my_socket_defined */ +#endif /* _global_h */ + #include "mysql_com.h" #include "mysql_version.h" @@ -90,12 +71,14 @@ extern char *mysql_unix_port; typedef struct st_mysql_field { char *name; /* Name of column */ char *table; /* Table of column if column was a field */ + char *org_table; /* Org table name if table was an alias */ + char *db; /* Database for table */ char *def; /* Default value (set by mysql_list_fields) */ - enum enum_field_types type; /* Type of field. Se mysql_com.h for types */ - unsigned int length; /* Width of column */ - unsigned int max_length; /* Max width of selected set */ + unsigned long length; /* Width of column */ + unsigned long max_length; /* Max width of selected set */ unsigned int flags; /* Div flags */ unsigned int decimals; /* Number of decimals in field */ + enum enum_field_types type; /* Type of field. Se mysql_com.h for types */ } MYSQL_FIELD; typedef char **MYSQL_ROW; /* return data as array of strings */ @@ -118,6 +101,24 @@ typedef struct st_mysql_rows { typedef MYSQL_ROWS *MYSQL_ROW_OFFSET; /* offset to current row */ +#ifndef ST_USED_MEM_DEFINED +#define ST_USED_MEM_DEFINED +typedef struct st_used_mem { /* struct for once_alloc */ + struct st_used_mem *next; /* Next block in use */ + unsigned int left; /* memory left in block */ + unsigned int size; /* size of block */ +} USED_MEM; +typedef struct st_mem_root { + USED_MEM *free; + USED_MEM *used; + USED_MEM *pre_alloc; + unsigned int min_malloc; + unsigned int block_size; + + void (*error_handler)(void); +} MEM_ROOT; +#endif + typedef struct st_mysql_data { my_ulonglong rows; unsigned int fields; @@ -134,6 +135,7 @@ struct st_mysql_options { char *ssl_cert; /* PEM cert file */ char *ssl_ca; /* PEM CA file */ char *ssl_capath; /* PEM directory of CA-s? */ + char *ssl_cipher; /* cipher to use */ my_bool use_ssl; /* if to use SSL or not */ my_bool compress,named_pipe; /* @@ -175,25 +177,30 @@ typedef struct st_mysql { gptr connector_fd; /* ConnectorFd for SSL */ char *host,*user,*passwd,*unix_socket,*server_version,*host_info, *info,*db; - unsigned int port,client_flag,server_capabilities; - unsigned int protocol_version; - unsigned int field_count; - unsigned int server_status; - unsigned long thread_id; /* Id for connection in server */ + struct charset_info_st *charset; + MYSQL_FIELD *fields; + MEM_ROOT field_alloc; my_ulonglong affected_rows; my_ulonglong insert_id; /* id if insert on table with NEXTNR */ my_ulonglong extra_info; /* Used by mysqlshow */ + unsigned long thread_id; /* Id for connection in server */ unsigned long packet_length; + unsigned int port,client_flag,server_capabilities; + unsigned int protocol_version; + unsigned int field_count; + unsigned int server_status; + unsigned int server_language; + struct st_mysql_options options; enum mysql_status status; - MYSQL_FIELD *fields; - MEM_ROOT field_alloc; my_bool free_me; /* If free in mysql_close */ my_bool reconnect; /* set to 1 if automatic reconnect */ - struct st_mysql_options options; char scramble_buff[9]; - struct charset_info_st *charset; - unsigned int server_language; + /* + Set if this is the original connection, not a master or a slave we have + added though mysql_rpl_probe() or mysql_set_master()/ mysql_add_slave() + */ + my_bool rpl_pivot; /* pointers to the master, and the next slave connections, points to itself if lone connection */ struct st_mysql* master, *next_slave; @@ -201,41 +208,60 @@ typedef struct st_mysql { struct st_mysql* last_used_slave; /* needed for round-robin slave pick */ /* needed for send/read/store/use result to work correctly with replication */ struct st_mysql* last_used_con; - /* - Set if this is the original connection, not a master or a slave we have - added though mysql_rpl_probe() or mysql_set_master()/ mysql_add_slave() - */ - my_bool rpl_pivot; } MYSQL; typedef struct st_mysql_res { my_ulonglong row_count; - unsigned int field_count, current_field; MYSQL_FIELD *fields; MYSQL_DATA *data; MYSQL_ROWS *data_cursor; + unsigned long *lengths; /* column lengths of current row */ + MYSQL *handle; /* for unbuffered reads */ MEM_ROOT field_alloc; + unsigned int field_count, current_field; MYSQL_ROW row; /* If unbuffered read */ MYSQL_ROW current_row; /* buffer to current row */ - unsigned long *lengths; /* column lengths of current row */ - MYSQL *handle; /* for unbuffered reads */ - my_bool eof; /* Used my mysql_fetch_row */ + my_bool eof; /* Used by mysql_fetch_row */ } MYSQL_RES; +#define MAX_MYSQL_MANAGER_ERR 256 +#define MAX_MYSQL_MANAGER_MSG 256 + +#define MANAGER_OK 200 +#define MANAGER_INFO 250 +#define MANAGER_ACCESS 401 +#define MANAGER_CLIENT_ERR 450 +#define MANAGER_INTERNAL_ERR 500 + + +typedef struct st_mysql_manager +{ + Vio* vio; + char *host,*user,*passwd; + unsigned int port; + my_bool free_me; + my_bool eof; + int cmd_status; + int last_errno; + char* net_buf,*net_buf_pos,*net_data_end; + int net_buf_size; + char last_error[MAX_MYSQL_MANAGER_ERR]; +} MYSQL_MANAGER; + /* Set up and bring down the server; to ensure that applications will * work when linked against either the standard client library or the * embedded server library, these functions should be called. */ -void mysql_server_init(int argc, const char **argv, const char **groups); -void mysql_server_end(); +int mysql_server_init(int argc, char **argv, char **groups); +void mysql_server_end(void); /* Set up and bring down a thread; these function should be called * for each thread in an application which opens at least one MySQL * connection. All uses of the connection(s) should be between these * function calls. */ -my_bool mysql_thread_init(); -void mysql_thread_end(); +my_bool mysql_thread_init(void); +void mysql_thread_end(void); /* Functions to get information from the MYSQL and MYSQL_RES structures */ /* Should definitely be used if one uses shared libraries */ @@ -261,7 +287,7 @@ const char * STDCALL mysql_character_set_name(MYSQL *mysql); MYSQL * STDCALL mysql_init(MYSQL *mysql); int STDCALL mysql_ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, - const char *capath); + const char *capath, const char *cipher); int STDCALL mysql_ssl_clear(MYSQL *mysql); my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, const char *passwd, const char *db); @@ -276,20 +302,20 @@ void STDCALL mysql_close(MYSQL *sock); int STDCALL mysql_select_db(MYSQL *mysql, const char *db); int STDCALL mysql_query(MYSQL *mysql, const char *q); int STDCALL mysql_send_query(MYSQL *mysql, const char *q, - unsigned int length); + unsigned long length); int STDCALL mysql_read_query_result(MYSQL *mysql); int STDCALL mysql_real_query(MYSQL *mysql, const char *q, - unsigned int length); + unsigned long length); /* perform query on master */ int STDCALL mysql_master_query(MYSQL *mysql, const char *q, - unsigned int length); + unsigned long length); int STDCALL mysql_master_send_query(MYSQL *mysql, const char *q, - unsigned int length); + unsigned long length); /* perform query on slave */ int STDCALL mysql_slave_query(MYSQL *mysql, const char *q, - unsigned int length); + unsigned long length); int STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q, - unsigned int length); + unsigned long length); /* enable/disable parsing of all queries to decide if they go on master or @@ -368,7 +394,18 @@ char * STDCALL mysql_odbc_escape_string(MYSQL *mysql, unsigned long *length)); void STDCALL myodbc_remove_escape(MYSQL *mysql,char *name); unsigned int STDCALL mysql_thread_safe(void); - +MYSQL_MANAGER* STDCALL mysql_manager_init(MYSQL_MANAGER* con); +MYSQL_MANAGER* STDCALL mysql_manager_connect(MYSQL_MANAGER* con, + const char* host, + const char* user, + const char* passwd, + unsigned int port); +void STDCALL mysql_manager_close(MYSQL_MANAGER* con); +int STDCALL mysql_manager_command(MYSQL_MANAGER* con, + const char* cmd, int cmd_len); +int STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con, + char* res_buf, + int res_buf_size); #define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT) #ifdef USE_OLD_FUNCTIONS @@ -376,14 +413,21 @@ MYSQL * STDCALL mysql_connect(MYSQL *mysql, const char *host, const char *user, const char *passwd); int STDCALL mysql_create_db(MYSQL *mysql, const char *DB); int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); +#define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT) +#define HAVE_MYSQL_REAL_CONNECT #endif -#define HAVE_MYSQL_REAL_CONNECT +/* + The following functions are mainly exported because of mysqlbinlog; + They are not for general usage +*/ + +int simple_command(MYSQL *mysql,enum enum_server_command command, + const char *arg, unsigned long length, my_bool skipp_check); +unsigned long net_safe_read(MYSQL* mysql); -#ifndef MYSQL_SERVER #ifdef __cplusplus } #endif -#endif -#endif +#endif /* _mysql_h */ diff --git a/include/mysql_com.h b/include/mysql_com.h index ce134fcab2c..048b6b98918 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -104,26 +104,31 @@ enum enum_server_command {COM_SLEEP,COM_QUIT,COM_INIT_DB,COM_QUERY, struct st_vio; /* Only C */ typedef struct st_vio Vio; +#define MAX_BLOB_WIDTH 8192 // Default width for blob + typedef struct st_net { Vio* vio; + unsigned char *buff,*buff_end,*write_pos,*read_pos; my_socket fd; /* For Perl DBI/dbd */ + unsigned long max_packet; int fcntl; - unsigned char *buff,*buff_end,*write_pos,*read_pos; + unsigned int last_errno,timeout,pkt_nr,compress_pkt_nr; char last_error[MYSQL_ERRMSG_SIZE]; - unsigned int last_errno,max_packet,timeout,pkt_nr; unsigned char error; my_bool return_errno,compress; - my_bool no_send_ok; /* needed if we are doing several - queries in one command ( as in LOAD TABLE ... FROM MASTER ), - and do not want to confuse the client with OK at the wrong time - */ + /* + The following variable is set if we are doing several queries in one + command ( as in LOAD TABLE ... FROM MASTER ), + and do not want to confuse the client with OK at the wrong time + */ unsigned long remain_in_buf,length, buf_length, where_b; unsigned int *return_status; unsigned char reading_or_writing; char save_char; + my_bool no_send_ok; } NET; -#define packet_error ((unsigned int) -1) +#define packet_error (~(unsigned long) 0) enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_TYPE_TINY, FIELD_TYPE_SHORT, FIELD_TYPE_LONG, @@ -165,6 +170,11 @@ int net_write_command(NET *net,unsigned char command,const char *packet, int net_real_write(NET *net,const char *packet,unsigned long len); unsigned long my_net_read(NET *net); +/* The following function is not meant for normal usage */ +struct sockaddr; +int my_connect(my_socket s, const struct sockaddr *name, unsigned int namelen, + unsigned int timeout); + struct rand_struct { unsigned long seed1,seed2,max_value; double max_value_dbl; @@ -193,7 +203,7 @@ typedef struct st_udf_init { my_bool maybe_null; /* 1 if function can return NULL */ unsigned int decimals; /* for real functions */ - unsigned int max_length; /* For string functions */ + unsigned long max_length; /* For string functions */ char *ptr; /* free pointer for function data */ my_bool const_item; /* 0 if result is independent of arguments */ } UDF_INIT; diff --git a/include/mysql_embed.h b/include/mysql_embed.h new file mode 100644 index 00000000000..d381fa8aefc --- /dev/null +++ b/include/mysql_embed.h @@ -0,0 +1,30 @@ +/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +/* Defines that are unique to the embedded version of MySQL */ + +#ifdef EMBEDDED_LIBRARY + +/* Things we don't need in the embedded version of MySQL */ + +#undef HAVE_PSTACK /* No stacktrace */ +#undef HAVE_DLOPEN /* No udf functions */ +#undef HAVE_OPENSSL +#undef HAVE_VIO +#undef HAVE_ISAM + +#define DONT_USE_RAID +#endif /* EMBEDDED_LIBRARY */ diff --git a/include/mysqld_error.h b/include/mysqld_error.h index 8f78d6190b1..a4e7066d483 100644 --- a/include/mysqld_error.h +++ b/include/mysqld_error.h @@ -221,4 +221,5 @@ #define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1218 #define ER_CANT_UPDATE_WITH_READLOCK 1219 #define ER_MIXING_NOT_ALLOWED 1220 -#define ER_ERROR_MESSAGES 221 +#define ER_DUP_ARGUMENT 1221 +#define ER_ERROR_MESSAGES 222 diff --git a/include/sslopt-case.h b/include/sslopt-case.h index d995e31044e..b5720286778 100644 --- a/include/sslopt-case.h +++ b/include/sslopt-case.h @@ -39,4 +39,10 @@ my_free(opt_ssl_ca, MYF(MY_ALLOW_ZERO_PTR)); opt_ssl_ca = my_strdup(optarg, MYF(0)); break; + case OPT_SSL_CIPHER: + opt_use_ssl = 1; /* true */ + my_free(opt_ssl_cipher, MYF(MY_ALLOW_ZERO_PTR)); + opt_ssl_cipher = my_strdup(optarg, MYF(0)); + break; + #endif diff --git a/include/sslopt-longopts.h b/include/sslopt-longopts.h index 2f58f0e9265..697c2f647bf 100644 --- a/include/sslopt-longopts.h +++ b/include/sslopt-longopts.h @@ -22,10 +22,12 @@ #define OPT_SSL_CERT 202 #define OPT_SSL_CA 203 #define OPT_SSL_CAPATH 204 +#define OPT_SSL_CIPHER 205 {"ssl", no_argument, 0, OPT_SSL_SSL}, {"ssl-key", required_argument, 0, OPT_SSL_KEY}, {"ssl-cert", required_argument, 0, OPT_SSL_CERT}, {"ssl-ca", required_argument, 0, OPT_SSL_CA}, {"ssl-capath", required_argument, 0, OPT_SSL_CAPATH}, + {"ssl-cipher", required_argument, 0, OPT_SSL_CIPHER}, #endif /* HAVE_OPENSSL */ diff --git a/include/sslopt-usage.h b/include/sslopt-usage.h index 5b2b4a88709..cd6a06fb459 100644 --- a/include/sslopt-usage.h +++ b/include/sslopt-usage.h @@ -21,5 +21,6 @@ --ssl-key X509 key in PEM format (implies --ssl)\n\ --ssl-cert X509 cert in PEM format (implies --ssl)\n\ --ssl-ca CA file in PEM format (check OpenSSL docs, implies --ssl)\n\ - --ssl-capath CA directory (check OpenSSL docs, implies --ssl)"); + --ssl-capath CA directory (check OpenSSL docs, implies --ssl)\n\ + --ssl-cipher SSL cipher to use (implies --ssl)"); #endif diff --git a/include/sslopt-vars.h b/include/sslopt-vars.h index 597ab4d9fa6..756a35589aa 100644 --- a/include/sslopt-vars.h +++ b/include/sslopt-vars.h @@ -21,4 +21,5 @@ static char *opt_ssl_key = 0; static char *opt_ssl_cert = 0; static char *opt_ssl_ca = 0; static char *opt_ssl_capath = 0; +static char *opt_ssl_cipher = 0; #endif diff --git a/include/violite.h b/include/violite.h index 49791c6b68a..d5f697b26c4 100644 --- a/include/violite.h +++ b/include/violite.h @@ -33,67 +33,59 @@ extern "C" { #endif /* __cplusplus */ enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, - VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL}; + VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL}; #ifndef __WIN__ #define HANDLE void * #endif -Vio* vio_new(my_socket sd, - enum enum_vio_type type, - my_bool localhost); +Vio* vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost); #ifdef __WIN__ -Vio* vio_new_win32pipe(HANDLE hPipe); +Vio* vio_new_win32pipe(HANDLE hPipe); #endif -void vio_delete(Vio* vio); +void vio_delete(Vio* vio); #ifdef EMBEDDED_LIBRARY void vio_reset(Vio *vio); #else void vio_reset(Vio* vio, enum enum_vio_type type, - my_socket sd, HANDLE hPipe, - my_bool localhost); + my_socket sd, HANDLE hPipe, my_bool localhost); #endif /* * vio_read and vio_write should have the same semantics * as read(2) and write(2). */ -int vio_read( Vio* vio, - gptr buf, int size); -int vio_write( Vio* vio, - const gptr buf, - int size); +int vio_read(Vio *vio, gptr buf, int size); +int vio_write(Vio *vio, const gptr buf, int size); /* * Whenever the socket is set to blocking mode or not. */ -int vio_blocking( Vio* vio, - my_bool onoff); -my_bool vio_is_blocking( Vio* vio); +int vio_blocking(Vio *vio, my_bool onoff); +my_bool vio_is_blocking(Vio *vio); /* * setsockopt TCP_NODELAY at IPPROTO_TCP level, when possible. */ - int vio_fastsend( Vio* vio); +int vio_fastsend(Vio *vio); /* * setsockopt SO_KEEPALIVE at SOL_SOCKET level, when possible. */ -int vio_keepalive( Vio* vio, - my_bool onoff); +int vio_keepalive(Vio *vio, my_bool onoff); /* * Whenever we should retry the last read/write operation. */ -my_bool vio_should_retry( Vio* vio); +my_bool vio_should_retry(Vio *vio); /* * When the workday is over... */ -int vio_close(Vio* vio); +int vio_close(Vio* vio); /* * Short text description of the socket for those, who are curious.. */ -const char* vio_description( Vio* vio); +const char* vio_description(Vio *vio); /* Return the type of the connection */ - enum enum_vio_type vio_type(Vio* vio); +enum enum_vio_type vio_type(Vio* vio); /* Return last error number */ int vio_errno(Vio*vio); @@ -116,9 +108,8 @@ my_bool vio_poll_read(Vio *vio,uint timeout); #ifdef __cplusplus } #endif -#endif /* vio_violite_h_ */ -#ifdef HAVE_VIO -#ifndef DONT_MAP_VIO + +#if defined(HAVE_VIO) && !defined(DONT_MAP_VIO) #define vio_delete(vio) (vio)->viodelete(vio) #define vio_errno(vio) (vio)->vioerrno(vio) #define vio_read(vio, buf, size) (vio)->read(vio,buf,size) @@ -132,9 +123,7 @@ my_bool vio_poll_read(Vio *vio,uint timeout); #define vio_peer_addr(vio, buf) (vio)->peer_addr(vio, buf) #define vio_in_addr(vio, in) (vio)->in_addr(vio, in) #define vio_poll_read(vio,timeout) (vio)->poll_read(vio,timeout) -#endif /* !DONT_MAP_VIO */ -#endif /* HAVE_VIO */ - +#endif /* defined(HAVE_VIO) && !defined(DONT_MAP_VIO) */ #ifdef HAVE_OPENSSL #define HEADER_DES_LOCL_H dummy_something @@ -142,17 +131,16 @@ my_bool vio_poll_read(Vio *vio,uint timeout); #include <openssl/err.h> #include "my_net.h" /* needed because of struct in_addr */ - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -void vio_ssl_delete(Vio* vio); +void vio_ssl_delete(Vio* vio); -int vio_ssl_read(Vio* vio,gptr buf, int size); -int vio_ssl_write(Vio* vio,const gptr buf,int size); -int vio_ssl_blocking(Vio* vio,my_bool onoff); -my_bool vio_ssl_is_blocking(Vio* vio); +int vio_ssl_read(Vio* vio,gptr buf, int size); +int vio_ssl_write(Vio* vio,const gptr buf,int size); +int vio_ssl_blocking(Vio* vio,my_bool onoff); +my_bool vio_ssl_is_blocking(Vio* vio); /* setsockopt TCP_NODELAY at IPPROTO_TCP level, when possible. */ int vio_ssl_fastsend(Vio* vio); @@ -170,8 +158,6 @@ void vio_ssl_in_addr(Vio *vio, struct in_addr *in); /* Return 1 if there is data to be read */ my_bool vio_ssl_poll_read(Vio *vio,uint timeout); -#ifdef HAVE_OPENSSL - /* Single copy for server */ struct st_VioSSLAcceptorFd { @@ -182,9 +168,6 @@ struct st_VioSSLAcceptorFd state_connect = 1, state_accept = 2 }; -// BIO* bio_; -// char desc_[100]; -// Vio* sd_; /* function pointers which are only once for SSL server Vio*(*sslaccept)(struct st_VioSSLAcceptorFd*,Vio*); */ @@ -197,24 +180,27 @@ struct st_VioSSLConnectorFd SSL_METHOD* ssl_method_; /* function pointers which are only once for SSL client */ }; -void sslaccept(struct st_VioSSLAcceptorFd*, Vio*); -void sslconnect(struct st_VioSSLConnectorFd*, Vio*); +void sslaccept(struct st_VioSSLAcceptorFd*, Vio*, long timeout); +void sslconnect(struct st_VioSSLConnectorFd*, Vio*, long timeout); -#else /* HAVE_OPENSSL */ -/* This dummy is required to maintain proper size of st_mysql in mysql.h */ -struct st_VioSSLConnectorFd {}; -#endif /* HAVE_OPENSSL */ -struct st_VioSSLConnectorFd *new_VioSSLConnectorFd( - const char* key_file,const char* cert_file,const char* ca_file,const char* ca_path); -struct st_VioSSLAcceptorFd *new_VioSSLAcceptorFd( - const char* key_file,const char* cert_file,const char* ca_file,const char* ca_path); +struct st_VioSSLConnectorFd +*new_VioSSLConnectorFd(const char* key_file, const char* cert_file, + const char* ca_file, const char* ca_path, + const char* cipher); +struct st_VioSSLAcceptorFd +*new_VioSSLAcceptorFd(const char* key_file, const char* cert_file, + const char* ca_file,const char* ca_path, + const char* cipher); Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state); - + #ifdef __cplusplus } #endif #endif /* HAVE_OPENSSL */ +/* This enumerator is used in parser - should be always visible */ +enum SSL_type {SSL_TYPE_NONE, SSL_TYPE_ANY, SSL_TYPE_X509, SSL_TYPE_SPECIFIED}; + #ifndef EMBEDDED_LIBRARY /* This structure is for every connection on both sides */ struct st_vio @@ -229,27 +215,25 @@ struct st_vio char desc[30]; /* String description */ #ifdef HAVE_VIO /* function pointers. They are similar for socket/SSL/whatever */ - void (*viodelete)(Vio*); - int(*vioerrno)(Vio*); - int(*read)(Vio*, gptr, int); - int(*write)(Vio*, gptr, int); - int(*vioblocking)(Vio*, my_bool); - my_bool(*is_blocking)(Vio*); - int(*viokeepalive)(Vio*, my_bool); - int(*fastsend)(Vio*); - my_bool(*peer_addr)(Vio*, gptr); - void(*in_addr)(Vio*, struct in_addr*); - my_bool(*should_retry)(Vio*); - int(*vioclose)(Vio*); - my_bool(*poll_read)(Vio*,uint); + void (*viodelete)(Vio*); + int (*vioerrno)(Vio*); + int (*read)(Vio*, gptr, int); + int (*write)(Vio*, gptr, int); + int (*vioblocking)(Vio*, my_bool); + my_bool (*is_blocking)(Vio*); + int (*viokeepalive)(Vio*, my_bool); + int (*fastsend)(Vio*); + my_bool (*peer_addr)(Vio*, gptr); + void (*in_addr)(Vio*, struct in_addr*); + my_bool (*should_retry)(Vio*); + int (*vioclose)(Vio*); + my_bool (*poll_read)(Vio*,uint); #ifdef HAVE_OPENSSL - BIO* bio_; SSL* ssl_; my_bool open_; - char *ssl_cip_; #endif /* HAVE_OPENSSL */ #endif /* HAVE_VIO */ }; #endif /* EMBEDDED_LIBRARY */ - +#endif /* vio_violite_h_ */ diff --git a/innobase/include/Makefile.am b/innobase/include/Makefile.am index fd5cc8b1a80..8664f6dfc17 100644 --- a/innobase/include/Makefile.am +++ b/innobase/include/Makefile.am @@ -55,5 +55,7 @@ noinst_HEADERS = btr0btr.h btr0btr.ic btr0cur.h btr0cur.ic \ ut0dbg.h ut0lst.h ut0mem.h ut0mem.ic ut0rnd.h ut0rnd.ic \ ut0sort.h ut0ut.h ut0ut.ic +EXTRA_DIST = Makefile.i + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/innobase/include/Makefile.i b/innobase/include/Makefile.i index 8c7e9910f26..985ec525950 100644 --- a/innobase/include/Makefile.i +++ b/innobase/include/Makefile.i @@ -2,7 +2,7 @@ libsdir = ../libs -INCLUDES = -I../../include -I../include +INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../../include -I../../include # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/innobase/include/mem0mem.ic b/innobase/include/mem0mem.ic index 8b8449469ef..edc3ab17f2a 100644 --- a/innobase/include/mem0mem.ic +++ b/innobase/include/mem0mem.ic @@ -170,7 +170,9 @@ mem_heap_alloc( buf = (byte*)buf + MEM_FIELD_HEADER_SIZE; #endif - +#ifdef UNIV_SET_MEM_TO_ZERO + memset(buf, '\0', n); +#endif return(buf); } @@ -494,8 +496,14 @@ mem_alloc_func( ) { #ifndef UNIV_MEM_DEBUG + void* buf; + + buf = mem_area_alloc(n, mem_comm_pool); - return(mem_area_alloc(n, mem_comm_pool)); +#ifdef UNIV_SET_MEM_TO_ZERO + memset(buf, '\0', n); +#endif + return(buf); #else diff --git a/innobase/include/os0sync.h b/innobase/include/os0sync.h index 89e3f953b50..78374cf8ede 100644 --- a/innobase/include/os0sync.h +++ b/innobase/include/os0sync.h @@ -160,6 +160,7 @@ os_fast_mutex_trylock( was reserved by another thread */ os_fast_mutex_t* fast_mutex); /* in: mutex to acquire */ +#endif /************************************************************** Releases ownership of a fast mutex. */ UNIV_INLINE @@ -188,7 +189,6 @@ void os_fast_mutex_free( /*===============*/ os_fast_mutex_t* fast_mutex); /* in: mutex to free */ -#endif #ifndef UNIV_NONINL #include "os0sync.ic" diff --git a/innobase/include/os0sync.ic b/innobase/include/os0sync.ic index 8be9a783593..057ad424dee 100644 --- a/innobase/include/os0sync.ic +++ b/innobase/include/os0sync.ic @@ -38,6 +38,7 @@ os_fast_mutex_trylock( return((ulint) pthread_mutex_trylock(fast_mutex)); #endif } +#endif /************************************************************** Releases ownership of a fast mutex. */ @@ -53,4 +54,3 @@ os_fast_mutex_unlock( pthread_mutex_unlock(fast_mutex); #endif } -#endif diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index 3f014adb76c..b77d7d5436a 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -70,6 +70,7 @@ extern ulint srv_n_rows_read; extern ibool srv_print_innodb_monitor; extern ibool srv_print_innodb_lock_monitor; extern ibool srv_print_innodb_tablespace_monitor; +extern ibool srv_print_verbose_log; extern ulint srv_n_spin_wait_rounds; extern ulint srv_spin_wait_delay; diff --git a/innobase/include/univ.i b/innobase/include/univ.i index d36b4ca9b8b..c56f21d6617 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -61,8 +61,12 @@ subdirectory of 'mysql'. */ /* DEBUG VERSION CONTROL ===================== */ +/* The following flag will make InnoDB to initialize +all memory it allocates to zero. It hides Purify +warnings about reading unallocated memory unless +memory is read outside the allocated blocks. */ /* -#define UNIV_SYNC_DEBUG +#define UNIV_INIT_MEM_TO_ZERO */ /* Make a non-inline debug version */ @@ -72,7 +76,7 @@ subdirectory of 'mysql'. */ #define UNIV_SEARCH_DEBUG #define UNIV_IBUF_DEBUG - +#define UNIV_SYNC_DEBUG #define UNIV_SYNC_PERF_STAT #define UNIV_SEARCH_PERF_STAT */ diff --git a/innobase/include/ut0mem.h b/innobase/include/ut0mem.h index fa46514fe16..8e5a4fda0d3 100644 --- a/innobase/include/ut0mem.h +++ b/innobase/include/ut0mem.h @@ -26,12 +26,39 @@ int ut_memcmp(void* str1, void* str2, ulint n); +/************************************************************************** +Allocates memory. Sets it also to zero if UNIV_SET_MEM_TO_ZERO is +defined and set_to_zero is TRUE. */ + void* -ut_malloc(ulint n); +ut_malloc_low( +/*==========*/ + /* out, own: allocated memory */ + ulint n, /* in: number of bytes to allocate */ + ibool set_to_zero); /* in: TRUE if allocated memory should be set + to zero if UNIV_SET_MEM_TO_ZERO is defined */ +/************************************************************************** +Allocates memory. Sets it also to zero if UNIV_SET_MEM_TO_ZERO is +defined. */ + +void* +ut_malloc( +/*======*/ + /* out, own: allocated memory */ + ulint n); /* in: number of bytes to allocate */ +/************************************************************************** +Frees a memory bloock allocated with ut_malloc. */ + +void +ut_free( +/*====*/ + void* ptr); /* in, own: memory block */ +/************************************************************************** +Frees all allocated memory not freed yet. */ -UNIV_INLINE void -ut_free(void* ptr); +ut_free_all_mem(void); +/*=================*/ UNIV_INLINE char* diff --git a/innobase/include/ut0mem.ic b/innobase/include/ut0mem.ic index fc4b6bd8be5..7ae9bc8bd74 100644 --- a/innobase/include/ut0mem.ic +++ b/innobase/include/ut0mem.ic @@ -28,13 +28,6 @@ ut_memcmp(void* str1, void* str2, ulint n) } UNIV_INLINE -void -ut_free(void* ptr) -{ - free(ptr); -} - -UNIV_INLINE char* ut_strcpy(char* dest, char* sour) { diff --git a/innobase/log/log0log.c b/innobase/log/log0log.c index beac63535ab..ec42c8f2e08 100644 --- a/innobase/log/log0log.c +++ b/innobase/log/log0log.c @@ -2641,9 +2641,11 @@ logs_empty_and_mark_files_at_shutdown(void) dulint lsn; ulint arch_log_no; - ut_print_timestamp(stderr); - fprintf(stderr, " InnoDB: Starting shutdown...\n"); - + if (srv_print_verbose_log) + { + ut_print_timestamp(stderr); + fprintf(stderr, " InnoDB: Starting shutdown...\n"); + } /* Wait until the master thread and all other operations are idle: our algorithm only works if the server is idle at shutdown */ loop: @@ -2732,8 +2734,11 @@ loop: fil_flush_file_spaces(FIL_TABLESPACE); - ut_print_timestamp(stderr); - fprintf(stderr, " InnoDB: Shutdown completed\n"); + if (srv_print_verbose_log) + { + ut_print_timestamp(stderr); + fprintf(stderr, " InnoDB: Shutdown completed\n"); + } } /********************************************************** diff --git a/innobase/mem/mem0pool.c b/innobase/mem/mem0pool.c index e8c02d812c4..6c3a4adebae 100644 --- a/innobase/mem/mem0pool.c +++ b/innobase/mem/mem0pool.c @@ -170,7 +170,11 @@ mem_pool_create( pool = ut_malloc(sizeof(mem_pool_t)); - pool->buf = ut_malloc(size); + /* We do not set the memory to zero (FALSE) in the pool, + but only when allocated at a higher level in mem0mem.c. + This is to avoid masking useful Purify warnings. */ + + pool->buf = ut_malloc_low(size, FALSE); pool->size = size; mutex_create(&(pool->mutex)); diff --git a/innobase/os/os0sync.c b/innobase/os/os0sync.c index c5dd603100d..8da142cd4a6 100644 --- a/innobase/os/os0sync.c +++ b/innobase/os/os0sync.c @@ -422,7 +422,6 @@ os_mutex_free( #endif } -#ifndef _WIN32 /************************************************************* Initializes an operating system fast mutex semaphore. */ @@ -472,4 +471,3 @@ os_fast_mutex_free( #endif } -#endif diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index ba556e1c050..1237a788622 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -120,6 +120,12 @@ ibool srv_print_innodb_monitor = FALSE; ibool srv_print_innodb_lock_monitor = FALSE; ibool srv_print_innodb_tablespace_monitor = FALSE; +/* + Set the following to 0 if you want InnoDB to write messages on + stderr on startup/shutdown +*/ +ibool srv_print_verbose_log = TRUE; + /* The parameters below are obsolete: */ ibool srv_print_parsed_sql = FALSE; diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index c4002767226..2e9bade8b35 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -888,9 +888,11 @@ innobase_start_or_create_for_mysql(void) /* buf_debug_prints = TRUE; */ - ut_print_timestamp(stderr); - fprintf(stderr, " InnoDB: Started\n"); - + if (srv_print_verbose_log) + { + ut_print_timestamp(stderr); + fprintf(stderr, " InnoDB: Started\n"); + } return((int) DB_SUCCESS); } @@ -916,5 +918,7 @@ innobase_shutdown_for_mysql(void) logs_empty_and_mark_files_at_shutdown(); + ut_free_all_mem(); + return((int) DB_SUCCESS); } diff --git a/innobase/ut/ut0mem.c b/innobase/ut/ut0mem.c index 492f57670a9..ebeefe0c297 100644 --- a/innobase/ut/ut0mem.c +++ b/innobase/ut/ut0mem.c @@ -14,30 +14,136 @@ Created 5/11/1994 Heikki Tuuri #include "mem0mem.h" + +/* This struct is placed first in every allocated memory block */ +typedef struct ut_mem_block_struct ut_mem_block_t; + +struct ut_mem_block_struct{ + UT_LIST_NODE_T(ut_mem_block_t) mem_block_list;/* mem block list node */ +}; + + +/* List of all memory blocks allocated from the operating system +with malloc */ +UT_LIST_BASE_NODE_T(ut_mem_block_t) ut_mem_block_list; + +os_fast_mutex_t ut_list_mutex; /* this protects the list */ + +ibool ut_mem_block_list_inited = FALSE; + +/************************************************************************** +Initializes the mem block list at database startup. */ +static +void +ut_mem_block_list_init(void) +/*========================*/ +{ + os_fast_mutex_init(&ut_list_mutex); + UT_LIST_INIT(ut_mem_block_list); + ut_mem_block_list_inited = TRUE; +} + +/************************************************************************** +Allocates memory. Sets it also to zero if UNIV_SET_MEM_TO_ZERO is +defined and set_to_zero is TRUE. */ + void* -ut_malloc(ulint n) +ut_malloc_low( +/*==========*/ + /* out, own: allocated memory */ + ulint n, /* in: number of bytes to allocate */ + ibool set_to_zero) /* in: TRUE if allocated memory should be set + to zero if UNIV_SET_MEM_TO_ZERO is defined */ { void* ret; - /* - ret = VirtualAlloc(NULL, n, MEM_COMMIT, PAGE_READWRITE); - */ - ret = malloc(n); + ut_ad((sizeof(ut_mem_block_t) % 8) == 0); /* check alignment ok */ + + if (!ut_mem_block_list_inited) { + ut_mem_block_list_init(); + } + + os_fast_mutex_lock(&ut_list_mutex); + + ret = malloc(n + sizeof(ut_mem_block_t)); if (ret == NULL) { fprintf(stderr, - "Innobase: Fatal error: cannot allocate memory!\n"); - fprintf(stderr, - "Innobase: Cannot continue operation!\n"); - fprintf(stderr, - "Innobase: Check if you can increase the swap file of your\n"); - fprintf(stderr, - "Innobase: operating system.\n"); + "InnoDB: Fatal error: cannot allocate %lu bytes of\n" + "InnoDB: memory with malloc!\n" + "InnoDB: Operating system errno: %lu\n" + "InnoDB: Cannot continue operation!\n" + "InnoDB: Check if you should increase the swap file or\n" + "InnoDB: ulimits of your operating system.\n", n, errno); + + os_fast_mutex_unlock(&ut_list_mutex); exit(1); } - return(ret); + if (set_to_zero) { +#ifdef UNIV_SET_MEM_TO_ZERO + memset(ret, '\0', n + sizeof(ut_mem_block_t)); +#endif + } + + UT_LIST_ADD_FIRST(mem_block_list, ut_mem_block_list, + ((ut_mem_block_t*)ret)); + os_fast_mutex_unlock(&ut_list_mutex); + + return((void*)((byte*)ret + sizeof(ut_mem_block_t))); +} + +/************************************************************************** +Allocates memory. Sets it also to zero if UNIV_SET_MEM_TO_ZERO is +defined. */ + +void* +ut_malloc( +/*======*/ + /* out, own: allocated memory */ + ulint n) /* in: number of bytes to allocate */ +{ + return(ut_malloc_low(n, TRUE)); +} +/************************************************************************** +Frees a memory bloock allocated with ut_malloc. */ + +void +ut_free( +/*====*/ + void* ptr) /* in, own: memory block */ +{ + ut_mem_block_t* block; + + block = (ut_mem_block_t*)((byte*)ptr - sizeof(ut_mem_block_t)); + + os_fast_mutex_lock(&ut_list_mutex); + + UT_LIST_REMOVE(mem_block_list, ut_mem_block_list, block); + free(block); + + os_fast_mutex_unlock(&ut_list_mutex); +} + +/************************************************************************** +Frees all allocated memory not freed yet. */ + +void +ut_free_all_mem(void) +/*=================*/ +{ + ut_mem_block_t* block; + + os_fast_mutex_lock(&ut_list_mutex); + + while (block = UT_LIST_GET_FIRST(ut_mem_block_list)) { + + UT_LIST_REMOVE(mem_block_list, ut_mem_block_list, block); + free(block); + } + + os_fast_mutex_unlock(&ut_list_mutex); } /************************************************************************** diff --git a/isam/isamlog.c b/isam/isamlog.c index 6fc5d98cc76..6d2bde42bf7 100644 --- a/isam/isamlog.c +++ b/isam/isamlog.c @@ -400,11 +400,7 @@ static int examine_log(my_string file_name, char **table_names) } to=isam_file_name; if (filepath) - { - strmov(isam_file_name,filepath); - convert_dirname(isam_file_name); - to=strend(isam_file_name); - } + to=convert_dirname(isam_file_name, filepath, NullS); strmov(to,pos); fn_ext(isam_file_name)[0]=0; /* Remove extension */ } diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 02291d75e7c..050cf2041d3 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -71,11 +71,11 @@ link_sources: # keep only the stubs for safemalloc.c and debug.c # # A list of needed headers collected from the deps information 000213 -nh = global.h config-win32.h dbug.h errmsg.h global.h \ +nh = my_global.h config-win32.h dbug.h errmsg.h \ m_ctype.h m_string.h \ my_alarm.h my_config.h my_dir.h my_list.h my_net.h my_sys.h \ - mysql.h mysql_com.h mysql_version.h mysqld_error.h mysys_err.h \ - my_pthread.h thr_alarm.h violite.h hash.h + mysql.h mysql_com.h mysql_version.h mysqld_error.h \ + mysys_err.h my_pthread.h thr_alarm.h violite.h hash.h # Get a list of the needed objects lobjs = $(mysysobjects1) $(dbugobjects) $(mystringsobjects) diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 8513b92624e..e00a961cabe 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -31,7 +31,7 @@ noinst_PROGRAMS = conf_to_src CHARSET_OBJS=@CHARSET_OBJS@ LTCHARSET_OBJS= ${CHARSET_OBJS:.o=.lo} -target_sources = libmysql.c net.c password.c \ +target_sources = libmysql.c net.c password.c manager.c \ get_password.c errmsg.c mystringsobjects = strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo \ @@ -56,7 +56,7 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ thr_mutex.lo mulalloc.lo string.lo default.lo \ my_compress.lo array.lo my_once.lo list.lo my_net.lo \ charset.lo hash.lo mf_iocache.lo my_seek.lo \ - my_pread.lo mf_cache.lo my_vsnprintf.lo + my_pread.lo mf_cache.lo my_vsnprintf.lo md5.lo # Not needed in the minimum library mysysobjects2 = getopt.lo getopt1.lo getvar.lo my_lib.lo diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index eb0e2f1820a..2a7aeead1b4 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -91,10 +91,12 @@ static sig_handler pipe_sig_handler(int sig); static ulong mysql_sub_escape_string(CHARSET_INFO *charset_info, char *to, const char *from, ulong length); -void mysql_server_init(int argc __attribute__((unused)), - const char **argv __attribute__((unused)), - const char **groups __attribute__((unused))) -{} +int mysql_server_init(int argc __attribute__((unused)), + char **argv __attribute__((unused)), + char **groups __attribute__((unused))) +{ + return 0; +} void mysql_server_end() {} @@ -140,12 +142,12 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host, * A modified version of connect(). connect2() allows you to specify * a timeout value, in seconds, that we should wait until we * derermine we can't connect to a particular host. If timeout is 0, -* connect2() will behave exactly like connect(). +* my_connect() will behave exactly like connect(). * * Base version coded by Steve Bernacki, Jr. <steve@navinet.net> *****************************************************************************/ -static int connect2(my_socket s, const struct sockaddr *name, uint namelen, +int my_connect(my_socket s, const struct sockaddr *name, uint namelen, uint timeout) { #if defined(__WIN__) || defined(OS2) @@ -314,11 +316,11 @@ HANDLE create_named_pipe(NET *net, uint connect_timeout, char **arg_host, ** or packet is an error message *****************************************************************************/ -uint +ulong net_safe_read(MYSQL *mysql) { NET *net= &mysql->net; - uint len=0; + ulong len=0; init_sigpipe_variables /* Don't give sigpipe errors if the client doesn't want them */ @@ -336,7 +338,7 @@ net_safe_read(MYSQL *mysql) CR_NET_PACKET_TOO_LARGE: CR_SERVER_LOST); strmov(net->last_error,ER(net->last_errno)); - return(packet_error); + return (packet_error); } if (net->read_pos[0] == 255) { @@ -347,7 +349,7 @@ net_safe_read(MYSQL *mysql) pos+=2; len-=2; (void) strmake(net->last_error,(char*) pos, - min(len,sizeof(net->last_error)-1)); + min((uint) len,(uint) sizeof(net->last_error)-1)); } else { @@ -438,7 +440,7 @@ static void free_rows(MYSQL_DATA *cur) int simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, - uint length, my_bool skipp_check) + ulong length, my_bool skipp_check) { NET *net= &mysql->net; int result= -1; @@ -669,8 +671,8 @@ mysql_free_result(MYSQL_RES *result) DBUG_PRINT("warning",("Not all rows in set were read; Ignoring rows")); for (;;) { - uint pkt_len; - if ((pkt_len=(uint) net_safe_read(result->handle)) == packet_error) + ulong pkt_len; + if ((pkt_len=net_safe_read(result->handle)) == packet_error) break; if (pkt_len == 1 && result->handle->net.read_pos[0] == 254) break; /* End of data */ @@ -695,7 +697,7 @@ mysql_free_result(MYSQL_RES *result) static const char *default_options[]= {"port","socket","compress","password","pipe", "timeout", "user", "init-command", "host", "database", "debug", "return-found-rows", - "ssl-key" ,"ssl-cert" ,"ssl-ca" ,"ssl-capath", + "ssl-key" ,"ssl-cert" ,"ssl-ca" ,"ssl-capath", "ssl-cipher" "character-set-dir", "default-character-set", "interactive-timeout", "connect_timeout", "replication-probe", "enable-reads-from-master", "repl-parse-query", @@ -864,13 +866,14 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, MYSQL_FIELD *field,*result; DBUG_ENTER("unpack_fields"); - field=result=(MYSQL_FIELD*) alloc_root(alloc,sizeof(MYSQL_FIELD)*fields); + field=result=(MYSQL_FIELD*) alloc_root(alloc, + (uint) sizeof(MYSQL_FIELD)*fields); if (!result) DBUG_RETURN(0); for (row=data->data; row ; row = row->next,field++) { - field->table= strdup_root(alloc,(char*) row->data[0]); + field->org_table= field->table= strdup_root(alloc,(char*) row->data[0]); field->name= strdup_root(alloc,(char*) row->data[1]); field->length= (uint) uint3korr(row->data[2]); field->type= (enum enum_field_types) (uchar) row->data[3][0]; @@ -911,7 +914,7 @@ static MYSQL_DATA *read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, NET *net = &mysql->net; DBUG_ENTER("read_rows"); - if ((pkt_len=(uint) net_safe_read(mysql)) == packet_error) + if ((pkt_len= net_safe_read(mysql)) == packet_error) DBUG_RETURN(0); if (!(result=(MYSQL_DATA*) my_malloc(sizeof(MYSQL_DATA), MYF(MY_WME | MY_ZEROFILL)))) @@ -1018,7 +1021,7 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) /* perform query on master */ int STDCALL mysql_master_query(MYSQL *mysql, const char *q, - unsigned int length) + unsigned long length) { if (mysql_master_send_query(mysql, q, length)) return 1; @@ -1026,7 +1029,7 @@ int STDCALL mysql_master_query(MYSQL *mysql, const char *q, } int STDCALL mysql_master_send_query(MYSQL *mysql, const char *q, - unsigned int length) + unsigned long length) { MYSQL*master = mysql->master; if (!length) @@ -1040,7 +1043,7 @@ int STDCALL mysql_master_send_query(MYSQL *mysql, const char *q, /* perform query on slave */ int STDCALL mysql_slave_query(MYSQL *mysql, const char *q, - unsigned int length) + unsigned long length) { if (mysql_slave_send_query(mysql, q, length)) return 1; @@ -1048,7 +1051,7 @@ int STDCALL mysql_slave_query(MYSQL *mysql, const char *q, } int STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q, - unsigned int length) + unsigned long length) { MYSQL* last_used_slave, *slave_to_use = 0; @@ -1269,7 +1272,7 @@ STDCALL mysql_rpl_query_type(const char* q, int len) case 'c': /* create or check */ return tolower(q[1]) == 'h' ? MYSQL_RPL_ADMIN : MYSQL_RPL_MASTER ; case 's': /* select or show */ - return tolower(q[1] == 'h') ? MYSQL_RPL_ADMIN : MYSQL_RPL_SLAVE; + return tolower(q[1]) == 'h' ? MYSQL_RPL_ADMIN : MYSQL_RPL_SLAVE; case 'f': /* flush */ case 'r': /* repair */ case 'g': /* grant */ @@ -1278,8 +1281,7 @@ STDCALL mysql_rpl_query_type(const char* q, int len) return MYSQL_RPL_SLAVE; } } - - return 0; + return MYSQL_RPL_MASTER; /* By default, send to master */ } @@ -1368,15 +1370,17 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) , const char *key __attribute__((unused)), const char *cert __attribute__((unused)), const char *ca __attribute__((unused)), - const char *capath __attribute__((unused))) + const char *capath __attribute__((unused)), + const char *cipher __attribute__((unused))) { #ifdef HAVE_OPENSSL mysql->options.ssl_key = key==0 ? 0 : my_strdup(key,MYF(0)); mysql->options.ssl_cert = cert==0 ? 0 : my_strdup(cert,MYF(0)); mysql->options.ssl_ca = ca==0 ? 0 : my_strdup(ca,MYF(0)); mysql->options.ssl_capath = capath==0 ? 0 : my_strdup(capath,MYF(0)); + mysql->options.ssl_cipher = cipher==0 ? 0 : my_strdup(cipher,MYF(0)); mysql->options.use_ssl = TRUE; - mysql->connector_fd = (gptr)new_VioSSLConnectorFd(key, cert, ca, capath); + mysql->connector_fd = (gptr)new_VioSSLConnectorFd(key, cert, ca, capath, cipher); DBUG_PRINT("info",("mysql_ssl_set, context: %p",((struct st_VioSSLConnectorFd *)(mysql->connector_fd))->ssl_context_)); #endif return 0; @@ -1396,10 +1400,12 @@ mysql_ssl_clear(MYSQL *mysql __attribute__((unused))) my_free(mysql->options.ssl_cert, MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.ssl_ca, MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.ssl_capath, MYF(MY_ALLOW_ZERO_PTR)); + my_free(mysql->options.ssl_cipher, MYF(MY_ALLOW_ZERO_PTR)); mysql->options.ssl_key = 0; mysql->options.ssl_cert = 0; mysql->options.ssl_ca = 0; mysql->options.ssl_capath = 0; + mysql->options.ssl_cipher= 0; mysql->options.use_ssl = FALSE; my_free(mysql->connector_fd,MYF(MY_ALLOW_ZERO_PTR)); mysql->connector_fd = 0; @@ -1523,7 +1529,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, bzero((char*) &UNIXaddr,sizeof(UNIXaddr)); UNIXaddr.sun_family = AF_UNIX; strmov(UNIXaddr.sun_path, unix_socket); - if (connect2(sock,(struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr), + if (my_connect(sock,(struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr), mysql->options.connect_timeout) <0) { DBUG_PRINT("error",("Got error %d on connect to local server",socket_errno)); @@ -1623,7 +1629,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, } #endif sock_addr.sin_port = (ushort) htons((ushort) port); - if (connect2(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr), + if (my_connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr), mysql->options.connect_timeout) <0) { DBUG_PRINT("error",("Got error %d on connect to '%s'",socket_errno,host)); @@ -1797,7 +1803,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, /* Do the SSL layering. */ DBUG_PRINT("info", ("IO layer change in progress...")); DBUG_PRINT("info", ("IO context %p",((struct st_VioSSLConnectorFd*)mysql->connector_fd)->ssl_context_)); - sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),mysql->net.vio); + sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),mysql->net.vio, (long)(mysql->options.connect_timeout)); DBUG_PRINT("info", ("IO layer change done!")); } #endif /* HAVE_OPENSSL */ @@ -1823,7 +1829,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, mysql->db=my_strdup(db,MYF(MY_WME)); db=0; } - if (my_net_write(net,buff,(uint) (end-buff)) || net_flush(net) || + if (my_net_write(net,buff,(ulong) (end-buff)) || net_flush(net) || net_safe_read(mysql) == packet_error) goto error; if (client_flag & CLIENT_COMPRESS) /* We will use compression */ @@ -1887,7 +1893,7 @@ static my_bool mysql_reconnect(MYSQL *mysql) if (!mysql->reconnect || (mysql->server_status & SERVER_STATUS_IN_TRANS) || !mysql->host_info) { - /* Allov reconnect next time */ + /* Allow reconnect next time */ mysql->server_status&= ~SERVER_STATUS_IN_TRANS; DBUG_RETURN(1); } @@ -1929,7 +1935,7 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, pos=scramble(pos, mysql->scramble_buff, passwd, (my_bool) (mysql->protocol_version == 9)); pos=strmov(pos+1,db ? db : ""); - if (simple_command(mysql,COM_CHANGE_USER, buff,(uint) (pos-buff),0)) + if (simple_command(mysql,COM_CHANGE_USER, buff,(ulong) (pos-buff),0)) DBUG_RETURN(1); my_free(mysql->user,MYF(MY_ALLOW_ZERO_PTR)); @@ -1954,7 +1960,7 @@ mysql_select_db(MYSQL *mysql, const char *db) DBUG_ENTER("mysql_select_db"); DBUG_PRINT("enter",("db: '%s'",db)); - if ((error=simple_command(mysql,COM_INIT_DB,db,(uint) strlen(db),0))) + if ((error=simple_command(mysql,COM_INIT_DB,db,(ulong) strlen(db),0))) DBUG_RETURN(error); my_free(mysql->db,MYF(MY_ALLOW_ZERO_PTR)); mysql->db=my_strdup(db,MYF(MY_WME)); @@ -1995,13 +2001,13 @@ mysql_close(MYSQL *mysql) my_free(mysql->options.my_cnf_group,MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.charset_dir,MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql->options.charset_name,MYF(MY_ALLOW_ZERO_PTR)); +#ifdef HAVE_OPENSSL + mysql_ssl_clear(mysql); +#endif /* HAVE_OPENSSL */ /* Clear pointers for better safety */ mysql->host_info=mysql->user=mysql->passwd=mysql->db=0; bzero((char*) &mysql->options,sizeof(mysql->options)); mysql->net.vio = 0; -#ifdef HAVE_OPENSSL - mysql_ssl_clear(mysql); -#endif /* HAVE_OPENSSL */ /* free/close slave list */ if (mysql->rpl_pivot) @@ -2014,6 +2020,7 @@ mysql_close(MYSQL *mysql) mysql_close(tmp); tmp = tmp1; } + mysql->rpl_pivot=0; } if (mysql != mysql->master) mysql_close(mysql->master); @@ -2104,7 +2111,7 @@ STDCALL mysql_add_slave(MYSQL* mysql, const char* host, */ int STDCALL -mysql_send_query(MYSQL* mysql, const char* query, uint length) +mysql_send_query(MYSQL* mysql, const char* query, ulong length) { if (mysql->options.rpl_parse && mysql->rpl_pivot) { @@ -2172,13 +2179,13 @@ get_info: CLIENT_LONG_FLAG)))) DBUG_RETURN(-1); mysql->status=MYSQL_STATUS_GET_RESULT; - mysql->field_count=field_count; + mysql->field_count= (uint) field_count; DBUG_RETURN(0); } int STDCALL -mysql_real_query(MYSQL *mysql, const char *query, uint length) +mysql_real_query(MYSQL *mysql, const char *query, ulong length) { DBUG_ENTER("mysql_real_query"); DBUG_PRINT("enter",("handle: %lx",mysql)); @@ -2269,8 +2276,9 @@ mysql_store_result(MYSQL *mysql) DBUG_RETURN(0); } mysql->status=MYSQL_STATUS_READY; /* server is ready */ - if (!(result=(MYSQL_RES*) my_malloc(sizeof(MYSQL_RES)+ - sizeof(ulong)*mysql->field_count, + if (!(result=(MYSQL_RES*) my_malloc((uint) (sizeof(MYSQL_RES)+ + sizeof(ulong) * + mysql->field_count), MYF(MY_WME | MY_ZEROFILL)))) { mysql->net.last_errno=CR_OUT_OF_MEMORY; @@ -2426,7 +2434,7 @@ mysql_fetch_lengths(MYSQL_RES *res) continue; } if (start) /* Found end of prev string */ - *prev_length= (uint) (*column-start-1); + *prev_length= (ulong) (*column-start-1); start= *column; prev_length=lengths; } @@ -2527,7 +2535,7 @@ mysql_list_fields(MYSQL *mysql, const char *table, const char *wild) LINT_INIT(query); end=strmake(strmake(buff, table,128)+1,wild ? wild : "",128); - if (simple_command(mysql,COM_FIELD_LIST,buff,(uint) (end-buff),1) || + if (simple_command(mysql,COM_FIELD_LIST,buff,(ulong) (end-buff),1) || !(query = read_rows(mysql,(MYSQL_FIELD*) 0,6))) DBUG_RETURN(NULL); @@ -2583,7 +2591,7 @@ mysql_create_db(MYSQL *mysql, const char *db) { DBUG_ENTER("mysql_createdb"); DBUG_PRINT("enter",("db: %s",db)); - DBUG_RETURN(simple_command(mysql,COM_CREATE_DB,db, (uint) strlen(db),0)); + DBUG_RETURN(simple_command(mysql,COM_CREATE_DB,db, (ulong) strlen(db),0)); } @@ -2592,7 +2600,7 @@ mysql_drop_db(MYSQL *mysql, const char *db) { DBUG_ENTER("mysql_drop_db"); DBUG_PRINT("enter",("db: %s",db)); - DBUG_RETURN(simple_command(mysql,COM_DROP_DB,db,(uint) strlen(db),0)); + DBUG_RETURN(simple_command(mysql,COM_DROP_DB,db,(ulong) strlen(db),0)); } #endif diff --git a/libmysql/manager.c b/libmysql/manager.c new file mode 100644 index 00000000000..07595ab8dee --- /dev/null +++ b/libmysql/manager.c @@ -0,0 +1,308 @@ +/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA */ + +#include <my_global.h> +#if defined(__WIN__) || defined(_WIN32) || defined(_WIN64) +#include <winsock.h> +#include <odbcinst.h> +#endif +#include <my_sys.h> +#include <mysys_err.h> +#include <m_string.h> +#include <m_ctype.h> +#include "mysql.h" +#include "mysql_version.h" +#include "mysqld_error.h" +#include "errmsg.h" +#include <violite.h> +#include <sys/stat.h> +#include <signal.h> +#include <time.h> +#include <errno.h> + +#ifdef HAVE_PWD_H +#include <pwd.h> +#endif +#if !defined(MSDOS) && !defined(__WIN__) +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> +#include <netdb.h> +#ifdef HAVE_SELECT_H +# include <select.h> +#endif +#ifdef HAVE_SYS_SELECT_H +#include <sys/select.h> +#endif +#endif +#ifdef HAVE_SYS_UN_H +# include <sys/un.h> +#endif +#if defined(THREAD) && !defined(__WIN__) +#include <my_pthread.h> /* because of signal() */ +#endif +#ifndef INADDR_NONE +#define INADDR_NONE -1 +#endif + + +#define RES_BUF_SHIFT 5 +#define SOCKET_ERROR -1 +#define NET_BUF_SIZE 2048 + +MYSQL_MANAGER* STDCALL mysql_manager_init(MYSQL_MANAGER* con) +{ + int net_buf_size=NET_BUF_SIZE; + if (!con) + { + if (!(con=(MYSQL_MANAGER*)my_malloc(sizeof(*con)+net_buf_size, + MYF(MY_WME|MY_ZEROFILL)))) + return 0; + con->free_me=1; + con->net_buf=(char*)con+sizeof(*con); + } + else + { + bzero((char*)con,sizeof(*con)); + if (!(con->net_buf=my_malloc(net_buf_size,MYF(0)))) + return 0; + } + con->net_buf_pos=con->net_data_end=con->net_buf; + con->net_buf_size=net_buf_size; + return con; +} + +MYSQL_MANAGER* STDCALL mysql_manager_connect(MYSQL_MANAGER* con, + const char* host, + const char* user, + const char* passwd, + unsigned int port) +{ + my_socket sock; + struct sockaddr_in sock_addr; + uint32 ip_addr; + char msg_buf[MAX_MYSQL_MANAGER_MSG]; + int msg_len; + + if (!host) + host="localhost"; + if (!user) + user="root"; + if (!passwd) + passwd=""; + + if ((sock=(my_socket)socket(AF_INET,SOCK_STREAM,0)) == SOCKET_ERROR) + { + con->last_errno=errno; + strmov(con->last_error,"Cannot create socket"); + goto err; + } + if (!(con->vio=vio_new(sock,VIO_TYPE_TCPIP,FALSE))) + { + con->last_errno=ENOMEM; + strmov(con->last_error,"Cannot create network I/O object"); + goto err; + } + vio_blocking(con->vio,TRUE); + bzero((char*) &sock_addr,sizeof(sock_addr)); + sock_addr.sin_family = AF_INET; + if ((int) (ip_addr = inet_addr(host)) != (int) INADDR_NONE) + { + memcpy_fixed(&sock_addr.sin_addr,&ip_addr,sizeof(ip_addr)); + } + else +#if defined(HAVE_GETHOSTBYNAME_R) && defined(_REENTRANT) && defined(THREAD) + { + int tmp_errno; + struct hostent tmp_hostent,*hp; + char buff2[GETHOSTBYNAME_BUFF_SIZE]; + hp = my_gethostbyname_r(host,&tmp_hostent,buff2,sizeof(buff2), + &tmp_errno); + if (!hp) + { + con->last_errno=tmp_errno; + sprintf(con->last_error,"Could not resolve host '%s'",host); + goto err; + } + memcpy(&sock_addr.sin_addr,hp->h_addr, (size_t) hp->h_length); + } +#else + { + struct hostent *hp; + if (!(hp=gethostbyname(host))) + { + con->last_errno=socket_errno; + sprintf(con->last_error, "Could not resolve host '%s'", host); + goto err; + } + memcpy(&sock_addr.sin_addr,hp->h_addr, (size_t) hp->h_length); + } +#endif + sock_addr.sin_port = (ushort) htons((ushort) port); + if (my_connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr), + 0) <0) + { + con->last_errno=errno; + sprintf(con->last_error ,"Could not connect to %-.64s", host); + goto err; + } + /* read the greating */ + if (vio_read(con->vio,msg_buf,MAX_MYSQL_MANAGER_MSG)<=0) + { + con->last_errno=errno; + strmov(con->last_error,"Read error on socket"); + goto err; + } + sprintf(msg_buf,"%-.16s %-.16s\n",user,passwd); + msg_len=strlen(msg_buf); + if (vio_write(con->vio,msg_buf,msg_len)!=msg_len) + { + con->last_errno=errno; + strmov(con->last_error,"Write error on socket"); + goto err; + } + if (vio_read(con->vio,msg_buf,MAX_MYSQL_MANAGER_MSG)<=0) + { + con->last_errno=errno; + strmov(con->last_error,"Read error on socket"); + goto err; + } + if ((con->cmd_status=atoi(msg_buf)) != MANAGER_OK) + { + strmov(con->last_error,"Access denied"); + goto err; + } + if (!my_multi_malloc(MYF(0), &con->host, (uint)strlen(host)+1, + &con->user, (uint)strlen(user)+1, + &con->passwd, (uint)strlen(passwd)+1, + NullS)) + { + con->last_errno=ENOMEM; + strmov(con->last_error,"Out of memory"); + goto err; + } + strmov(con->host,host); + strmov(con->user,user); + strmov(con->passwd,passwd); + return con; +err: + { + my_bool free_me=con->free_me; + con->free_me=0; + mysql_manager_close(con); + con->free_me=free_me; + } + return 0; +} + +void STDCALL mysql_manager_close(MYSQL_MANAGER* con) +{ + my_free((gptr)con->host,MYF(MY_ALLOW_ZERO_PTR)); + /* no need to free con->user and con->passwd, because they were + allocated in my_multimalloc() along with con->host, freeing + con->hosts frees the whole block + */ + if (con->vio) + { + vio_delete(con->vio); + con->vio=0; + } + if (con->free_me) + my_free((gptr)con,MYF(0)); +} + +int STDCALL mysql_manager_command(MYSQL_MANAGER* con,const char* cmd, + int cmd_len) +{ + if (!cmd_len) + cmd_len=strlen(cmd); + if (vio_write(con->vio,(char*)cmd,cmd_len) != cmd_len) + { + con->last_errno=errno; + strmov(con->last_error,"Write error on socket"); + return 1; + } + con->eof=0; + return 0; +} + +int STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con, char* res_buf, + int res_buf_size) +{ + char* res_buf_end=res_buf+res_buf_size; + char* net_buf_pos=con->net_buf_pos, *net_buf_end=con->net_data_end; + int res_buf_shift=RES_BUF_SHIFT; + int done=0; + + if (res_buf_size<RES_BUF_SHIFT) + { + con->last_errno=ENOMEM; + strmov(con->last_error,"Result buffer too small"); + return 1; + } + + for (;;) + { + for (;net_buf_pos<net_buf_end && res_buf<res_buf_end; + net_buf_pos++,res_buf++) + { + char c=*net_buf_pos; + if (c == '\r') + c=*++net_buf_pos; + if (c == '\n') + { + *res_buf=0; + net_buf_pos++; + done=1; + break; + } + else + *res_buf=*net_buf_pos; + } + if (done || res_buf==res_buf_end) + break; + + if (net_buf_pos == net_buf_end && res_buf<res_buf_end) + { + int num_bytes; + if ((num_bytes=vio_read(con->vio,con->net_buf,con->net_buf_size))<=0) + { + con->last_errno=errno; + strmov(con->last_error,"socket read failed"); + return 1; + } + net_buf_pos=con->net_buf; + net_buf_end=net_buf_pos+num_bytes; + } + } + con->net_buf_pos=net_buf_pos; + con->net_data_end=net_buf_end; + res_buf=res_buf_end-res_buf_size; + if ((con->eof=(res_buf[3]==' '))) + res_buf_shift--; + res_buf_end-=res_buf_shift; + for (;res_buf<res_buf_end;res_buf++) + { + if(!(*res_buf=res_buf[res_buf_shift])) + break; + } + return 0; +} + + + + diff --git a/libmysql/net.c b/libmysql/net.c index 1f21fd2f2f9..5e002a0f63e 100644 --- a/libmysql/net.c +++ b/libmysql/net.c @@ -31,15 +31,16 @@ #include <winsock.h> #endif #include <my_global.h> +#include <mysql.h> +#include <mysql_embed.h> #include <mysql_com.h> -#include <violite.h> +#include <mysqld_error.h> #include <my_sys.h> #include <m_string.h> -#include "mysql.h" -#include "mysqld_error.h" +#include <my_net.h> +#include <violite.h> #include <signal.h> #include <errno.h> -#include <sys/types.h> #ifdef MYSQL_SERVER ulong max_allowed_packet=65536; @@ -59,20 +60,9 @@ ulong net_write_timeout= NET_WRITE_TIMEOUT; #endif ulong net_buffer_length=8192; /* Default length. Enlarged if necessary */ -#if !defined(__WIN__) && !defined(MSDOS) -#include <sys/socket.h> -#else +#if defined(__WIN__) || defined(MSDOS) #undef MYSQL_SERVER /* Win32 can't handle interrupts */ #endif -#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) -#include <netinet/in_systm.h> -#include <netinet/in.h> -#include <netinet/ip.h> -#if !defined(alpha_linux_port) -#include <netinet/tcp.h> -#endif -#endif -#include "mysqld_error.h" #ifdef MYSQL_SERVER #include "my_pthread.h" #include "thr_alarm.h" @@ -89,7 +79,7 @@ extern ulong mysqld_net_retry_count; typedef my_bool thr_alarm_t; typedef my_bool ALARM; #define thr_alarm_init(A) (*(A))=0 -#define thr_alarm_in_use(A) (*(A)!= 0) +#define thr_alarm_in_use(A) (*(A) != 0) #define thr_end_alarm(A) #define thr_alarm(A,B,C) local_thr_alarm((A),(B),(C)) inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __attribute__((unused))) @@ -129,7 +119,7 @@ int my_net_init(NET *net, Vio* vio) net->no_send_ok = 0; net->error=0; net->return_errno=0; net->return_status=0; net->timeout=(uint) net_read_timeout; /* Timeout for read */ - net->pkt_nr=0; + net->pkt_nr=net->compress_pkt_nr=0; net->write_pos=net->read_pos = net->buff; net->last_error[0]=0; net->compress=0; net->reading_or_writing=0; @@ -190,7 +180,7 @@ static my_bool net_realloc(NET *net, ulong length) void net_clear(NET *net) { #ifndef EXTRA_DEBUG - int count; + int count; /* One may get 'unused' warn */ bool is_blocking=vio_is_blocking(net->vio); if (is_blocking) vio_blocking(net->vio, FALSE); @@ -204,7 +194,7 @@ void net_clear(NET *net) vio_blocking(net->vio, TRUE); } #endif /* EXTRA_DEBUG */ - net->pkt_nr=0; /* Ready for new command */ + net->pkt_nr=net->compress_pkt_nr=0; /* Ready for new command */ net->write_pos=net->buff; } @@ -217,9 +207,12 @@ int net_flush(NET *net) if (net->buff != net->write_pos) { error=net_real_write(net,(char*) net->buff, - (uint) (net->write_pos - net->buff)); + (ulong) (net->write_pos - net->buff)); net->write_pos=net->buff; } + /* Sync packet number if using compression */ + if (net->compress) + net->pkt_nr=net->compress_pkt_nr; DBUG_RETURN(error); } @@ -248,7 +241,7 @@ my_net_write(NET *net,const char *packet,ulong len) { const ulong z_size = MAX_THREE_BYTES; int3store(buff, z_size); - buff[3]= (net->compress) ? 0 : (uchar) (net->pkt_nr++); + buff[3]= net->pkt_nr++; if (net_write_buff(net, (char*) buff, NET_HEADER_SIZE) || net_write_buff(net, packet, z_size)) return 1; @@ -257,7 +250,7 @@ my_net_write(NET *net,const char *packet,ulong len) } /* Write last packet */ int3store(buff,len); - buff[3]= (net->compress) ? 0 : (uchar) (net->pkt_nr++); + buff[3]= net->pkt_nr++; if (net_write_buff(net,(char*) buff,NET_HEADER_SIZE)) return 1; return net_write_buff(net,packet,len); @@ -275,7 +268,7 @@ my_net_write(NET *net,const char *packet,ulong len) int net_write_command(NET *net,uchar command,const char *packet,ulong len) { - uint length=len+1; /* 1 extra byte for command */ + ulong length=len+1; /* 1 extra byte for command */ uchar buff[NET_HEADER_SIZE+1]; uint header_size=NET_HEADER_SIZE+1; buff[4]=command; /* For first packet */ @@ -287,7 +280,7 @@ net_write_command(NET *net,uchar command,const char *packet,ulong len) do { int3store(buff, MAX_THREE_BYTES); - buff[3]= (net->compress) ? 0 : (uchar) (net->pkt_nr++); + buff[3]= net->pkt_nr++; if (net_write_buff(net,(char*) buff, header_size) || net_write_buff(net,packet,len)) return 1; @@ -299,7 +292,7 @@ net_write_command(NET *net,uchar command,const char *packet,ulong len) len=length; /* Data left to be written */ } int3store(buff,length); - buff[3]= (net->compress) ? 0 : (uchar) (net->pkt_nr++); + buff[3]= net->pkt_nr++; return test(net_write_buff(net,(char*) buff,header_size) || net_write_buff(net,packet,len) || net_flush(net)); } @@ -312,7 +305,7 @@ net_write_command(NET *net,uchar command,const char *packet,ulong len) static int net_write_buff(NET *net,const char *packet,ulong len) { - uint left_length=(uint) (net->buff_end - net->write_pos); + ulong left_length=(ulong) (net->buff_end - net->write_pos); while (len > left_length) { @@ -338,7 +331,7 @@ net_write_buff(NET *net,const char *packet,ulong len) int net_real_write(NET *net,const char *packet,ulong len) { - int length; + long int length; char *pos,*end; thr_alarm_t alarmed; #if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2) @@ -378,7 +371,7 @@ net_real_write(NET *net,const char *packet,ulong len) } int3store(&b[NET_HEADER_SIZE],complen); int3store(b,len); - b[3]=(uchar) (net->pkt_nr++); + b[3]=(uchar) (net->compress_pkt_nr++); len+= header_length; packet= (char*) b; } @@ -396,7 +389,7 @@ net_real_write(NET *net,const char *packet,ulong len) pos=(char*) packet; end=pos+len; while (pos != end) { - if ((int) (length=vio_write(net->vio,pos,(int) (end-pos))) <= 0) + if ((long) (length=vio_write(net->vio,pos,(ulong) (end-pos))) <= 0) { my_bool interrupted = vio_should_retry(net->vio); #if (!defined(__WIN__) && !defined(__EMX__) && !defined(OS2)) @@ -496,7 +489,7 @@ static void my_net_skip_rest(NET *net, ulong remain, thr_alarm_t *alarmed) if ((int) (length=vio_read(net->vio,(char*) net->buff,remain)) <= 0L) { my_bool interrupted = vio_should_retry(net->vio); - if (!thr_got_alarm(alarmed) && interrupted) + if (!thr_got_alarm(&alarmed) && interrupted) { /* Probably in MIT threads */ if (retry_count++ < RETRY_COUNT) continue; @@ -516,7 +509,7 @@ static void my_net_skip_rest(NET *net, ulong remain, thr_alarm_t *alarmed) This function reallocates the net->buff buffer if necessary. */ -static uint +static ulong my_real_read(NET *net, ulong *complen) { uchar *pos; @@ -627,9 +620,9 @@ my_real_read(NET *net, ulong *complen) if (net->buff[net->where_b] != (uchar) 255) { DBUG_PRINT("error", - ("Packets out of order (Found: %d, expected %d)", + ("Packets out of order (Found: %d, expected %u)", (int) net->buff[net->where_b + 3], - (uint) (uchar) net->pkt_nr)); + net->pkt_nr)); #ifdef EXTRA_DEBUG fprintf(stderr,"Packets out of order (Found: %d, expected %d)\n", (int) net->buff[net->where_b + 3], @@ -642,7 +635,7 @@ my_real_read(NET *net, ulong *complen) #endif goto end; } - net->pkt_nr++; + net->compress_pkt_nr= ++net->pkt_nr; #ifdef HAVE_COMPRESS if (net->compress) { @@ -710,7 +703,7 @@ my_net_read(NET *net) if (len == MAX_THREE_BYTES) { /* First packet of a multi-packet. Concatenate the packets */ - int save_pos = net->where_b; + ulong save_pos = net->where_b; ulong total_length=0; do { @@ -820,8 +813,8 @@ my_net_read(NET *net) net->read_pos= net->buff+ first_packet_offset + NET_HEADER_SIZE; net->buf_length= buf_length; - net->remain_in_buf= buf_length - start_of_packet; - len = ((uint) (start_of_packet - first_packet_offset) - NET_HEADER_SIZE - + net->remain_in_buf= (ulong) (buf_length - start_of_packet); + len = ((ulong) (start_of_packet - first_packet_offset) - NET_HEADER_SIZE - multi_byte_packet); net->save_char= net->read_pos[len]; /* Must be saved */ net->read_pos[len]=0; /* Safeguard for mysql_use_result */ diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 1f0b15d15b6..f0e0ad2728e 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -17,27 +17,25 @@ # # This file is public domain and comes with NO WARRANTY of any kind -MYSQLDATAdir = $(localstatedir) -MYSQLSHAREdir = $(pkgdatadir) -MYSQLBASEdir= $(prefix) +MYSQLDATAdir = $(localstatedir) +MYSQLSHAREdir = $(pkgdatadir) +MYSQLBASEdir= $(prefix) DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" -INCLUDES = @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include -I../include \ - -I$(srcdir)/.. -I$(top_srcdir) -I.. -I../sql -I../regex +INCLUDES= @MT_INCLUDES@ @bdb_includes@ -I$(srcdir)/../include \ + -I../include -I$(srcdir)/.. -I$(top_srcdir) -I.. \ + -I../sql -I../regex - -## XXX: should we use client or server LDFLAGS for libmysqld? -LDADD = @CLIENT_EXTRA_LDFLAGS@ libmysqld.la -pkglib_LTLIBRARIES = libmysqld.la +noinst_LIBRARIES = libmysqld_int.a +pkglib_LIBRARIES = libmysqld.a SUBDIRS = . examples -libmysqld_la_SOURCES= libmysqld.c lib_sql.cc lib_load.cc - +libmysqld_sources= libmysqld.c lib_sql.cc lib_load.cc libmysqlsources = errmsg.c get_password.c password.c -## XXX: we should not have to duplicate info from the sources list -libmysqlobjects = errmsg.lo get_password.lo password.lo + +noinst_HEADERS = embedded_priv.h sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ ha_innobase.cc ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \ @@ -45,7 +43,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ hostname.cc init.cc \ item.cc item_buff.cc item_cmpfunc.cc item_create.cc \ item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \ - item_uniq.cc key.cc lock.cc log.cc log_event.cc md5.c \ + item_uniq.cc key.cc lock.cc log.cc log_event.cc \ mini_client.cc net_pkg.cc net_serv.cc opt_ft.cc opt_range.cc \ opt_sum.cc procedure.cc records.cc slave.cc sql_acl.cc \ sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \ @@ -56,37 +54,53 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \ unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc -## XXX: we should not have to duplicate info from the sources list -sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \ - ha_innobase.lo ha_berkeley.lo ha_heap.lo ha_isam.lo ha_isammrg.lo \ - ha_myisam.lo ha_myisammrg.lo handler.lo sql_handler.lo \ - hostname.lo init.lo \ - item.lo item_buff.lo item_cmpfunc.lo item_create.lo \ - item_func.lo item_strfunc.lo item_sum.lo item_timefunc.lo \ - item_uniq.lo key.lo lock.lo log.lo log_event.lo md5.lo \ - mini_client.lo net_pkg.lo net_serv.lo opt_ft.lo opt_range.lo \ - opt_sum.lo procedure.lo records.lo slave.lo sql_acl.lo \ - sql_analyse.lo sql_base.lo sql_cache.lo sql_class.lo \ - sql_crypt.lo sql_db.lo sql_delete.lo sql_insert.lo sql_lex.lo \ - sql_list.lo sql_manager.lo sql_map.lo sql_parse.lo \ - sql_rename.lo sql_repl.lo sql_select.lo sql_show.lo \ - sql_string.lo sql_table.lo sql_test.lo sql_udf.lo \ - sql_update.lo sql_yacc.lo table.lo thr_malloc.lo time.lo \ - unireg.lo uniques.lo stacktrace.lo sql_union.lo hash_filo.lo - EXTRA_DIST = lib_vio.c +libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) +libmysqld_a_SOURCES= + # automake misses these sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy -libmysqld_la_LIBADD = $(sqlobjects) $(libmysqlobjects) +# The following libraries should be included in libmysqld.a +INC_LIB= $(top_builddir)/regex/libregex.a \ + $(top_builddir)/myisam/libmyisam.a \ + $(top_builddir)/myisammrg/libmyisammrg.a \ + $(top_builddir)/heap/libheap.a \ + @innodb_libs@ @bdb_libs_with_path@ \ + $(top_builddir)/mysys/libmysys.a \ + $(top_builddir)/strings/libmystrings.a \ + $(top_builddir)/dbug/libdbug.a \ + $(top_builddir)/regex/libregex.a + +# +# To make it easy for the end user to use the embedded library we +# generate a total libmysqld.a from all library files, + +libmysqld.a: libmysqld_int.a $(INC_LIB) + if test ! -d tmp ; then mkdir tmp ; fi + rm -f $@ libmysqld_int2.a tmp/*.o tmp/*.a + cp $(INC_LIB) tmp + cp libmysqld_int.a libmysqld_int2.a ; \ + cd tmp ; \ + for file in *.a ; do \ + bfile=`basename $$file .a` ; \ + ar x $$file; \ + for obj in *.o ; do mv $$obj $${bfile}_$$obj ; done ; \ + ar q ../libmysqld_int2.a *.o ; \ + rm *.o ; \ + done + mv libmysqld_int2.a libmysqld.a + rm tmp/* + $(RANLIB) libmysqld.a + ## XXX: any time the client interface changes, we'll need to bump ## the version info for libmysqld; however, it's possible for the ## libmysqld interface to change without affecting the standard ## libmysqlclient interface. Should we make a separate version ## string for the two? -libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ -CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la +#libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ +#CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la # This is called from the toplevel makefile link_sources: diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h new file mode 100644 index 00000000000..96d2c96ed0b --- /dev/null +++ b/libmysqld/embedded_priv.h @@ -0,0 +1,32 @@ +/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +/* Prototypes for the embedded version of MySQL */ + +#include <my_global.h> +#include <mysql_embed.h> +#include <mysql.h> +#include <mysql_version.h> +#include <mysqld_error.h> +#include <my_pthread.h> + +C_MODE_START +extern void start_embedded_connection(NET * net); +extern void end_embedded_connection(NET * net); +extern void lib_connection_phase(NET *net, int phase); +extern bool lib_dispatch_command(enum enum_server_command command, NET *net, + const char *arg, ulong length); +C_MODE_END diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index b687a528c6f..d1cf24caf48 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -7,26 +7,15 @@ link_sources: @LN_CP_F@ $(srcdir)/../../client/$$f $(srcdir)/$$f; \ done; -DEFS = -DEMBEDDED_SERVER +DEFS = -DEMBEDDED_LIBRARY INCLUDES = -I$(top_srcdir)/include $(openssl_includes) \ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client -LIBS = @LIBS@ -LDADD = $(top_builddir)/libmysqld/libmysqld.la \ - $(top_builddir)/isam/libnisam.a \ - $(top_builddir)/myisam/libmyisam.a \ - $(top_builddir)/heap/libheap.a \ - $(top_builddir)/merge/libmerge.a \ - $(top_builddir)/myisammrg/libmyisammrg.a \ - @innodb_libs@ @bdb_libs@ @pstack_libs@ \ - $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a \ - $(top_builddir)/dbug/libdbug.a \ - $(top_builddir)/regex/libregex.a @LIBDL@ +LIBS = @LIBS@ +LDADD = ../libmysqld.a @innodb_system_libs@ @LIBDL@ -mysqltest_DEPENDENCIES = ../libmysqld.la mysqltest_SOURCES = mysqltest.c -mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc \ +mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \ my_readline.h sql_string.h completion_hash.h mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) diff --git a/libmysqld/examples/test-run b/libmysqld/examples/test-run index 1e15126b126..b97d2742b74 100755 --- a/libmysqld/examples/test-run +++ b/libmysqld/examples/test-run @@ -6,26 +6,19 @@ # that will run on all platforms (or incorporate it into the # standard mysql-test-run). -#test_data_dir=/tmp/mysql-data -test_data_dir=../../mysql-test/var/master-data -cd "$test_data_dir" || { - echo "can't cd to $test_data_dir" >&2 - exit 1 -} - # All paths below must be relative to $test_data_dir -#top_builddir=/home/tim/my/4 -top_builddir=../../.. +top_builddir=../.. mysql_test_dir=$top_builddir/mysql-test examples=$top_builddir/libmysqld/examples mysqltest=$examples/mysqltest -testdir=./test - +datadir=$mysql_test_dir/var/master-data +test_data_dir=test gdb=0 list=0 run= tests= start= +clean=1 cr=" " @@ -35,6 +28,7 @@ usage () { cat <<EOF usage: $0 [-g|-h|-r] [test-name ...] + -C | --noclean Do not remove old innodb and bdb files at start. -g | --gdb run $mysqltest in gdb -h | --help show this help -l | --list ) list all available tests @@ -43,6 +37,7 @@ usage: $0 [-g|-h|-r] [test-name ...] EOF } +init_args="" while test $# -gt 0 do arg= @@ -56,6 +51,8 @@ do -h | --help | -\? ) usage; exit 0;; -l | --list ) list=1 ; shift ;; -r | --run ) run="${cr}run"; shift;; + --debug) init_args="$init_args --debug" ; shift ;; + -C | --noclean) clean=0 ; shift ;; -s | --start=* ) test $argset -eq 0 && { shift; arg="$1"; } start="$arg" @@ -66,25 +63,30 @@ do esac done -test -d "$mysql_test_dir/t" -a -d "$mysql_test_dir/r" -a \ - -f $mysqltest -a -d $testdir || { - echo "bad setup (is '$testdir', from '$test_data_dir', missing?)" >&2 +if test ! -d "$datadir/$test_data_dir" +then + echo "bad setup (is '$datadir/$test_data_dir'', missing ?)" >&2 exit 1 -} +fi test -n "$tests" || tests=`/bin/ls -1 "$mysql_test_dir"/t/*.test | grep -v '^.*/rpl[^/]*$' | \ sed -e 's,^.*/,,' -e 's,.test$,,'` -echo "cleaning data directory '$test_data_dir'" -rm -f $test_data_dir/ib_* $test_data_dir/ibdata* log.* -echo "cleaning test directory '$testdir'" -rm -f $testdir/* - +echo "cleaning data directory '$datadir/$test_data_dir'" +if test $clean = 1 +then + rm -f $datadir/ib_* $datadir/ibdata* + rm -f $datadir/log.00* +fi +rm -f $datadir/../tmp/* rm -f test-gdbinit TZ=GMT-3; export TZ +# At least one of the tests needs the following environment variable +MYSQL_TEST_DIR=`( cd $mysql_test_dir ; pwd )` ; export MYSQL_TEST_DIR + skip=1 test -z "$start" && skip=0 @@ -94,16 +96,20 @@ do test $skip -eq 1 && test -n "$start" && test "$start" = "$b" && skip=0 test $skip -eq 1 && { echo "skipping '$b'"; continue; } - t="$mysql_test_dir/t/$b.test" - r="$mysql_test_dir/r/$b.result" - c="$mysql_test_dir/r/$b.reject" + t="t/$b.test" + r="r/$b.result" # Only test if $t exists; there is no $r for some tests - test -f $t || { - echo "test '$b' doesn't exist" >&2 + test -f $mysql_test_dir/$t || { + echo "test '$mysql_test_dir/$t' doesn't exist" >&2 continue } - args="-v -S /tmp/mysql.sock -R $r -x $t test" + args="$init_args -v --basedir=$mysql_test_dir/ -R $r -x $t --server-arg=--datadir=$datadir" + if test -f "$mysql_test_dir/t/$b-master.opt" ; then + args="$args --server-file=t/$b-master.opt" + fi + + args="$args $test_data_dir" # Add database last echo "set args $args$run" > test-gdbinit #if false && test -n "$run" if test -n "$run" -o $gdb -eq 1 @@ -127,5 +133,5 @@ do res=$? fi - test $res -eq 0 || echo "!!! error: $res" + test $res -eq 0 -o $res -eq 2 || echo "!!! error: $res" done diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index f07150c9845..139f9b9c0c7 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -12,19 +12,21 @@ * modified is included with the above copyright notice. * */ -#include "my_global.h" -#include "my_pthread.h" +#include "embedded_priv.h" #include "sys/types.h" #include "../regex/regex.h" #include "my_sys.h" +/* + The following is needed to not cause conflicts when we include mysqld.cc +*/ + #define main main1 #define mysql_unix_port mysql_inix_port1 #define mysql_port mysql_port1 #define net_read_timeout net_read_timeout1 #define net_write_timeout net_write_timeout1 #define changeable_vars changeable_vars1 -//#define mysql_tmpdir mysql_tmpdir1 extern "C" { @@ -35,38 +37,21 @@ extern "C" class THD; -static int -check_connections1(THD * thd); - -static bool -check_user(THD *thd, enum_server_command command,const char *user, const char *passwd, const char *db, bool check_count); - -static int -check_connections2(THD * thd); - -extern void free_defaults(char ** argv); -void free_defaults_internal(char ** argv){if (argv) free_defaults(argv);} +static int check_connections1(THD * thd); +static int check_connections2(THD * thd); +static bool check_user(THD *thd, enum_server_command command, + const char *user, const char *passwd, const char *db, + bool check_count); +void free_defaults_internal(char ** argv) {if (argv) free_defaults(argv);} #define free_defaults free_defaults_internal -char mysql_data_home[FN_REFLEN]; -char * get_mysql_data_home(){return mysql_data_home;}; -#define mysql_data_home mysql_data_home_internal #include "../sql/mysqld.cc" #define SCRAMBLE_LENGTH 8 -extern "C" { - -/* -void -free_defaults(char ** argv) {}; -void -load_defaults(const char *, const char **, int *, char ***) {}; -*/ +C_MODE_START -char * -get_mysql_home(){ return mysql_home;}; -char * -get_mysql_real_data_home(){ return mysql_real_data_home;}; +char * get_mysql_home(){ return mysql_home;}; +char * get_mysql_real_data_home(){ return mysql_real_data_home;}; bool lib_dispatch_command(enum enum_server_command command, NET *net, @@ -82,9 +67,7 @@ bool lib_dispatch_command(enum enum_server_command command, NET *net, } - -void -lib_connection_phase(NET * net, int phase) +void lib_connection_phase(NET * net, int phase) { THD * thd; thd = (THD *)(net->vio->dest_thd); @@ -98,7 +81,9 @@ lib_connection_phase(NET * net, int phase) } } } -} +C_MODE_END + + void start_embedded_conn1(NET * net) { THD * thd = new THD; @@ -116,7 +101,6 @@ void start_embedded_conn1(NET * net) if (v) { v -> dest_thd = thd; - /* v -> dest_net = &thd->net; XXX: Probably not needed? */ } thd->net.vio = v; if (thd->store_globals()) @@ -256,7 +240,7 @@ static bool check_user(THD *thd,enum_server_command command, const char *user, send_error(net,ER_OUT_OF_RESOURCES); return 1; } - thd->master_access=acl_getroot(thd->host, thd->ip, thd->user, + thd->master_access=acl_getroot(thd, thd->host, thd->ip, thd->user, passwd, thd->scramble, &thd->priv_user, protocol_version == 9 || !(thd->client_capabilities & @@ -307,10 +291,14 @@ static bool check_user(THD *thd,enum_server_command command, const char *user, } -extern "C"{ -void mysql_server_init(int argc, const char **argv, const char **groups) +extern "C" +{ + +static my_bool inited, org_my_init_done; + +int mysql_server_init(int argc, char **argv, char **groups) { - char hostname[FN_REFLEN]; + char glob_hostname[FN_REFLEN]; /* This mess is to allow people to call the init function without * having to mess with a fake argv */ @@ -318,7 +306,7 @@ void mysql_server_init(int argc, const char **argv, const char **groups) char ***argvp; int fake_argc = 1; char *fake_argv[] = { (char *)"", 0 }; - const char *fake_groups[] = { "server", 0 }; + const char *fake_groups[] = { "server", "embedded", 0 }; if (argc) { argcp = &argc; @@ -330,11 +318,22 @@ void mysql_server_init(int argc, const char **argv, const char **groups) argvp = (char ***) &fake_argv; } if (!groups) - groups = fake_groups; + groups = (char**) fake_groups; my_umask=0660; // Default umask for new files my_umask_dir=0700; // Default umask for new directories - MY_INIT((char *)"mysqld_server"); // init my_sys library & pthreads + + /* Only call MY_INIT() if it hasn't been called before */ + if (!inited) + { + inited=1; + org_my_init_done=my_init_done; + } + if (!org_my_init_done) + { + MY_INIT((char *)"mysql_embedded"); // init my_sys library & pthreads + } + tzset(); // Set tzname start_time=time((time_t*) 0); @@ -343,49 +342,34 @@ void mysql_server_init(int argc, const char **argv, const char **groups) { struct tm tm_tmp; localtime_r(&start_time,&tm_tmp); - strmov(time_zone,tzname[tm_tmp.tm_isdst == 1 ? 1 : 0]); + strmov(time_zone,tzname[tm_tmp.tm_isdst != 0 ? 1 : 0]); } #else { struct tm *start_tm; start_tm=localtime(&start_time); - strmov(time_zone=tzname[start_tm->tm_isdst == 1 ? 1 : 0]); + strmov(time_zone,tzname[start_tm->tm_isdst != 0 ? 1 : 0]); } #endif #endif - if (gethostname(hostname,sizeof(hostname)-4) < 0) - strmov(hostname,"mysql"); - strmov(pidfile_name,hostname); - strmov(strcend(pidfile_name,'.'),".pid"); // Add extension -#ifdef DEMO_VERSION - strcat(server_version,"-demo"); -#endif -#ifdef SHAREWARE_VERSION - strcat(server_version,"-shareware"); -#endif + if (gethostname(glob_hostname,sizeof(glob_hostname)-4) < 0) + strmov(glob_hostname,"mysql"); #ifndef DBUG_OFF strcat(server_version,"-debug"); #endif - strcat(server_version,"-library-ver"); -#ifdef _CUSTOMSTARTUPCONFIG_ - if (_cust_check_startup()) - { - /* _cust_check_startup will report startup failure error */ - exit( 1 ); - } -#endif - load_defaults("my", groups, argcp, argvp); + strcat(server_version,"-embedded"); + load_defaults("my", (const char **) groups, argcp, argvp); defaults_argv=*argvp; mysql_tmpdir=getenv("TMPDIR"); /* Use this if possible */ -#ifdef __WIN__ +#if defined( __WIN__) || defined(OS2) if (!mysql_tmpdir) mysql_tmpdir=getenv("TEMP"); if (!mysql_tmpdir) mysql_tmpdir=getenv("TMP"); #endif if (!mysql_tmpdir || !mysql_tmpdir[0]) - mysql_tmpdir=strdup((char*) P_tmpdir); + mysql_tmpdir=(char*) P_tmpdir; /* purecov: inspected */ set_options(); get_options(*argcp, *argvp); @@ -426,23 +410,20 @@ void mysql_server_init(int argc, const char **argv, const char **groups) (void) pthread_cond_init(&COND_slave_start, NULL); if (set_default_charset_by_name(default_charset, MYF(MY_WME))) - unireg_abort(1); + { + mysql_server_end(); + return 1; + } charsets_list = list_charsets(MYF(MY_COMPILED_SETS|MY_CONFIG_SETS)); - - if (!(opt_specialflag & SPECIAL_NO_PRIOR)) - my_pthread_setprio(pthread_self(),CONNECT_PRIOR); /* Parameter for threads created for connections */ (void) pthread_attr_init(&connection_attrib); (void) pthread_attr_setdetachstate(&connection_attrib, PTHREAD_CREATE_DETACHED); pthread_attr_setstacksize(&connection_attrib,thread_stack); - - if (!(opt_specialflag & SPECIAL_NO_PRIOR)) - my_pthread_attr_setprio(&connection_attrib,WAIT_PRIOR); pthread_attr_setscope(&connection_attrib, PTHREAD_SCOPE_SYSTEM); -#ifdef SET_RLIMIT_NOFILE +#if defined( SET_RLIMIT_NOFILE) || defined( OS2) /* connections and databases neads lots of files */ { uint wanted_files=10+(uint) max(max_connections*5, @@ -467,64 +448,57 @@ void mysql_server_init(int argc, const char **argv, const char **groups) #ifdef USE_REGEX regex_init(); #endif - select_thread=pthread_self(); - select_thread_in_use=1; + if (use_temp_pool && bitmap_init(&temp_pool,1024)) + { + mysql_server_end(); + return 1; + } /* ** We have enough space for fiddling with the argv, continue */ umask(((~my_umask) & 0666)); -// strcpy(mysql_real_data_home, "/usr/local"); - //if (my_setwd(mysql_real_data_home,MYF(MY_WME))) - //{ - // unireg_abort(1); /* purecov: inspected */ - //} - //mysql_data_home[0]=FN_CURLIB; // all paths are relative from here - //mysql_data_home[1]=0; - - strcpy(get_mysql_data_home(), mysql_real_data_home); - - //server_init(); table_cache_init(); hostname_cache_init(); sql_cache_init(); randominit(&sql_rand,(ulong) start_time,(ulong) start_time/2); reset_floating_point_exceptions(); init_thr_lock(); + init_slave_list(); /* Setup log files */ if (opt_log) - open_log(&mysql_log, hostname, opt_logname, ".log", LOG_NORMAL); + open_log(&mysql_log, glob_hostname, opt_logname, ".log", LOG_NORMAL); if (opt_update_log) - open_log(&mysql_update_log, hostname, opt_update_logname, "", + { + open_log(&mysql_update_log, glob_hostname, opt_update_logname, "", LOG_NEW); + using_update_log=1; + } if (opt_bin_log) { - if(server_id) - { - if (!opt_bin_logname) - { - char tmp[FN_REFLEN]; - strnmov(tmp,hostname,FN_REFLEN-5); - strmov(strcend(tmp,'.'),"-bin"); - opt_bin_logname=my_strdup(tmp,MYF(MY_WME)); - } - mysql_bin_log.set_index_file_name(opt_binlog_index_name); - open_log(&mysql_bin_log, hostname, opt_bin_logname, "-bin", - LOG_BIN); - } - else - sql_print_error("Server id is not set - binary logging disabled"); + if (!opt_bin_logname) + { + char tmp[FN_REFLEN]; + strmake(tmp,glob_hostname,FN_REFLEN-5); + strmov(strcend(tmp,'.'),"-bin"); + opt_bin_logname=my_strdup(tmp,MYF(MY_WME)); + } + mysql_bin_log.set_index_file_name(opt_binlog_index_name); + open_log(&mysql_bin_log, glob_hostname, opt_bin_logname, "-bin", + LOG_BIN); + using_update_log=1; } if (opt_slow_log) - open_log(&mysql_slow_log, hostname, opt_slow_logname, "-slow.log", + open_log(&mysql_slow_log, glob_hostname, opt_slow_logname, "-slow.log", LOG_NORMAL); if (ha_init()) { sql_print_error("Can't init databases"); exit(1); } + ha_key_cache(); #ifdef HAVE_MLOCKALL if (locked_in_memory && !geteuid()) { @@ -555,120 +529,73 @@ void mysql_server_init(int argc, const char **argv, const char **groups) sql_print_error("Can't create thread-keys"); exit(1); } - //init_signals(); - opt_noacl = 1; + opt_noacl = 1; // No permissions if (acl_init(opt_noacl)) { - select_thread_in_use=0; - (void) pthread_kill(signal_thread,MYSQL_KILL_SIGNAL); - exit(1); + mysql_server_end(); + return 1; } - if (!opt_noacl) - (void) grant_init(); #ifdef HAVE_DLOPEN if (!opt_noacl) udf_init(); #endif - if (opt_bootstrap) - { - int error=bootstrap(stdin); - end_thr_alarm(); // Don't allow alarms - unireg_abort(error ? 1 : 0); - } - if (opt_init_file) - { - if (read_init_file(opt_init_file)) - { - end_thr_alarm(); // Don't allow alarms - unireg_abort(1); - } - } (void) thr_setconcurrency(concurrency); // 10 by default - if (flush_time && flush_time != ~(ulong) 0L) + if ( +#ifdef HAVE_BERKELEY_DB + !berkeley_skip || +#endif + (flush_time && flush_time != ~(ulong) 0L)) { pthread_t hThread; if (pthread_create(&hThread,&connection_attrib,handle_manager,0)) + { sql_print_error("Warning: Can't create thread to manage maintenance"); + mysql_server_end(); + return 1; + } } - - // slave thread - if(master_host) - { - if(server_id) - { - pthread_t hThread; - if(!opt_skip_slave_start && - pthread_create(&hThread, &connection_attrib, handle_slave, 0)) - sql_print_error("Warning: Can't create thread to handle slave"); - } - else - sql_print_error("Server id is not set, slave thread will not be started"); - } - - //printf(ER(ER_READY),my_progname,server_version,""); - //printf("%s initialized.\n", server_version); - fflush(stdout); + return 0; } + void mysql_server_end() { - /* (void) pthread_attr_destroy(&connection_attrib); */ - - DBUG_PRINT("quit",("Exiting main thread")); - -#ifdef EXTRA_DEBUG - sql_print_error("Before Lock_thread_count"); -#endif - (void) pthread_mutex_lock(&LOCK_thread_count); - select_thread_in_use=0; // For close_connections - (void) pthread_cond_broadcast(&COND_thread_count); - (void) pthread_mutex_unlock(&LOCK_thread_count); -#ifdef EXTRA_DEBUG - sql_print_error("After lock_thread_count"); + clean_up(0); +#ifdef THREAD + /* Don't call my_thread_end() if the application is using MY_INIT() */ + if (!org_my_init_done) + my_thread_end(); #endif - -// /* Wait until cleanup is done */ -// (void) pthread_mutex_lock(&LOCK_thread_count); -// while (!ready_to_exit) -// { -// pthread_cond_wait(&COND_thread_count,&LOCK_thread_count); -// } -// (void) pthread_mutex_unlock(&LOCK_thread_count); - unireg_end(0); - my_thread_end(); } my_bool mysql_thread_init() { #ifdef THREAD - return my_thread_init(); + return my_thread_init(); #else - return 0; + return 0; #endif } void mysql_thread_end() { #ifdef THREAD - my_thread_end(); + my_thread_end(); #endif } void start_embedded_connection(NET * net) { - start_embedded_conn1(net); + start_embedded_conn1(net); } -//==================================================================== -} -int embedded_do_command(NET * net) + +void end_embedded_connection(NET * net) { - THD * thd = (THD *) net ->vio; - do_command(thd); - return 0; + THD *thd = (THD *) net->vio->dest_thd; + delete thd; } - - +} /* extern "C" */ diff --git a/libmysqld/lib_vio.c b/libmysqld/lib_vio.c index e86e6c7e8da..270b08ef51d 100644 --- a/libmysqld/lib_vio.c +++ b/libmysqld/lib_vio.c @@ -23,12 +23,13 @@ */ #include <my_global.h> +#include "mysql_embed.h" +#include "mysql.h" -#ifndef HAVE_VIO /* is Vio suppored by the Vio lib ? */ +#ifndef HAVE_VIO /* is Vio enabled */ #include <errno.h> #include <my_sys.h> -#include "mysql.h" #include <violite.h> #include <my_sys.h> #include <my_net.h> @@ -36,27 +37,6 @@ #include <dbug.h> #include <assert.h> -#if defined(__EMX__) -#include <sys/ioctl.h> -#define ioctlsocket(A,B,C) ioctl((A),(B),(void *)(C),sizeof(*(C))) -#undef HAVE_FCNTL -#endif /* defined(__EMX__) */ - -#if defined(MSDOS) || defined(__WIN__) -#ifdef __WIN__ -#undef errno -#undef EINTR -#undef EAGAIN -#define errno WSAGetLastError() -#define EINTR WSAEINTR -#define EAGAIN WSAEINPROGRESS -#endif /* __WIN__ */ -#define O_NONBLOCK 1 /* For emulation of fcntl() */ -#endif -#ifndef EWOULDBLOCK -#define EWOULDBLOCK EAGAIN -#endif - #ifndef __WIN__ #define HANDLE void * #endif @@ -71,14 +51,11 @@ struct st_vio struct sockaddr_in remote; /* Remote internet address */ enum enum_vio_type type; /* Type of connection */ char desc[30]; /* String description */ - /* #ifdef EMBEDDED_LIBRARY */ - /* void *dest_net; */ void *dest_thd; char *packets, **last_packet; char *where_in_packet, *end_of_packet; my_bool reading; MEM_ROOT root; - /* #endif */ }; /* Initialize the communication buffer */ @@ -89,7 +66,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost) vio = (Vio *) my_malloc (sizeof(*vio),MYF(MY_WME|MY_ZEROFILL)); if (vio) { - init_alloc_root(&vio->root, 8192, 1024); + init_alloc_root(&vio->root, 8192, 8192); vio->root.min_malloc = sizeof(char *) + 4; vio->last_packet = &vio->packets; } @@ -125,7 +102,7 @@ void vio_reset(Vio *vio) int vio_errno(Vio *vio __attribute__((unused))) { - return errno; /* On Win32 this mapped to WSAGetLastError() */ + return socket_errno; /* On Win32 this mapped to WSAGetLastError() */ } int vio_read(Vio * vio, gptr buf, int size) @@ -197,8 +174,9 @@ int vio_keepalive(Vio* vio, my_bool set_keep_alive) my_bool vio_should_retry(Vio * vio __attribute__((unused))) { - int en = errno; - return en == EAGAIN || en == EINTR || en == EWOULDBLOCK; + int en = socket_errno; + return (en == SOCKET_EAGAIN || en == SOCKET_EINTR || + en == SOCKET_EWOULDBLOCK); } diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index cb8b2f02773..49f467da601 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -15,19 +15,11 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#define DONT_USE_RAID -#include <my_global.h> -#if defined(__WIN__) || defined(_WIN32) || defined(_WIN64) -#include <winsock.h> -#include <odbcinst.h> -#endif +#include "embedded_priv.h" #include <my_sys.h> #include <mysys_err.h> #include <m_string.h> #include <m_ctype.h> -#include "mysql.h" -#include "mysql_version.h" -#include "mysqld_error.h" #include "errmsg.h" #include <violite.h> #include <sys/stat.h> @@ -51,9 +43,6 @@ #ifdef HAVE_SYS_UN_H # include <sys/un.h> #endif -#if defined(THREAD) && !defined(__WIN__) -#include <my_pthread.h> /* because of signal() */ -#endif #ifndef INADDR_NONE #define INADDR_NONE -1 #endif @@ -74,12 +63,6 @@ my_string mysql_unix_port=0; #define closesocket(A) close(A) #endif -/* XXX: this is real ugly... */ -extern void start_embedded_connection(NET * net); -extern void lib_connection_phase(NET *net, int phase); -extern bool lib_dispatch_command(enum enum_server_command command, NET *net, - const char *arg, ulong length); - static void mysql_once_init(void); static MYSQL_DATA *read_rows (MYSQL *mysql,MYSQL_FIELD *fields, uint field_count); @@ -88,9 +71,7 @@ static int read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, static void end_server(MYSQL *mysql); static void read_user_name(char *name); static void append_wild(char *to,char *end,const char *wild); -static my_bool mysql_reconnect(MYSQL *mysql); static int send_file_to_server(MYSQL *mysql,const char *filename); -static sig_handler pipe_sig_handler(int sig); static ulong mysql_sub_escape_string(CHARSET_INFO *charset_info, char *to, const char *from, ulong length); @@ -98,17 +79,12 @@ static ulong mysql_sub_escape_string(CHARSET_INFO *charset_info, char *to, #define set_sigpipe(mysql) #define reset_sigpipe(mysql) -static MYSQL* spawn_init(MYSQL* parent, const char* host, - unsigned int port, - const char* user, - const char* passwd); - /***************************************************************************** ** read a packet from server. Give error message if socket was down ** or packet is an error message *****************************************************************************/ -static uint +ulong net_safe_read(MYSQL *mysql) { NET *net= &mysql->net; @@ -237,9 +213,9 @@ static void free_rows(MYSQL_DATA *cur) } -static int +int simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, - uint length, my_bool skipp_check) + ulong length, my_bool skipp_check) { NET *net= &mysql->net; int result= -1; @@ -403,22 +379,6 @@ mysql_debug(const char *debug) #endif } - -/************************************************************************** -** Close the server connection if we get a SIGPIPE - ARGSUSED -**************************************************************************/ - -static sig_handler -pipe_sig_handler(int sig __attribute__((unused))) -{ - DBUG_PRINT("info",("Hit by signal %d",sig)); -#ifdef DONT_REMEMBER_SIGNAL - (void) signal(SIGPIPE,pipe_sig_handler); -#endif -} - - /************************************************************************** ** Shut down connection **************************************************************************/ @@ -429,11 +389,7 @@ end_server(MYSQL *mysql) DBUG_ENTER("end_server"); if (mysql->net.vio != 0) { - init_sigpipe_variables - DBUG_PRINT("info",("Net: %s", vio_description(mysql->net.vio))); - set_sigpipe(mysql); - vio_delete(mysql->net.vio); - reset_sigpipe(mysql); + end_embedded_connection(&mysql->net); mysql->net.vio= 0; /* Marker */ } net_end(&mysql->net); @@ -739,7 +695,7 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) ulong pkt_len,len; uchar *pos,*prev_pos; - if ((pkt_len=(uint) net_safe_read(mysql)) == packet_error) + if ((pkt_len=net_safe_read(mysql)) == packet_error) return -1; if (pkt_len == 1 && mysql->net.read_pos[0] == 254) return 1; /* End of data */ @@ -767,301 +723,6 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) return 0; } -/* perform query on master */ -int STDCALL mysql_master_query(MYSQL *mysql, const char *q, - unsigned int length) -{ - if(mysql_master_send_query(mysql, q, length)) - return 1; - return mysql_read_query_result(mysql); -} - -int STDCALL mysql_master_send_query(MYSQL *mysql, const char *q, - unsigned int length) -{ - MYSQL*master = mysql->master; - if (!length) - length = strlen(q); - if (!master->net.vio && !mysql_real_connect(master,0,0,0,0,0,0,0)) - return 1; - mysql->last_used_con = master; - return simple_command(master, COM_QUERY, q, length, 1); -} - - -/* perform query on slave */ -int STDCALL mysql_slave_query(MYSQL *mysql, const char *q, - unsigned int length) -{ - if(mysql_slave_send_query(mysql, q, length)) - return 1; - return mysql_read_query_result(mysql); -} - -int STDCALL mysql_slave_send_query(MYSQL *mysql, const char *q, - unsigned int length) -{ - MYSQL* last_used_slave, *slave_to_use = 0; - - if((last_used_slave = mysql->last_used_slave)) - slave_to_use = last_used_slave->next_slave; - else - slave_to_use = mysql->next_slave; - /* next_slave is always safe to use - we have a circular list of slaves - if there are no slaves, mysql->next_slave == mysql - */ - mysql->last_used_con = mysql->last_used_slave = slave_to_use; - if(!length) - length = strlen(q); - if(!slave_to_use->net.vio && !mysql_real_connect(slave_to_use, 0,0,0, - 0,0,0,0)) - return 1; - return simple_command(slave_to_use, COM_QUERY, q, length, 1); -} - - -/* enable/disable parsing of all queries to decide - if they go on master or slave */ -void STDCALL mysql_enable_rpl_parse(MYSQL* mysql) -{ - mysql->options.rpl_parse = 1; -} - -void STDCALL mysql_disable_rpl_parse(MYSQL* mysql) -{ - mysql->options.rpl_parse = 0; -} - -/* get the value of the parse flag */ -int STDCALL mysql_rpl_parse_enabled(MYSQL* mysql) -{ - return mysql->options.rpl_parse; -} - -/* enable/disable reads from master */ -void STDCALL mysql_enable_reads_from_master(MYSQL* mysql) -{ - mysql->options.no_master_reads = 0; -} - -void STDCALL mysql_disable_reads_from_master(MYSQL* mysql) -{ - mysql->options.no_master_reads = 1; -} - -/* get the value of the master read flag */ -int STDCALL mysql_reads_from_master_enabled(MYSQL* mysql) -{ - return !(mysql->options.no_master_reads); -} - -/* We may get an error while doing replication internals. - In this case, we add a special explanation to the original - error -*/ -static inline void expand_error(MYSQL* mysql, int error) -{ - char tmp[MYSQL_ERRMSG_SIZE]; - char* p, *tmp_end; - tmp_end = strnmov(tmp, mysql->net.last_error, MYSQL_ERRMSG_SIZE); - p = strnmov(mysql->net.last_error, ER(error), MYSQL_ERRMSG_SIZE); - memcpy(p, tmp, tmp_end - tmp); - mysql->net.last_errno = error; -} - -/* This function assumes we have just called SHOW SLAVE STATUS and have - read the given result and row -*/ -static inline int get_master(MYSQL* mysql, MYSQL_RES* res, MYSQL_ROW row) -{ - MYSQL* master; - if(mysql_num_fields(res) < 3) - return 1; /* safety */ - - /* use the same username and password as the original connection */ - if(!(master = spawn_init(mysql, row[0], atoi(row[2]), 0, 0))) - return 1; - mysql->master = master; - return 0; -} - -/* assuming we already know that mysql points to a master connection, - retrieve all the slaves -*/ -static inline int get_slaves_from_master(MYSQL* mysql) -{ - MYSQL_RES* res = 0; - MYSQL_ROW row; - int error = 1; - int has_auth_info; - if (!mysql->net.vio && !mysql_real_connect(mysql,0,0,0,0,0,0,0)) - { - expand_error(mysql, CR_PROBE_MASTER_CONNECT); - return 1; - } - - if (mysql_query(mysql, "SHOW SLAVE HOSTS") || - !(res = mysql_store_result(mysql))) - { - expand_error(mysql, CR_PROBE_SLAVE_HOSTS); - return 1; - } - - switch (mysql_num_fields(res)) - { - case 3: has_auth_info = 0; break; - case 5: has_auth_info = 1; break; - default: - goto err; - } - - while ((row = mysql_fetch_row(res))) - { - MYSQL* slave; - const char* tmp_user, *tmp_pass; - - if (has_auth_info) - { - tmp_user = row[3]; - tmp_pass = row[4]; - } - else - { - tmp_user = mysql->user; - tmp_pass = mysql->passwd; - } - - if(!(slave = spawn_init(mysql, row[1], atoi(row[2]), - tmp_user, tmp_pass))) - goto err; - - /* Now add slave into the circular linked list */ - slave->next_slave = mysql->next_slave; - mysql->next_slave = slave; - } - error = 0; -err: - if(res) - mysql_free_result(res); - return error; -} - -int STDCALL mysql_rpl_probe(MYSQL* mysql) -{ - MYSQL_RES* res = 0; - MYSQL_ROW row; - int error = 1; - /* first determine the replication role of the server we connected to - the most reliable way to do this is to run SHOW SLAVE STATUS and see - if we have a non-empty master host. This is still not fool-proof - - it is not a sin to have a master that has a dormant slave thread with - a non-empty master host. However, it is more reliable to check - for empty master than whether the slave thread is actually running - */ - if (mysql_query(mysql, "SHOW SLAVE STATUS") || - !(res = mysql_store_result(mysql))) - { - expand_error(mysql, CR_PROBE_SLAVE_STATUS); - return 1; - } - - if (!(row = mysql_fetch_row(res))) - goto err; - - /* check master host for emptiness/NULL */ - if (row[0] && *(row[0])) - { - /* this is a slave, ask it for the master */ - if (get_master(mysql, res, row) || get_slaves_from_master(mysql)) - goto err; - } - else - { - mysql->master = mysql; - if (get_slaves_from_master(mysql)) - goto err; - } - - error = 0; -err: - if(res) - mysql_free_result(res); - return error; -} - - -/* make a not so fool-proof decision on where the query should go, to - the master or the slave. Ideally the user should always make this - decision himself with mysql_master_query() or mysql_slave_query(). - However, to be able to more easily port the old code, we support the - option of an educated guess - this should work for most applications, - however, it may make the wrong decision in some particular cases. If - that happens, the user would have to change the code to call - mysql_master_query() or mysql_slave_query() explicitly in the place - where we have made the wrong decision -*/ -enum mysql_rpl_type -STDCALL mysql_rpl_query_type(const char* q, int len) -{ - const char* q_end; - q_end = (len) ? q + len : strend(q); - for(; q < q_end; ++q) - { - char c; - if(isalpha(c=*q)) - switch(tolower(c)) - { - case 'i': /* insert */ - case 'u': /* update or unlock tables */ - case 'l': /* lock tables or load data infile */ - case 'd': /* drop or delete */ - case 'a': /* alter */ - return MYSQL_RPL_MASTER; - case 'c': /* create or check */ - return tolower(q[1]) == 'h' ? MYSQL_RPL_ADMIN : MYSQL_RPL_MASTER ; - case 's': /* select or show */ - return tolower(q[1] == 'h') ? MYSQL_RPL_ADMIN : MYSQL_RPL_SLAVE; - case 'f': /* flush */ - case 'r': /* repair */ - case 'g': /* grant */ - return MYSQL_RPL_ADMIN; - default: - return MYSQL_RPL_SLAVE; - } - } - - return 0; -} - -static MYSQL* spawn_init(MYSQL* parent, const char* host, - unsigned int port, - const char* user, - const char* passwd) -{ - MYSQL* child; - if (!(child = mysql_init(0))) - return 0; - - child->options.user = my_strdup((user) ? user : - (parent->user ? parent->user : - parent->options.user), MYF(0)); - child->options.password = my_strdup((passwd) ? passwd : (parent->passwd ? - parent->passwd : - parent->options.password), MYF(0)); - child->options.port = port; - child->options.host = my_strdup((host) ? host : (parent->host ? - parent->host : - parent->options.host), MYF(0)); - if(parent->db) - child->options.db = my_strdup(parent->db, MYF(0)); - else if(parent->options.db) - child->options.db = my_strdup(parent->options.db, MYF(0)); - - child->options.rpl_parse = child->options.rpl_probe = child->rpl_pivot = 0; - - return child; -} - /**************************************************************************** ** Init MySQL structure or allocate one ****************************************************************************/ @@ -1308,7 +969,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, mysql->db=my_strdup(db,MYF(MY_WME)); db=0; } - if (my_net_write(net,buff,(uint) (end-buff)) || net_flush(net)) + if (my_net_write(net,buff,(ulong) (end-buff)) || net_flush(net)) goto error; lib_connection_phase(net,2); @@ -1346,35 +1007,6 @@ error: } -static my_bool mysql_reconnect(MYSQL *mysql) -{ - MYSQL tmp_mysql; - DBUG_ENTER("mysql_reconnect"); - - if (!mysql->reconnect || - (mysql->server_status & SERVER_STATUS_IN_TRANS) || !mysql->host_info) - { - /* Allov reconnect next time */ - mysql->server_status&= ~SERVER_STATUS_IN_TRANS; - DBUG_RETURN(1); - } - mysql_init(&tmp_mysql); - tmp_mysql.options=mysql->options; - if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd, - mysql->db, mysql->port, mysql->unix_socket, - mysql->client_flag)) - DBUG_RETURN(1); - tmp_mysql.free_me=mysql->free_me; - mysql->free_me=0; - bzero((char*) &mysql->options,sizeof(mysql->options)); - mysql_close(mysql); - *mysql=tmp_mysql; - net_clear(&mysql->net); - mysql->affected_rows= ~(my_ulonglong) 0; - DBUG_RETURN(0); -} - - /************************************************************************** ** Change user and database **************************************************************************/ @@ -1394,7 +1026,7 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user, pos=scramble(pos, mysql->scramble_buff, passwd, (my_bool) (mysql->protocol_version == 9)); pos=strmov(pos+1,db ? db : ""); - if (simple_command(mysql,COM_CHANGE_USER, buff,(uint) (pos-buff),0)) + if (simple_command(mysql,COM_CHANGE_USER, buff,(ulong) (pos-buff),0)) DBUG_RETURN(1); my_free(mysql->user,MYF(MY_ALLOW_ZERO_PTR)); @@ -1419,7 +1051,7 @@ mysql_select_db(MYSQL *mysql, const char *db) DBUG_ENTER("mysql_select_db"); DBUG_PRINT("enter",("db: '%s'",db)); - if ((error=simple_command(mysql,COM_INIT_DB,db,(uint) strlen(db),0))) + if ((error=simple_command(mysql,COM_INIT_DB,db,(ulong) strlen(db),0))) DBUG_RETURN(error); my_free(mysql->db,MYF(MY_ALLOW_ZERO_PTR)); mysql->db=my_strdup(db,MYF(MY_WME)); @@ -1482,11 +1114,11 @@ mysql_close(MYSQL *mysql) int STDCALL mysql_query(MYSQL *mysql, const char *query) { - return mysql_real_query(mysql,query, (uint) strlen(query)); + return mysql_real_query(mysql,query, (ulong) strlen(query)); } int STDCALL -mysql_send_query(MYSQL* mysql, const char* query, uint length) +mysql_send_query(MYSQL* mysql, const char* query, ulong length) { return simple_command(mysql, COM_QUERY, query, length, 1); } @@ -1541,8 +1173,109 @@ get_info: DBUG_RETURN(0); } +/**************************************************************************** +* A modified version of connect(). connect2() allows you to specify +* a timeout value, in seconds, that we should wait until we +* derermine we can't connect to a particular host. If timeout is 0, +* my_connect() will behave exactly like connect(). +* +* Base version coded by Steve Bernacki, Jr. <steve@navinet.net> +*****************************************************************************/ + +int my_connect(my_socket s, const struct sockaddr *name, uint namelen, + uint timeout) +{ +#if defined(__WIN__) || defined(OS2) + return connect(s, (struct sockaddr*) name, namelen); +#else + int flags, res, s_err; + SOCKOPT_OPTLEN_TYPE s_err_size = sizeof(uint); + fd_set sfds; + struct timeval tv; + time_t start_time, now_time; + + /* If they passed us a timeout of zero, we should behave + * exactly like the normal connect() call does. + */ + + if (timeout == 0) + return connect(s, (struct sockaddr*) name, namelen); + + flags = fcntl(s, F_GETFL, 0); /* Set socket to not block */ +#ifdef O_NONBLOCK + fcntl(s, F_SETFL, flags | O_NONBLOCK); /* and save the flags.. */ +#endif + + res = connect(s, (struct sockaddr*) name, namelen); + s_err = errno; /* Save the error... */ + fcntl(s, F_SETFL, flags); + if ((res != 0) && (s_err != EINPROGRESS)) + { + errno = s_err; /* Restore it */ + return(-1); + } + if (res == 0) /* Connected quickly! */ + return(0); + + /* Otherwise, our connection is "in progress." We can use + * the select() call to wait up to a specified period of time + * for the connection to suceed. If select() returns 0 + * (after waiting howevermany seconds), our socket never became + * writable (host is probably unreachable.) Otherwise, if + * select() returns 1, then one of two conditions exist: + * + * 1. An error occured. We use getsockopt() to check for this. + * 2. The connection was set up sucessfully: getsockopt() will + * return 0 as an error. + * + * Thanks goes to Andrew Gierth <andrew@erlenstar.demon.co.uk> + * who posted this method of timing out a connect() in + * comp.unix.programmer on August 15th, 1997. + */ + + FD_ZERO(&sfds); + FD_SET(s, &sfds); + /* + * select could be interrupted by a signal, and if it is, + * the timeout should be adjusted and the select restarted + * to work around OSes that don't restart select and + * implementations of select that don't adjust tv upon + * failure to reflect the time remaining + */ + start_time = time(NULL); + for (;;) + { + tv.tv_sec = (long) timeout; + tv.tv_usec = 0; + if ((res = select(s+1, NULL, &sfds, NULL, &tv)) >= 0) + break; + now_time=time(NULL); + timeout-= (uint) (now_time - start_time); + if (errno != EINTR || (int) timeout <= 0) + return -1; + } + + /* select() returned something more interesting than zero, let's + * see if we have any errors. If the next two statements pass, + * we've got an open socket! + */ + + s_err=0; + if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*) &s_err, &s_err_size) != 0) + return(-1); + + if (s_err) + { /* getsockopt could succeed */ + errno = s_err; + return(-1); /* but return an error... */ + } + return(0); /* It's all good! */ +#endif +} + + int STDCALL -mysql_real_query(MYSQL *mysql, const char *query, uint length) +mysql_real_query(MYSQL *mysql, const char *query, ulong length) { DBUG_ENTER("mysql_real_query"); DBUG_PRINT("enter",("handle: %lx",mysql)); @@ -1940,7 +1673,7 @@ mysql_create_db(MYSQL *mysql, const char *db) { DBUG_ENTER("mysql_createdb"); DBUG_PRINT("enter",("db: %s",db)); - DBUG_RETURN(simple_command(mysql,COM_CREATE_DB,db, (uint) strlen(db),0)); + DBUG_RETURN(simple_command(mysql,COM_CREATE_DB,db, (ulong) strlen(db),0)); } @@ -1949,7 +1682,7 @@ mysql_drop_db(MYSQL *mysql, const char *db) { DBUG_ENTER("mysql_drop_db"); DBUG_PRINT("enter",("db: %s",db)); - DBUG_RETURN(simple_command(mysql,COM_DROP_DB,db,(uint) strlen(db),0)); + DBUG_RETURN(simple_command(mysql,COM_DROP_DB,db,(ulong) strlen(db),0)); } diff --git a/merge/Makefile.am b/merge/Makefile.am index 52abfc4cdc0..94de6d65391 100644 --- a/merge/Makefile.am +++ b/merge/Makefile.am @@ -16,10 +16,10 @@ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include pkglib_LIBRARIES = libmerge.a -noinst_HEADERS = mrgdef.h -libmerge_a_SOURCES = open.c extra.c info.c _locking.c \ - rrnd.c update.c delete.c rsame.c panic.c \ - close.c create.c static.c +noinst_HEADERS = mrg_def.h +libmerge_a_SOURCES = mrg_open.c mrg_extra.c mrg_info.c mrg_locking.c \ + mrg_rrnd.c mrg_update.c mrg_delete.c mrg_rsame.c \ + mrg_panic.c mrg_close.c mrg_create.c mrg_static.c OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ __math.h time.h __time.h unistd.h __unistd.h types.h \ diff --git a/merge/close.c b/merge/mrg_close.c index 2b769ade8e9..4879dbf4c36 100644 --- a/merge/close.c +++ b/merge/mrg_close.c @@ -16,7 +16,7 @@ /* close a isam-database */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_close(register MRG_INFO *info) { diff --git a/merge/create.c b/merge/mrg_create.c index fd2c16f9ea2..d92b617f4ba 100644 --- a/merge/create.c +++ b/merge/mrg_create.c @@ -16,7 +16,7 @@ /* Create a MERGE-file */ -#include "mrgdef.h" +#include "mrg_def.h" /* create file named 'name' and save filenames in it table_names should be NULL or a vector of string-pointers with diff --git a/merge/mrgdef.h b/merge/mrg_def.h index 3f22c83589a..3f22c83589a 100644 --- a/merge/mrgdef.h +++ b/merge/mrg_def.h diff --git a/merge/delete.c b/merge/mrg_delete.c index a4ee46eedc2..4eb19957c63 100644 --- a/merge/delete.c +++ b/merge/mrg_delete.c @@ -16,7 +16,7 @@ /* Delete last read record */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_delete(MRG_INFO *info,const byte *record) { diff --git a/merge/extra.c b/merge/mrg_extra.c index c4f048a4385..ace931f5810 100644 --- a/merge/extra.c +++ b/merge/mrg_extra.c @@ -20,7 +20,7 @@ record-cache-flags are set in mrg_rrnd when we are changing database. */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_extra( MRG_INFO *info, diff --git a/merge/info.c b/merge/mrg_info.c index d44ada8e6e6..981d1975fea 100644 --- a/merge/info.c +++ b/merge/mrg_info.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mrgdef.h" +#include "mrg_def.h" ulong mrg_position(MRG_INFO *info) { diff --git a/merge/_locking.c b/merge/mrg_locking.c index 81582da1312..13ccb09bbe6 100644 --- a/merge/_locking.c +++ b/merge/mrg_locking.c @@ -18,7 +18,7 @@ Lock databases against read or write. */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_lock_database(MRG_INFO *info,int lock_type) { diff --git a/merge/open.c b/merge/mrg_open.c index 7b5e571b9ad..708e56e1a81 100644 --- a/merge/open.c +++ b/merge/mrg_open.c @@ -16,7 +16,7 @@ /* open a MERGE-database */ -#include "mrgdef.h" +#include "mrg_def.h" #include <stddef.h> #include <errno.h> #ifdef VMS diff --git a/merge/panic.c b/merge/mrg_panic.c index cf333e3a9bf..dd9b8bf4e0f 100644 --- a/merge/panic.c +++ b/merge/mrg_panic.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mrgdef.h" +#include "mrg_def.h" /* if flag == HA_PANIC_CLOSE then all misam files are closed */ /* if flag == HA_PANIC_WRITE then all misam files are unlocked and diff --git a/merge/rrnd.c b/merge/mrg_rrnd.c index e53982aca21..42430a039f7 100644 --- a/merge/rrnd.c +++ b/merge/mrg_rrnd.c @@ -19,7 +19,7 @@ get by mrg_info(). The next record can be read with pos= -1 */ -#include "mrgdef.h" +#include "mrg_def.h" static MRG_TABLE *find_table(MRG_TABLE *start,MRG_TABLE *end,mrg_off_t pos); diff --git a/merge/rsame.c b/merge/mrg_rsame.c index 4ebf25b21c1..307e4284486 100644 --- a/merge/rsame.c +++ b/merge/mrg_rsame.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_rsame( diff --git a/merge/static.c b/merge/mrg_static.c index e5f95ef195a..793dc8c4d92 100644 --- a/merge/static.c +++ b/merge/mrg_static.c @@ -20,7 +20,7 @@ */ #ifndef stdin -#include "mrgdef.h" +#include "mrg_def.h" #endif LIST *mrg_open_list=0; diff --git a/merge/update.c b/merge/mrg_update.c index 9fcb82089e4..88f8572eb7d 100644 --- a/merge/update.c +++ b/merge/mrg_update.c @@ -16,7 +16,7 @@ /* Update last read record */ -#include "mrgdef.h" +#include "mrg_def.h" int mrg_update( register MRG_INFO *info, diff --git a/myisam/mi_changed.c b/myisam/mi_changed.c index bd6b14b0c6c..5b9003798b0 100644 --- a/myisam/mi_changed.c +++ b/myisam/mi_changed.c @@ -24,7 +24,7 @@ int mi_is_changed(MI_INFO *info) { int result; DBUG_ENTER("mi_is_changed"); - if (_mi_readinfo(info,F_RDLCK,1)) + if (fast_mi_readinfo(info)) DBUG_RETURN(-1); VOID(_mi_writeinfo(info,0)); result=(int) info->data_changed; diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 4ea52c1b565..656e6aa995f 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -231,7 +231,7 @@ wrong: static int check_k_link(MI_CHECK *param, register MI_INFO *info, uint nr) { my_off_t next_link; - uint block_size=(nr+1)*MI_KEY_BLOCK_LENGTH; + uint block_size=(nr+1)*MI_MIN_KEY_BLOCK_LENGTH; ha_rows records; char llbuff[21],*buff; DBUG_ENTER("check_k_link"); @@ -1205,8 +1205,6 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, param->glob_crc=0; if (param->testflag & T_CALC_CHECKSUM) param->calc_checksum=1; - if (!rep_quick) - share->state.checksum=0; info->update= (short) (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED); for (i=0 ; i < info->s->base.keys ; i++) @@ -1301,9 +1299,9 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, else { info->state->data_file_length=sort_info->max_pos; - if (param->testflag & T_CALC_CHECKSUM) - share->state.checksum=param->glob_crc; } + if (param->testflag & T_CALC_CHECKSUM) + share->state.checksum=param->glob_crc; if (!(param->testflag & T_SILENT)) { @@ -1886,8 +1884,6 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, param->glob_crc=0; if (param->testflag & T_CALC_CHECKSUM) param->calc_checksum=1; - if (! rep_quick) - share->state.checksum=0; rec_per_key_part= param->rec_per_key_part; for (sort_info->key=0 ; sort_info->key < share->base.keys ; @@ -2018,7 +2014,7 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, "Can't change size of datafile, error: %d", my_errno); } - else if (param->testflag & T_CALC_CHECKSUM) + if (param->testflag & T_CALC_CHECKSUM) share->state.checksum=param->glob_crc; if (my_chsize(share->kfile,info->state->key_file_length,MYF(0))) @@ -2115,6 +2111,7 @@ static int sort_key_read(SORT_INFO *sort_info, void *key) DBUG_RETURN(sort_write_record(sort_info)); } /* sort_key_read */ + static int sort_ft_key_read(SORT_INFO *sort_info, void *key) { int error; @@ -2540,7 +2537,7 @@ int sort_write_record(SORT_INFO *sort_info) DBUG_RETURN(1); } sort_info->filepos+=share->base.pack_reclength; - info->s->state.checksum+=mi_static_checksum(info, sort_info->record); + /* sort_info->param->glob_crc+=mi_static_checksum(info, sort_info->record); */ break; case DYNAMIC_RECORD: if (! info->blobs) @@ -2564,7 +2561,7 @@ int sort_write_record(SORT_INFO *sort_info) } info->checksum=mi_checksum(info,sort_info->record); reclength=_mi_rec_pack(info,from,sort_info->record); - info->s->state.checksum+=info->checksum; + /* sort_info->param->glob_crc+=info->checksum; */ block_length=reclength+ 3 + test(reclength >= (65520-3)); if (block_length < share->base.min_block_length) block_length=share->base.min_block_length; @@ -2578,7 +2575,7 @@ int sort_write_record(SORT_INFO *sort_info) DBUG_RETURN(1); } sort_info->filepos+=block_length; - info->s->state.checksum+=info->checksum; + /* sort_info->param->glob_crc+=info->checksum; */ break; case COMPRESSED_RECORD: reclength=info->packed_length; @@ -2591,7 +2588,7 @@ int sort_write_record(SORT_INFO *sort_info) mi_check_print_error(param,"%d when writing to datafile",my_errno); DBUG_RETURN(1); } - info->s->state.checksum+=info->checksum; + /* sort_info->param->glob_crc+=info->checksum; */ sort_info->filepos+=reclength+length; break; } @@ -2808,9 +2805,9 @@ static int sort_delete_record(MI_CHECK *param) DBUG_RETURN(1); } } - if (info->s->calc_checksum) - info->s->state.checksum-=(*info->s->calc_checksum)(info, - sort_info->record); + if (param->calc_checksum) + param->glob_crc-=(*info->s->calc_checksum)(info, + sort_info->record); } error=flush_io_cache(&info->rec_cache) || (*info->s->delete_record)(info); info->dfile=old_file; /* restore actual value */ diff --git a/myisam/mi_create.c b/myisam/mi_create.c index 7033cd59639..aad0300c978 100644 --- a/myisam/mi_create.c +++ b/myisam/mi_create.c @@ -227,8 +227,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, share.state.key_del=key_del; if (uniques) { - max_key_block_length= MI_KEY_BLOCK_LENGTH; - max_key_length= MI_UNIQUE_HASH_LENGTH; + max_key_block_length= myisam_block_size; + max_key_length= MI_UNIQUE_HASH_LENGTH; } for (i=0, keydef=keydefs ; i < keys ; i++ , keydef++) @@ -370,7 +370,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, share.state.rec_per_key_part[key_segs-1]=1L; length+=key_length; keydef->block_length= MI_BLOCK_SIZE(length,pointer,MI_MAX_KEYPTR_SIZE); - if (keydef->block_length/MI_KEY_BLOCK_LENGTH > MI_MAX_KEY_BLOCK_SIZE) + if (keydef->block_length > MI_MAX_KEY_BLOCK_LENGTH) { my_errno=HA_WRONG_CREATE_OPTION; goto err; @@ -386,7 +386,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, (length*2)))* (ulong) keydef->block_length; } - for (i=max_key_block_length/MI_KEY_BLOCK_LENGTH ; i-- ; ) + for (i=max_key_block_length/MI_MIN_KEY_BLOCK_LENGTH ; i-- ; ) key_del[i]=HA_OFFSET_ERROR; unique_key_parts=0; @@ -401,7 +401,8 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, key_segs+=uniques; /* Each unique has 1 key seg */ base_pos=(MI_STATE_INFO_SIZE + keys * MI_STATE_KEY_SIZE + - max_key_block_length/MI_KEY_BLOCK_LENGTH*MI_STATE_KEYBLOCK_SIZE+ + max_key_block_length/MI_MIN_KEY_BLOCK_LENGTH* + MI_STATE_KEYBLOCK_SIZE+ key_segs*MI_STATE_KEYSEG_SIZE); info_length=base_pos+(uint) (MI_BASE_INFO_SIZE+ keys * MI_KEYDEF_SIZE+ @@ -420,7 +421,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, mi_int2store(share.state.header.base_pos,base_pos); share.state.header.language= (ci->language ? ci->language : MY_CHARSET_CURRENT); - share.state.header.max_block_size=max_key_block_length/MI_KEY_BLOCK_LENGTH; + share.state.header.max_block_size=max_key_block_length/MI_MIN_KEY_BLOCK_LENGTH; share.state.dellink = HA_OFFSET_ERROR; share.state.process= (ulong) getpid(); @@ -433,7 +434,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, share.base.rec_reflength=pointer; share.base.key_reflength= mi_get_pointer_length((tot_length + max_key_block_length * keys * - MI_INDEX_BLOCK_MARGIN) / MI_KEY_BLOCK_LENGTH, + MI_INDEX_BLOCK_MARGIN) / MI_MIN_KEY_BLOCK_LENGTH, 3); share.base.keys= share.state.header.keys = keys; share.state.header.uniques= uniques; @@ -575,7 +576,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, { tmp_keydef.keysegs=1; tmp_keydef.flag= HA_UNIQUE_CHECK; - tmp_keydef.block_length= MI_KEY_BLOCK_LENGTH; + tmp_keydef.block_length= myisam_block_size; tmp_keydef.keylength= MI_UNIQUE_HASH_LENGTH + pointer; tmp_keydef.minlength=tmp_keydef.maxlength=tmp_keydef.keylength; tmp_keyseg.type= MI_UNIQUE_HASH_TYPE; diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c index 445e745b07d..65d245e64f9 100644 --- a/myisam/mi_delete.c +++ b/myisam/mi_delete.c @@ -196,7 +196,8 @@ static int d_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, DBUG_ENTER("d_search"); DBUG_DUMP("page",(byte*) anc_buff,mi_getint(anc_buff)); - flag=(*keyinfo->bin_search)(info,keyinfo,anc_buff,key,key_length,SEARCH_SAME, + flag=(*keyinfo->bin_search)(info,keyinfo,anc_buff,key, USE_WHOLE_KEY, + SEARCH_SAME, &keypos, lastkey, &last_key); if (flag == MI_FOUND_WRONG_KEY) { diff --git a/myisam/mi_delete_all.c b/myisam/mi_delete_all.c index 2c506da865f..6467246e779 100644 --- a/myisam/mi_delete_all.c +++ b/myisam/mi_delete_all.c @@ -43,7 +43,7 @@ int mi_delete_all_rows(MI_INFO *info) info->state->empty=info->state->key_empty=0; state->checksum=0; - for (i=share->base.max_key_block_length/MI_KEY_BLOCK_LENGTH ; i-- ; ) + for (i=share->base.max_key_block_length/MI_MIN_KEY_BLOCK_LENGTH ; i-- ; ) state->key_del[i]= HA_OFFSET_ERROR; for (i=0 ; i < share->base.keys ; i++) state->key_root[i]= HA_OFFSET_ERROR; diff --git a/myisam/mi_dynrec.c b/myisam/mi_dynrec.c index c9fe493744d..c07fa5aa080 100644 --- a/myisam/mi_dynrec.c +++ b/myisam/mi_dynrec.c @@ -1059,11 +1059,11 @@ int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, byte *buf) } while (left_length); info->update|= HA_STATE_AKTIV; /* We have a aktive record */ - VOID(_mi_writeinfo(info,0)); + fast_mi_writeinfo(info); DBUG_RETURN(_mi_rec_unpack(info,buf,info->rec_buff,block_info.rec_len) != MY_FILE_ERROR ? 0 : -1); } - VOID(_mi_writeinfo(info,0)); + fast_mi_writeinfo(info); DBUG_RETURN(-1); /* Wrong data to read */ panic: @@ -1393,8 +1393,7 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, } while (left_len); info->update|= HA_STATE_AKTIV | HA_STATE_KEY_CHANGED; - if (share->r_locks == 0 && share->w_locks == 0) - VOID(_mi_writeinfo(info,0)); + fast_mi_writeinfo(info); if (_mi_rec_unpack(info,buf,info->rec_buff,block_info.rec_len) != MY_FILE_ERROR) DBUG_RETURN(0); diff --git a/myisam/mi_info.c b/myisam/mi_info.c index 867718de326..c55707ea00c 100644 --- a/myisam/mi_info.c +++ b/myisam/mi_info.c @@ -45,7 +45,7 @@ int mi_status(MI_INFO *info, register MI_ISAMINFO *x, uint flag) { pthread_mutex_lock(&share->intern_lock); VOID(_mi_readinfo(info,F_RDLCK,0)); - VOID(_mi_writeinfo(info,0)); + fast_mi_writeinfo(info); pthread_mutex_unlock(&share->intern_lock); } if (flag & HA_STATUS_VARIABLE) diff --git a/myisam/mi_key.c b/myisam/mi_key.c index 9f4e2cb1524..67772c250ac 100644 --- a/myisam/mi_key.c +++ b/myisam/mi_key.c @@ -346,7 +346,7 @@ err: int _mi_read_key_record(MI_INFO *info, my_off_t filepos, byte *buf) { - VOID(_mi_writeinfo(info,0)); + fast_mi_writeinfo(info); if (filepos != HA_OFFSET_ERROR) { if (info->lastinx >= 0) diff --git a/myisam/mi_locking.c b/myisam/mi_locking.c index 8ef5db1d344..b8ffc300fa9 100644 --- a/myisam/mi_locking.c +++ b/myisam/mi_locking.c @@ -50,6 +50,7 @@ int mi_lock_database(MI_INFO *info, int lock_type) count= --share->r_locks; else count= --share->w_locks; + --share->tot_locks; if (info->lock_type == F_WRLCK && !share->w_locks && !share->delay_key_write && flush_key_blocks(share->kfile,FLUSH_KEEP)) { @@ -153,6 +154,7 @@ int mi_lock_database(MI_INFO *info, int lock_type) } VOID(_mi_test_if_changed(info)); share->r_locks++; + share->tot_locks++; info->lock_type=lock_type; break; case F_WRLCK: @@ -200,6 +202,7 @@ int mi_lock_database(MI_INFO *info, int lock_type) VOID(_mi_test_if_changed(info)); info->lock_type=lock_type; share->w_locks++; + share->tot_locks++; break; default: break; /* Impossible */ @@ -295,13 +298,12 @@ my_bool mi_check_status(void* param) int _mi_readinfo(register MI_INFO *info, int lock_type, int check_keybuffer) { - MYISAM_SHARE *share; DBUG_ENTER("_mi_readinfo"); - share=info->s; if (info->lock_type == F_UNLCK) { - if (!share->r_locks && !share->w_locks) + MYISAM_SHARE *share=info->s; + if (!share->tot_locks) { if ((info->tmp_lock_type=lock_type) != F_RDLCK) if (my_lock(share->kfile,lock_type,0L,F_TO_EOF, @@ -339,7 +341,7 @@ int _mi_writeinfo(register MI_INFO *info, uint operation) DBUG_ENTER("_mi_writeinfo"); error=0; - if (share->r_locks == 0 && share->w_locks == 0) + if (share->tot_locks == 0) { olderror=my_errno; /* Remember last error */ if (operation) diff --git a/myisam/mi_open.c b/myisam/mi_open.c index c34f2aa43f4..675dac38d41 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -217,7 +217,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) (mi_safe_mul(share->base.reclength, (ulonglong) 1 << (share->base.rec_reflength*8))-1); max_key_file_length= - mi_safe_mul(MI_KEY_BLOCK_LENGTH, + mi_safe_mul(MI_MIN_KEY_BLOCK_LENGTH, ((ulonglong) 1 << (share->base.key_reflength*8))-1); #if SIZEOF_OFF_T == 4 set_if_smaller(max_data_file_length, INT_MAX32); @@ -913,7 +913,7 @@ char *mi_keydef_read(char *ptr, MI_KEYDEF *keydef) keydef->keylength = mi_uint2korr(ptr); ptr +=2; keydef->minlength = mi_uint2korr(ptr); ptr +=2; keydef->maxlength = mi_uint2korr(ptr); ptr +=2; - keydef->block_size = keydef->block_length/MI_KEY_BLOCK_LENGTH-1; + keydef->block_size = keydef->block_length/MI_MIN_KEY_BLOCK_LENGTH-1; keydef->underflow_block_length=keydef->block_length/3; keydef->version = 0; /* Not saved */ return ptr; diff --git a/myisam/mi_page.c b/myisam/mi_page.c index f8e2a977754..d62970c7d98 100644 --- a/myisam/mi_page.c +++ b/myisam/mi_page.c @@ -64,9 +64,9 @@ int _mi_write_keypage(register MI_INFO *info, register MI_KEYDEF *keyinfo, #ifndef FAST /* Safety check */ if (page < info->s->base.keystart || page+keyinfo->block_length > info->state->key_file_length || - page & (myisam_block_size-1)) + (page & (MI_MIN_KEY_BLOCK_LENGTH-1))) { - DBUG_PRINT("error",("Trying to write outside key region: %lu", + DBUG_PRINT("error",("Trying to write inside key status region: %lu", (long) page)); my_errno=EINVAL; return(-1); diff --git a/myisam/mi_range.c b/myisam/mi_range.c index 038f9abc3a6..6bf3356e449 100644 --- a/myisam/mi_range.c +++ b/myisam/mi_range.c @@ -45,7 +45,7 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx, const byte *start_key, if ((inx = _mi_check_index(info,inx)) < 0) DBUG_RETURN(HA_POS_ERROR); - if (_mi_readinfo(info,F_RDLCK,1)) + if (fast_mi_readinfo(info)) DBUG_RETURN(HA_POS_ERROR); info->update&= (HA_STATE_CHANGED+HA_STATE_ROW_CHANGED); if (info->s->concurrent_insert) @@ -58,7 +58,7 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx, const byte *start_key, info->state->records+ (ha_rows) 1); if (info->s->concurrent_insert) rw_unlock(&info->s->key_root_lock[inx]); - VOID(_mi_writeinfo(info,0)); + fast_mi_writeinfo(info); if (start_pos == HA_POS_ERROR || end_pos == HA_POS_ERROR) DBUG_RETURN(HA_POS_ERROR); DBUG_PRINT("info",("records: %ld",(ulong) (end_pos-start_pos))); @@ -72,7 +72,7 @@ ha_rows mi_records_in_range(MI_INFO *info, int inx, const byte *start_key, static ha_rows _mi_record_pos(MI_INFO *info, const byte *key, uint key_len, enum ha_rkey_function search_flag) { - uint inx=(uint) info->lastinx; + uint inx=(uint) info->lastinx, nextflag; MI_KEYDEF *keyinfo=info->s->keyinfo+inx; uchar *key_buff; double pos; @@ -86,8 +86,12 @@ static ha_rows _mi_record_pos(MI_INFO *info, const byte *key, uint key_len, key_len=_mi_pack_key(info,inx,key_buff,(uchar*) key,key_len); DBUG_EXECUTE("key",_mi_print_key(DBUG_FILE,keyinfo->seg, (uchar*) key_buff,key_len);); + nextflag=myisam_read_vec[search_flag]; + if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST))) + key_len=USE_WHOLE_KEY; + pos=_mi_search_pos(info,keyinfo,key_buff,key_len, - myisam_read_vec[search_flag] | SEARCH_SAVE_BUFF, + nextflag | SEARCH_SAVE_BUFF, info->s->state.key_root[inx]); if (pos >= 0.0) { @@ -145,9 +149,9 @@ static double _mi_search_pos(register MI_INFO *info, ** Matches keynr+1 */ offset=1.0; /* Matches keynr+1 */ - if (nextflag & SEARCH_FIND && + if ((nextflag & SEARCH_FIND) && nod_flag && ((keyinfo->flag & (HA_NOSAME | HA_NULL_PART)) != HA_NOSAME || - key_len) && nod_flag) + key_len != USE_WHOLE_KEY)) { /* ** There may be identical keys in the tree. Try to match on of those. diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c index 0df390412b9..86547d3ef04 100644 --- a/myisam/mi_rkey.c +++ b/myisam/mi_rkey.c @@ -27,7 +27,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, { uchar *key_buff; MYISAM_SHARE *share=info->s; - uint pack_key_length; + uint pack_key_length, use_key_length, nextflag; DBUG_ENTER("mi_rkey"); DBUG_PRINT("enter",("base: %lx inx: %d search_flag: %d", info,inx,search_flag)); @@ -55,11 +55,17 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, bmove(key_buff,key,key_len); } - if (_mi_readinfo(info,F_RDLCK,1)) + if (fast_mi_readinfo(info)) goto err; if (share->concurrent_insert) rw_rdlock(&share->key_root_lock[inx]); - if (!_mi_search(info,info->s->keyinfo+inx,key_buff,pack_key_length, + + nextflag=myisam_read_vec[search_flag]; + use_key_length=pack_key_length; + if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST))) + use_key_length=USE_WHOLE_KEY; + + if (!_mi_search(info,info->s->keyinfo+inx,key_buff,use_key_length, myisam_read_vec[search_flag],info->s->state.key_root[inx])) { while (info->lastpos >= info->state->data_file_length) diff --git a/myisam/mi_rnext.c b/myisam/mi_rnext.c index f297740af60..6d135462f96 100644 --- a/myisam/mi_rnext.c +++ b/myisam/mi_rnext.c @@ -35,7 +35,7 @@ int mi_rnext(MI_INFO *info, byte *buf, int inx) if (info->lastpos == HA_OFFSET_ERROR && info->update & HA_STATE_PREV_FOUND) flag=0; /* Read first */ - if (_mi_readinfo(info,F_RDLCK,1)) + if (fast_mi_readinfo(info)) DBUG_RETURN(my_errno); if (info->s->concurrent_insert) rw_rdlock(&info->s->key_root_lock[inx]); @@ -51,7 +51,7 @@ int mi_rnext(MI_INFO *info, byte *buf, int inx) info->s->state.key_root[inx]); else error=_mi_search(info,info->s->keyinfo+inx,info->lastkey, - info->lastkey_length,flag, info->s->state.key_root[inx]); + USE_WHOLE_KEY,flag, info->s->state.key_root[inx]); if (!error) { diff --git a/myisam/mi_rnext_same.c b/myisam/mi_rnext_same.c index 0e172894cdf..44943ea9137 100644 --- a/myisam/mi_rnext_same.c +++ b/myisam/mi_rnext_same.c @@ -35,7 +35,7 @@ int mi_rnext_same(MI_INFO *info, byte *buf) DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX); keyinfo=info->s->keyinfo+inx; flag=SEARCH_BIGGER; /* Read next */ - if (_mi_readinfo(info,F_RDLCK,1)) + if (fast_mi_readinfo(info)) DBUG_RETURN(my_errno); memcpy(info->lastkey2,info->lastkey,info->last_rkey_length); diff --git a/myisam/mi_rprev.c b/myisam/mi_rprev.c index fff2d2257b6..4807e636252 100644 --- a/myisam/mi_rprev.c +++ b/myisam/mi_rprev.c @@ -36,7 +36,7 @@ int mi_rprev(MI_INFO *info, byte *buf, int inx) if (info->lastpos == HA_OFFSET_ERROR && info->update & HA_STATE_NEXT_FOUND) flag=0; /* Read last */ - if (_mi_readinfo(info,F_RDLCK,1)) + if (fast_mi_readinfo(info)) DBUG_RETURN(my_errno); changed=_mi_test_if_changed(info); if (share->concurrent_insert) @@ -50,7 +50,7 @@ int mi_rprev(MI_INFO *info, byte *buf, int inx) share->state.key_root[inx]); else error=_mi_search(info,share->keyinfo+inx,info->lastkey, - info->lastkey_length, flag, share->state.key_root[inx]); + USE_WHOLE_KEY, flag, share->state.key_root[inx]); if (!error) { diff --git a/myisam/mi_rsame.c b/myisam/mi_rsame.c index a4092b53c0b..511c247760e 100644 --- a/myisam/mi_rsame.c +++ b/myisam/mi_rsame.c @@ -41,7 +41,7 @@ int mi_rsame(MI_INFO *info, byte *record, int inx) info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED); /* Read row from data file */ - if (_mi_readinfo(info,F_RDLCK,1)) + if (fast_mi_readinfo(info)) DBUG_RETURN(my_errno); if (inx >= 0) @@ -51,7 +51,8 @@ int mi_rsame(MI_INFO *info, byte *record, int inx) info->lastpos); if (info->s->concurrent_insert) rw_rdlock(&info->s->key_root_lock[inx]); - VOID(_mi_search(info,info->s->keyinfo+inx,info->lastkey,0,SEARCH_SAME, + VOID(_mi_search(info,info->s->keyinfo+inx,info->lastkey, USE_WHOLE_KEY, + SEARCH_SAME, info->s->state.key_root[inx])); if (info->s->concurrent_insert) rw_unlock(&info->s->key_root_lock[inx]); diff --git a/myisam/mi_search.c b/myisam/mi_search.c index b0a0b06f499..49777498405 100644 --- a/myisam/mi_search.c +++ b/myisam/mi_search.c @@ -105,14 +105,15 @@ int _mi_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, } else { - if (nextflag & SEARCH_FIND && (!(keyinfo->flag & HA_NOSAME) - || key_len) && nod_flag) + if ((nextflag & SEARCH_FIND) && nod_flag && + ((keyinfo->flag & (HA_NOSAME | HA_NULL_PART)) != HA_NOSAME || + key_len != USE_WHOLE_KEY)) { if ((error=_mi_search(info,keyinfo,key,key_len,SEARCH_FIND, _mi_kpos(nod_flag,keypos))) >= 0 || my_errno != HA_ERR_KEY_NOT_FOUND) DBUG_RETURN(error); - info->last_keypage= HA_OFFSET_ERROR; /* Buffer not in memory */ + info->last_keypage= HA_OFFSET_ERROR; /* Buffer not in mem */ } } if (pos != info->last_keypage) @@ -281,8 +282,6 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, LINT_INIT(saved_vseg); t_buff[0]=0; /* Avoid bugs */ - if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST))) - key_len=USE_WHOLE_KEY; end= page+mi_getint(page); nod_flag=mi_test_if_nod(page); page+=2+nod_flag; @@ -475,11 +474,11 @@ my_off_t _mi_kpos(uint nod_flag, uchar *after_key) switch (nod_flag) { #if SIZEOF_OFF_T > 4 case 7: - return mi_uint7korr(after_key)*MI_KEY_BLOCK_LENGTH; + return mi_uint7korr(after_key)*MI_MIN_KEY_BLOCK_LENGTH; case 6: - return mi_uint6korr(after_key)*MI_KEY_BLOCK_LENGTH; + return mi_uint6korr(after_key)*MI_MIN_KEY_BLOCK_LENGTH; case 5: - return mi_uint5korr(after_key)*MI_KEY_BLOCK_LENGTH; + return mi_uint5korr(after_key)*MI_MIN_KEY_BLOCK_LENGTH; #else case 7: after_key++; @@ -489,13 +488,13 @@ my_off_t _mi_kpos(uint nod_flag, uchar *after_key) after_key++; #endif case 4: - return ((my_off_t) mi_uint4korr(after_key))*MI_KEY_BLOCK_LENGTH; + return ((my_off_t) mi_uint4korr(after_key))*MI_MIN_KEY_BLOCK_LENGTH; case 3: - return ((my_off_t) mi_uint3korr(after_key))*MI_KEY_BLOCK_LENGTH; + return ((my_off_t) mi_uint3korr(after_key))*MI_MIN_KEY_BLOCK_LENGTH; case 2: - return (my_off_t) (mi_uint2korr(after_key)*MI_KEY_BLOCK_LENGTH); + return (my_off_t) (mi_uint2korr(after_key)*MI_MIN_KEY_BLOCK_LENGTH); case 1: - return (uint) (*after_key)*MI_KEY_BLOCK_LENGTH; + return (uint) (*after_key)*MI_MIN_KEY_BLOCK_LENGTH; case 0: /* At leaf page */ default: /* Impossible */ return(HA_OFFSET_ERROR); @@ -507,7 +506,7 @@ my_off_t _mi_kpos(uint nod_flag, uchar *after_key) void _mi_kpointer(register MI_INFO *info, register uchar *buff, my_off_t pos) { - pos/=MI_KEY_BLOCK_LENGTH; + pos/=MI_MIN_KEY_BLOCK_LENGTH; switch (info->s->base.key_reflength) { #if SIZEOF_OFF_T > 4 case 7: mi_int7store(buff,pos); break; @@ -717,10 +716,7 @@ int _mi_key_cmp(register MI_KEYSEG *keyseg, register uchar *a, double d_1,d_2; uint next_key_length; - if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST))) - key_length=USE_WHOLE_KEY; *diff_pos=0; - for ( ; (int) key_length >0 ; key_length=next_key_length, keyseg++) { uchar *end; @@ -1452,7 +1448,7 @@ int _mi_search_next(register MI_INFO *info, register MI_KEYDEF *keyinfo, info->page_changed || (info->int_keytree_version != keyinfo->version && (info->int_nod_flag || info->buff_used))) - DBUG_RETURN(_mi_search(info,keyinfo,key,key_length, + DBUG_RETURN(_mi_search(info,keyinfo,key, USE_WHOLE_KEY, nextflag | SEARCH_SAVE_BUFF, pos)); if (info->buff_used) @@ -1465,17 +1461,17 @@ int _mi_search_next(register MI_INFO *info, register MI_KEYDEF *keyinfo, /* Last used buffer is in info->buff */ nod_flag=mi_test_if_nod(info->buff); - memcpy(lastkey,key,key_length); if (nextflag & SEARCH_BIGGER) /* Next key */ { my_off_t tmp_pos=_mi_kpos(nod_flag,info->int_keypos); if (tmp_pos != HA_OFFSET_ERROR) { - if ((error=_mi_search(info,keyinfo,key,key_length, + if ((error=_mi_search(info,keyinfo,key, USE_WHOLE_KEY, nextflag | SEARCH_SAVE_BUFF, tmp_pos)) <=0) DBUG_RETURN(error); } + memcpy(lastkey,key,key_length); if (!(info->lastkey_length=(*keyinfo->get_key)(keyinfo,nod_flag, &info->int_keypos,lastkey))) DBUG_RETURN(-1); @@ -1489,12 +1485,14 @@ int _mi_search_next(register MI_INFO *info, register MI_KEYDEF *keyinfo, if (!info->int_keypos) DBUG_RETURN(-1); if (info->int_keypos == info->buff+2) - DBUG_RETURN(_mi_search(info,keyinfo,key,key_length, + DBUG_RETURN(_mi_search(info,keyinfo,key, USE_WHOLE_KEY, nextflag | SEARCH_SAVE_BUFF, pos)); - if ((error=_mi_search(info,keyinfo,key,0,nextflag | SEARCH_SAVE_BUFF, + if ((error=_mi_search(info,keyinfo,key, USE_WHOLE_KEY, + nextflag | SEARCH_SAVE_BUFF, _mi_kpos(nod_flag,info->int_keypos))) <= 0) DBUG_RETURN(error); + /* QQ: We should be able to optimize away the following call */ if (! _mi_get_last_key(info,keyinfo,info->buff,lastkey, info->int_keypos,&info->lastkey_length)) DBUG_RETURN(-1); diff --git a/myisam/mi_static.c b/myisam/mi_static.c index 389aac3142a..43e21340f5f 100644 --- a/myisam/mi_static.c +++ b/myisam/mi_static.c @@ -40,7 +40,7 @@ my_bool myisam_concurrent_insert=0; #endif my_off_t myisam_max_extra_temp_length= MI_MAX_TEMP_LENGTH; my_off_t myisam_max_temp_length= MAX_FILE_SIZE; -uint myisam_bulk_insert_tree_size=8192*1024; +ulong myisam_bulk_insert_tree_size=8192*1024; /* read_vec[] is used for converting between P_READ_KEY.. and SEARCH_ */ /* Position is , == , >= , <= , > , < */ diff --git a/myisam/mi_statrec.c b/myisam/mi_statrec.c index e0fce6d3e1c..2712c125f4e 100644 --- a/myisam/mi_statrec.c +++ b/myisam/mi_statrec.c @@ -181,8 +181,7 @@ int _mi_read_static_record(register MI_INFO *info, register my_off_t pos, error=my_pread(info->dfile,(char*) record,info->s->base.reclength, pos,MYF(MY_NABP)) != 0; - if (info->s->r_locks == 0 && info->s->w_locks == 0) - VOID(_mi_writeinfo(info,0)); + fast_mi_writeinfo(info); if (! error) { if (!*record) @@ -195,7 +194,7 @@ int _mi_read_static_record(register MI_INFO *info, register my_off_t pos, } return(-1); /* Error on read */ } - VOID(_mi_writeinfo(info,0)); /* No such record */ + fast_mi_writeinfo(info); /* No such record */ return(-1); } @@ -257,7 +256,7 @@ int _mi_read_rnd_static_record(MI_INFO *info, byte *buf, DBUG_PRINT("test",("filepos: %ld (%ld) records: %ld del: %ld", filepos/share->base.reclength,filepos, info->state->records, info->state->del)); - VOID(_mi_writeinfo(info,0)); + fast_mi_writeinfo(info); DBUG_RETURN(my_errno=HA_ERR_END_OF_FILE); } info->lastpos= filepos; diff --git a/myisam/mi_test2.c b/myisam/mi_test2.c index b66b02afdf9..cb60aeb8618 100644 --- a/myisam/mi_test2.c +++ b/myisam/mi_test2.c @@ -343,68 +343,72 @@ int main(int argc, char *argv[]) } if (testflag==3) goto end; - if (!silent) - printf("- Same key: first - next -> last - prev -> first\n"); - DBUG_PRINT("progpos",("first - next -> last - prev -> first")); for (i=999, dupp_keys=j=0 ; i>0 ; i--) { - if (key1[i] >dupp_keys) { dupp_keys=key1[i]; j=i; } + if (key1[i] > dupp_keys) { dupp_keys=key1[i]; j=i; } } sprintf(key,"%6d",j); - if (verbose) printf(" Using key: \"%s\" Keys: %d\n",key,dupp_keys); - if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT)) goto err; - if (mi_rsame(file,read_record2,-1)) goto err; - if (memcmp(read_record,read_record2,reclength) != 0) - { - printf("mi_rsame didn't find same record\n"); - goto end; - } - info.recpos=mi_position(file); - if (mi_rfirst(file,read_record2,0) || - mi_rsame_with_pos(file,read_record2,0,info.recpos) || - memcmp(read_record,read_record2,reclength) != 0) + if (dupp_keys) { - printf("mi_rsame_with_pos didn't find same record\n"); - goto end; - } - { - int skr=mi_rnext(file,read_record2,0); - if ((skr && my_errno != HA_ERR_END_OF_FILE) || - mi_rprev(file,read_record2,-1) || + if (!silent) + printf("- Same key: first - next -> last - prev -> first\n"); + DBUG_PRINT("progpos",("first - next -> last - prev -> first")); + if (verbose) printf(" Using key: \"%s\" Keys: %d\n",key,dupp_keys); + + if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT)) goto err; + if (mi_rsame(file,read_record2,-1)) goto err; + if (memcmp(read_record,read_record2,reclength) != 0) + { + printf("mi_rsame didn't find same record\n"); + goto end; + } + info.recpos=mi_position(file); + if (mi_rfirst(file,read_record2,0) || + mi_rsame_with_pos(file,read_record2,0,info.recpos) || memcmp(read_record,read_record2,reclength) != 0) { - printf("mi_rsame_with_pos lost position\n"); + printf("mi_rsame_with_pos didn't find same record\n"); + goto end; + } + { + int skr=mi_rnext(file,read_record2,0); + if ((skr && my_errno != HA_ERR_END_OF_FILE) || + mi_rprev(file,read_record2,-1) || + memcmp(read_record,read_record2,reclength) != 0) + { + printf("mi_rsame_with_pos lost position\n"); + goto end; + } + } + ant=1; + start=keyinfo[0].seg[0].start; length=keyinfo[0].seg[0].length; + while (mi_rnext(file,read_record2,0) == 0 && + memcmp(read_record2+start,key,length) == 0) ant++; + if (ant != dupp_keys) + { + printf("next: Found: %d keys of %d\n",ant,dupp_keys); + goto end; + } + ant=0; + while (mi_rprev(file,read_record3,0) == 0 && + bcmp(read_record3+start,key,length) == 0) ant++; + if (ant != dupp_keys) + { + printf("prev: Found: %d records of %d\n",ant,dupp_keys); goto end; } - } - ant=1; - start=keyinfo[0].seg[0].start; length=keyinfo[0].seg[0].length; - while (mi_rnext(file,read_record2,0) == 0 && - memcmp(read_record2+start,key,length) == 0) ant++; - if (ant != dupp_keys) - { - printf("next: Found: %d keys of %d\n",ant,dupp_keys); - goto end; - } - ant=0; - while (mi_rprev(file,read_record3,0) == 0 && - bcmp(read_record3+start,key,length) == 0) ant++; - if (ant != dupp_keys) - { - printf("prev: Found: %d records of %d\n",ant,dupp_keys); - goto end; - } - /* Check of mi_rnext_same */ - if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT)) - goto err; - ant=1; - while (!mi_rnext_same(file,read_record3) && ant < dupp_keys+10) - ant++; - if (ant != dupp_keys || my_errno != HA_ERR_END_OF_FILE) - { - printf("mi_rnext_same: Found: %d records of %d\n",ant,dupp_keys); - goto end; + /* Check of mi_rnext_same */ + if (mi_rkey(file,read_record,0,key,0,HA_READ_KEY_EXACT)) + goto err; + ant=1; + while (!mi_rnext_same(file,read_record3) && ant < dupp_keys+10) + ant++; + if (ant != dupp_keys || my_errno != HA_ERR_END_OF_FILE) + { + printf("mi_rnext_same: Found: %d records of %d\n",ant,dupp_keys); + goto end; + } } if (!silent) @@ -776,9 +780,13 @@ end: printf("\nFollowing test have been made:\n"); printf("Write records: %d\nUpdate records: %d\nSame-key-read: %d\nDelete records: %d\n", write_count,update,dupp_keys,opt_delete); if (rec_pointer_size) - printf("Record pointer size: %d\n",rec_pointer_size); + printf("Record pointer size: %d\n",rec_pointer_size); + printf("myisam_block_size: %u\n", myisam_block_size); if (key_cacheing) + { puts("Key cacheing used"); + printf("key_cache_block_size: %u\n", key_cache_block_size); + } if (write_cacheing) puts("Write cacheing used"); if (write_cacheing) @@ -801,7 +809,7 @@ reads: %10lu\n", end_key_cache(); if (blob_buffer) my_free(blob_buffer,MYF(0)); - my_end(MY_CHECK_ERROR | MY_GIVE_INFO); + my_end(silent ? MY_CHECK_ERROR : MY_CHECK_ERROR | MY_GIVE_INFO); return(0); err: printf("got error: %d when using MyISAM-database\n",my_errno); @@ -861,7 +869,29 @@ static void get_options(int argc, char **argv) verbose=1; break; case 'm': /* records */ - recant=atoi(++pos); + if ((recant=atoi(++pos)) < 10) + { + fprintf(stderr,"record count must be >= 10\n"); + exit(1); + } + break; + case 'e': /* myisam_block_length */ + if ((myisam_block_size=atoi(++pos)) < MI_MIN_KEY_BLOCK_LENGTH || + myisam_block_size > MI_MAX_KEY_BLOCK_LENGTH) + { + fprintf(stderr,"Wrong myisam_block_length\n"); + exit(1); + } + myisam_block_size=1 << my_bit_log2(myisam_block_size); + break; + case 'E': /* myisam_block_length */ + if ((key_cache_block_size=atoi(++pos)) < MI_MIN_KEY_BLOCK_LENGTH || + key_cache_block_size > MI_MAX_KEY_BLOCK_LENGTH) + { + fprintf(stderr,"Wrong key_cache_block_size\n"); + exit(1); + } + key_cache_block_size=1 << my_bit_log2(key_cache_block_size); break; case 'f': if ((first_key=atoi(++pos)) < 0 || first_key >= MYISAM_KEYS) @@ -904,7 +934,7 @@ static void get_options(int argc, char **argv) case 'V': printf("%s Ver 1.2 for %s at %s\n",progname,SYSTEM_TYPE,MACHINE_TYPE); puts("By Monty, for your professional use\n"); - printf("Usage: %s [-?AbBcDIKLPRqSsVWltv] [-k#] [-f#] [-m#] [-t#]\n", + printf("Usage: %s [-?AbBcDIKLPRqSsVWltv] [-k#] [-f#] [-m#] [-e#] [-E#] [-t#]\n", progname); exit(0); case '#': diff --git a/myisam/mi_test_all.res b/myisam/mi_test_all.res index d6b4703d702..94355bf1aa2 100644 --- a/myisam/mi_test_all.res +++ b/myisam/mi_test_all.res @@ -1,48 +1,50 @@ -Maximum memory usage: 545477 bytes (533k) -Maximum memory usage: 545477 bytes (533k) -Maximum memory usage: 545369 bytes (533k) -mi_test2-i686 -s -L -K -R1 -m2000 ; Should give error 135 +mi_test2 -s -L -K -R1 -m2000 ; Should give error 135 Error: 135 in write at record: 1105 got error: 135 when using MyISAM-database -Maximum memory usage: 29439 bytes (29k) -Maximum memory usage: 66541 bytes (65k) -Maximum memory usage: 5101 bytes (5k) -Maximum memory usage: 545488 bytes (533k) +myisamchk: MyISAM file test2 +myisamchk: warning: Datafile is almost full, 65532 of 65534 used +MyISAM-table 'test2' is usable but should be fixed Commands Used count Errors Recover errors -open 1 0 0 -write 50 0 0 -update 5 0 0 -delete 50 0 0 -close 1 0 0 -extra 6 0 0 -Total 113 0 0 -Maximum memory usage: 545744 bytes (533k) +open 17 0 0 +write 850 0 0 +update 85 0 0 +delete 850 0 0 +close 17 0 0 +extra 102 0 0 +Total 1921 0 0 Commands Used count Errors Recover errors -open 2 0 0 -write 100 0 0 -update 10 0 0 -delete 100 0 0 -close 2 0 0 -extra 12 0 0 -Total 226 0 0 -Maximum memory usage: 5101 bytes (5k) -1.12user 0.52system 0:01.71elapsed 95%CPU (0avgtext+0avgdata 0maxresident)k -0inputs+0outputs (214major+25minor)pagefaults 0swaps -Maximum memory usage: 21189 bytes (21k) -1.29user 0.55system 0:01.82elapsed 101%CPU (0avgtext+0avgdata 0maxresident)k -0inputs+0outputs (215major+29minor)pagefaults 0swaps -Maximum memory usage: 66541 bytes (65k) -1.10user 0.51system 0:01.66elapsed 96%CPU (0avgtext+0avgdata 0maxresident)k -0inputs+0outputs (216major+40minor)pagefaults 0swaps -Maximum memory usage: 82629 bytes (81k) -1.33user 0.24system 0:01.54elapsed 101%CPU (0avgtext+0avgdata 0maxresident)k -0inputs+0outputs (216major+44minor)pagefaults 0swaps -Maximum memory usage: 545477 bytes (533k) -1.31user 0.24system 0:01.55elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k -0inputs+0outputs (216major+173minor)pagefaults 0swaps -Maximum memory usage: 545389 bytes (533k) -1.37user 0.18system 0:01.57elapsed 98%CPU (0avgtext+0avgdata 0maxresident)k -0inputs+0outputs (218major+180minor)pagefaults 0swaps -Maximum memory usage: 109165 bytes (107k) -1.42user 0.38system 0:01.78elapsed 101%CPU (0avgtext+0avgdata 0maxresident)k -0inputs+0outputs (218major+51minor)pagefaults 0swaps +open 18 0 0 +write 900 0 0 +update 90 0 0 +delete 900 0 0 +close 18 0 0 +extra 108 0 0 +Total 2034 0 0 + +real 0m1.054s +user 0m0.410s +sys 0m0.640s + +real 0m1.077s +user 0m0.550s +sys 0m0.530s + +real 0m1.100s +user 0m0.420s +sys 0m0.680s + +real 0m0.783s +user 0m0.590s +sys 0m0.200s + +real 0m0.764s +user 0m0.560s +sys 0m0.210s + +real 0m0.699s +user 0m0.570s +sys 0m0.130s + +real 0m0.991s +user 0m0.630s +sys 0m0.350s diff --git a/myisam/mi_test_all.sh b/myisam/mi_test_all.sh index ccc9c39c64e..a2d57ea1a83 100755 --- a/myisam/mi_test_all.sh +++ b/myisam/mi_test_all.sh @@ -66,6 +66,14 @@ myisamchk$suffix -rs test1 myisamchk$suffix -se test1 myisamchk$suffix -rqs test1 myisamchk$suffix -se test1 +myisamchk$suffix -rs --correct-checksum test1 +myisamchk$suffix -se test1 +myisamchk$suffix -rqs --correct-checksum test1 +myisamchk$suffix -se test1 +myisamchk$suffix -ros --correct-checksum test1 +myisamchk$suffix -se test1 +myisamchk$suffix -rqos --correct-checksum test1 +myisamchk$suffix -se test1 # check of myisampack / myisamchk myisampack$suffix --force -s test1 @@ -105,13 +113,25 @@ mi_test1$suffix $silent --key_multiple -P -S myisamchk$suffix -sm test1 mi_test2$suffix $silent -L -K -W -P +myisamchk$suffix -sm test2 mi_test2$suffix $silent -L -K -W -P -A +myisamchk$suffix -sm test2 mi_test2$suffix $silent -L -K -W -P -S -R1 -m500 echo "mi_test2$suffix $silent -L -K -R1 -m2000 ; Should give error 135" +myisamchk$suffix -sm test2 mi_test2$suffix $silent -L -K -R1 -m2000 +myisamchk$suffix -sm test2 mi_test2$suffix $silent -L -K -P -S -R3 -m50 -b1000000 +myisamchk$suffix -sm test2 mi_test2$suffix $silent -L -B +myisamchk$suffix -sm test2 mi_test2$suffix $silent -D -B -c +myisamchk$suffix -sm test2 +mi_test2$suffix $silent -m10000 -e8192 -K +myisamchk$suffix -sm test2 +mi_test2$suffix $silent -m10000 -e16384 -E16384 -K -L +myisamchk$suffix -sm test2 + mi_test2$suffix $silent -L -K -W -P -m50 -l myisamlog$suffix mi_test2$suffix $silent -L -K -W -P -m50 -l -b100 diff --git a/myisam/mi_write.c b/myisam/mi_write.c index 322b0755015..5c6db053829 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -291,7 +291,7 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, my_bool insert_last) { int error,flag; - uint comp_flag,nod_flag; + uint comp_flag,nod_flag, search_key_length; uchar *temp_buff,*keypos; uchar keybuff[MI_MAX_KEY_BUFF]; my_bool was_last_key; @@ -299,10 +299,14 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, DBUG_ENTER("w_search"); DBUG_PRINT("enter",("page: %ld",page)); + search_key_length=USE_WHOLE_KEY; if (keyinfo->flag & HA_SORT_ALLOWS_SAME) comp_flag=SEARCH_BIGGER; /* Put after same key */ else if (keyinfo->flag & HA_NOSAME) + { comp_flag=SEARCH_FIND | SEARCH_UPDATE; /* No dupplicates */ + search_key_length= key_length; + } else comp_flag=SEARCH_SAME; /* Keys in rec-pos order */ @@ -312,8 +316,8 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, if (!_mi_fetch_keypage(info,keyinfo,page,temp_buff,0)) goto err; - flag=(*keyinfo->bin_search)(info,keyinfo,temp_buff,key,key_length,comp_flag, - &keypos, keybuff, &was_last_key); + flag=(*keyinfo->bin_search)(info,keyinfo,temp_buff,key,search_key_length, + comp_flag, &keypos, keybuff, &was_last_key); nod_flag=mi_test_if_nod(temp_buff); if (flag == 0) { diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 319539b44d4..b4c9e2f0fd6 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -40,6 +40,7 @@ static char **default_argv; static const char *load_default_groups[]= { "myisamchk", 0 }; static const char *set_charset_name; static CHARSET_INFO *set_charset; +static long opt_myisam_block_size; static const char *type_names[]= { "?","char","binary", "short", "long", "float", @@ -141,6 +142,9 @@ int main(int argc, char **argv) static CHANGEABLE_VAR changeable_vars[] = { { "key_buffer_size",(long*) &check_param.use_buffers,(long) USE_BUFFER_INIT, (long) MALLOC_OVERHEAD, (long) ~0L,(long) MALLOC_OVERHEAD,(long) IO_SIZE }, + { "myisam_block_size", (long*) &opt_myisam_block_size, + MI_KEY_BLOCK_LENGTH, MI_MIN_KEY_BLOCK_LENGTH, MI_MAX_KEY_BLOCK_LENGTH, + 0, MI_MIN_KEY_BLOCK_LENGTH }, { "read_buffer_size", (long*) &check_param.read_buffer_length,(long) READ_BUFFER_INIT, (long) MALLOC_OVERHEAD,(long) ~0L,(long) MALLOC_OVERHEAD,(long) 1L }, { "write_buffer_size", (long*) &check_param.write_buffer_length,(long) READ_BUFFER_INIT, @@ -159,7 +163,10 @@ static CHANGEABLE_VAR changeable_vars[] = { 20, 4, HA_FT_MAXLEN, 0, 1 }, { NullS,(long*) 0,0L,0L,0L,0L,0L,} }; -enum options {OPT_CHARSETS_DIR=256, OPT_SET_CHARSET,OPT_START_CHECK_POS}; +enum options { + OPT_CHARSETS_DIR=256, OPT_SET_CHARSET,OPT_START_CHECK_POS, + OPT_CORRECT_CHECKSUM +}; static struct option long_options[] = @@ -167,9 +174,10 @@ static struct option long_options[] = {"analyze", no_argument, 0, 'a'}, {"block-search", required_argument,0, 'b'}, {"backup", no_argument, 0, 'B'}, - {"character-sets-dir",required_argument,0, OPT_CHARSETS_DIR}, + {"character-sets-dir",required_argument,0, OPT_CHARSETS_DIR}, {"check", no_argument, 0, 'c'}, {"check-only-changed",no_argument, 0, 'C'}, + {"correct-checksum", no_argument, 0, OPT_CORRECT_CHECKSUM}, #ifndef DBUG_OFF {"debug", optional_argument, 0, '#'}, #endif @@ -205,7 +213,7 @@ static struct option long_options[] = static void print_version(void) { - printf("%s Ver 1.51 for %s at %s\n",my_progname,SYSTEM_TYPE, + printf("%s Ver 1.52 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE); } @@ -248,6 +256,7 @@ static void usage(void) puts("Repair options (When using -r or -o) \n\ -B, --backup Make a backup of the .MYD file as 'filename-time.BAK'\n\ + --correct-checksum Correct checksum information for table. \n\ -D, --data-file-length=# Max length of data file (when recreating data\n\ file when it's full)\n\ -e, --extend-check Try to recover every possible row from the data file\n\ @@ -433,6 +442,9 @@ static void get_options(register int *argc,register char ***argv) case 'V': print_version(); exit(0); + case OPT_CORRECT_CHECKSUM: + check_param.testflag|=T_CALC_CHECKSUM; + break; case OPT_CHARSETS_DIR: charsets_dir = optarg; break; @@ -449,6 +461,11 @@ static void get_options(register int *argc,register char ***argv) exit(0); } } + /* If using repair, then update checksum if one uses --update-state */ + if ((check_param.testflag & T_UPDATE_STATE) && + (check_param.testflag & (T_REP | T_REP_BY_SORT))) + check_param.testflag|= T_CALC_CHECKSUM; + (*argc)-=optind; (*argv)+=optind; if (*argc == 0) @@ -456,6 +473,7 @@ static void get_options(register int *argc,register char ***argv) usage(); exit(-1); } + if ((check_param.testflag & T_UNPACK) && (check_param.opt_rep_quick || (check_param.testflag & T_SORT_RECORDS))) { @@ -479,6 +497,7 @@ static void get_options(register int *argc,register char ***argv) if (!(set_charset=get_charset_by_name(set_charset_name, MYF(MY_WME)))) exit(1); + myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size); return; } /* get options */ @@ -605,7 +624,8 @@ static int myisamchk(MI_CHECK *param, my_string filename) (((ulonglong) 1L << share->base.keys)-1)) || test_if_almost_full(info) || info->s->state.header.file_version[3] != myisam_file_magic[3] || - (set_charset && set_charset->number != share->state.header.language))) + (set_charset && set_charset->number != share->state.header.language) || + myisam_block_size != MI_KEY_BLOCK_LENGTH)) { if (set_charset) check_param.language=set_charset->number; diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h index a2a30ae50ce..33837dfda00 100644 --- a/myisam/myisamdef.h +++ b/myisam/myisamdef.h @@ -173,7 +173,7 @@ typedef struct st_mi_isam_share { /* Shared between opens */ File data_file; /* Shared data file */ int mode; /* mode of file on open */ uint reopen; /* How many times reopened */ - uint w_locks,r_locks; /* Number of read/write locks */ + uint w_locks,r_locks,tot_locks; /* Number of read/write locks */ uint blocksize; /* blocksize of keyfile */ ulong min_pack_length; /* Theese are used by packed data */ ulong max_pack_length; @@ -365,10 +365,8 @@ struct st_myisam_info { #define PACK_TYPE_ZERO_FILL 4 #define MI_FOUND_WRONG_KEY 32738 /* Impossible value from _mi_key_cmp */ -#define MI_KEY_BLOCK_LENGTH 1024 /* Min key block length */ -#define MI_MAX_KEY_BLOCK_LENGTH 8192 -#define MI_MAX_KEY_BLOCK_SIZE (MI_MAX_KEY_BLOCK_LENGTH/MI_KEY_BLOCK_LENGTH) -#define MI_BLOCK_SIZE(key_length,data_pointer,key_pointer) ((((key_length+data_pointer+key_pointer)*4+key_pointer+2)/MI_KEY_BLOCK_LENGTH+1)*MI_KEY_BLOCK_LENGTH) +#define MI_MAX_KEY_BLOCK_SIZE (MI_MAX_KEY_BLOCK_LENGTH/MI_MIN_KEY_BLOCK_LENGTH) +#define MI_BLOCK_SIZE(key_length,data_pointer,key_pointer) ((((key_length+data_pointer+key_pointer)*4+key_pointer+2)/myisam_block_size+1)*myisam_block_size) #define MI_MAX_KEYPTR_SIZE 5 /* For calculating block lengths */ #define MI_MIN_KEYBLOCK_LENGTH 50 /* When to split delete blocks */ @@ -589,6 +587,9 @@ enum myisam_log_commands { #define myisam_log_command(a,b,c,d,e) if (myisam_log_file >= 0) _myisam_log_command(a,b,c,d,e) #define myisam_log_record(a,b,c,d,e) if (myisam_log_file >= 0) _myisam_log_record(a,b,c,d,e) +#define fast_mi_writeinfo(INFO) if (!(INFO)->s->tot_locks) (void) _mi_writeinfo((INFO),0) +#define fast_mi_readinfo(INFO) (!(INFO)->lock_type == F_UNLCK) && _mi_readinfo((INFO),F_RDLCK,1) + #ifdef __cplusplus extern "C" { #endif diff --git a/myisam/myisamlog.c b/myisam/myisamlog.c index fb199c22765..2d4c7570956 100644 --- a/myisam/myisamlog.c +++ b/myisam/myisamlog.c @@ -404,11 +404,7 @@ static int examine_log(my_string file_name, char **table_names) } to=isam_file_name; if (filepath) - { - strmov(isam_file_name,filepath); - convert_dirname(isam_file_name); - to=strend(isam_file_name); - } + to=convert_dirname(isam_file_name,filepath,NullS); strmov(to,pos); fn_ext(isam_file_name)[0]=0; /* Remove extension */ } diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 9408198400f..a19c5e4d88e 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -284,7 +284,7 @@ static void usage(void) -?, --help Display this help and exit.\n\ -V, --version Output version information and exit."); print_defaults("my",load_default_groups); -}; +} /* reads options */ /* Initiates DEBUG - but no debugging here ! */ diff --git a/myisammrg/Makefile.am b/myisammrg/Makefile.am index b09d7d70191..5355534eb77 100644 --- a/myisammrg/Makefile.am +++ b/myisammrg/Makefile.am @@ -16,12 +16,12 @@ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include pkglib_LIBRARIES = libmyisammrg.a -noinst_HEADERS = mymrgdef.h +noinst_HEADERS = myrg_def.h libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \ myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \ myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \ myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \ - myrg_rprev.c myrg_queue.c + myrg_rprev.c myrg_queue.c myrg_write.c OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ __math.h time.h __time.h unistd.h __unistd.h types.h \ xtypes.h ac-types.h posix.h string.h __string.h \ diff --git a/myisammrg/myrg_close.c b/myisammrg/myrg_close.c index 7ab73c5ded4..8ac1c4d8005 100644 --- a/myisammrg/myrg_close.c +++ b/myisammrg/myrg_close.c @@ -16,7 +16,7 @@ /* close a isam-database */ -#include "mymrgdef.h" +#include "myrg_def.h" int myrg_close(MYRG_INFO *info) { diff --git a/myisammrg/myrg_create.c b/myisammrg/myrg_create.c index 113831b9d7f..c320a595e80 100644 --- a/myisammrg/myrg_create.c +++ b/myisammrg/myrg_create.c @@ -16,14 +16,15 @@ /* Create a MYMERGE_-file */ -#include "mymrgdef.h" +#include "myrg_def.h" /* create file named 'name' and save filenames in it table_names should be NULL or a vector of string-pointers with a NULL-pointer last */ -int myrg_create(const char *name, const char **table_names, my_bool fix_names) +int myrg_create(const char *name, const char **table_names, + uint insert_method, my_bool fix_names) { int save_errno; uint errpos; @@ -50,6 +51,13 @@ int myrg_create(const char *name, const char **table_names, my_bool fix_names) goto err; } } + if (insert_method != MERGE_INSERT_DISABLED) + { + end=strxmov(buff,"#INSERT_METHOD=", + get_type(&merge_insert_method,insert_method-1),"\n",NullS); + if (my_write(file,buff,(uint) (end-buff),MYF(MY_WME | MY_NABP))) + goto err; + } if (my_close(file,MYF(0))) goto err; DBUG_RETURN(0); diff --git a/myisammrg/mymrgdef.h b/myisammrg/myrg_def.h index aae1d07cd64..aae1d07cd64 100644 --- a/myisammrg/mymrgdef.h +++ b/myisammrg/myrg_def.h diff --git a/myisammrg/myrg_delete.c b/myisammrg/myrg_delete.c index 9ac32655172..4085c435416 100644 --- a/myisammrg/myrg_delete.c +++ b/myisammrg/myrg_delete.c @@ -16,7 +16,7 @@ /* Delete last read record */ -#include "mymrgdef.h" +#include "myrg_def.h" int myrg_delete( MYRG_INFO *info, diff --git a/myisammrg/myrg_extra.c b/myisammrg/myrg_extra.c index c8a634e748f..315abe0f29e 100644 --- a/myisammrg/myrg_extra.c +++ b/myisammrg/myrg_extra.c @@ -20,7 +20,7 @@ record-cache-flags are set in myrg_rrnd when we are changing database. */ -#include "mymrgdef.h" +#include "myrg_def.h" int myrg_extra(MYRG_INFO *info,enum ha_extra_function function) { diff --git a/myisammrg/myrg_info.c b/myisammrg/myrg_info.c index 8ca830339b9..14bc228cc1f 100644 --- a/myisammrg/myrg_info.c +++ b/myisammrg/myrg_info.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mymrgdef.h" +#include "myrg_def.h" ulonglong myrg_position(MYRG_INFO *info) { diff --git a/myisammrg/myrg_locking.c b/myisammrg/myrg_locking.c index c89acca3918..70eb2c94d13 100644 --- a/myisammrg/myrg_locking.c +++ b/myisammrg/myrg_locking.c @@ -18,7 +18,7 @@ Lock databases against read or write. */ -#include "mymrgdef.h" +#include "myrg_def.h" int myrg_lock_database( MYRG_INFO *info, diff --git a/myisammrg/myrg_open.c b/myisammrg/myrg_open.c index 9fa89b315ff..c5f1330d3e4 100644 --- a/myisammrg/myrg_open.c +++ b/myisammrg/myrg_open.c @@ -14,26 +14,23 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* open a MYMERGE_-database */ +/* open a MyISAM MERGE table */ -#include "mymrgdef.h" +#include "myrg_def.h" #include <stddef.h> #include <errno.h> #ifdef VMS #include "mrg_static.c" #endif -/* open a MYMERGE_-database. - +/* + open a MyISAM MERGE table if handle_locking is 0 then exit with error if some database is locked if handle_locking is 1 then wait if database is locked */ -MYRG_INFO *myrg_open( -const char *name, -int mode, -int handle_locking) +MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) { int save_errno,i,errpos; uint files,dir_length,length,options; @@ -63,25 +60,34 @@ int handle_locking) { if ((end=buff+length)[-1] == '\n') end[-1]='\0'; - if (buff[0] && buff[0] != '#') /* Skipp empty lines and comments */ + if (!buff[0]) + continue; /* Skip empty lines */ + if (buff[0] == '#') { - if (!test_if_hard_path(buff)) - { - VOID(strmake(name_buff+dir_length,buff, - sizeof(name_buff)-1-dir_length)); - VOID(cleanup_dirname(buff,name_buff)); + if( !strncmp(buff+1,"INSERT_METHOD=",14)) + { /* Lookup insert method */ + int tmp=find_type(buff+15,&merge_insert_method,2); + info.merge_insert_method = (uint) (tmp >= 0 ? tmp : 0); } - if (!(isam=mi_open(buff,mode,test(handle_locking)))) - goto err; - files++; - last_isam=isam; - if (info.reclength && info.reclength != isam->s->base.reclength) - { - my_errno=HA_ERR_WRONG_IN_RECORD; + continue; /* Skip comments */ + } + + if (!test_if_hard_path(buff)) + { + VOID(strmake(name_buff+dir_length,buff, + sizeof(name_buff)-1-dir_length)); + VOID(cleanup_dirname(buff,name_buff)); + } + if (!(isam=mi_open(buff,mode,test(handle_locking)))) goto err; - } - info.reclength=isam->s->base.reclength; + files++; + last_isam=isam; + if (info.reclength && info.reclength != isam->s->base.reclength) + { + my_errno=HA_ERR_WRONG_IN_RECORD; + goto err; } + info.reclength=isam->s->base.reclength; } if (!(m_info= (MYRG_INFO*) my_malloc(sizeof(MYRG_INFO)+ files*sizeof(MYRG_TABLE), diff --git a/myisammrg/myrg_panic.c b/myisammrg/myrg_panic.c index 99a1f6828d1..67d2ee8bb19 100644 --- a/myisammrg/myrg_panic.c +++ b/myisammrg/myrg_panic.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mymrgdef.h" +#include "myrg_def.h" /* if flag == HA_PANIC_CLOSE then all misam files are closed */ /* if flag == HA_PANIC_WRITE then all misam files are unlocked and diff --git a/myisammrg/myrg_queue.c b/myisammrg/myrg_queue.c index d6f831db48c..b4f729fc2cf 100644 --- a/myisammrg/myrg_queue.c +++ b/myisammrg/myrg_queue.c @@ -16,7 +16,7 @@ /* Read record based on a key */ -#include "mymrgdef.h" +#include "myrg_def.h" static int queue_key_cmp(void *keyseg, byte *a, byte *b) { diff --git a/myisammrg/myrg_rfirst.c b/myisammrg/myrg_rfirst.c index 0625e848660..2ee9c015a84 100644 --- a/myisammrg/myrg_rfirst.c +++ b/myisammrg/myrg_rfirst.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mymrgdef.h" +#include "myrg_def.h" /* Read first row according to specific key */ diff --git a/myisammrg/myrg_rkey.c b/myisammrg/myrg_rkey.c index cd2c73c8ec2..ba042352a51 100644 --- a/myisammrg/myrg_rkey.c +++ b/myisammrg/myrg_rkey.c @@ -27,7 +27,7 @@ */ -#include "mymrgdef.h" +#include "myrg_def.h" /* todo: we could store some additional info to speedup lookups: column (key, keyseg) can be constant per table diff --git a/myisammrg/myrg_rlast.c b/myisammrg/myrg_rlast.c index f41844dfd5c..e03a07c295a 100644 --- a/myisammrg/myrg_rlast.c +++ b/myisammrg/myrg_rlast.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mymrgdef.h" +#include "myrg_def.h" /* Read last row with the same key as the previous read. */ diff --git a/myisammrg/myrg_rnext.c b/myisammrg/myrg_rnext.c index 5a3fbdfb299..abb9ef95e44 100644 --- a/myisammrg/myrg_rnext.c +++ b/myisammrg/myrg_rnext.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mymrgdef.h" +#include "myrg_def.h" /* Read next row with the same key as previous read diff --git a/myisammrg/myrg_rprev.c b/myisammrg/myrg_rprev.c index d8089e80498..bd7e6a1f6d2 100644 --- a/myisammrg/myrg_rprev.c +++ b/myisammrg/myrg_rprev.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mymrgdef.h" +#include "myrg_def.h" /* Read previous row with the same key as previous read diff --git a/myisammrg/myrg_rrnd.c b/myisammrg/myrg_rrnd.c index de731e58d5b..d50d077e6ba 100644 --- a/myisammrg/myrg_rrnd.c +++ b/myisammrg/myrg_rrnd.c @@ -19,7 +19,7 @@ get by myrg_info(). The next record can be read with pos= -1 */ -#include "mymrgdef.h" +#include "myrg_def.h" static MYRG_TABLE *find_table(MYRG_TABLE *start,MYRG_TABLE *end,ulonglong pos); diff --git a/myisammrg/myrg_rsame.c b/myisammrg/myrg_rsame.c index 301b96e667b..eeb270a1b37 100644 --- a/myisammrg/myrg_rsame.c +++ b/myisammrg/myrg_rsame.c @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "mymrgdef.h" +#include "myrg_def.h" int myrg_rsame(MYRG_INFO *info,byte *record,int inx) { diff --git a/myisammrg/myrg_static.c b/myisammrg/myrg_static.c index 88eb095382b..fdc1c89c439 100644 --- a/myisammrg/myrg_static.c +++ b/myisammrg/myrg_static.c @@ -20,7 +20,11 @@ */ #ifndef stdin -#include "mymrgdef.h" +#include "myrg_def.h" #endif LIST *myrg_open_list=0; +static const char *merge_insert_methods[] = +{ "FIRST", "LAST", NullS }; +TYPELIB merge_insert_method= { array_elements(merge_insert_methods)-1,"", + merge_insert_methods}; diff --git a/myisammrg/myrg_update.c b/myisammrg/myrg_update.c index b75c6ea6f9b..8417554727b 100644 --- a/myisammrg/myrg_update.c +++ b/myisammrg/myrg_update.c @@ -16,7 +16,7 @@ /* Update last read record */ -#include "mymrgdef.h" +#include "myrg_def.h" int myrg_update(register MYRG_INFO *info,const byte *oldrec, byte *newrec) { diff --git a/myisammrg/myrg_write.c b/myisammrg/myrg_write.c new file mode 100644 index 00000000000..8d8f4a34d18 --- /dev/null +++ b/myisammrg/myrg_write.c @@ -0,0 +1,30 @@ +/* Copyright (C) 2001 MySQL AB & MySQL Finland AB & TCX DataKonsult AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +/* Write a row to a MyISAM MERGE table */ + +#include "myrg_def.h" + +int myrg_write(register MYRG_INFO *info, byte *rec) +{ + /* [phi] MERGE_WRITE_DISABLED is handled by the else case */ + if (info->merge_insert_method == MERGE_INSERT_TO_FIRST) + return mi_write(info->open_tables[0].table,rec); + else if (info->merge_insert_method == MERGE_INSERT_TO_LAST) + return mi_write(info->end_table[-1].table,rec); + else /* unsupported insertion method */ + return (my_errno=HA_ERR_WRONG_COMMAND); +} diff --git a/mysql-test/fix-result b/mysql-test/fix-result index 7060db36e03..8e6f574d7c2 100755 --- a/mysql-test/fix-result +++ b/mysql-test/fix-result @@ -7,7 +7,7 @@ #It is assumed we are running the script in mysql-test directory -VERSION=4.0.0-debug-log +VERSION=4.0.0-alpha-debug-log TEST_CASE=$1 if [ -z "$TEST_CASE" ] ; diff --git a/mysql-test/include/have_bdb.inc b/mysql-test/include/have_bdb.inc index 0126e30210f..3f7377e7515 100644 --- a/mysql-test/include/have_bdb.inc +++ b/mysql-test/include/have_bdb.inc @@ -1,2 +1,4 @@ -- require r/have_bdb.require +disable_query_log; show variables like "have_bdb"; +enable_query_log; diff --git a/mysql-test/include/have_gemini.inc b/mysql-test/include/have_gemini.inc index 78a84ac6f3e..d98c9750714 100644 --- a/mysql-test/include/have_gemini.inc +++ b/mysql-test/include/have_gemini.inc @@ -1,2 +1,4 @@ -- require r/have_gemini.require +disable_query_log; show variables like "have_gemini"; +enable_query_log; diff --git a/mysql-test/include/have_innodb.inc b/mysql-test/include/have_innodb.inc index 7dcaef44878..4f83d378cbc 100644 --- a/mysql-test/include/have_innodb.inc +++ b/mysql-test/include/have_innodb.inc @@ -1,2 +1,4 @@ -- require r/have_innodb.require +disable_query_log; show variables like "have_innodb"; +enable_query_log; diff --git a/mysql-test/include/have_isam.inc b/mysql-test/include/have_isam.inc index d83328f70f4..830170c921f 100644 --- a/mysql-test/include/have_isam.inc +++ b/mysql-test/include/have_isam.inc @@ -1,2 +1,4 @@ -- require r/have_isam.require +disable_query_log; show variables like "have_isam"; +enable_query_log; diff --git a/mysql-test/include/have_openssl.inc b/mysql-test/include/have_openssl.inc index b9aa2dadb9e..54c5b04b3e4 100644 --- a/mysql-test/include/have_openssl.inc +++ b/mysql-test/include/have_openssl.inc @@ -1,2 +1,4 @@ -- require r/have_openssl.require +disable_query_log; show variables like "have_openssl"; +enable_query_log; diff --git a/mysql-test/include/have_openssl_1.inc b/mysql-test/include/have_openssl_1.inc index 5aa93b688f3..4d3646abdc2 100644 --- a/mysql-test/include/have_openssl_1.inc +++ b/mysql-test/include/have_openssl_1.inc @@ -1,2 +1,4 @@ -- require r/have_openssl_1.require +disable_query_log; show variables like "have_openssl"; +enable_query_log; diff --git a/mysql-test/include/have_openssl_2.inc b/mysql-test/include/have_openssl_2.inc index b15af43715b..724d295a398 100644 --- a/mysql-test/include/have_openssl_2.inc +++ b/mysql-test/include/have_openssl_2.inc @@ -1,2 +1,4 @@ -- require r/have_openssl_2.require +disable_query_log; SHOW STATUS LIKE "SSL_get_cipher"; +enable_query_log; diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 61077f898f6..c7c37fd01d3 100644 --- a/mysql-test/include/master-slave.inc +++ b/mysql-test/include/master-slave.inc @@ -1,7 +1,7 @@ -connect (master,localhost,root,,test,0,mysql-master.sock); -connect (master1,localhost,root,,test,0,mysql-master.sock); -connect (slave,localhost,root,,test,0,mysql-slave.sock); -connect (slave1,localhost,root,,test,0,mysql-slave.sock); +connect (master,localhost,root,,test,0,master.sock); +connect (master1,localhost,root,,test,0,master.sock); +connect (slave,localhost,root,,test,0,slave.sock); +connect (slave1,localhost,root,,test,0,slave.sock); connection slave; !slave stop; @r/slave-stopped.result show status like 'Slave_running'; diff --git a/mysql-test/include/not_embedded.inc b/mysql-test/include/not_embedded.inc new file mode 100644 index 00000000000..52ae026ece3 --- /dev/null +++ b/mysql-test/include/not_embedded.inc @@ -0,0 +1,5 @@ +-- require r/not_embedded.require +disable_query_log; +select version() like "%embedded%" as "have_embedded"; +enable_query_log; + diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh index 0535b66e289..f810d2d9ad4 100644 --- a/mysql-test/install_test_db.sh +++ b/mysql-test/install_test_db.sh @@ -134,7 +134,7 @@ then c_u="$c_u References_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u Index_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," - c_u="$c_u ssl_type enum('none', 'cipher', 'x509','issuer','subject') NOT NULL," + c_u="$c_u ssl_type enum('NONE','ANY', 'X509', 'SPECIFIED') NOT NULL," c_u="$c_u ssl_cipher char(60) NULL," c_u="$c_u x509_issuer blob NULL," c_u="$c_u x509_subject blob NULL," diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 3a925372085..7ee629e826e 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -98,7 +98,8 @@ MYSQL_TEST_DIR=$BASEDIR/mysql-test export MYSQL_TEST_DIR STD_DATA=$MYSQL_TEST_DIR/std_data hostname=`hostname` # Installed in the mysql privilege table - + +MANAGER_QUIET_OPT="-q" TESTDIR="$MYSQL_TEST_DIR/t" TESTSUFFIX=test TOT_SKIP=0 @@ -113,11 +114,20 @@ SLAVE_LOAD_TMPDIR=../../var/tmp #needs to be same length to test logging RES_SPACE=" " MYSQLD_SRC_DIRS="strings mysys include extra regex isam merge myisam \ myisammrg heap sql" +# +# Set LD_LIBRARY_PATH if we are using shared libraries +# +LD_LIBRARY_PATH="$BASEDIR/lib:$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH MASTER_RUNNING=0 MASTER_MYPORT=9306 SLAVE_RUNNING=0 SLAVE_MYPORT=9307 +MYSQL_MANAGER_PORT=9308 +MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd +MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log +MYSQL_MANAGER_USER=root NO_SLAVE=0 EXTRA_MASTER_OPT="" @@ -130,15 +140,19 @@ DO_CLIENT_GDB="" SLEEP_TIME=2 CHARACTER_SET=latin1 DBUSER="" +START_WAIT_TIMEOUT=3 +STOP_WAIT_TIMEOUT=3 while test $# -gt 0; do case "$1" in --user=*) DBUSER=`$ECHO "$1" | $SED -e "s;--user=;;"` ;; --force) FORCE=1 ;; + --verbose-manager) MANAGER_QUIET_OPT="" ;; --local) USE_RUNNING_SERVER="" ;; --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;; --master_port=*) MASTER_MYPORT=`$ECHO "$1" | $SED -e "s;--master_port=;;"` ;; --slave_port=*) SLAVE_MYPORT=`$ECHO "$1" | $SED -e "s;--slave_port=;;"` ;; + --manager-port=*) MYSQL_MANAGER_PORT=`$ECHO "$1" | $SED -e "s;--manager_port=;;"` ;; --with-openssl) EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \ --ssl-ca=$BASEDIR/SSL/cacert.pem \ @@ -157,6 +171,9 @@ while test $# -gt 0; do --skip-rpl) NO_SLAVE=1 ;; --skip-test=*) SKIP_TEST=`$ECHO "$1" | $SED -e "s;--skip-test=;;"`;; --do-test=*) DO_TEST=`$ECHO "$1" | $SED -e "s;--do-test=;;"`;; + --wait-timeout=*) + START_WAIT_TIMEOUT=`$ECHO "$1" | $SED -e "s;--wait-timeout=;;"` + STOP_WAIT_TIMEOUT=$START_WAIT_TIMEOUT;; --record) RECORD=1; EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;; @@ -166,6 +183,8 @@ while test $# -gt 0; do ;; --big*) # Actually --big-test EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;; + --compress) + EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" ;; --sleep=*) EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1" SLEEP_TIME=`$ECHO "$1" | $SED -e "s;--sleep=;;"` @@ -186,6 +205,8 @@ while test $# -gt 0; do DO_GPROF=1 ;; --gdb ) + START_WAIT_TIMEOUT=300 + STOP_WAIT_TIMEOUT=300 if [ x$BINARY_DIST = x1 ] ; then $ECHO "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with --gdb option" fi @@ -229,13 +250,13 @@ done MYRUN_DIR=$MYSQL_TEST_DIR/var/run MASTER_MYDDIR="$MYSQL_TEST_DIR/var/master-data" -MASTER_MYSOCK="$MYSQL_TMP_DIR/mysql-master.sock" +MASTER_MYSOCK="$MYSQL_TMP_DIR/master.sock" MASTER_MYPID="$MYRUN_DIR/mysqld.pid" MASTER_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld.log" MASTER_MYERR="$MYSQL_TEST_DIR/var/log/mysqld.err" SLAVE_MYDDIR="$MYSQL_TEST_DIR/var/slave-data" -SLAVE_MYSOCK="$MYSQL_TMP_DIR/mysql-slave.sock" +SLAVE_MYSOCK="$MYSQL_TMP_DIR/slave.sock" SLAVE_MYPID="$MYRUN_DIR/mysqld-slave.pid" SLAVE_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld-slave.log" SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/mysqld-slave.err" @@ -269,13 +290,15 @@ DASH72=`$ECHO '----------------------------------------------------------------- # on binary, use what is installed if [ x$SOURCE_DIST = x1 ] ; then MYSQLD="$BASEDIR/sql/mysqld" - if [ -e "$BASEDIR/client/.libs/mysqltest" ] ; then - [ -e "$BASEDIR/client/.libs/lt-mysqltest" ] || $BASEDIR/client/mysqltest -V + if [ -f "$BASEDIR/client/.libs/lt-mysqltest" ] ; then MYSQL_TEST="$BASEDIR/client/.libs/lt-mysqltest" else MYSQL_TEST="$BASEDIR/client/mysqltest" fi MYSQLADMIN="$BASEDIR/client/mysqladmin" + MYSQL_MANAGER_CLIENT="$BASEDIR/client/mysqlmanagerc" + MYSQL_MANAGER="$BASEDIR/tools/mysqlmanager" + MYSQL_MANAGER_PWGEN="$BASEDIR/client/mysqlmanager-pwgen" MYSQL="$BASEDIR/client/mysql" LANGUAGE="$BASEDIR/sql/share/english/" CHARSETSDIR="$BASEDIR/sql/share/charsets" @@ -284,6 +307,9 @@ else MYSQLD="$BASEDIR/bin/mysqld" MYSQL_TEST="$BASEDIR/bin/mysqltest" MYSQLADMIN="$BASEDIR/bin/mysqladmin" + MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager" + MYSQL_MANAGER_CLIENT="$BASEDIR/bin/mysqlmanagerc" + MYSQL_MANAGER_PWGEN="$BASEDIR/bin/mysqlmanager-pwgen" MYSQL="$BASEDIR/bin/mysql" INSTALL_DB="./install_test_db -bin" if test -d "$BASEDIR/share/mysql/english" @@ -318,7 +344,9 @@ then fi -MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB --user=$DBUSER --password=$DBPASSWD --silent -v --tmpdir=$MYSQL_TMP_DIR" +MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \ + --user=$DBUSER --password=$DBPASSWD --silent -v \ + --tmpdir=$MYSQL_TMP_DIR" MYSQL_TEST_BIN=$MYSQL_TEST MYSQL_TEST="$MYSQL_TEST $MYSQL_TEST_ARGS" GDB_CLIENT_INIT=$MYSQL_TMP_DIR/gdbinit.client @@ -331,6 +359,7 @@ GPROF_MASTER=$GPROF_DIR/master.gprof GPROF_SLAVE=$GPROF_DIR/slave.gprof TIMEFILE="$MYSQL_TMP_DIR/mysqltest-time" SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov +XTERM=`which xterm` #++ # Function Definitions @@ -346,7 +375,7 @@ prompt_user () read unused } -# We can't use diff -u as this isn't portable +# We can't use diff -u or diff -a as these are not portable show_failed_diff () { @@ -363,7 +392,7 @@ show_failed_diff () then echo "Below are the diffs between actual and expected results:" echo "-------------------------------------------------------" - $DIFF -c -a $result_file $reject_file + $DIFF -c $result_file $reject_file echo "-------------------------------------------------------" echo "Please follow the instructions outlined at" echo "http://www.mysql.com/doc/R/e/Reporting_mysqltest_bugs.html" @@ -487,23 +516,83 @@ gcov_collect () { $ECHO "gcov info in $GCOV_MSG, errors in $GCOV_ERR" } +abort_if_failed() +{ + if [ ! $? = 0 ] ; then + echo $1 + exit 1 + fi +} + +start_manager() +{ + MYSQL_MANAGER_PW=`$MYSQL_MANAGER_PWGEN -u $MYSQL_MANAGER_USER \ + -o $MYSQL_MANAGER_PW_FILE` + $MYSQL_MANAGER --log=$MYSQL_MANAGER_LOG --port=$MYSQL_MANAGER_PORT \ + --password-file=$MYSQL_MANAGER_PW_FILE + abort_if_failed "Could not start MySQL manager" + mysqltest_manager_args="--manager-user=$MYSQL_MANAGER_USER \ + --manager-password=$MYSQL_MANAGER_PW \ + --manager-port=$MYSQL_MANAGER_PORT \ + --manager-wait-timeout=$START_WAIT_TIMEOUT" + MYSQL_TEST="$MYSQL_TEST $mysqltest_manager_args" + MYSQL_TEST_ARGS="$MYSQL_TEST_ARGS $mysqltest_manager_args" + +} + +stop_manager() +{ + $MYSQL_MANAGER_CLIENT $MANAGER_QUIET_OPT -u$MYSQL_MANAGER_USER \ + -p$MYSQL_MANAGER_PW -P $MYSQL_MANAGER_PORT <<EOF +shutdown +EOF +} + +manager_launch() +{ + ident=$1 + shift + $MYSQL_MANAGER_CLIENT $MANAGER_QUIET_OPT --user=$MYSQL_MANAGER_USER \ + --password=$MYSQL_MANAGER_PW --port=$MYSQL_MANAGER_PORT <<EOF +def_exec $ident $@ +set_exec_stdout $ident $CUR_MYERR +set_exec_stderr $ident $CUR_MYERR +set_exec_con $ident root localhost $CUR_MYSOCK +start_exec $ident $START_WAIT_TIMEOUT +EOF + abort_if_failed "Could not execute manager command" +} + +manager_term() +{ + ident=$1 + shift + $MYSQL_MANAGER_CLIENT $MANAGER_QUIET_OPT --user=$MYSQL_MANAGER_USER \ + --password=$MYSQL_MANAGER_PW --port=$MYSQL_MANAGER_PORT <<EOF +stop_exec $ident $STOP_WAIT_TIMEOUT +EOF + abort_if_failed "Could not execute manager command" +} + start_master() { [ x$MASTER_RUNNING = 1 ] && return + # Remove old berkeley db log files that can confuse the server + $RM -f $MASTER_MYDDIR/log.* + # Remove stale binary logs + $RM -f $MYSQL_TEST_DIR/var/log/master-bin.* #run master initialization shell script if one exists if [ -f "$master_init_script" ] ; then /bin/sh $master_init_script fi cd $BASEDIR # for gcov - # Remove old berkeley db log files that can confuse the server - $RM -f $MASTER_MYDDIR/log.* #start master if [ -z "$DO_BENCH" ] then - master_args="--no-defaults --log-bin=master-bin \ - --server-id=1 \ + master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \ + --server-id=1 --rpl-recovery-rank=1 \ --basedir=$MY_BASEDIR \ --port=$MASTER_MYPORT \ --exit-info=256 \ @@ -519,7 +608,8 @@ start_master() $SMALL_SERVER \ $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT" else - master_args="--no-defaults --log-bin=master-bin --server-id=1 \ + master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \ + --server-id=1 --rpl-recovery-rank=1 \ --basedir=$MY_BASEDIR \ --port=$MASTER_MYPORT \ --datadir=$MASTER_MYDDIR \ @@ -533,21 +623,24 @@ start_master() --innodb_data_file_path=ibdata1:50M \ $SMALL_SERVER \ $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT" - fi + fi + + CUR_MYERR=$MASTER_MYERR + CUR_MYSOCK=$MASTER_MYSOCK + if [ x$DO_DDD = x1 ] then $ECHO "set args $master_args" > $GDB_MASTER_INIT - ddd --debugger "gdb -x $GDB_MASTER_INIT" $MYSQLD & - prompt_user "Hit enter to continue after you've started the master" + manager_launch master ddd -display $DISPLAY --debugger \ + "gdb -x $GDB_MASTER_INIT" $MYSQLD elif [ x$DO_GDB = x1 ] then $ECHO "set args $master_args" > $GDB_MASTER_INIT - xterm -title "Master" -e gdb -x $GDB_MASTER_INIT $MYSQLD & - prompt_user "Hit enter to continue after you've started the master" + manager_launch master $XTERM -display :0 -title "Master" -e gdb -x \ + $GDB_MASTER_INIT $MYSQLD else - $MYSQLD $master_args >> $MASTER_MYERR 2>&1 & + manager_launch master $MYSQLD $master_args fi - wait_for_server_start $MASTER_MYPORT MASTER_RUNNING=1 } @@ -556,6 +649,9 @@ start_slave() [ x$SKIP_SLAVE = x1 ] && return [ x$SLAVE_RUNNING = 1 ] && return + # Remove stale binary logs + $RM -f $MYSQL_TEST_DIR/var/log/slave-bin.* + #run slave initialization shell script if one exists if [ -f "$slave_init_script" ] ; then @@ -568,7 +664,7 @@ start_slave() --master-host=127.0.0.1 \ --master-password= \ --master-port=$MASTER_MYPORT \ - --server-id=2" + --server-id=2 --rpl-recovery-rank=2" else master_info=$SLAVE_MASTER_INFO fi @@ -576,13 +672,14 @@ start_slave() $RM -f $SLAVE_MYDDIR/log.* slave_args="--no-defaults $master_info \ --exit-info=256 \ - --log-bin=slave-bin --log-slave-updates \ + --log-bin=$MYSQL_TEST_DIR/var/log/slave-bin \ + --log-slave-updates \ + --log=$SLAVE_MYLOG \ --basedir=$MY_BASEDIR \ --datadir=$SLAVE_MYDDIR \ --pid-file=$SLAVE_MYPID \ --port=$SLAVE_MYPORT \ --socket=$SLAVE_MYSOCK \ - --log=$SLAVE_MYLOG \ --character-sets-dir=$CHARSETSDIR \ --default-character-set=$CHARACTER_SET \ --core \ @@ -592,22 +689,25 @@ start_slave() --slave-load-tmpdir=$SLAVE_LOAD_TMPDIR \ --report-host=127.0.0.1 --report-user=root \ --report-port=$SLAVE_MYPORT \ + --master-retry-count=5 \ $SMALL_SERVER \ $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT" + CUR_MYERR=$SLAVE_MYERR + CUR_MYSOCK=$SLAVE_MYSOCK + if [ x$DO_DDD = x1 ] then $ECHO "set args $master_args" > $GDB_SLAVE_INIT - ddd --debugger "gdb -x $GDB_SLAVE_INIT" $SLAVE_MYSQLD & - prompt_user "Hit enter to continue after you've started the slave" + manager_launch slave ddd -display $DISPLAY --debugger \ + "gdb -x $GDB_SLAVE_INIT" $SLAVE_MYSQLD elif [ x$DO_GDB = x1 ] then $ECHO "set args $slave_args" > $GDB_SLAVE_INIT - xterm -title "Slave" -e gdb -x $GDB_SLAVE_INIT $SLAVE_MYSQLD & - prompt_user "Hit enter to continue after you've started the slave" + manager_launch slave $XTERM -display $DISPLAY -title "Slave" -e gdb -x \ + $GDB_SLAVE_INIT $SLAVE_MYSQLD else - $SLAVE_MYSQLD $slave_args >> $SLAVE_MYERR 2>&1 & + manager_launch slave $SLAVE_MYSQLD $slave_args fi - wait_for_server_start $SLAVE_MYPORT SLAVE_RUNNING=1 } @@ -623,7 +723,7 @@ stop_slave () { if [ x$SLAVE_RUNNING = x1 ] then - $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O shutdown_timeout=10 shutdown + manager_term slave if [ $? != 0 ] && [ -f $SLAVE_MYPID ] then # try harder! $ECHO "slave not cooperating with mysqladmin, will try manual kill" @@ -645,7 +745,7 @@ stop_master () { if [ x$MASTER_RUNNING = x1 ] then - $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O shutdown_timeout=10 shutdown + manager_term master if [ $? != 0 ] && [ -f $MASTER_MYPID ] then # try harder! $ECHO "master not cooperating with mysqladmin, will try manual kill" @@ -780,10 +880,10 @@ run_testcase () if [ -f $tf ] ; then $RM -f r/$tname.*reject mysql_test_args="-R r/$tname.result $EXTRA_MYSQL_TEST_OPT" - if [ -z "$DO_CLIENT_GDB" ] ; then - mytime=`$TIME -p $MYSQL_TEST $mysql_test_args < $tf 2> $TIMEFILE` + if [ -z "$DO_CLIENT_GDB" ] ; then + mytime=`$TIME -p $MYSQL_TEST $mysql_test_args < $tf 2> $TIMEFILE` else - do_gdb_test "$mysql_test_args" "$tf" + do_gdb_test "$mysql_test_args" "$tf" fi res=$? @@ -830,6 +930,7 @@ run_testcase () if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ] then mysql_stop + stop_manager fi exit 1 fi @@ -862,7 +963,8 @@ then $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O connect_timeout=5 shutdown > /dev/null 2>&1 $ECHO "Installing Test Databases" mysql_install_db - + $ECHO "Starting MySQL Manager" + start_manager #do not automagically start deamons if we are in gdb or running only one test #case if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ] @@ -894,10 +996,10 @@ then fi cd $savedir mysql_stop + stop_manager exit fi - $ECHO $ECHO " TEST USER SYSTEM ELAPSED RESULT" $ECHO $DASH72 @@ -931,6 +1033,7 @@ then mysql_stop fi +stop_manager report_stats $ECHO diff --git a/mysql-test/r/alias.result b/mysql-test/r/alias.result index 61a65f68007..3954c2d0170 100644 --- a/mysql-test/r/alias.result +++ b/mysql-test/r/alias.result @@ -1,2 +1,61 @@ +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 ( +cont_nr int(11) NOT NULL auto_increment, +ver_nr int(11) NOT NULL default '0', +aufnr int(11) NOT NULL default '0', +username varchar(50) NOT NULL default '', +hdl_nr int(11) NOT NULL default '0', +eintrag date NOT NULL default '0000-00-00', +st_klasse varchar(40) NOT NULL default '', +st_wert varchar(40) NOT NULL default '', +st_zusatz varchar(40) NOT NULL default '', +st_bemerkung varchar(255) NOT NULL default '', +kunden_art varchar(40) NOT NULL default '', +mcbs_knr int(11) default NULL, +mcbs_aufnr int(11) NOT NULL default '0', +schufa_status char(1) default '?', +bemerkung text, +wirknetz text, +wf_igz int(11) NOT NULL default '0', +tarifcode varchar(80) default NULL, +recycle char(1) default NULL, +sim varchar(30) default NULL, +mcbs_tpl varchar(30) default NULL, +emp_nr int(11) NOT NULL default '0', +laufzeit int(11) default NULL, +hdl_name varchar(30) default NULL, +prov_hdl_nr int(11) NOT NULL default '0', +auto_wirknetz varchar(50) default NULL, +auto_billing varchar(50) default NULL, +touch timestamp(14) NOT NULL, +kategorie varchar(50) default NULL, +kundentyp varchar(20) NOT NULL default '', +sammel_rech_msisdn varchar(30) NOT NULL default '', +p_nr varchar(9) NOT NULL default '', +suffix char(3) NOT NULL default '', +PRIMARY KEY (cont_nr), +KEY idx_aufnr(aufnr), +KEY idx_hdl_nr(hdl_nr), +KEY idx_st_klasse(st_klasse), +KEY ver_nr(ver_nr), +KEY eintrag_idx(eintrag), +KEY emp_nr_idx(emp_nr), +KEY wf_igz(wf_igz), +KEY touch(touch), +KEY hdl_tag(eintrag,hdl_nr), +KEY prov_hdl_nr(prov_hdl_nr), +KEY mcbs_aufnr(mcbs_aufnr), +KEY kundentyp(kundentyp), +KEY p_nr(p_nr,suffix) +) TYPE=MyISAM; +INSERT INTO t1 VALUES (3359356,405,3359356,'Mustermann Musterfrau',52500,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprüft','','privat',1485525,2122316,'+','','N',1909160,'MobilComSuper92000D2',NULL,NULL,'MS9ND2',3,24,'MobilCom Shop Koeln',52500,NULL,'auto',20010202105916,'Mobilfunk','PP','','',''); +INSERT INTO t1 VALUES (3359357,468,3359357,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprüft','','privat',1503580,2139699,'+','','P',1909171,'MobilComSuper9D1T10SFreisprech(Akquise)',NULL,NULL,'MS9NS1',327,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','',''); +INSERT INTO t1 VALUES (3359358,407,3359358,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprüft','','privat',1501358,2137473,'N','','N',1909159,'MobilComSuper92000D2',NULL,NULL,'MS9ND2',325,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','',''); +INSERT INTO t1 VALUES (3359359,468,3359359,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprüft','','privat',1507831,2143894,'+','','P',1909162,'MobilComSuper9D1T10SFreisprech(Akquise)',NULL,NULL,'MS9NS1',327,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','',''); +INSERT INTO t1 VALUES (3359360,0,0,'Mustermann Musterfrau',29674907,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprüft','','privat',1900169997,2414578,'+',NULL,'N',1909148,'',NULL,NULL,'RV99066_2',20,NULL,'POS',29674907,NULL,NULL,20010202105916,'Mobilfunk','','','97317481','007'); +INSERT INTO t1 VALUES (3359361,406,3359361,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag storniert','','(7001-84):Storno, Kd. möchte nicht mehr','privat',NULL,0,'+','','P',1909150,'MobilComSuper92000D1(Akquise)',NULL,NULL,'MS9ND1',325,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','',''); +INSERT INTO t1 VALUES (3359362,406,3359362,'Mustermann Musterfrau',7001,'2000-05-20','workflow','Auftrag erledigt','Originalvertrag eingegangen und geprüft','','privat',1509984,2145874,'+','','P',1909154,'MobilComSuper92000D1(Akquise)',NULL,NULL,'MS9ND1',327,24,'MobilCom Intern',7003,NULL,'auto',20010202105916,'Mobilfunk','PP','','',''); +SELECT ELT(FIELD(kundentyp,'PP','PPA','PG','PGA','FK','FKA','FP','FPA','K','KA','V','VA',''), 'Privat (Private Nutzung)','Privat (Private Nutzung) Sitz im Ausland','Privat (geschaeftliche Nutzung)','Privat (geschaeftliche Nutzung) Sitz im Ausland','Firma (Kapitalgesellschaft)','Firma (Kapitalgesellschaft) Sitz im Ausland','Firma (Personengesellschaft)','Firma (Personengesellschaft) Sitz im Ausland','oeff. rechtl. Koerperschaft','oeff. rechtl. Koerperschaft Sitz im Ausland','Eingetragener Verein','Eingetragener Verein Sitz im Ausland','Typ unbekannt') AS Kundentyp ,kategorie FROM t1 WHERE hdl_nr < 2000000 AND kategorie IN ('Prepaid','Mobilfunk') AND st_klasse = 'Workflow' GROUP BY kundentyp ORDER BY kategorie; Kundentyp kategorie Privat (Private Nutzung) Mobilfunk +drop table t1; diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index dbdbb7f57a9..d2975c33a47 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -1,3 +1,20 @@ +drop table if exists t1; +create table t1 ( +col1 int not null auto_increment primary key, +col2 varchar(30) not null, +col3 varchar (20) not null, +col4 varchar(4) not null, +col5 enum('PENDING', 'ACTIVE', 'DISABLED') not null, +col6 int not null, to_be_deleted int); +alter table t1 +add column col4_5 varchar(20) not null after col4, +add column col7 varchar(30) not null after col6, +add column col8 datetime not null, drop column to_be_deleted; +drop table t1; +create table t1 (bandID MEDIUMINT UNSIGNED NOT NULL PRIMARY KEY, payoutID SMALLINT UNSIGNED NOT NULL); +insert into t1 (bandID,payoutID) VALUES (1,6),(2,6),(3,4),(4,9),(5,10),(6,1),(7,12),(8,12); +alter table t1 add column new_col int, order by payoutid,bandid; +select * from t1; bandID payoutID new_col 6 1 NULL 3 4 NULL @@ -7,6 +24,8 @@ bandID payoutID new_col 5 10 NULL 7 12 NULL 8 12 NULL +alter table t1 order by bandid,payoutid; +select * from t1; bandID payoutID new_col 1 6 NULL 2 6 NULL @@ -16,19 +35,76 @@ bandID payoutID new_col 6 1 NULL 7 12 NULL 8 12 NULL +drop table t1; +CREATE TABLE t1 ( +GROUP_ID int(10) unsigned DEFAULT '0' NOT NULL, +LANG_ID smallint(5) unsigned DEFAULT '0' NOT NULL, +NAME varchar(80) DEFAULT '' NOT NULL, +PRIMARY KEY (GROUP_ID,LANG_ID), +KEY NAME (NAME)); +ALTER TABLE t1 CHANGE NAME NAME CHAR(80) not null; +SHOW FULL COLUMNS FROM t1; Field Type Null Key Default Extra Privileges GROUP_ID int(10) unsigned PRI 0 select,insert,update,references LANG_ID smallint(5) unsigned PRI 0 select,insert,update,references NAME char(80) MUL select,insert,update,references +DROP TABLE t1; +create table t1 (n int); +insert into t1 values(9),(3),(12),(10); +alter table t1 order by n; +select * from t1; n 3 9 10 12 +drop table t1; +CREATE TABLE t1 ( +id int(11) unsigned NOT NULL default '0', +category_id tinyint(4) unsigned NOT NULL default '0', +type_id tinyint(4) unsigned NOT NULL default '0', +body text NOT NULL, +user_id int(11) unsigned NOT NULL default '0', +status enum('new','old') NOT NULL default 'new', +PRIMARY KEY (id) +) TYPE=MyISAM; +ALTER TABLE t1 ORDER BY t1.id, t1.status, t1.type_id, t1.user_id, t1.body; +DROP TABLE t1; +CREATE TABLE t1 (AnamneseId int(10) unsigned NOT NULL auto_increment,B BLOB,PRIMARY KEY (AnamneseId)) type=myisam; +insert into t1 values (null,"hello"); +LOCK TABLES t1 WRITE; +ALTER TABLE t1 ADD Column new_col int not null; +UNLOCK TABLES; +OPTIMIZE TABLE t1; Table Op Msg_type Msg_text test.t1 optimize status OK +DROP TABLE t1; +create table t1 (n1 int not null, n2 int, n3 int, n4 float, +unique(n1), +key (n1, n2, n3, n4), +key (n2, n3, n4, n1), +key (n3, n4, n1, n2), +key (n4, n1, n2, n3) ); +alter table t1 disable keys; + insert into t1 values(10,RAND()*1000,RAND()*1000,RAND()); + insert into t1 values(9,RAND()*1000,RAND()*1000,RAND()); + insert into t1 values(8,RAND()*1000,RAND()*1000,RAND()); + insert into t1 values(7,RAND()*1000,RAND()*1000,RAND()); + insert into t1 values(6,RAND()*1000,RAND()*1000,RAND()); + insert into t1 values(5,RAND()*1000,RAND()*1000,RAND()); + insert into t1 values(4,RAND()*1000,RAND()*1000,RAND()); + insert into t1 values(3,RAND()*1000,RAND()*1000,RAND()); + insert into t1 values(2,RAND()*1000,RAND()*1000,RAND()); + insert into t1 values(1,RAND()*1000,RAND()*1000,RAND()); +alter table t1 enable keys; +drop table t1; +create table t1 (i int unsigned not null auto_increment primary key); +insert into t1 values (null),(null),(null),(null); +alter table t1 drop i,add i int unsigned not null auto_increment, drop primary key, add primary key (i); +select * from t1; i 1 2 3 4 +drop table t1; diff --git a/mysql-test/r/analyse.result b/mysql-test/r/analyse.result index f6b8cc2fcbf..c183530df48 100644 --- a/mysql-test/r/analyse.result +++ b/mysql-test/r/analyse.result @@ -1,6 +1,13 @@ +drop table if exists t1,t2; +create table t1 (i int, j int); +insert into t1 values (1,2), (3,4), (5,6), (7,8); +select * from t1 procedure analyse(); Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL t1.j 2 8 1 1 0 0 5.0000 2.2361 ENUM('2','4','6','8') NOT NULL +create table t2 select * from t1 procedure analyse(); +select * from t2; Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL t1.j 2 8 1 1 0 0 5.0000 2.2361 ENUM('2','4','6','8') NOT NULL +drop table t1,t2; diff --git a/mysql-test/r/auto_increment.result b/mysql-test/r/auto_increment.result index bf6265e5b64..66efd2ba567 100644 --- a/mysql-test/r/auto_increment.result +++ b/mysql-test/r/auto_increment.result @@ -1,32 +1,52 @@ +drop table if exists t1; +create table t1 (a int not null auto_increment,b int, primary key (a)) type=myisam auto_increment=3; +insert into t1 values (1,1),(NULL,3),(NULL,4); +delete from t1 where a=4; +insert into t1 values (NULL,5),(NULL,6); +select * from t1; a b 1 1 3 3 5 5 6 6 +delete from t1 where a=6; +replace t1 values (3,1); +ALTER TABLE t1 add c int; +replace t1 values (3,3,3); +insert into t1 values (NULL,7,7); +update t1 set a=8,b=b+1,c=c+1 where a=7; +insert into t1 values (NULL,9,9); +select * from t1; a b c 1 1 NULL 3 3 3 5 5 NULL 8 8 8 9 9 9 -a b -1 1 -5 5 -3 3 -4 4 -6 6 -a b c -1 1 NULL -5 5 NULL -3 3 NULL -4 4 NULL -6 6 6 +drop table t1; +create table t1 ( +skey tinyint unsigned NOT NULL auto_increment PRIMARY KEY, +sval char(20) +); +insert into t1 values (NULL, "hello"); +insert into t1 values (NULL, "hey"); +select * from t1; skey sval 1 hello 2 hey +select _rowid,t1._rowid,skey,sval from t1; _rowid _rowid skey sval 1 1 1 hello 2 2 2 hey +drop table t1; +create table t1 (a char(10) not null, b int not null auto_increment, primary key(a,b)); +insert into t1 values ("a",1),("b",2),("a",2),("c",1); +insert into t1 values ("a",NULL),("b",NULL),("c",NULL),("e",NULL); +insert into t1 (a) values ("a"),("b"),("c"),("d"); +insert into t1 (a) values ('k'),('d'); +insert into t1 (a) values ("a"); +insert into t1 values ("d",last_insert_id()); +select * from t1; a b a 1 a 2 @@ -44,9 +64,17 @@ d 2 d 5 e 1 k 1 +drop table t1; +create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ordid), index(ord,ordid)); +insert into t1 (ordid,ord) values (NULL,'sdj'),(NULL,'sdj'); +select * from t1; ordid ord 1 sdj 2 sdj +drop table t1; +create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ord,ordid)); +insert into t1 values (NULL,'sdj'),(NULL,'sdj'),(NULL,"abc"),(NULL,'abc'),(NULL,'zzz'),(NULL,'sdj'),(NULL,'abc'); +select * from t1; ordid ord 1 abc 2 abc @@ -55,8 +83,15 @@ ordid ord 2 sdj 3 sdj 1 zzz +drop table t1; +create table t1 (a int not null primary key auto_increment); +insert into t1 values (0); +update t1 set a=0; +select * from t1; a 0 +check table t1; Table Op Msg_type Msg_text test.t1 check warning Found row where the auto_increment column has the value 0 test.t1 check status OK +drop table t1; diff --git a/mysql-test/r/backup.result b/mysql-test/r/backup.result index 2bbe15954dc..ff7d17584bf 100644 --- a/mysql-test/r/backup.result +++ b/mysql-test/r/backup.result @@ -1,43 +1,72 @@ +set SQL_LOG_BIN=0; +drop table if exists t1; +create table t1(n int); +backup table t1 to '../bogus'; Table Op Msg_type Msg_text test.t1 backup error Failed copying .frm file: errno = X test.t1 backup status Operation failed +backup table t1 to '../tmp'; Table Op Msg_type Msg_text test.t1 backup status OK +drop table t1; +restore table t1 from '../tmp'; Table Op Msg_type Msg_text test.t1 restore status OK +select count(*) from t1; count(*) 0 +insert into t1 values (23),(45),(67); +backup table t1 to '../tmp'; Table Op Msg_type Msg_text test.t1 backup status OK +drop table t1; +restore table t1 from '../bogus'; Table Op Msg_type Msg_text t1 restore error Failed copying .frm file +restore table t1 from '../tmp'; Table Op Msg_type Msg_text test.t1 restore status OK +select n from t1; n 23 45 67 +create table t2(m int not null primary key); +create table t3(k int not null primary key); +insert into t2 values (123),(145),(167); +insert into t3 values (223),(245),(267); +backup table t1,t2,t3 to '../tmp'; Table Op Msg_type Msg_text test.t1 backup status OK test.t2 backup status OK test.t3 backup status OK +drop table t1,t2,t3; +restore table t1,t2,t3 from '../tmp'; Table Op Msg_type Msg_text test.t1 restore status OK test.t2 restore status OK test.t3 restore status OK +select n from t1; n 23 45 67 +select m from t2; m 123 145 167 +select k from t3; k 223 245 267 +drop table t1,t2,t3; +restore table t1 from '../tmp'; Table Op Msg_type Msg_text test.t1 restore status OK +lock tables t1 write; +backup table t1 to '../tmp'; +unlock tables; Table Op Msg_type Msg_text test.t1 backup status OK diff --git a/mysql-test/r/bdb-crash.result b/mysql-test/r/bdb-crash.result index 8fa8378640b..29d296a2c3f 100644 --- a/mysql-test/r/bdb-crash.result +++ b/mysql-test/r/bdb-crash.result @@ -1,3 +1,32 @@ +drop table if exists tblChange; +CREATE TABLE tblCharge ( +ChargeID int(10) unsigned DEFAULT '0' NOT NULL auto_increment, +ServiceID int(10) unsigned DEFAULT '0' NOT NULL, +ChargeDate date DEFAULT '0000-00-00' NOT NULL, +ChargeAmount decimal(20,2) DEFAULT '0.00' NOT NULL, +FedTaxes decimal(20,2) DEFAULT '0.00' NOT NULL, +ProvTaxes decimal(20,2) DEFAULT '0.00' NOT NULL, +ChargeStatus enum('New','Auth','Unauth','Sale','Denied','Refund') +DEFAULT 'New' NOT NULL, +ChargeAuthorizationMessage text, +ChargeComment text, +ChargeTimeStamp varchar(20), +PRIMARY KEY (ChargeID), +KEY ServiceID (ServiceID), +KEY ChargeDate (ChargeDate) +) type=BDB; +BEGIN; +INSERT INTO tblCharge +VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now'); +COMMIT; +BEGIN; +UPDATE tblCharge SET ChargeAuthorizationMessage = 'blablabla' WHERE +ChargeID = 1; +COMMIT; +INSERT INTO tblCharge +VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now'); +select * from tblCharge; ChargeID ServiceID ChargeDate ChargeAmount FedTaxes ProvTaxes ChargeStatus ChargeAuthorizationMessage ChargeComment ChargeTimeStamp 1 1 2001-03-01 1.00 1.00 1.00 New blablabla NULL now 2 1 2001-03-01 1.00 1.00 1.00 New NULL NULL now +drop table tblCharge; diff --git a/mysql-test/r/bdb.result b/mysql-test/r/bdb.result index 4d26304db4c..a7ddff5c532 100644 --- a/mysql-test/r/bdb.result +++ b/mysql-test/r/bdb.result @@ -1,3 +1,7 @@ +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8; +create table t1 (id int unsigned not null auto_increment, code tinyint unsigned not null, name char(20) not null, primary key (id), key (code), unique (name)) type=bdb; +insert into t1 (code, name) values (1, 'Tim'), (1, 'Monty'), (2, 'David'), (2, 'Erik'), (3, 'Sasha'), (3, 'Jeremy'), (4, 'Matt'); +select id, code, name from t1 order by id; id code name 1 1 Tim 2 1 Monty @@ -6,6 +10,8 @@ id code name 5 3 Sasha 6 3 Jeremy 7 4 Matt +update ignore t1 set id = 8, name = 'Sinisa' where id < 3; +select id, code, name from t1 order by id; id code name 2 1 Monty 3 2 David @@ -14,6 +20,8 @@ id code name 6 3 Jeremy 7 4 Matt 8 1 Sinisa +update ignore t1 set id = id + 10, name = 'Ralph' where id < 4; +select id, code, name from t1 order by id; id code name 3 2 David 4 2 Erik @@ -22,10 +30,26 @@ id code name 7 4 Matt 8 1 Sinisa 12 1 Ralph +drop table t1; +CREATE TABLE t1 ( +id int(11) NOT NULL auto_increment, +parent_id int(11) DEFAULT '0' NOT NULL, +level tinyint(4) DEFAULT '0' NOT NULL, +PRIMARY KEY (id), +KEY parent_id (parent_id), +KEY level (level) +) type=bdb; +INSERT INTO t1 VALUES (1,0,0),(3,1,1),(4,1,1),(8,2,2),(9,2,2),(17,3,2),(22,4,2),(24,4,2),(28,5,2),(29,5,2),(30,5,2),(31,6,2),(32,6,2),(33,6,2),(203,7,2),(202,7,2),(20,3,2),(157,0,0),(193,5,2),(40,7,2),(2,1,1),(15,2,2),(6,1,1),(34,6,2),(35,6,2),(16,3,2),(7,1,1),(36,7,2),(18,3,2),(26,5,2),(27,5,2),(183,4,2),(38,7,2),(25,5,2),(37,7,2),(21,4,2),(19,3,2),(5,1,1),(179,5,2); +update t1 set parent_id=parent_id+100; +select * from t1 where parent_id=102; id parent_id level 8 102 2 9 102 2 15 102 2 +update t1 set id=id+1000; +update t1 set id=1024 where id=1009; +Duplicate entry '1024' for key 1 +select * from t1; id parent_id level 1001 100 0 1002 101 1 @@ -66,6 +90,8 @@ id parent_id level 1193 105 2 1202 107 2 1203 107 2 +update ignore t1 set id=id+1; +select * from t1; id parent_id level 1001 100 0 1002 101 1 @@ -106,16 +132,22 @@ id parent_id level 1194 105 2 1202 107 2 1204 107 2 +update ignore t1 set id=1023 where id=1010; +select * from t1 where parent_id=102; id parent_id level 1008 102 2 1015 102 2 1010 102 2 +explain select level from t1 where level=1; table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 1 where used; Using index +explain select level,id from t1 where level=1; table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 1 where used; Using index +explain select level,id,parent_id from t1 where level=1; table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 1 where used +select level,id from t1 where level=1; level id 1 1002 1 1003 @@ -123,6 +155,7 @@ level id 1 1005 1 1006 1 1007 +select level,id,parent_id from t1 where level=1; level id parent_id 1 1002 101 1 1003 101 @@ -130,31 +163,77 @@ level id parent_id 1 1005 101 1 1006 101 1 1007 101 +optimize table t1; Table Op Msg_type Msg_text test.t1 optimize status OK +show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 id A 39 NULL NULL t1 1 parent_id 1 parent_id A 9 NULL NULL t1 1 level 1 level A 3 NULL NULL +drop table t1; +CREATE TABLE t1 ( +gesuchnr int(11) DEFAULT '0' NOT NULL, +benutzer_id int(11) DEFAULT '0' NOT NULL, +PRIMARY KEY (gesuchnr,benutzer_id) +) type=BDB; +replace into t1 (gesuchnr,benutzer_id) values (2,1); +replace into t1 (gesuchnr,benutzer_id) values (1,1); +replace into t1 (gesuchnr,benutzer_id) values (1,1); +select * from t1; gesuchnr benutzer_id 1 1 2 1 +drop table t1; +create table t1 (id int not null primary key, x int not null, key (x)) type=bdb; +insert into t1 (id, x) values (1, 1); +replace into t1 (id, x) values (1, 2); +select * from t1; id x 1 2 +drop table t1; +create table t1 (a int) type=bdb; +insert into t1 values (1), (2); +optimize table t1; Table Op Msg_type Msg_text test.t1 optimize status OK +delete from t1 where a = 1; +select * from t1; a 2 +check table t1; Table Op Msg_type Msg_text test.t1 check error The handler for the table doesn't support check/repair +drop table t1; +create table t1 (a int,b varchar(20)) type=bdb; +insert into t1 values (1,""), (2,"testing"); +delete from t1 where a = 1; +select * from t1; a b 2 testing +create index skr on t1 (a); +insert into t1 values (3,""), (4,"testing"); +analyze table t1; Table Op Msg_type Msg_text test.t1 analyze status OK +show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 1 skr 1 a A 3 NULL NULL +drop table t1; +create table t1 (a int,b varchar(20),key(a)) type=bdb; +insert into t1 values (1,""), (2,"testing"); +select * from t1 where a = 1; a b 1 +drop table t1; +create table t1 (a char(10) not null, b int not null auto_increment, primary key(a,b)) type=BDB; +insert into t1 values ("a",1),("b",2),("a",2),("c",1); +insert into t1 values ("a",NULL),("b",NULL),("c",NULL),("e",NULL); +insert into t1 (a) values ("a"),("b"),("c"),("d"); +insert into t1 (a) values ('k'),('d'); +insert into t1 (a) values ("a"); +insert into t1 values ("d",last_insert_id()); +select * from t1; a b a 1 a 2 @@ -172,51 +251,136 @@ d 2 d 5 e 1 k 1 +flush tables; +select count(*) from t1; count(*) 16 +drop table t1; +create table t1 (n int not null primary key) type=bdb; +set autocommit=0; +insert into t1 values (4); +rollback; +select n, "after rollback" from t1; n after rollback +insert into t1 values (4); +commit; +select n, "after commit" from t1; n after commit 4 after commit +commit; +insert into t1 values (5); +insert into t1 values (4); +Duplicate entry '4' for key 1 +commit; +select n, "after commit" from t1; n after commit 4 after commit 5 after commit +set autocommit=1; +insert into t1 values (6); +insert into t1 values (4); +Duplicate entry '4' for key 1 +select n from t1; n 4 5 6 +rollback; +drop table t1; +create table t1 ( id int NOT NULL PRIMARY KEY, nom varchar(64)) type=BDB; +begin; +insert into t1 values(1,'hamdouni'); +select id as afterbegin_id,nom as afterbegin_nom from t1; afterbegin_id afterbegin_nom 1 hamdouni +rollback; +select id as afterrollback_id,nom as afterrollback_nom from t1; afterrollback_id afterrollback_nom +set autocommit=0; +insert into t1 values(2,'mysql'); +select id as afterautocommit0_id,nom as afterautocommit0_nom from t1; afterautocommit0_id afterautocommit0_nom 2 mysql +rollback; +select id as afterrollback_id,nom as afterrollback_nom from t1; afterrollback_id afterrollback_nom +set autocommit=1; +drop table t1; +CREATE TABLE t1 (id char(8) not null primary key, val int not null) type=bdb; +insert into t1 values ('pippo', 12); +insert into t1 values ('pippo', 12); +Duplicate entry 'pippo' for key 1 +delete from t1; +delete from t1 where id = 'pippo'; +select * from t1; id val +insert into t1 values ('pippo', 12); +set autocommit=0; +delete from t1; +rollback; +select * from t1; id val pippo 12 +delete from t1; +commit; +select * from t1; id val +drop table t1; +set autocommit=1; +CREATE TABLE t1 (ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(64)) TYPE=BDB; +INSERT INTO t1 VALUES (1, 'Jochen'); +select * from t1; ID NAME 1 Jochen +drop table t1; +CREATE TABLE t1 ( _userid VARCHAR(60) NOT NULL PRIMARY KEY) TYPE=BDB; +set autocommit=0; +INSERT INTO t1 SET _userid='marc@anyware.co.uk'; +COMMIT; +SELECT * FROM t1; _userid marc@anyware.co.uk +SELECT _userid FROM t1 WHERE _userid='marc@anyware.co.uk'; _userid marc@anyware.co.uk +drop table t1; +set autocommit=1; +CREATE TABLE t1 ( +user_id int(10) DEFAULT '0' NOT NULL, +name varchar(100), +phone varchar(100), +ref_email varchar(100) DEFAULT '' NOT NULL, +detail varchar(200), +PRIMARY KEY (user_id,ref_email) +)type=bdb; +INSERT INTO t1 VALUES (10292,'sanjeev','29153373','sansh777@hotmail.com','xxx'),(10292,'shirish','2333604','shirish@yahoo.com','ddsds'),(10292,'sonali','323232','sonali@bolly.com','filmstar'); +select * from t1 where user_id=10292; user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar +INSERT INTO t1 VALUES (10291,'sanjeev','29153373','sansh777@hotmail.com','xxx'),(10293,'shirish','2333604','shirish@yahoo.com','ddsds'); +select * from t1 where user_id=10292; user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar +select * from t1 where user_id>=10292; user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar 10293 shirish 2333604 shirish@yahoo.com ddsds +select * from t1 where user_id>10292; user_id name phone ref_email detail 10293 shirish 2333604 shirish@yahoo.com ddsds +select * from t1 where user_id<10292; user_id name phone ref_email detail 10291 sanjeev 29153373 sansh777@hotmail.com xxx +drop table t1; +CREATE TABLE t1 (a int not null, b int not null,c int not null, +key(a),primary key(a,b), unique(c),key(a),unique(b)); +show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 a A NULL NULL NULL t1 0 PRIMARY 2 b A 0 NULL NULL @@ -224,69 +388,153 @@ t1 0 b 1 b A 0 NULL NULL t1 0 c 1 c A 0 NULL NULL t1 1 a 1 a A NULL NULL NULL t1 1 a_2 1 a A NULL NULL NULL +drop table t1; +create table t1 (col1 int not null, col2 char(4) not null, primary key(col1)); +alter table t1 type=BDB; +insert into t1 values ('1','1'),('5','2'),('2','3'),('3','4'),('4','4'); +select * from t1; col1 col2 1 1 2 3 3 4 4 4 5 2 +update t1 set col2='7' where col1='4'; +select * from t1; col1 col2 1 1 2 3 3 4 4 7 5 2 +alter table t1 add co3 int not null; +select * from t1; col1 col2 co3 1 1 0 2 3 0 3 4 0 4 7 0 5 2 0 +update t1 set col2='9' where col1='2'; +select * from t1; col1 col2 co3 1 1 0 2 9 0 3 4 0 4 7 0 5 2 0 +drop table t1; +create table t1 (a int not null , b int, primary key (a)) type = BDB; +create table t2 (a int not null , b int, primary key (a)) type = myisam; +insert into t1 VALUES (1,3) , (2,3), (3,3); +select * from t1; a b 1 3 2 3 3 3 +insert into t2 select * from t1; +select * from t2; a b 1 3 2 3 3 3 +delete from t1 where b = 3; +select * from t1; a b +insert into t1 select * from t2; +select * from t1; a b 1 3 2 3 3 3 +select * from t2; a b 1 3 2 3 3 3 +drop table t1,t2; +CREATE TABLE t1 ( +id int(11) NOT NULL auto_increment, +ggid varchar(32) binary DEFAULT '' NOT NULL, +email varchar(64) DEFAULT '' NOT NULL, +passwd varchar(32) binary DEFAULT '' NOT NULL, +PRIMARY KEY (id), +UNIQUE ggid (ggid) +) TYPE=BDB; +insert into t1 (ggid,passwd) values ('test1','xxx'); +insert into t1 (ggid,passwd) values ('test2','yyy'); +insert into t1 (ggid,passwd) values ('test2','this will fail'); +Duplicate entry 'test2' for key 2 +insert into t1 (ggid,id) values ('this will fail',1); +Duplicate entry '1' for key 1 +select * from t1 where ggid='test1'; id ggid email passwd 1 test1 xxx +select * from t1 where passwd='xxx'; id ggid email passwd 1 test1 xxx +select * from t1 where id=2; id ggid email passwd 2 test2 yyy +replace into t1 (ggid,id) values ('this will work',1); +replace into t1 (ggid,passwd) values ('test2','this will work'); +update t1 set id=100,ggid='test2' where id=1; +Duplicate entry 'test2' for key 2 +select * from t1; id ggid email passwd 1 this will work 3 test2 this will work +select * from t1 where id=1; id ggid email passwd 1 this will work +select * from t1 where id=999; id ggid email passwd +drop table t1; +CREATE TABLE t1 ( +user_name varchar(12), +password text, +subscribed char(1), +user_id int(11) DEFAULT '0' NOT NULL, +quota bigint(20), +weight double, +access_date date, +access_time time, +approved datetime, +dummy_primary_key int(11) NOT NULL auto_increment, +PRIMARY KEY (dummy_primary_key) +) TYPE=BDB; +INSERT INTO t1 VALUES ('user_0','somepassword','N',0,0,0,'2000-09-07','23:06:59','2000-09-07 23:06:59',1); +INSERT INTO t1 VALUES ('user_1','somepassword','Y',1,1,1,'2000-09-07','23:06:59','2000-09-07 23:06:59',2); +INSERT INTO t1 VALUES ('user_2','somepassword','N',2,2,1.4142135623731,'2000-09-07','23:06:59','2000-09-07 23:06:59',3); +INSERT INTO t1 VALUES ('user_3','somepassword','Y',3,3,1.7320508075689,'2000-09-07','23:06:59','2000-09-07 23:06:59',4); +INSERT INTO t1 VALUES ('user_4','somepassword','N',4,4,2,'2000-09-07','23:06:59','2000-09-07 23:06:59',5); +select user_name, password , subscribed, user_id, quota, weight, access_date, access_time, approved, dummy_primary_key from t1 order by user_name; user_name password subscribed user_id quota weight access_date access_time approved dummy_primary_key user_0 somepassword N 0 0 0 2000-09-07 23:06:59 2000-09-07 23:06:59 1 user_1 somepassword Y 1 1 1 2000-09-07 23:06:59 2000-09-07 23:06:59 2 user_2 somepassword N 2 2 1.4142135623731 2000-09-07 23:06:59 2000-09-07 23:06:59 3 user_3 somepassword Y 3 3 1.7320508075689 2000-09-07 23:06:59 2000-09-07 23:06:59 4 user_4 somepassword N 4 4 2 2000-09-07 23:06:59 2000-09-07 23:06:59 5 +drop table t1; +CREATE TABLE t1 ( +id int(11) NOT NULL auto_increment, +parent_id int(11) DEFAULT '0' NOT NULL, +level tinyint(4) DEFAULT '0' NOT NULL, +KEY (id), +KEY parent_id (parent_id), +KEY level (level) +) type=bdb; +INSERT INTO t1 VALUES (1,0,0),(3,1,1),(4,1,1),(8,2,2),(9,2,2),(17,3,2),(22,4,2),(24,4,2),(28,5,2),(29,5,2),(30,5,2),(31,6,2),(32,6,2),(33,6,2),(203,7,2),(202,7,2),(20,3,2),(157,0,0),(193,5,2),(40,7,2),(2,1,1),(15,2,2),(6,1,1),(34,6,2),(35,6,2),(16,3,2),(7,1,1),(36,7,2),(18,3,2),(26,5,2),(27,5,2),(183,4,2),(38,7,2),(25,5,2),(37,7,2),(21,4,2),(19,3,2),(5,1,1); +INSERT INTO t1 values (179,5,2); +update t1 set parent_id=parent_id+100; +select * from t1 where parent_id=102; id parent_id level 8 102 2 9 102 2 15 102 2 +update t1 set id=id+1000; +update t1 set id=1024 where id=1009; +select * from t1; id parent_id level 1001 100 0 1003 101 1 @@ -327,6 +575,8 @@ id parent_id level 1019 103 2 1005 101 1 1179 105 2 +update ignore t1 set id=id+1; +select * from t1; id parent_id level 1002 100 0 1004 101 1 @@ -367,12 +617,16 @@ id parent_id level 1020 103 2 1006 101 1 1180 105 2 +update ignore t1 set id=1023 where id=1010; +select * from t1 where parent_id=102; id parent_id level 1009 102 2 1025 102 2 1016 102 2 +explain select level from t1 where level=1; table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 1 where used; Using index +select level,id from t1 where level=1; level id 1 1004 1 1005 @@ -380,6 +634,7 @@ level id 1 1007 1 1008 1 1006 +select level,id,parent_id from t1 where level=1; level id parent_id 1 1004 101 1 1005 101 @@ -387,6 +642,7 @@ level id parent_id 1 1007 101 1 1008 101 1 1006 101 +select level,id from t1 where level=1 order by id; level id 1 1003 1 1004 @@ -394,6 +650,8 @@ level id 1 1006 1 1007 1 1008 +delete from t1 where level=1; +select * from t1; id parent_id level 1002 100 0 1009 102 2 @@ -428,43 +686,86 @@ id parent_id level 1022 104 2 1020 103 2 1180 105 2 +drop table t1; +CREATE TABLE t1 ( +sca_code char(6) NOT NULL, +cat_code char(6) NOT NULL, +sca_desc varchar(50), +lan_code char(2) NOT NULL, +sca_pic varchar(100), +sca_sdesc varchar(50), +sca_sch_desc varchar(16), +PRIMARY KEY (sca_code, cat_code, lan_code), +INDEX sca_pic (sca_pic) +) type = bdb ; +INSERT INTO t1 ( sca_code, cat_code, sca_desc, lan_code, sca_pic, sca_sdesc, sca_sch_desc) VALUES ( 'PD', 'J', 'PENDANT', 'EN', NULL, NULL, 'PENDANT'),( 'RI', 'J', 'RING', 'EN', NULL, NULL, 'RING'),( 'QQ', 'N', 'RING', 'EN', 'not null', NULL, 'RING'); +select count(*) from t1 where sca_code = 'PD'; count(*) 1 +select count(*) from t1 where sca_code <= 'PD'; count(*) 1 +select count(*) from t1 where sca_pic is null; count(*) 2 +alter table t1 drop index sca_pic, add index sca_pic (cat_code, sca_pic); +select count(*) from t1 where sca_code='PD' and sca_pic is null; count(*) 1 +select count(*) from t1 where cat_code='E'; count(*) 0 +alter table t1 drop index sca_pic, add index (sca_pic, cat_code); +select count(*) from t1 where sca_code='PD' and sca_pic is null; count(*) 1 +select count(*) from t1 where sca_pic >= 'n'; count(*) 1 +select sca_pic from t1 where sca_pic is null; sca_pic NULL NULL +update t1 set sca_pic="test" where sca_pic is null; +delete from t1 where sca_code='pd'; +drop table t1; +set @a:=now(); +CREATE TABLE t1 (a int not null, b timestamp not null, primary key (a)) type=bdb; +insert into t1 (a) values(1),(2),(3); +select t1.a from t1 natural join t1 as t2 where t1.b >= @a order by t1.a; a 1 2 3 +update t1 set a=5 where a=1; +select a from t1; a 2 3 5 +drop table t1; +flush logs; +create table t1 (b blob, i int, key (b(100)), key (i), key (i, b(20))) type=bdb; +insert into t1 values ('this is a blob', 1), (null, -1), (null, null),("",1),("",2),("",3); +select b from t1 where b = 'this is a blob'; b this is a blob +select * from t1 where b like 't%'; b i this is a blob 1 +select b, i from t1 where b is not null; b i this is a blob 1 1 2 3 +select * from t1 where b is null and i > 0; b i +select * from t1 where i is NULL; b i NULL NULL +update t1 set b='updated' where i=1; +select * from t1; b i updated 1 NULL -1 @@ -472,63 +773,331 @@ NULL NULL updated 1 2 3 +drop table t1; +create table t1 (a varchar(100) not null, primary key(a), b int not null) type=bdb; +insert into t1 values("hello",1),("world",2); +select * from t1 order by b desc; a b world 2 hello 1 +optimize table t1; Table Op Msg_type Msg_text test.t1 optimize status OK +show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 a A 2 NULL NULL +drop table t1; +create table t1 (i int, j int )TYPE=BDB; +insert into t1 values (1,2); +select * from t1 where i=1 and j=2; i j 1 2 +create index ax1 on t1 (i,j); +select * from t1 where i=1 and j=2; i j 1 2 +drop table t1; +drop table if exists t1, t2, t3, t4, t5, t6, t7; +create table t1 +( +branch_id int auto_increment primary key, +branch_name varchar(255) not null, +branch_active int not null default 1, +unique branch_name(branch_name), +index branch_active(branch_active) +) type=bdb; +drop table if exists t2 ; +create table t2 +( +target_id int auto_increment primary key, +target_name varchar(255) not null, +target_active int not null default 1, +unique target_name(target_name), +index target_active(target_active) +) type=bdb; +drop table if exists t3 ; +create table t3 +( +platform_id int auto_increment primary key, +platform_name varchar(255) not null, +platform_active int not null default 1, +unique platform_name(platform_name), +index platform_active(platform_active) +) type=bdb; +drop table if exists t4 ; +create table t4 +( +product_id int auto_increment primary key, +product_name varchar(255) not null, +version_file varchar(255) not null, +product_active int not null default 1, +unique product_name(product_name), +index product_active(product_active) +) type=bdb; +drop table if exists t5 ; +create table t5 +( +product_file_id int auto_increment primary key, +product_id int not null, +file_name varchar(255) not null, +/* cvs module used to find the file version */ +module_name varchar(255) not null, +/* flag whether the file is still included in the product */ +file_included int not null default 1, +unique product_file(product_id,file_name), +index file_included(file_included) +) type=bdb; +drop table if exists t6 ; +create table t6 +( +file_platform_id int auto_increment primary key, +product_file_id int not null, +platform_id int not null, +branch_id int not null, +/* filename in the build system */ +build_filename varchar(255) not null, +/* default filename in the build archive */ +archive_filename varchar(255) not null, +unique file_platform(product_file_id,platform_id,branch_id) +) type=bdb; +drop table if exists t8 ; +create table t8 +( +archive_id int auto_increment primary key, +branch_id int not null, +target_id int not null, +platform_id int not null, +product_id int not null, +status_id int not null default 1, +unique archive(branch_id,target_id,platform_id,product_id), +index status_id(status_id) +) type=bdb; +drop table if exists t7 ; +create table t7 +( +build_id int auto_increment primary key, +branch_id int not null, +target_id int not null, +build_number int not null, +build_date date not null, +/* build system tag, e.g. 'rmanight-022301-1779' */ +build_tag varchar(255) not null, +/* path relative to the build archive root, e.g. 'current' */ +build_path text not null, +unique build(branch_id,target_id,build_number) +) type=bdb; +insert into t1 (branch_name) +values ('RealMedia'); +insert into t1 (branch_name) +values ('RP8REV'); +insert into t1 (branch_name) +values ('SERVER_8_0_GOLD'); +insert into t2 (target_name) +values ('rmanight'); +insert into t2 (target_name) +values ('playerall'); +insert into t2 (target_name) +values ('servproxyall'); +insert into t3 (platform_name) +values ('linux-2.0-libc6-i386'); +insert into t3 (platform_name) +values ('win32-i386'); +insert into t4 (product_name, version_file) +values ('realserver', 'servinst'); +insert into t4 (product_name, version_file) +values ('realproxy', 'prxyinst'); +insert into t4 (product_name, version_file) +values ('realplayer', 'playinst'); +insert into t4 (product_name, version_file) +values ('plusplayer', 'plusinst'); +create temporary table tmp1 +select branch_id, target_id, platform_id, product_id +from t1, t2, t3, t4 ; +create temporary table tmp2 +select tmp1.branch_id, tmp1.target_id, tmp1.platform_id, tmp1.product_id +from tmp1 left join t8 +using (branch_id,target_id,platform_id,product_id) +where t8.archive_id is null ; +insert into t8 +(branch_id, target_id, platform_id, product_id, status_id) +select branch_id, target_id, platform_id, product_id, 1 +from tmp2 ; +drop table tmp1 ; +drop table tmp2 ; +insert into t5 (product_id, file_name, module_name) +values (1, 'servinst', 'server'); +insert into t5 (product_id, file_name, module_name) +values (2, 'prxyinst', 'server'); +insert into t5 (product_id, file_name, module_name) +values (3, 'playinst', 'rpapp'); +insert into t5 (product_id, file_name, module_name) +values (4, 'plusinst', 'rpapp'); +insert into t6 +(product_file_id,platform_id,branch_id,build_filename,archive_filename) +values (1, 2, 3, 'servinst.exe', 'win32-servinst.exe'); +insert into t6 +(product_file_id,platform_id,branch_id,build_filename,archive_filename) +values (1, 1, 3, 'v80_linux-2.0-libc6-i386_servinst.bin', 'linux2-servinst.exe'); +insert into t6 +(product_file_id,platform_id,branch_id,build_filename,archive_filename) +values (3, 2, 2, 'playinst.exe', 'win32-playinst.exe'); +insert into t6 +(product_file_id,platform_id,branch_id,build_filename,archive_filename) +values (4, 2, 2, 'playinst.exe', 'win32-playinst.exe'); +insert into t7 +(branch_id,target_id,build_number,build_tag,build_date,build_path) +values (2, 2, 1071, 'playerall-022101-1071', '2001-02-21', 'current'); +insert into t7 +(branch_id,target_id,build_number,build_tag,build_date,build_path) +values (2, 2, 1072, 'playerall-022201-1072', '2001-02-22', 'current'); +insert into t7 +(branch_id,target_id,build_number,build_tag,build_date,build_path) +values (3, 3, 388, 'servproxyall-022201-388', '2001-02-22', 'current'); +insert into t7 +(branch_id,target_id,build_number,build_tag,build_date,build_path) +values (3, 3, 389, 'servproxyall-022301-389', '2001-02-23', 'current'); +insert into t7 +(branch_id,target_id,build_number,build_tag,build_date,build_path) +values (4, 4, 100, 'foo target-010101-100', '2001-01-01', 'current'); +update t8 +set status_id=2 +where branch_id=2 and target_id=2 and platform_id=2 and product_id=1; +select t7.build_path +from +t1, +t7, +t2, +t3, +t4, +t5, +t6 +where +t7.branch_id = t1.branch_id and +t7.target_id = t2.target_id and +t5.product_id = t4.product_id and +t6.product_file_id = t5.product_file_id and +t6.platform_id = t3.platform_id and +t6.branch_id = t6.branch_id and +t7.build_id = 1 and +t4.product_id = 3 and +t5.file_name = 'playinst' and +t3.platform_id = 2; build_path current +drop table t1, t2, t3, t4, t5, t6, t7, t8; +CREATE TABLE t1 ( +a tinytext NOT NULL, +b tinyint(3) unsigned NOT NULL default '0', +PRIMARY KEY (a(32),b) +) TYPE=BDB; +INSERT INTO t1 VALUES ('a',1),('a',2); +SELECT * FROM t1 WHERE a='a' AND b=2; a b a 2 +SELECT * FROM t1 WHERE a='a' AND b in (2); a b a 2 +SELECT * FROM t1 WHERE a='a' AND b in (1,2); a b a 1 a 2 +drop table t1; +CREATE TABLE t1 ( +a int3 unsigned NOT NULL, +b int1 unsigned NOT NULL, +UNIQUE (a, b) +) TYPE = BDB; +INSERT INTO t1 VALUES (1, 1); +SELECT MIN(B),MAX(b) FROM t1 WHERE t1.a = 1; MIN(B) MAX(b) 1 1 +drop table t1; +create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) type=bdb; +insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL'); +LOCK TABLES t1 WRITE; +insert into t1 values (99,1,2,'D'),(1,1,2,'D'); +Duplicate entry '1-1' for key 1 +select id from t1; id 0 1 2 +select id from t1; id 0 1 2 +UNLOCK TABLES; +DROP TABLE t1; +create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) type=bdb; +insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL'); +LOCK TABLES t1 WRITE; +begin; +insert into t1 values (99,1,2,'D'),(1,1,2,'D'); +Duplicate entry '1-1' for key 1 +select id from t1; id 0 1 2 +insert ignore into t1 values (100,1,2,'D'),(1,1,99,'D'); +commit; +select id,id3 from t1; id id3 0 0 1 1 2 2 100 2 +UNLOCK TABLES; +DROP TABLE t1; +CREATE TABLE t1 (SYAIN_NO char(5) NOT NULL default '', KINMU_DATE char(6) NOT NULL default '', PRIMARY KEY (SYAIN_NO,KINMU_DATE)) TYPE=BerkeleyDB; +CREATE TABLE t2 ( SYAIN_NO char(5) NOT NULL default '',STR_DATE char(8) NOT NULL default '',PRIMARY KEY (SYAIN_NO,STR_DATE) ) TYPE=BerkeleyDB; +select T1.KINMU_DATE from t1 T1 ,t2 T2 where T1.SYAIN_NO = '12345' and T1.KINMU_DATE = '200106' and T2.SYAIN_NO = T1.SYAIN_NO; KINMU_DATE +select T1.KINMU_DATE from t1 T1 ,t2 T2 where T1.SYAIN_NO = '12345' and T1.KINMU_DATE = '200106' and T2.SYAIN_NO = T1.SYAIN_NO; KINMU_DATE +DROP TABLE t1,t2; +drop table if exists t1; +create table t1 (a int(11) not null, b int(11) not null, unique (a,b)) type=bdb; +insert into t1 values (1,1), (1,2); +select * from t1 where a = 1; a b 1 1 1 2 +select t1.*, t2.* from t1, t1 t2 where t1.a = t2.a and t2.a = 1; a b a b 1 1 1 1 1 1 1 2 1 2 1 1 1 2 1 2 +select * from t1 where a = 1; a b 1 1 1 2 +drop table t1; +create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) type=bdb; +insert into t1 values (0,0,0,'ABCDEFGHIJ'); +create table t2 (id int NOT NULL,primary key (id)) type=bdb; +LOCK TABLES t1 WRITE, t2 WRITE; +insert into t2 values(1); +SELECT t1.* FROM t1 WHERE id IN (1); id id2 id3 dummy1 +SELECT t1.* FROM t2 left outer join t1 on (t1.id=t2.id); id id2 id3 dummy1 NULL NULL NULL NULL +delete from t1 where id3 >= 0 and id3 <= 0; +drop table t1,t2; +CREATE TABLE t1 (i varchar(48) NOT NULL default '', p varchar(255) default NULL,s varchar(48) NOT NULL default '', PRIMARY KEY (i), UNIQUE(p,s)) TYPE=BDB; +INSERT INTO t1 VALUES ('00000000-e6c4ddeaa6-003b8-83458387','programs/xxxxxxxx.wmv','00000000-e6c4ddeb32-003bc-83458387'); +SELECT * FROM t1 WHERE p='programs/xxxxxxxx.wmv'; i p s 00000000-e6c4ddeaa6-003b8-83458387 programs/xxxxxxxx.wmv 00000000-e6c4ddeb32-003bc-83458387 +drop table t1; +CREATE TABLE t1 ( STR_DATE varchar(8) NOT NULL default '',INFO_NOTE varchar(200) default NULL,PRIMARY KEY (STR_DATE) ) TYPE=BerkeleyDB; +select INFO_NOTE from t1 where STR_DATE = '20010610'; INFO_NOTE +select INFO_NOTE from t1 where STR_DATE < '20010610'; INFO_NOTE +select INFO_NOTE from t1 where STR_DATE > '20010610'; INFO_NOTE +drop table t1; diff --git a/mysql-test/r/bench_count_distinct.result b/mysql-test/r/bench_count_distinct.result index 20f23c0abbe..d414e8e466e 100644 --- a/mysql-test/r/bench_count_distinct.result +++ b/mysql-test/r/bench_count_distinct.result @@ -1,2 +1,6 @@ +drop table if exists t1; +create table t1(n int not null, key(n)) delay_key_write = 1; +select count(distinct n) from t1; count(distinct n) 100 +drop table t1; diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result index 46ce0fda2c1..1c4a94ef1ee 100644 --- a/mysql-test/r/bigint.result +++ b/mysql-test/r/bigint.result @@ -1,15 +1,57 @@ +select 0,256,00000000000000065536,2147483647,-2147483648,2147483648,+4294967296; 0 256 00000000000000065536 2147483647 -2147483648 2147483648 +4294967296 0 256 65536 2147483647 -2147483648 2147483648 4294967296 +select 9223372036854775807,-009223372036854775808; 9223372036854775807 -009223372036854775808 9223372036854775807 -9223372036854775808 +select +9999999999999999999,-9999999999999999999; +9999999999999999999 -9999999999999999999 10000000000000000000 -10000000000000000000 +drop table if exists t1; +create table t1 (a bigint unsigned not null, primary key(a)); +insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE); +select * from t1; a 18446744073709551614 18446744073709551615 +select * from t1 where a=18446744073709551615; a 18446744073709551615 +select * from t1 where a='18446744073709551615'; a 18446744073709551615 +delete from t1 where a=18446744073709551615; +select * from t1; a 18446744073709551614 +drop table t1; +create table t1 ( a int not null default 1, big bigint ); +insert into t1 (big) values (-1),(12345678901234567),(9223372036854775807),(18446744073709551615); +select min(big),max(big),max(big)-1 from t1; +min(big) max(big) max(big)-1 +-1 9223372036854775807 9223372036854775806 +select min(big),max(big),max(big)-1 from t1 group by a; +min(big) max(big) max(big)-1 +-1 9223372036854775807 9223372036854775806 +alter table t1 modify big bigint unsigned not null; +select min(big),max(big),max(big)-1 from t1; +min(big) max(big) max(big)-1 +12345678901234567 18446744073709551615 18446744073709551614 +select min(big),max(big),max(big)-1 from t1 group by a; +min(big) max(big) max(big)-1 +12345678901234567 18446744073709551615 18446744073709551614 +alter table t1 add key (big); +select min(big),max(big),max(big)-1 from t1; +min(big) max(big) max(big)-1 +12345678901234567 18446744073709551615 18446744073709551614 +select min(big),max(big),max(big)-1 from t1 group by a; +min(big) max(big) max(big)-1 +12345678901234567 18446744073709551615 18446744073709551614 +alter table t1 modify big bigint not null; +select min(big),max(big),max(big)-1 from t1; +min(big) max(big) max(big)-1 +-1 9223372036854775807 9223372036854775806 +select min(big),max(big),max(big)-1 from t1 group by a; +min(big) max(big) max(big)-1 +-1 9223372036854775807 9223372036854775806 +drop table t1; diff --git a/mysql-test/r/binary.result b/mysql-test/r/binary.result index c5f9961699d..9f1c8ffac41 100644 --- a/mysql-test/r/binary.result +++ b/mysql-test/r/binary.result @@ -1,33 +1,55 @@ +create table t1 (name char(20) not null, primary key (name)); +create table t2 (name char(20) binary not null, primary key (name)); +insert into t1 values ("å"); +insert into t1 values ("ä"); +insert into t1 values ("ö"); +insert into t2 select * from t1; +select * from t1 order by name; name å ä ö +select concat("*",name,"*") from t1 order by 1; concat("*",name,"*") *å* *ä* *ö* +select min(name),min(concat("*",name,"*")),max(name),max(concat("*",name,"*")) from t1; min(name) min(concat("*",name,"*")) max(name) max(concat("*",name,"*")) å *å* ö *ö* +select * from t2 order by name; name ä å ö +select concat("*",name,"*") from t2 order by 1; concat("*",name,"*") *ä* *å* *ö* +select min(name),min(concat("*",name,"*")),max(name),max(concat("*",name,"*")) from t2; min(name) min(concat("*",name,"*")) max(name) max(concat("*",name,"*")) ä *ä* ö *ö* +select name from t1 where name between 'Ä' and 'Ö'; name ä ö +select name from t2 where name between 'ä' and 'ö'; name ä å ö +select name from t2 where name between 'Ä' and 'Ö'; name +drop table t1,t2; +create table t1 (a char(10) not null, b char(10) binary not null,index (a)); +insert into t1 values ("hello ","hello "),("hello2 ","hello2 "); +select * from t1 where a="hello "; a b hello hello +select * from t1 where b="hello "; a b +select * from t1 where b="hello"; a b hello hello +drop table t1; diff --git a/mysql-test/r/bulk_replace.result b/mysql-test/r/bulk_replace.result index 80eedd277a1..0a079965b82 100644 --- a/mysql-test/r/bulk_replace.result +++ b/mysql-test/r/bulk_replace.result @@ -1,5 +1,11 @@ +drop table if exists t1; +CREATE TABLE t1 (a int, unique (a), b int not null, unique(b), c int not null, index(c)); +replace into t1 values (1,1,1),(2,2,2),(3,1,3); +select * from t1; a b c 3 1 3 2 2 2 +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +drop table t1; diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result index 073164aa035..ec37c9a5763 100644 --- a/mysql-test/r/case.result +++ b/mysql-test/r/case.result @@ -1,42 +1,65 @@ +drop table if exists t1; +select CASE "b" when "a" then 1 when "b" then 2 END; CASE "b" when "a" then 1 when "b" then 2 END 2 +select CASE "c" when "a" then 1 when "b" then 2 END; CASE "c" when "a" then 1 when "b" then 2 END NULL +select CASE "c" when "a" then 1 when "b" then 2 ELSE 3 END; CASE "c" when "a" then 1 when "b" then 2 ELSE 3 END 3 +select CASE BINARY "b" when "a" then 1 when "B" then 2 WHEN "b" then "ok" END; CASE BINARY "b" when "a" then 1 when "B" then 2 WHEN "b" then "ok" END ok +select CASE "b" when "a" then 1 when binary "B" then 2 WHEN "b" then "ok" END; CASE "b" when "a" then 1 when binary "B" then 2 WHEN "b" then "ok" END ok +select CASE concat("a","b") when concat("ab","") then "a" when "b" then "b" end; CASE concat("a","b") when concat("ab","") then "a" when "b" then "b" end a +select CASE when 1=0 then "true" else "false" END; CASE when 1=0 then "true" else "false" END false +select CASE 1 when 1 then "one" WHEN 2 then "two" ELSE "more" END; CASE 1 when 1 then "one" WHEN 2 then "two" ELSE "more" END one +select CASE 2.0 when 1 then "one" WHEN 2.0 then "two" ELSE "more" END; CASE 2.0 when 1 then "one" WHEN 2.0 then "two" ELSE "more" END two +select (CASE "two" when "one" then "1" WHEN "two" then "2" END) | 0; (CASE "two" when "one" then "1" WHEN "two" then "2" END) | 0 2 +select (CASE "two" when "one" then 1.00 WHEN "two" then 2.00 END) +0.0; (CASE "two" when "one" then 1.00 WHEN "two" then 2.00 END) +0.0 2.00 +select case 1/0 when "a" then "true" else "false" END; case 1/0 when "a" then "true" else "false" END false +select case 1/0 when "a" then "true" END; case 1/0 when "a" then "true" END NULL +select (case 1/0 when "a" then "true" END) | 0; (case 1/0 when "a" then "true" END) | 0 NULL +select (case 1/0 when "a" then "true" END) + 0.0; (case 1/0 when "a" then "true" END) + 0.0 NULL +select case when 1>0 then "TRUE" else "FALSE" END; case when 1>0 then "TRUE" else "FALSE" END TRUE +select case when 1<0 then "TRUE" else "FALSE" END; case when 1<0 then "TRUE" else "FALSE" END FALSE +create table t1 (a int); +insert into t1 values(1),(2),(3),(4); +select case a when 1 then 2 when 2 then 3 else 0 end as fcase, count(*) from t1 group by fcase; fcase count(*) 0 2 2 1 3 1 +select case a when 1 then "one" when 2 then "two" else "nothing" end as fcase, count(*) from t1 group by fcase; fcase count(*) nothing 2 one 1 two 1 +drop table t1; diff --git a/mysql-test/r/check.result b/mysql-test/r/check.result index 694d7429a14..b13151cf514 100644 --- a/mysql-test/r/check.result +++ b/mysql-test/r/check.result @@ -1,2 +1,7 @@ +drop table if exists t1; +create table t1(n int not null, key(n), key(n), key(n), key(n)); + check table t1 type=extended; +insert into t1 values (200000); Table Op Msg_type Msg_text test.t1 check status OK +drop table t1; diff --git a/mysql-test/r/comments.result b/mysql-test/r/comments.result index 7044667e4af..521b5c9509d 100644 --- a/mysql-test/r/comments.result +++ b/mysql-test/r/comments.result @@ -1,15 +1,27 @@ +select 1+2/*hello*/+3; 1+2/*hello*/+3 6 +select 1 /* long +multi line comment */; 1 1 +/* empty query */; +Query was empty +select 1 /*!32301 +1 */; 1 /*!32301 +1 2 +select 1 /*!52301 +1 */; 1 1 +select 1--1; 1--1 2 +select 1 --2 ++1; 1 --2 +1 4 +select 1 # The rest of the row will be ignored +; 1 1 diff --git a/mysql-test/r/compare.result b/mysql-test/r/compare.result index 6af85c16dff..07f9ce4e81a 100644 --- a/mysql-test/r/compare.result +++ b/mysql-test/r/compare.result @@ -1,6 +1,14 @@ +drop table if exists t1; +CREATE TABLE t1 (id CHAR(12) not null, PRIMARY KEY (id)); +insert into t1 values ('000000000001'),('000000000002'); +explain select * from t1 where id=000000000001; table type possible_keys key key_len ref rows Extra t1 index PRIMARY PRIMARY 12 NULL 2 where used; Using index +select * from t1 where id=000000000001; id 000000000001 +delete from t1 where id=000000000002; +select * from t1; id 000000000001 +drop table t1; diff --git a/mysql-test/r/count_distinct.result b/mysql-test/r/count_distinct.result index 97d7b57f249..3bff6c6ad88 100644 --- a/mysql-test/r/count_distinct.result +++ b/mysql-test/r/count_distinct.result @@ -1,11 +1,46 @@ +drop table if exists t1,t2,t3; +create table t1 (libname varchar(21) not null, city text, primary key (libname)); +create table t2 (isbn varchar(21) not null, author text, title text, primary key (isbn)); +create table t3 (isbn varchar(21) not null, libname varchar(21) not null, quantity int ,primary key (isbn,libname)); +insert into t2 values ('001','Daffy','A duck''s life'); +insert into t2 values ('002','Bugs','A rabbit\'s life'); +insert into t2 values ('003','Cowboy','Life on the range'); +insert into t2 values ('000','Anonymous','Wanna buy this book?'); +insert into t2 values ('004','Best Seller','One Heckuva book'); +insert into t2 values ('005','EveryoneBuys','This very book'); +insert into t2 values ('006','San Fran','It is a san fran lifestyle'); +insert into t2 values ('007','BerkAuthor','Cool.Berkley.the.book'); +insert into t3 values('000','New York Public Libra','1'); +insert into t3 values('001','New York Public Libra','2'); +insert into t3 values('002','New York Public Libra','3'); +insert into t3 values('003','New York Public Libra','4'); +insert into t3 values('004','New York Public Libra','5'); +insert into t3 values('005','New York Public Libra','6'); +insert into t3 values('006','San Fransisco Public','5'); +insert into t3 values('007','Berkeley Public1','3'); +insert into t3 values('007','Berkeley Public2','3'); +insert into t3 values('001','NYC Lib','8'); +insert into t1 values ('New York Public Libra','New York'); +insert into t1 values ('San Fransisco Public','San Fran'); +insert into t1 values ('Berkeley Public1','Berkeley'); +insert into t1 values ('Berkeley Public2','Berkeley'); +insert into t1 values ('NYC Lib','New York'); +select t2.isbn,city,t1.libname,count(t1.libname) as a from t3 left join t1 on t3.libname=t1.libname left join t2 on t3.isbn=t2.isbn group by city,t1.libname; isbn city libname a 007 Berkeley Berkeley Public1 1 007 Berkeley Berkeley Public2 1 000 New York New York Public Libra 6 001 New York NYC Lib 1 006 San Fran San Fransisco Public 1 +select t2.isbn,city,t1.libname,count(distinct t1.libname) as a from t3 left join t1 on t3.libname=t1.libname left join t2 on t3.isbn=t2.isbn group by city having count(distinct t1.libname) > 1; isbn city libname a 007 Berkeley Berkeley Public1 2 000 New York New York Public Libra 2 +drop table t1, t2, t3; +create table t1 (f1 int); +insert into t1 values (1); +create table t2 (f1 int,f2 int); +select t1.f1,count(distinct t2.f2),count(distinct 1,NULL) from t1 left join t2 on t1.f1=t2.f1 group by t1.f1; f1 count(distinct t2.f2) count(distinct 1,NULL) 1 0 0 +drop table t1,t2; diff --git a/mysql-test/r/count_distinct2.result b/mysql-test/r/count_distinct2.result index 3586910e8b3..131e3b325ec 100644 --- a/mysql-test/r/count_distinct2.result +++ b/mysql-test/r/count_distinct2.result @@ -1,37 +1,62 @@ +drop table if exists t1; +create table t1(n1 int, n2 int, s char(20), vs varchar(20), t text); +insert into t1 values (1,11, 'one','eleven', 'eleven'), +(1,11, 'one','eleven', 'eleven'), +(2,11, 'two','eleven', 'eleven'), +(2,12, 'two','twevle', 'twelve'), +(2,13, 'two','thirteen', 'foo'), +(2,13, 'two','thirteen', 'foo'), +(2,13, 'two','thirteen', 'bar'), +(NULL,13, 'two','thirteen', 'bar'), +(2,NULL, 'two','thirteen', 'bar'), +(2,13, NULL,'thirteen', 'bar'), +(2,13, 'two',NULL, 'bar'), +(2,13, 'two','thirteen', NULL); +select distinct n1 from t1; n1 1 2 NULL +select count(distinct n1) from t1; count(distinct n1) 2 +select distinct n2 from t1; n2 11 12 13 NULL +select count(distinct n2) from t1; count(distinct n2) 3 +select distinct s from t1; s one two NULL +select count(distinct s) from t1; count(distinct s) 2 +select distinct vs from t1; vs eleven twevle thirteen NULL +select count(distinct vs) from t1; count(distinct vs) 3 +select distinct t from t1; t eleven twelve foo bar NULL +select count(distinct t) from t1; count(distinct t) 4 +select distinct n1,n2 from t1; n1 n2 1 11 2 11 @@ -39,15 +64,19 @@ n1 n2 2 13 NULL 13 2 NULL +select count(distinct n1,n2) from t1; count(distinct n1,n2) 4 +select distinct n1,s from t1; n1 s 1 one 2 two NULL two 2 NULL +select count(distinct n1,s) from t1; count(distinct n1,s) 2 +select distinct s,n1,vs from t1; s n1 vs one 1 eleven two 2 eleven @@ -56,8 +85,10 @@ two 2 thirteen two NULL thirteen NULL 2 thirteen two 2 NULL +select count(distinct s,n1,vs) from t1; count(distinct s,n1,vs) 4 +select distinct s,t from t1; s t one eleven two eleven @@ -66,19 +97,33 @@ two foo two bar NULL bar two NULL +select count(distinct s,t) from t1; count(distinct s,t) 5 +select count(distinct n1), count(distinct n2) from t1; count(distinct n1) count(distinct n2) 2 3 +select count(distinct n2), n1 from t1 group by n1; count(distinct n2) n1 1 NULL 1 1 3 2 +drop table t1; +create table t1 (n int default NULL); +flush status; +select count(distinct n) from t1; count(distinct n) 5000 +show status like 'Created_tmp_disk_tables'; Variable_name Value Created_tmp_disk_tables 1 +drop table t1; +create table t1 (s text); +flush status; +select count(distinct s) from t1; count(distinct s) 5000 +show status like 'Created_tmp_disk_tables'; Variable_name Value Created_tmp_disk_tables 1 +drop table t1; diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 7940d51868a..5f14de18735 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1,14 +1,70 @@ +drop table if exists t1,t2; +create table t1 (b char(0)); +insert into t1 values (""),(null); +select * from t1; b NULL +drop table if exists t1; +create table t1 (b char(0) not null); +create table if not exists t1 (b char(0) not null); +insert into t1 values (""),(null); +select * from t1; b +drop table if exists t1; +create table t2 type=heap select * from t1; +Table 'test.t1' doesn't exist +create table t2 select auto+1 from t1; +Table 'test.t1' doesn't exist +drop table if exists t1,t2; +create table t1 (b char(0) not null, index(b)); +The used table handler can't index column 'b' +create table t1 (a int not null auto_increment,primary key (a)) type=heap; +The used table type doesn't support AUTO_INCREMENT columns +create table t1 (a int not null,b text) type=heap; +The used table type doesn't support BLOB/TEXT columns +create table t1 (a int ,primary key(a)) type=heap; +All parts of a PRIMARY KEY must be NOT NULL; If you need NULL in a key, use UNIQUE instead +drop table if exists t1; +create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ord,ordid)) type=heap; +The used table type doesn't support AUTO_INCREMENT columns +create table t1 (ordid int(8), primary key (ordid)); +All parts of a PRIMARY KEY must be NOT NULL; If you need NULL in a key, use UNIQUE instead +create table not_existing_database.test (a int); +Got one of the listed errors +create table `a/a` (a int); +Incorrect table name 'a/a' +create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa int); +Incorrect table name 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' +create table a (`aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` int); +Identifier name 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' is too long +create table 1ea10 (1a20 int,1e int); +insert into 1ea10 values(1,1); +select 1ea10.1a20,1e+ 1e+10 from 1ea10; 1a20 1e+ 1e+10 1 10000000001 +drop table 1ea10; +create table t1 (t1.index int); +drop table t1; +drop database if exists test_$1; +create database test_$1; +create table test_$1.$test1 (a$1 int, $b int, c$ int); +insert into test_$1.$test1 values (1,2,3); +select a$1, $b, c$ from test_$1.$test1; a$1 $b c$ 1 2 3 +create table test_$1.test2$ (a int); +drop table test_$1.test2$; +drop database test_$1; +create table t1 (a int auto_increment not null primary key, B CHAR(20)); +insert into t1 (b) values ("hello"),("my"),("world"); +create table t2 (key (b)) select * from t1; +explain select * from t2 where b="world"; table type possible_keys key key_len ref rows Extra t2 ref B B 21 const 1 where used +select * from t2 where b="world"; a B 3 world +drop table t1,t2; diff --git a/mysql-test/r/ctype_latin1_de.result b/mysql-test/r/ctype_latin1_de.result index 44a1757209e..58ed0dfdbf3 100644 --- a/mysql-test/r/ctype_latin1_de.result +++ b/mysql-test/r/ctype_latin1_de.result @@ -1,3 +1,12 @@ +drop table if exists t1; +create table t1 (a char (20) not null, b int not null auto_increment, index (a,b),index(b)); +insert into t1 (a) values ('ä'),('ac'),('ae'),('ad'),('Äc'),('aeb'); +insert into t1 (a) values ('üc'),('uc'),('ue'),('ud'),('Ü'),('ueb'),('uf'); +insert into t1 (a) values ('ö'),('oc'),('Öa'),('oe'),('od'),('Öc'),('oeb'); +insert into t1 (a) values ('s'),('ss'),('ß'),('ßb'),('ssa'),('ssc'),('ßa'); +insert into t1 (a) values ('eä'),('uü'),('öo'),('ää'),('ääa'),('aeae'); +insert into t1 (a) values ('q'),('a'),('u'),('o'),('é'),('É'); +select a,b from t1 order by a,b; a b a 35 ac 2 @@ -38,6 +47,7 @@ ueb 12 üc 7 uf 13 uü 29 +select a,b from t1 order by upper(a),b; a b a 35 ac 2 @@ -78,6 +88,7 @@ ueb 12 üc 7 uf 13 uü 29 +select a from t1 order by a desc; a uü uf @@ -118,15 +129,19 @@ ae ad ac a +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +select * from t1 where a like "ö%"; a b ö 14 Öa 16 Öc 19 öo 30 +select * from t1 where a like binary "%É%"; a b É 39 +select * from t1 where a like "%Á%"; a b a 35 ac 2 @@ -138,6 +153,7 @@ aeb 6 Öa 16 ssa 25 ßa 27 +select * from t1 where a like "%U%"; a b u 36 uc 8 @@ -146,30 +162,46 @@ ue 9 ueb 12 uf 13 uü 29 +select * from t1 where a like "%ss%"; a b ss 22 ssa 25 ssc 26 +drop table t1; +select strcmp('ä','ae'),strcmp('ae','ä'),strcmp('aeq','äq'),strcmp('äq','aeq'); strcmp('ä','ae') strcmp('ae','ä') strcmp('aeq','äq') strcmp('äq','aeq') 0 0 0 0 +select strcmp('ss','ß'),strcmp('ß','ss'),strcmp('ßs','sss'),strcmp('ßq','ssq'); strcmp('ss','ß') strcmp('ß','ss') strcmp('ßs','sss') strcmp('ßq','ssq') 0 0 0 0 +select strcmp('ä','af'),strcmp('a','ä'),strcmp('ää','aeq'),strcmp('ää','aeaeq'); strcmp('ä','af') strcmp('a','ä') strcmp('ää','aeq') strcmp('ää','aeaeq') -1 -1 -1 -1 +select strcmp('ss','ßa'),strcmp('ß','ssa'),strcmp('sßa','sssb'),strcmp('s','ß'); strcmp('ss','ßa') strcmp('ß','ssa') strcmp('sßa','sssb') strcmp('s','ß') -1 -1 -1 -1 +select strcmp('ö','oö'),strcmp('Ü','uü'),strcmp('ö','oeb'); strcmp('ö','oö') strcmp('Ü','uü') strcmp('ö','oeb') -1 -1 -1 +select strcmp('af','ä'),strcmp('ä','a'),strcmp('aeq','ää'),strcmp('aeaeq','ää'); strcmp('af','ä') strcmp('ä','a') strcmp('aeq','ää') strcmp('aeaeq','ää') 1 1 1 1 +select strcmp('ßa','ss'),strcmp('ssa','ß'),strcmp('sssb','sßa'),strcmp('ß','s'); strcmp('ßa','ss') strcmp('ssa','ß') strcmp('sssb','sßa') strcmp('ß','s') 1 1 1 1 +select strcmp('u','öa'),strcmp('u','ö'); strcmp('u','öa') strcmp('u','ö') 1 1 +create table t1 (a varchar(10), key(a)); +insert into t1 values ("a"),("abc"),("abcd"),("hello"),("test"); +select * from t1 where a like "abc%"; a abc abcd +select * from t1 where a like "test%"; a test +select * from t1 where a like "te_t"; a test +drop table t1; diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result index d1914341a8d..44aef139ad2 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/delayed.result @@ -1,10 +1,30 @@ +create table t1 (a char(10), tmsp timestamp); +insert into t1 set a = 1; +insert delayed into t1 set a = 2; +insert into t1 set a = 3, tmsp=NULL; +insert delayed into t1 set a = 4; +insert delayed into t1 set a = 5, tmsp = 19711006010203; +insert delayed into t1 (a, tmsp) values (6, 19711006010203); +insert delayed into t1 (a, tmsp) values (7, NULL); +insert into t1 set a = 8,tmsp=19711006010203; +select * from t1 where tmsp=0; a tmsp +select * from t1 where tmsp=19711006010203; a tmsp 5 19711006010203 6 19711006010203 8 19711006010203 +drop table t1; +create table t1 (a int not null auto_increment primary key, b char(10)); +insert delayed into t1 values (1,"b"); +insert delayed into t1 values (null,"c"); +insert delayed into t1 values (3,"d"),(null,"e"); +insert delayed into t1 values (3,"this will give an","error"); +Column count doesn't match value count at row 1 +select * from t1; a b 1 b 2 c 3 d 4 e +drop table t1; diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result new file mode 100644 index 00000000000..c2230722aa6 --- /dev/null +++ b/mysql-test/r/delete.result @@ -0,0 +1,26 @@ +drop table if exists t1; +CREATE TABLE t1 (a tinyint(3), b tinyint(5)); +INSERT INTO t1 VALUES (1,1); +INSERT LOW_PRIORITY INTO t1 VALUES (1,2); +INSERT INTO t1 VALUES (1,3); +DELETE from t1 where a=1 limit 1; +DELETE LOW_PRIORITY from t1 where a=1; +INSERT INTO t1 VALUES (1,1); +DELETE from t1; +LOCK TABLE t1 write; +INSERT INTO t1 VALUES (1,2); +DELETE from t1; +UNLOCK TABLES; +INSERT INTO t1 VALUES (1,2); +SET AUTOCOMMIT=0; +DELETE from t1; +SET AUTOCOMMIT=1; +drop table t1; +create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a)); +insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23); +delete from t1 where a=26; +drop table t1; +create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a)); +insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27); +delete from t1 where a=27; +drop table t1; diff --git a/mysql-test/r/dirty-close.result b/mysql-test/r/dirty-close.result index f85b057eefa..c4fc19a35f8 100644 --- a/mysql-test/r/dirty-close.result +++ b/mysql-test/r/dirty-close.result @@ -1,4 +1,9 @@ +drop table if exists t1; +create table t1 (n int); +insert into t1 values (1),(2),(3); +select * from t1; n 1 2 3 +drop table t1; diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index 8f8770e5602..21f87a11a53 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -1,3 +1,21 @@ +drop table if exists t1,t2,t3; +CREATE TABLE t1 (id int,facility char(20)); +CREATE TABLE t2 (facility char(20)); +INSERT INTO t1 VALUES (NULL,NULL); +INSERT INTO t1 VALUES (-1,''); +INSERT INTO t1 VALUES (0,''); +INSERT INTO t1 VALUES (1,'/L'); +INSERT INTO t1 VALUES (2,'A01'); +INSERT INTO t1 VALUES (3,'ANC'); +INSERT INTO t1 VALUES (4,'F01'); +INSERT INTO t1 VALUES (5,'FBX'); +INSERT INTO t1 VALUES (6,'MT'); +INSERT INTO t1 VALUES (7,'P'); +INSERT INTO t1 VALUES (8,'RV'); +INSERT INTO t1 VALUES (9,'SRV'); +INSERT INTO t1 VALUES (10,'VMT'); +INSERT INTO t2 SELECT DISTINCT FACILITY FROM t1; +select id from t1 group by id; id NULL -1 @@ -12,6 +30,7 @@ NULL 8 9 10 +select * from t1 order by id; id facility NULL NULL -1 @@ -26,6 +45,7 @@ NULL NULL 8 RV 9 SRV 10 VMT +select id-5,facility from t1 order by "id-5"; id-5 facility NULL NULL -6 @@ -40,6 +60,7 @@ NULL NULL 3 RV 4 SRV 5 VMT +select id,concat(facility) from t1 group by id ; id concat(facility) NULL NULL -1 @@ -54,6 +75,7 @@ NULL NULL 8 RV 9 SRV 10 VMT +select id+0 as a,max(id),concat(facility) as b from t1 group by a order by b desc,a; a max(id) b 10 10 VMT 9 9 SRV @@ -68,9 +90,11 @@ a max(id) b -1 -1 0 0 NULL NULL NULL +select id >= 0 and id <= 5 as grp,count(*) from t1 group by grp; grp count(*) 0 7 1 6 +SELECT DISTINCT FACILITY FROM t1; FACILITY NULL @@ -84,6 +108,7 @@ P RV SRV VMT +SELECT FACILITY FROM t2; FACILITY NULL @@ -97,52 +122,157 @@ P RV SRV VMT +SELECT count(*) from t1,t2 where t1.facility=t2.facility; count(*) 12 +select count(facility) from t1; count(facility) 12 +select count(*) from t1; count(*) 13 +select count(*) from t1 where facility IS NULL; count(*) 1 +select count(*) from t1 where facility = NULL; count(*) 0 +select count(*) from t1 where facility IS NOT NULL; count(*) 12 +select count(*) from t1 where id IS NULL; count(*) 1 +select count(*) from t1 where id IS NOT NULL; count(*) 12 +drop table t1,t2; +CREATE TABLE t1 (UserId int(11) DEFAULT '0' NOT NULL); +INSERT INTO t1 VALUES (20); +INSERT INTO t1 VALUES (27); +SELECT UserId FROM t1 WHERE Userid=22; UserId +SELECT UserId FROM t1 WHERE UserId=22 group by Userid; UserId +SELECT DISTINCT UserId FROM t1 WHERE UserId=22 group by Userid; UserId +SELECT DISTINCT UserId FROM t1 WHERE UserId=22; UserId +drop table t1; +CREATE TABLE t1 (a int(10) unsigned not null primary key,b int(10) unsigned); +INSERT INTO t1 VALUES (1,1),(2,1); +CREATE TABLE t2 (a int(10) unsigned not null, key (A)); +INSERT INTO t2 VALUES (1),(2); +CREATE TABLE t3 (a int(10) unsigned, key(A), b text); +INSERT INTO t3 VALUES (1,'1'),(2,'2'); +SELECT DISTINCT t3.b FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a; b 1 +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 where used; Distinct +SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a; a 1 +create temporary table t4 select * from t3; +insert into t3 select * from t4; +insert into t4 select * from t3; +insert into t3 select * from t4; +insert into t4 select * from t3; +insert into t3 select * from t4; +insert into t4 select * from t3; +insert into t3 select * from t4; +explain select distinct t1.a from t1,t3 where t1.a=t3.a; table type possible_keys key key_len ref rows Extra t1 index PRIMARY PRIMARY 4 NULL 2 Using index; Using temporary t3 ref a a 5 t1.a 10 Using index; Distinct +select distinct t1.a from t1,t3 where t1.a=t3.a; a 1 2 +select distinct 1 from t1,t3 where t1.a=t3.a; 1 1 +drop table t1,t2,t3,t4; +CREATE TABLE t1 (name varchar(255)); +INSERT INTO t1 VALUES ('aa'),('ab'),('ac'),('ad'),('ae'); +SELECT DISTINCT * FROM t1 LIMIT 2; name aa ab +SELECT DISTINCT name FROM t1 LIMIT 2; name aa ab +SELECT DISTINCT 1 FROM t1 LIMIT 2; 1 1 +drop table t1; +CREATE TABLE t1 ( +ID int(11) NOT NULL auto_increment, +NAME varchar(75) DEFAULT '' NOT NULL, +LINK_ID int(11) DEFAULT '0' NOT NULL, +PRIMARY KEY (ID), +KEY NAME (NAME), +KEY LINK_ID (LINK_ID) +); +INSERT INTO t1 (ID, NAME, LINK_ID) VALUES (1,'Mike',0),(2,'Jack',0),(3,'Bill',0); +CREATE TABLE t2 ( +ID int(11) NOT NULL auto_increment, +NAME varchar(150) DEFAULT '' NOT NULL, +PRIMARY KEY (ID), +KEY NAME (NAME) +); +SELECT DISTINCT +t2.id AS key_link_id, +t2.name AS link +FROM t1 +LEFT JOIN t2 ON t1.link_id=t2.id +GROUP BY t1.id +ORDER BY link; key_link_id link NULL NULL +drop table t1,t2; +create table t1 ( +id int not null, +name tinytext not null, +unique (id) +); +create table t2 ( +id int not null, +idx int not null, +unique (id, idx) +); +create table t3 ( +id int not null, +idx int not null, +unique (id, idx) +); +insert into t1 values (1,'yes'), (2,'no'); +insert into t2 values (1,1); +insert into t3 values (1,1); +EXPLAIN +SELECT DISTINCT +t1.id +from +t1 +straight_join +t2 +straight_join +t3 +straight_join +t1 as j_lj_t2 left join t2 as t2_lj +on j_lj_t2.id=t2_lj.id +straight_join +t1 as j_lj_t3 left join t3 as t3_lj +on j_lj_t3.id=t3_lj.id +WHERE +((t1.id=j_lj_t2.id AND t2_lj.id IS NULL) OR (t1.id=t2.id AND t2.idx=2)) +AND ((t1.id=j_lj_t3.id AND t3_lj.id IS NULL) OR (t1.id=t3.id AND t3.idx=2)); table type possible_keys key key_len ref rows Extra t1 index id id 4 NULL 2 Using index; Using temporary t2 index id id 8 NULL 1 Using index; Distinct @@ -151,25 +281,58 @@ j_lj_t2 index id id 4 NULL 2 where used; Using index; Distinct t2_lj index id id 8 NULL 1 where used; Using index; Distinct j_lj_t3 index id id 4 NULL 2 where used; Using index; Distinct t3_lj index id id 8 NULL 1 where used; Using index; Distinct +SELECT DISTINCT +t1.id +from +t1 +straight_join +t2 +straight_join +t3 +straight_join +t1 as j_lj_t2 left join t2 as t2_lj +on j_lj_t2.id=t2_lj.id +straight_join +t1 as j_lj_t3 left join t3 as t3_lj +on j_lj_t3.id=t3_lj.id +WHERE +((t1.id=j_lj_t2.id AND t2_lj.id IS NULL) OR (t1.id=t2.id AND t2.idx=2)) +AND ((t1.id=j_lj_t3.id AND t3_lj.id IS NULL) OR (t1.id=t3.id AND t3.idx=2)); id 2 +drop table t1,t2,t3; +drop table if exists t1; +create table t1 (a int not null, b int not null, t time); +insert into t1 values (1,1,"00:06:15"),(1,2,"00:06:15"),(1,2,"00:30:15"),(1,3,"00:06:15"),(1,3,"00:30:15"); +select a,sec_to_time(sum(time_to_sec(t))) from t1 group by a,b; a sec_to_time(sum(time_to_sec(t))) 1 00:06:15 1 00:36:30 1 00:36:30 +select distinct a,sec_to_time(sum(time_to_sec(t))) from t1 group by a,b; a sec_to_time(sum(time_to_sec(t))) 1 00:06:15 1 00:36:30 +create table t2 (a int not null primary key, b int); +insert into t2 values (1,1),(2,2),(3,3); +select t1.a,sec_to_time(sum(time_to_sec(t))) from t1 left join t2 on (t1.b=t2.a) group by t1.a,t2.b; a sec_to_time(sum(time_to_sec(t))) 1 00:06:15 1 00:36:30 1 00:36:30 +select distinct t1.a,sec_to_time(sum(time_to_sec(t))) from t1 left join t2 on (t1.b=t2.a) group by t1.a,t2.b; a sec_to_time(sum(time_to_sec(t))) 1 00:06:15 1 00:36:30 +drop table t1,t2; +create table t1 (a int not null,b char(5), c text); +insert into t1 (a) values (1),(2),(3),(4),(1),(2),(3),(4); +select distinct a from t1 group by b,a having a > 2 order by a desc; a 4 3 +select distinct a,c from t1 group by b,c,a having a > 2 order by a desc; a c 4 NULL 3 NULL +drop table t1; diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result index 741fc6bba85..7c1b7c5b60d 100644 --- a/mysql-test/r/drop.result +++ b/mysql-test/r/drop.result @@ -1,11 +1,48 @@ +drop table if exists t1; +drop table if exists t1; +drop table t1; +Unknown table 't1' +create table t1(n int); +insert into t1 values(1); +create temporary table t1( n int); +insert into t1 values(2); +create table t1(n int); +Table 't1' already exists +drop table t1; +select * from t1; n 1 +drop database if exists foo; +create database foo; +drop database if exists foo; +create database foo; +create table foo.foo (n int); +insert into foo.foo values (4); +select * from foo.foo; n 4 +drop database if exists foo; +create database foo; +drop database foo; +drop database if exists foo; +flush tables with read lock; +create database foo; +Got one of the listed errors +unlock tables; +create database foo; +show databases; Database foo mysql test +flush tables with read lock; +drop database foo; +Got one of the listed errors +unlock tables; +drop database foo; +show databases; Database mysql test +drop database foo; +Can't drop database 'foo'. Database doesn't exist diff --git a/mysql-test/r/empty_table.result b/mysql-test/r/empty_table.result index 284ed65ee3b..cea787f4abd 100644 --- a/mysql-test/r/empty_table.result +++ b/mysql-test/r/empty_table.result @@ -1,4 +1,10 @@ +drop table if exists t1; +create table t1 (nr int(5) not null auto_increment,b blob,str char(10), primary key (nr)); +select count(*) from t1; count(*) 0 +select * from t1; nr b str +select * from t1 limit 0; nr b str +drop table t1; diff --git a/mysql-test/r/err000001.result b/mysql-test/r/err000001.result new file mode 100644 index 00000000000..5afecc6d600 --- /dev/null +++ b/mysql-test/r/err000001.result @@ -0,0 +1,25 @@ +drop table if exists t1; +insert into t1 values(1); +Table 'test.t1' doesn't exist +delete from t1; +Table 'test.t1' doesn't exist +update t1 set a=1; +Table 'test.t1' doesn't exist +create table t1 (a int); +select count(test.t1.b) from t1; +Unknown column 'test.t1.b' in 'field list' +select count(not_existing_database.t1) from t1; +Unknown table 'not_existing_database' in field list +select count(not_existing_database.t1.a) from t1; +Unknown table 'not_existing_database.t1' in field list +select count(not_existing_database.t1.a) from not_existing_database.t1; +Got one of the listed errors +select 1 from t1 order by 2; +Unknown column '2' in 'order clause' +select 1 from t1 group by 2; +Unknown column '2' in 'group statement' +select 1 from t1 order by t1.b; +Unknown column 't1.b' in 'order clause' +select count(*),b from t1; +Unknown column 'b' in 'field list' +drop table t1; diff --git a/mysql-test/r/explain.result b/mysql-test/r/explain.result index 558feb10f84..681baea5e07 100644 --- a/mysql-test/r/explain.result +++ b/mysql-test/r/explain.result @@ -1,15 +1,30 @@ +drop table if exists t1; +create table t1 (id int not null, str char(10), unique(str)); +insert into t1 values (1, null),(2, null),(3, "foo"),(4, "bar"); +select * from t1 where str is null; id str 1 NULL 2 NULL +select * from t1 where str="foo"; id str 3 foo +explain select * from t1 where str is null; table type possible_keys key key_len ref rows Extra t1 ref str str 11 const 1 where used +explain select * from t1 where str="foo"; table type possible_keys key key_len ref rows Extra t1 const str str 11 const 1 +explain select * from t1 ignore key (str) where str="foo"; table type possible_keys key key_len ref rows Extra t1 ALL str NULL NULL NULL 4 where used +explain select * from t1 use key (str,str) where str="foo"; table type possible_keys key key_len ref rows Extra t1 const str str 11 const 1 +explain select * from t1 use key (str,str,foo) where str="foo"; +Key column 'foo' doesn't exist in table +explain select * from t1 ignore key (str,str,foo) where str="foo"; +Key column 'foo' doesn't exist in table +drop table t1; +explain select 1; Comment No tables used diff --git a/mysql-test/r/flush.result b/mysql-test/r/flush.result index fca84de710c..1fb4fc05136 100644 --- a/mysql-test/r/flush.result +++ b/mysql-test/r/flush.result @@ -1,6 +1,30 @@ +drop table if exists t1; +create temporary table t1(n int not null primary key); +drop table if exists t2; +create table t2(n int); +insert into t2 values(3); +select * from t1; n 3 +flush tables with read lock; +drop table t2; +Table 't2' was locked with a READ lock and can't be updated + drop table t2; +unlock tables; +drop database if exists foo; +create database foo; +create table foo.t1(n int); +insert into foo.t1 values (23); +flush tables with read lock; + drop database foo; +select * from foo.t1; n 23 +unlock tables; +create table t1 (n int); +flush tables with read lock; +insert into t1 values (345); +select * from t1; n 345 +drop table t1; diff --git a/mysql-test/r/foreign_key.result b/mysql-test/r/foreign_key.result new file mode 100644 index 00000000000..ece53db2e9a --- /dev/null +++ b/mysql-test/r/foreign_key.result @@ -0,0 +1,15 @@ +drop table if exists t1; +create table t1 ( +a int not null references t2, +b int not null references t2 (c), +primary key (a,b), +foreign key (a) references t3 match full, +foreign key (a) references t3 match partial, +foreign key (a,b) references t3 (c,d) on delete no action +on update no action, +foreign key (a,b) references t3 (c,d) on update cascade, +foreign key (a,b) references t3 (c,d) on delete set default, +foreign key (a,b) references t3 (c,d) on update set null); +create index a on t1 (a); +create unique index b on t1 (a,b); +drop table t1; diff --git a/mysql-test/r/fulltext_cache.result b/mysql-test/r/fulltext_cache.result index 0e5dd2060d5..b908840ad92 100644 --- a/mysql-test/r/fulltext_cache.result +++ b/mysql-test/r/fulltext_cache.result @@ -1,5 +1,30 @@ +drop table if exists t1, t2; +CREATE TABLE t1 ( +id int(10) unsigned NOT NULL auto_increment, +q varchar(255) default NULL, +PRIMARY KEY (id) +); +INSERT INTO t1 VALUES (1,'aaaaaaaaa dsaass de'); +INSERT INTO t1 VALUES (2,'ssde df s fsda sad er'); +CREATE TABLE t2 ( +id int(10) unsigned NOT NULL auto_increment, +id2 int(10) unsigned default NULL, +item varchar(255) default NULL, +PRIMARY KEY (id), +FULLTEXT KEY item(item) +); +INSERT INTO t2 VALUES (1,1,'sushi'); +INSERT INTO t2 VALUES (2,1,'Bolo de Chocolate'); +INSERT INTO t2 VALUES (3,1,'Feijoada'); +INSERT INTO t2 VALUES (4,1,'Mousse de Chocolate'); +INSERT INTO t2 VALUES (5,2,'um copo de Vodka'); +INSERT INTO t2 VALUES (6,2,'um chocolate Snickers'); +INSERT INTO t2 VALUES (7,1,'Bife'); +INSERT INTO t2 VALUES (8,1,'Pizza de Salmao'); +SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi') as x FROM t1, t2 +WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id; q item id x -aaaaaaaaa dsaass de sushi 1 1.92378664016724 +aaaaaaaaa dsaass de sushi 1 1.92378665219675 aaaaaaaaa dsaass de Bolo de Chocolate 2 0 aaaaaaaaa dsaass de Feijoada 3 0 aaaaaaaaa dsaass de Mousse de Chocolate 4 0 @@ -7,8 +32,10 @@ ssde df s fsda sad er um copo de Vodka 5 0 ssde df s fsda sad er um chocolate Snickers 6 0 aaaaaaaaa dsaass de Bife 7 0 aaaaaaaaa dsaass de Pizza de Salmao 8 0 +SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi') as x FROM t2, t1 +WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id; q item id x -aaaaaaaaa dsaass de sushi 1 1.92378664016724 +aaaaaaaaa dsaass de sushi 1 1.92378665219675 aaaaaaaaa dsaass de Bolo de Chocolate 2 0 aaaaaaaaa dsaass de Feijoada 3 0 aaaaaaaaa dsaass de Mousse de Chocolate 4 0 @@ -16,3 +43,4 @@ ssde df s fsda sad er um copo de Vodka 5 0 ssde df s fsda sad er um chocolate Snickers 6 0 aaaaaaaaa dsaass de Bife 7 0 aaaaaaaaa dsaass de Pizza de Salmao 8 0 +drop table t1, t2; diff --git a/mysql-test/r/fulltext_distinct.result b/mysql-test/r/fulltext_distinct.result index 9729eb59c10..801d82dc6a2 100644 --- a/mysql-test/r/fulltext_distinct.result +++ b/mysql-test/r/fulltext_distinct.result @@ -1,10 +1,41 @@ +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 ( +id mediumint unsigned NOT NULL auto_increment, +tag char(6) NOT NULL default '', +value text NOT NULL default '', +PRIMARY KEY (id), +KEY kt(tag), +KEY kv(value(15)), +FULLTEXT KEY kvf(value) +) TYPE=MyISAM; +DROP TABLE IF EXISTS t2; +CREATE TABLE t2 ( +id_t2 mediumint unsigned NOT NULL default '0', +id_t1 mediumint unsigned NOT NULL default '0', +field_number tinyint unsigned NOT NULL default '0', +PRIMARY KEY (id_t2,id_t1,field_number), +KEY id_t1(id_t1) +) TYPE=MyISAM; +INSERT INTO t1 (tag,value) VALUES ('foo123','bar111'); +INSERT INTO t2 VALUES (2231626,64280,0); +INSERT INTO t1 (tag,value) VALUES ('foo123','bar222'); +INSERT INTO t2 VALUES (2231626,64281,0); +insert into t1 (tag,value) values ('bar345','baz333 ar'); +insert into t2 values (12346, 3, 1); +select * from t1; id tag value 1 foo123 bar111 2 foo123 bar222 3 bar345 baz333 ar +select * from t2; id_t2 id_t1 field_number 12346 3 1 2231626 64280 0 2231626 64281 0 +SELECT DISTINCT t2.id_t2 +FROM t2, t1 +WHERE MATCH (t1.value) AGAINST ('baz333') +AND t1.id = t2.id_t1; id_t2 12346 +DROP TABLE t1,t2; diff --git a/mysql-test/r/fulltext_left_join.result b/mysql-test/r/fulltext_left_join.result index 051d3bf4f84..03751a17308 100644 --- a/mysql-test/r/fulltext_left_join.result +++ b/mysql-test/r/fulltext_left_join.result @@ -1,5 +1,25 @@ +CREATE TABLE t1 ( +id VARCHAR(255) NOT NULL PRIMARY KEY, +sujet VARCHAR(255), +motsclefs TEXT, +texte MEDIUMTEXT, +FULLTEXT(sujet, motsclefs, texte) +); +INSERT INTO t1 VALUES('123','toto','essai','test'); +INSERT INTO t1 VALUES('456','droit','penal','lawyer'); +INSERT INTO t1 VALUES('789','aaaaa','bbbbb','cccccc'); +CREATE TABLE t2 ( +id VARCHAR(255) NOT NULL, +author VARCHAR(255) NOT NULL +); +INSERT INTO t2 VALUES('123', 'moi'); +INSERT INTO t2 VALUES('123', 'lui'); +INSERT INTO t2 VALUES('456', 'lui'); +select match(t1.texte,t1.sujet,t1.motsclefs) against('droit') +from t1 left join t2 on t2.id=t1.id; match(t1.texte,t1.sujet,t1.motsclefs) against('droit') 0 0 -0.67003107070923 +0.67003110026735 0 +drop table t1, t2; diff --git a/mysql-test/r/fulltext_multi.result b/mysql-test/r/fulltext_multi.result index f1f890da9de..27374e9e4aa 100644 --- a/mysql-test/r/fulltext_multi.result +++ b/mysql-test/r/fulltext_multi.result @@ -1,12 +1,30 @@ +use test; +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 ( +a int(11) NOT NULL auto_increment, +b text, +c varchar(254) default NULL, +PRIMARY KEY (a), +FULLTEXT KEY bb(b), +FULLTEXT KEY cc(c), +FULLTEXT KEY a(b,c) +); +INSERT INTO t1 VALUES (1,'lala lolo lili','oooo aaaa pppp'); +INSERT INTO t1 VALUES (2,'asdf fdsa','lkjh fghj'); +INSERT INTO t1 VALUES (3,'qpwoei','zmxnvb'); +SELECT a, MATCH b AGAINST ('lala lkjh') FROM t1; a MATCH b AGAINST ('lala lkjh') -1 0.67003107070923 +1 0.67003110026735 2 0 3 0 +SELECT a, MATCH c AGAINST ('lala lkjh') FROM t1; a MATCH c AGAINST ('lala lkjh') 1 0 -2 0.67756325006485 +2 0.67756324121582 3 0 +SELECT a, MATCH b,c AGAINST ('lala lkjh') FROM t1; a MATCH b,c AGAINST ('lala lkjh') -1 0.64840710163116 -2 0.66266459226608 +1 0.64840710366884 +2 0.66266459031789 3 0 +drop table t1; diff --git a/mysql-test/r/fulltext_order_by.result b/mysql-test/r/fulltext_order_by.result index c0db830c08a..cc94ba7e041 100644 --- a/mysql-test/r/fulltext_order_by.result +++ b/mysql-test/r/fulltext_order_by.result @@ -1,19 +1,34 @@ +use test; +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 ( +a INT AUTO_INCREMENT PRIMARY KEY, +message CHAR(20), +FULLTEXT(message) +) comment = 'original testcase by sroussey@network54.com'; +INSERT INTO t1 (message) VALUES ("Testing"),("table"),("testbug"), +("steve"),("is"),("cool"),("steve is cool"); +SELECT a, MATCH (message) AGAINST ('steve') FROM t1 WHERE MATCH (message) AGAINST ('steve'); a MATCH (message) AGAINST ('steve') -4 0.90587323904037 -7 0.89568990468979 +4 0.90587321329654 +7 0.89568988462614 +SELECT a, MATCH (message) AGAINST ('steve') FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY a; a MATCH (message) AGAINST ('steve') -4 0.90587323904037 -7 0.89568990468979 +4 0.90587321329654 +7 0.89568988462614 +SELECT a, MATCH (message) AGAINST ('steve') FROM t1 WHERE a in (2,7,4) and MATCH (message) AGAINST ('steve') ORDER BY a DESC; a MATCH (message) AGAINST ('steve') -7 0.89568990468979 -4 0.90587323904037 +7 0.89568988462614 +4 0.90587321329654 +SELECT a, MATCH (message) AGAINST ('steve') FROM t1 WHERE a=7 and MATCH (message) AGAINST ('steve') ORDER BY 1; a MATCH (message) AGAINST ('steve') -7 0.89568990468979 +7 0.89568988462614 +SELECT a, MATCH (message) AGAINST ('steve') as rel FROM t1 ORDER BY rel; a rel 1 0 2 0 3 0 5 0 6 0 -7 0.89568990468979 -4 0.90587323904037 +7 0.89568988462614 +4 0.90587321329654 +drop table t1; diff --git a/mysql-test/r/fulltext_update.result b/mysql-test/r/fulltext_update.result index 77ee76ad30d..5d3f95b318c 100644 --- a/mysql-test/r/fulltext_update.result +++ b/mysql-test/r/fulltext_update.result @@ -1,2 +1,22 @@ +drop table if exists test; +CREATE TABLE test ( +gnr INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, +url VARCHAR(80) DEFAULT '' NOT NULL, +shortdesc VARCHAR(200) DEFAULT '' NOT NULL, +longdesc text DEFAULT '' NOT NULL, +description VARCHAR(80) DEFAULT '' NOT NULL, +name VARCHAR(80) DEFAULT '' NOT NULL, +FULLTEXT(url,description,shortdesc,longdesc), +PRIMARY KEY(gnr) +); +insert into test (url,shortdesc,longdesc,description,name) VALUES +("http:/test.at", "kurz", "lang","desc", "name"); +insert into test (url,shortdesc,longdesc,description,name) VALUES +("http:/test.at", "kurz", "","desc", "name"); +update test set url='test', description='ddd', name='nam' where gnr=2; +update test set url='test', shortdesc='ggg', longdesc='mmm', +description='ddd', name='nam' where gnr=2; +check table test; Table Op Msg_type Msg_text test.test check status OK +drop table test; diff --git a/mysql-test/r/fulltext_var.result b/mysql-test/r/fulltext_var.result index 0352cd7addf..ececb63d31f 100644 --- a/mysql-test/r/fulltext_var.result +++ b/mysql-test/r/fulltext_var.result @@ -1,3 +1,4 @@ +show variables like "ft\_%"; Variable_name Value ft_min_word_len 4 ft_max_word_len 254 diff --git a/mysql-test/r/func_crypt.result b/mysql-test/r/func_crypt.result index 021989add8d..54f2865454d 100644 --- a/mysql-test/r/func_crypt.result +++ b/mysql-test/r/func_crypt.result @@ -1,2 +1,3 @@ +select length(encrypt('foo', 'ff')) <> 0; length(encrypt('foo', 'ff')) <> 0 1 diff --git a/mysql-test/r/func_date_add.result b/mysql-test/r/func_date_add.result index 3bc0fb1aff3..acdf2c5d7be 100644 --- a/mysql-test/r/func_date_add.result +++ b/mysql-test/r/func_date_add.result @@ -1,12 +1,47 @@ +drop table if exists t1; +CREATE TABLE t1 ( +visitor_id int(10) unsigned DEFAULT '0' NOT NULL, +group_id int(10) unsigned DEFAULT '0' NOT NULL, +hits int(10) unsigned DEFAULT '0' NOT NULL, +sessions int(10) unsigned DEFAULT '0' NOT NULL, +ts timestamp(14), +PRIMARY KEY (visitor_id,group_id) +)/*! type=MyISAM */; +INSERT INTO t1 VALUES (465931136,7,2,2,20000318160952); +INSERT INTO t1 VALUES (173865424,2,2,2,20000318233615); +INSERT INTO t1 VALUES (173865424,8,2,2,20000318233615); +INSERT INTO t1 VALUES (173865424,39,2,2,20000318233615); +INSERT INTO t1 VALUES (173865424,7,2,2,20000318233615); +INSERT INTO t1 VALUES (173865424,3,2,2,20000318233615); +INSERT INTO t1 VALUES (173865424,6,2,2,20000318233615); +INSERT INTO t1 VALUES (173865424,60,2,2,20000318233615); +INSERT INTO t1 VALUES (173865424,1502,2,2,20000318233615); +INSERT INTO t1 VALUES (48985536,2,2,2,20000319013932); +INSERT INTO t1 VALUES (48985536,8,2,2,20000319013932); +INSERT INTO t1 VALUES (48985536,39,2,2,20000319013932); +INSERT INTO t1 VALUES (48985536,7,2,2,20000319013932); +INSERT INTO t1 VALUES (465931136,3,2,2,20000318160951); +INSERT INTO t1 VALUES (465931136,119,1,1,20000318160953); +INSERT INTO t1 VALUES (465931136,2,1,1,20000318160950); +INSERT INTO t1 VALUES (465931136,8,1,1,20000318160950); +INSERT INTO t1 VALUES (465931136,39,1,1,20000318160950); +INSERT INTO t1 VALUES (1092858576,14,1,1,20000319013445); +INSERT INTO t1 VALUES (357917728,3,2,2,20000319145026); +INSERT INTO t1 VALUES (357917728,7,2,2,20000319145027); +select visitor_id,max(ts) as mts from t1 group by visitor_id +having mts < DATE_SUB(NOW(),INTERVAL 3 MONTH); visitor_id mts 48985536 20000319013932 173865424 20000318233615 357917728 20000319145027 465931136 20000318160953 1092858576 20000319013445 +select visitor_id,max(ts) as mts from t1 group by visitor_id +having DATE_ADD(mts,INTERVAL 3 MONTH) < NOW(); visitor_id mts 48985536 20000319013932 173865424 20000318233615 357917728 20000319145027 465931136 20000318160953 1092858576 20000319013445 +drop table t1; diff --git a/mysql-test/r/func_equal.result b/mysql-test/r/func_equal.result index 6e2933641aa..32a911eedf8 100644 --- a/mysql-test/r/func_equal.result +++ b/mysql-test/r/func_equal.result @@ -1,15 +1,29 @@ +select 0<=>0,0.0<=>0.0,"A"<=>"A",NULL<=>NULL; 0<=>0 0.0<=>0.0 "A"<=>"A" NULL<=>NULL 1 1 1 1 +select 1<=>0,0<=>NULL,NULL<=>0; 1<=>0 0<=>NULL NULL<=>0 0 0 0 +select 1.0<=>0.0,0.0<=>NULL,NULL<=>0.0; 1.0<=>0.0 0.0<=>NULL NULL<=>0.0 0 0 0 +select "A"<=>"B","A"<=>NULL,NULL<=>"A"; "A"<=>"B" "A"<=>NULL NULL<=>"A" 0 0 0 +drop table if exists t1,t2; +create table t1 (id int, value int); +create table t2 (id int, value int); +insert into t1 values (1,null); +insert into t2 values (1,null); +select t1.*, t2.*, t1.value<=>t2.value from t1, t2 where t1.id=t2.id and t1.id=1; id value id value t1.value<=>t2.value 1 NULL 1 NULL 1 +select * from t1 where id <=>id; id value 1 NULL +select * from t1 where value <=> value; id value 1 NULL +select * from t1 where id <=> value or value<=>id; id value +drop table t1,t2; diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index ea9a06123ae..bdb33be5d4c 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -1,3 +1,11 @@ +create table t1 (grp int, a bigint unsigned, c char(10) not null); +insert into t1 values (1,1,"a"); +insert into t1 values (2,2,"b"); +insert into t1 values (2,3,"c"); +insert into t1 values (3,4,"E"); +insert into t1 values (3,5,"C"); +insert into t1 values (3,6,"D"); +select a,c,sum(a) from t1 group by a; a c sum(a) 1 a 1 2 b 2 @@ -5,9 +13,12 @@ a c sum(a) 4 E 4 5 C 5 6 D 6 +select a,c,sum(a) from t1 where a > 10 group by a; a c sum(a) +select sum(a) from t1 where a > 10; sum(a) NULL +select a from t1 order by rand(10); a 1 3 @@ -15,6 +26,7 @@ a 5 2 4 +select distinct a from t1 order by rand(10); a 1 3 @@ -22,65 +34,119 @@ a 5 2 4 +select count(distinct a),count(distinct grp) from t1; count(distinct a) count(distinct grp) 6 3 +insert into t1 values (null,null,''); +select count(distinct a),count(distinct grp) from t1; count(distinct a) count(distinct grp) 6 3 +select sum(a),count(a),avg(a),std(a),bit_or(a),bit_and(a),min(a),max(a),min(c),max(c) from t1; sum(a) count(a) avg(a) std(a) bit_or(a) bit_and(a) min(a) max(a) min(c) max(c) 21 6 3.5000 1.7078 7 0 1 6 E +select grp, sum(a),count(a),avg(a),std(a),bit_or(a),bit_and(a),min(a),max(a),min(c),max(c) from t1 group by grp; grp sum(a) count(a) avg(a) std(a) bit_or(a) bit_and(a) min(a) max(a) min(c) max(c) NULL 0 0 NULL NULL 0 0 NULL NULL 1 1 1 1.0000 0.0000 1 1 1 1 a a 2 5 2 2.5000 0.5000 3 2 2 3 b c 3 15 3 5.0000 0.8165 7 4 4 6 C E +select grp, sum(a)+count(a)+avg(a)+std(a)+bit_or(a)+bit_and(a)+min(a)+max(a)+min(c)+max(c) as sum from t1 group by grp; grp sum NULL NULL 1 7 2 20 3 44.816496580928 +create table t2 (grp int, a bigint unsigned, c char(10)); +insert into t2 select grp,max(a)+max(grp),max(c) from t1 group by grp; +replace into t2 select grp, a, c from t1 limit 2,1; +select * from t2; grp a c NULL NULL 1 2 a 2 5 c 3 9 E 2 3 c +drop table t1,t2; +CREATE TABLE t1 (id int(11),value1 float(10,2)); +INSERT INTO t1 VALUES (1,0.00),(1,1.00), (1,2.00), (2,10.00), (2,11.00), (2,12.00); +CREATE TABLE t2 (id int(11),name char(20)); +INSERT INTO t2 VALUES (1,'Set One'),(2,'Set Two'); +select id, avg(value1), std(value1) from t1 group by id; id avg(value1) std(value1) 1 1.000000 0.816497 2 11.000000 0.816497 +select name, avg(value1), std(value1) from t1, t2 where t1.id = t2.id group by t1.id; name avg(value1) std(value1) Set One 1.000000 0.816497 Set Two 11.000000 0.816497 +drop table t1,t2; +create table t1 (id int not null); +create table t2 (id int not null,rating int null); +insert into t1 values(1),(2),(3); +insert into t2 values(1, 3),(2, NULL),(2, NULL),(3, 2),(3, NULL); +select t1.id, avg(rating) from t1 left join t2 on ( t1.id = t2.id ) group by t1.id; id avg(rating) 1 3.0000 2 NULL 3 2.0000 +drop table t1,t2; +create table t1 (a smallint(6) primary key, c char(10), b text); +INSERT INTO t1 VALUES (1,'1','1'); +INSERT INTO t1 VALUES (2,'2','2'); +INSERT INTO t1 VALUES (4,'4','4'); +select count(*) from t1; count(*) 3 +select count(*) from t1 where a = 1; count(*) 1 +select count(*) from t1 where a = 100; count(*) 0 +select count(*) from t1 where a >= 10; count(*) 0 +select count(a) from t1 where a = 1; count(a) 1 +select count(a) from t1 where a = 100; count(a) 0 +select count(a) from t1 where a >= 10; count(a) 0 +select count(b) from t1 where b >= 2; count(b) 2 +select count(b) from t1 where b >= 10; count(b) 0 +select count(c) from t1 where c = 10; count(c) 0 +drop table t1; +CREATE TABLE t1 (d DATETIME, i INT); +INSERT INTO t1 VALUES (NOW(), 1); +SELECT COUNT(i), i, COUNT(i)*i FROM t1 GROUP BY i; COUNT(i) i COUNT(i)*i 1 1 1 +SELECT COUNT(i), (i+0), COUNT(i)*(i+0) FROM t1 GROUP BY i; COUNT(i) (i+0) COUNT(i)*(i+0) 1 1 1 +DROP TABLE t1; +create table t1 ( +num float(5,2), +user char(20) +); +insert into t1 values (10.3,'nem'),(20.53,'monty'),(30.23,'sinisa'); +insert into t1 values (30.13,'nem'),(20.98,'monty'),(10.45,'sinisa'); +insert into t1 values (5.2,'nem'),(8.64,'monty'),(11.12,'sinisa'); +select sum(num) from t1; sum(num) 147.58 +select sum(num) from t1 group by user; sum(num) 50.15 45.63 51.80 +drop table t1; diff --git a/mysql-test/r/func_in.result b/mysql-test/r/func_in.result index f201d371876..8c991dee8d8 100644 --- a/mysql-test/r/func_in.result +++ b/mysql-test/r/func_in.result @@ -1,14 +1,27 @@ +CREATE TABLE t1 (field char(1)); +INSERT INTO t1 VALUES ('A'),(NULL); +SELECT * from t1 WHERE field IN (NULL); field +SELECT * from t1 WHERE field NOT IN (NULL); field A +SELECT * from t1 where field = field; field A +SELECT * from t1 where field <=> field; field A NULL +DELETE FROM t1 WHERE field NOT IN (NULL); +SELECT * FROM t1; field NULL +drop table t1; +create table t1 (id int(10) primary key); +insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9); +select * from t1 where id in (2,5,9); id 2 5 9 +drop table t1; diff --git a/mysql-test/r/func_like.result b/mysql-test/r/func_like.result index a6c28daae88..796674b5fa4 100644 --- a/mysql-test/r/func_like.result +++ b/mysql-test/r/func_like.result @@ -1,10 +1,18 @@ +drop table if exists t1; +create table t1 (a varchar(10), key(a)); +insert into t1 values ("a"),("abc"),("abcd"),("hello"),("test"); +select * from t1 where a like "abc%"; a abc abcd +select * from t1 where a like "ABC%"; a abc abcd +select * from t1 where a like "test%"; a test +select * from t1 where a like "te_t"; a test +drop table t1; diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index cee67a3e25c..771c640805b 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -1,22 +1,33 @@ +select floor(5.5),floor(-5.5); floor(5.5) floor(-5.5) 5 -6 +select ceiling(5.5),ceiling(-5.5); ceiling(5.5) ceiling(-5.5) 6 -5 +select truncate(52.64,1),truncate(52.64,2),truncate(52.64,-1),truncate(52.64,-2); truncate(52.64,1) truncate(52.64,2) truncate(52.64,-1) truncate(52.64,-2) 52.6 52.64 50 0 +select round(5.5),round(-5.5); round(5.5) round(-5.5) 6 -6 +select round(5.64,1),round(5.64,2),round(5.64,-1),round(5.64,-2); round(5.64,1) round(5.64,2) round(5.64,-1) round(5.64,-2) 5.6 5.64 10 0 +select abs(-10), sign(-5), sign(5), sign(0); abs(-10) sign(-5) sign(5) sign(0) 10 -1 1 0 +select log(exp(10)),exp(log(sqrt(10))*2); log(exp(10)) exp(log(sqrt(10))*2) 10.000000 10.000000 +select pow(10,log10(10)),power(2,4); pow(10,log10(10)) power(2,4) 10.000000 16.000000 +select rand(999999),rand(); rand(999999) rand() 0.18435012473199 0.76373626176616 +select pi(),sin(pi()/2),cos(pi()/2),abs(tan(pi())),cot(1),asin(1),acos(0),atan(1); PI() sin(pi()/2) cos(pi()/2) abs(tan(pi())) cot(1) asin(1) acos(0) atan(1) 3.141593 1.000000 0.000000 0.000000 0.64209262 1.570796 1.570796 0.785398 +select degrees(pi()),radians(360); degrees(pi()) radians(360) 180 6.2831853071796 diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 5448127548b..575f5e5429a 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -1,8 +1,12 @@ +select format(1.5555,0),format(123.5555,1),format(1234.5555,2),format(12345.5555,3),format(123456.5555,4),format(1234567.5555,5),format("12345.2399",2); format(1.5555,0) format(123.5555,1) format(1234.5555,2) format(12345.5555,3) format(123456.5555,4) format(1234567.5555,5) format("12345.2399",2) 2 123.6 1,234.56 12,345.556 123,456.5555 1,234,567.55550 12,345.24 +select inet_ntoa(inet_aton("255.255.255.255.255.255.255.255")); inet_ntoa(inet_aton("255.255.255.255.255.255.255.255")) 255.255.255.255.255.255.255.255 +select inet_aton("255.255.255.255.255"),inet_aton("255.255.1.255"),inet_aton("0.1.255"); inet_aton("255.255.255.255.255") inet_aton("255.255.1.255") inet_aton("0.1.255") 1099511627775 4294902271 511 +select inet_ntoa(1099511627775),inet_ntoa(4294902271),inet_ntoa(511); inet_ntoa(1099511627775) inet_ntoa(4294902271) inet_ntoa(511) 255.255.255.255.255 255.255.1.255 0.0.1.255 diff --git a/mysql-test/r/func_op.result b/mysql-test/r/func_op.result index b14f575c998..dca85a77c09 100644 --- a/mysql-test/r/func_op.result +++ b/mysql-test/r/func_op.result @@ -1,6 +1,9 @@ +select 1+1,1-1,1+1*2,8/5,8%5,mod(8,5),mod(8,5)|0,-(1+1)*-2; 1+1 1-1 1+1*2 8/5 8%5 mod(8,5) mod(8,5)|0 -(1+1)*-2 2 0 3 1.60 3 3 3 4 +select 1 | (1+1),5 & 3,bit_count(7) ; 1 | (1+1) 5 & 3 bit_count(7) 3 1 3 +select 1 << 32,1 << 63, 1 << 64, 4 >> 2, 4 >> 63, 1<< 63 >> 60; 1 << 32 1 << 63 1 << 64 4 >> 2 4 >> 63 1<< 63 >> 60 4294967296 -9223372036854775808 0 1 0 8 diff --git a/mysql-test/r/func_regexp.result b/mysql-test/r/func_regexp.result index 5927dba0974..8d22994ef2b 100644 --- a/mysql-test/r/func_regexp.result +++ b/mysql-test/r/func_regexp.result @@ -1,3 +1,20 @@ +drop table if exists t1; +create table t1 (s1 char(64),s2 char(64)); +insert into t1 values('aaa','aaa'); +insert into t1 values('aaa|qqq','qqq'); +insert into t1 values('gheis','^[^a-dXYZ]+$'); +insert into t1 values('aab','^aa?b'); +insert into t1 values('Baaan','^Ba*n'); +insert into t1 values('aaa','qqq|aaa'); +insert into t1 values('qqq','qqq|aaa'); +insert into t1 values('bbb','qqq|aaa'); +insert into t1 values('bbb','qqq'); +insert into t1 values('aaa','aba'); +insert into t1 values(null,'abc'); +insert into t1 values('def',null); +insert into t1 values(null,null); +insert into t1 values('ghi','ghi['); +select HIGH_PRIORITY s1 regexp s2 from t1; s1 regexp s2 1 1 @@ -13,13 +30,25 @@ NULL NULL NULL NULL +drop table t1; +create table t1 (xxx char(128)); +insert into t1 (xxx) values('this is a test of some long text to see what happens'); +select * from t1 where xxx regexp('is a test of some long text to'); xxx this is a test of some long text to see what happens +select * from t1 where xxx regexp('is a test of some long text to '); xxx this is a test of some long text to see what happens +select * from t1 where xxx regexp('is a test of some long text to s'); xxx this is a test of some long text to see what happens +select * from t1 where xxx regexp('is a test of some long text to se'); xxx this is a test of some long text to see what happens +drop table t1; +create table t1 (xxx char(128)); +insert into t1 (xxx) values('this is some text: to test - out.reg exp (22/45)'); +select * from t1 where xxx REGEXP '^this is some text: to test - out\\.reg exp [[(][0-9]+[/\\][0-9]+[])][ ]*$'; xxx this is some text: to test - out.reg exp (22/45) +drop table t1; diff --git a/mysql-test/r/func_set.result b/mysql-test/r/func_set.result index b82fffc3dbd..5305c16c5d9 100644 --- a/mysql-test/r/func_set.result +++ b/mysql-test/r/func_set.result @@ -1,18 +1,27 @@ +select interval(55,10,20,30,40,50,60,70,80,90,100),interval(3,1,1+1,1+1+1+1),field("IBM","NCA","ICL","SUN","IBM","DIGITAL"),field("A","B","C"),elt(2,"ONE","TWO","THREE"),interval(0,1,2,3,4),elt(1,1,2,3)|0,elt(1,1.1,1.2,1.3)+0; interval(55,10,20,30,40,50,60,70,80,90,100) interval(3,1,1+1,1+1+1+1) field("IBM","NCA","ICL","SUN","IBM","DIGITAL") field("A","B","C") elt(2,"ONE","TWO","THREE") interval(0,1,2,3,4) elt(1,1,2,3)|0 elt(1,1.1,1.2,1.3)+0 5 2 4 0 TWO 0 1 1.1 +select find_in_set("b","a,b,c"),find_in_set("c","a,b,c"),find_in_set("dd","a,bbb,dd"),find_in_set("bbb","a,bbb,dd"); find_in_set("b","a,b,c") find_in_set("c","a,b,c") find_in_set("dd","a,bbb,dd") find_in_set("bbb","a,bbb,dd") 2 3 3 2 +select find_in_set("d","a,b,c"),find_in_set("dd","a,bbb,d"),find_in_set("bb","a,bbb,dd"); find_in_set("d","a,b,c") find_in_set("dd","a,bbb,d") find_in_set("bb","a,bbb,dd") 0 0 0 +select make_set(0,'a','b','c'),make_set(-1,'a','b','c'),make_set(1,'a','b','c'),make_set(2,'a','b','c'),make_set(1+2,concat('a','b'),'c'); make_set(0,'a','b','c') make_set(-1,'a','b','c') make_set(1,'a','b','c') make_set(2,'a','b','c') make_set(1+2,concat('a','b'),'c') a,b,c a b ab,c +select make_set(NULL,'a','b','c'),make_set(1|4,'a',NULL,'c'),make_set(1+2,'a',NULL,'c'); make_set(NULL,'a','b','c') make_set(1|4,'a',NULL,'c') make_set(1+2,'a',NULL,'c') NULL a,c a +select export_set(9,"Y","N","-",5),export_set(9,"Y","N"),export_set(9,"Y","N",""); export_set(9,"Y","N","-",5) export_set(9,"Y","N") export_set(9,"Y","N","") Y-N-N-Y-N Y,N,N,Y,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N YNNYNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN +select elt(2,1),field(NULL,"a","b","c"); elt(2,1) field(NULL,"a","b","c") NULL 0 +select find_in_set("","a,b,c"),find_in_set("","a,b,c,"),find_in_set("",",a,b,c"); find_in_set("","a,b,c") find_in_set("","a,b,c,") find_in_set("",",a,b,c") 0 4 1 +select find_in_set("abc","abc"),find_in_set("ab","abc"),find_in_set("abcd","abc"); find_in_set("abc","abc") find_in_set("ab","abc") find_in_set("abcd","abc") 1 0 0 diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index ec421e9f31b..efbcd91964b 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -1,112 +1,186 @@ +drop table if exists t1; +select 'hello',"'hello'",'""hello""','''h''e''l''l''o''',"hel""lo",'hel\'lo'; hello 'hello' ""hello"" 'h'e'l'l'o' hel"lo hel'lo hello 'hello' ""hello"" 'h'e'l'l'o' hel"lo hel'lo +select 'hello' 'monty'; hello hellomonty +select length('\n\t\r\b\0\_\%\\'); length('\n\t\r\b\0\_\%\\') 10 +select concat('monty',' was here ','again'),length('hello'),char(ascii('h')); concat('monty',' was here ','again') length('hello') char(ascii('h')) monty was here again 5 h +select locate('he','hello'),locate('he','hello',2),locate('lo','hello',2) ; locate('he','hello') locate('he','hello',2) locate('lo','hello',2) 1 0 4 +select instr('hello','he'); instr('hello','he') 1 +select position('ll' in 'hello'),position('a' in 'hello'); position('ll' in 'hello') position('a' in 'hello') 3 0 +select left('hello',2),right('hello',2),substring('hello',2,2),mid('hello',1,5) ; left('hello',2) right('hello',2) substring('hello',2,2) mid('hello',1,5) he lo el hello +select concat('',left(right(concat('what ',concat('is ','happening')),9),4),'',substring('monty',5,1)) ; concat('',left(right(concat('what ',concat('is ','happening')),9),4),'',substring('monty',5,1)) happy +select substring_index('www.tcx.se','.',-2),substring_index('www.tcx.se','.',1); substring_index('www.tcx.se','.',-2) substring_index('www.tcx.se','.',1) tcx.se www +select substring_index('www.tcx.se','tcx',1),substring_index('www.tcx.se','tcx',-1); substring_index('www.tcx.se','tcx',1) substring_index('www.tcx.se','tcx',-1) www. .se +select substring_index('.tcx.se','.',-2),substring_index('.tcx.se','.tcx',-1); substring_index('.tcx.se','.',-2) substring_index('.tcx.se','.tcx',-1) tcx.se .se +select concat(':',ltrim(' left '),':',rtrim(' right '),':'); concat(':',ltrim(' left '),':',rtrim(' right '),':') :left : right: +select concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':'); concat(':',trim(LEADING FROM ' left'),':',trim(TRAILING FROM ' right '),':') :left: right: +select concat(':',trim(' m '),':',trim(BOTH FROM ' y '),':',trim('*' FROM '*s*'),':'); concat(':',trim(' m '),':',trim(BOTH FROM ' y '),':',trim('*' FROM '*s*'),':') :m:y:s: +select concat(':',trim(BOTH 'ab' FROM 'ababmyabab'),':',trim(BOTH '*' FROM '***sql'),':'); concat(':',trim(BOTH 'ab' FROM 'ababmyabab'),':',trim(BOTH '*' FROM '***sql'),':') :my:sql: +select concat(':',trim(LEADING '.*' FROM '.*my'),':',trim(TRAILING '.*' FROM 'sql.*.*'),':'); concat(':',trim(LEADING '.*' FROM '.*my'),':',trim(TRAILING '.*' FROM 'sql.*.*'),':') :my:sql: +select TRIM("foo" FROM "foo"), TRIM("foo" FROM "foook"), TRIM("foo" FROM "okfoo"); TRIM("foo" FROM "foo") TRIM("foo" FROM "foook") TRIM("foo" FROM "okfoo") ok ok +select concat_ws(', ','monty','was here','again'); concat_ws(', ','monty','was here','again') monty, was here, again +select concat_ws(NULL,'a'),concat_ws(',',NULL,''); concat_ws(NULL,'a') concat_ws(',',NULL,'') NULL +select concat_ws(',','',NULL,'a'); concat_ws(',','',NULL,'a') a +SELECT CONCAT('"',CONCAT_WS('";"',repeat('a',60),repeat('b',60),repeat('c',60),repeat('d',100)), '"'); CONCAT('"',CONCAT_WS('";"',repeat('a',60),repeat('b',60),repeat('c',60),repeat('d',100)), '"') "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";"cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc";"dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd" +select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es'); insert('txs',2,1,'hi') insert('is ',4,0,'a') insert('txxxxt',2,4,'es') this is a test +select replace('aaaa','a','b'),replace('aaaa','aa','b'),replace('aaaa','a','bb'),replace('aaaa','','b'),replace('bbbb','a','c'); replace('aaaa','a','b') replace('aaaa','aa','b') replace('aaaa','a','bb') replace('aaaa','','b') replace('bbbb','a','c') bbbb bb bbbbbbbb aaaa bbbb +select replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') ; replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') this is a REAL test +select soundex(''),soundex('he'),soundex('hello all folks'); soundex('') soundex('he') soundex('hello all folks') H000 H4142 +select password('test'),length(encrypt('test')),encrypt('test','aa'); password('test') length(encrypt('test')) encrypt('test','aa') 378b243e220ca493 13 aaqPiZY5xR5l. +select md5('hello'); md5('hello') 5d41402abc4b2a76b9719d911017c592 +select repeat('monty',5),concat('*',space(5),'*'); repeat('monty',5) concat('*',space(5),'*') montymontymontymontymonty * * +select reverse('abc'),reverse('abcd'); reverse('abc') reverse('abcd') cba dcba +select rpad('a',4,'1'),rpad('a',4,'12'),rpad('abcd',3,'12'); rpad('a',4,'1') rpad('a',4,'12') rpad('abcd',3,'12') a111 a121 abc +select lpad('a',4,'1'),lpad('a',4,'12'),lpad('abcd',3,'12'); lpad('a',4,'1') lpad('a',4,'12') lpad('abcd',3,'12') 111a 121a abc +select rpad(741653838,17,'0'),lpad(741653838,17,'0'); rpad(741653838,17,'0') lpad(741653838,17,'0') 74165383800000000 00000000741653838 +select rpad('abcd',7,'ab'),lpad('abcd',7,'ab'); rpad('abcd',7,'ab') lpad('abcd',7,'ab') abcdaba abaabcd +select rpad('abcd',1,'ab'),lpad('abcd',1,'ab'); rpad('abcd',1,'ab') lpad('abcd',1,'ab') a a +select LEAST(NULL,'HARRY','HARRIOT',NULL,'HAROLD'),GREATEST(NULL,'HARRY','HARRIOT',NULL,'HAROLD'); LEAST(NULL,'HARRY','HARRIOT',NULL,'HAROLD') GREATEST(NULL,'HARRY','HARRIOT',NULL,'HAROLD') HAROLD HARRY +select least(1,2,3) | greatest(16,32,8), least(5,4)*1,greatest(-1.0,1.0)*1,least(3,2,1)*1.0,greatest(1,1.1,1.0),least("10",9),greatest("A","B","0"); least(1,2,3) | greatest(16,32,8) least(5,4)*1 greatest(-1.0,1.0)*1 least(3,2,1)*1.0 greatest(1,1.1,1.0) least("10",9) greatest("A","B","0") 33 4 1.0 1.0 1.1 9 B +select decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000); decode(encode(repeat("a",100000),"monty"),"monty")=repeat("a",100000) 1 +select decode(encode("abcdef","monty"),"monty")="abcdef"; decode(encode("abcdef","monty"),"monty")="abcdef" 1 +select reverse(""); reverse("") +select insert("aa",100,1,"b"),insert("aa",1,3,"b"),left("aa",-1),substring("a",1,2); insert("aa",100,1,"b") insert("aa",1,3,"b") left("aa",-1) substring("a",1,2) aa b a +select elt(2,1),field(NULL,"a","b","c"),reverse(""); elt(2,1) field(NULL,"a","b","c") reverse("") NULL 0 +select locate("a","b",2),locate("","a",1); locate("a","b",2) locate("","a",1) 0 1 +select ltrim("a"),rtrim("a"),trim(BOTH "" from "a"),trim(BOTH " " from "a"); ltrim("a") rtrim("a") trim(BOTH "" from "a") trim(BOTH " " from "a") a a a a +select concat("1","2")|0,concat("1",".5")+0.0; concat("1","2")|0 concat("1",".5")+0.0 12 1.5 +select substring_index("www.tcx.se","",3); substring_index("www.tcx.se","",3) +select length(repeat("a",100000000)),length(repeat("a",1000*64)); length(repeat("a",100000000)) length(repeat("a",1000*64)) NULL 64000 +select position("0" in "baaa" in (1)),position("0" in "1" in (1,2,3)),position("sql" in ("mysql")); position("0" in "baaa" in (1)) position("0" in "1" in (1,2,3)) position("sql" in ("mysql")) 1 0 3 +select position(("1" in (1,2,3)) in "01"); position(("1" in (1,2,3)) in "01") 2 +select length(repeat("a",65500)),length(concat(repeat("a",32000),repeat("a",32000))),length(replace("aaaaa","a",concat(repeat("a",10000)))),length(insert(repeat("a",40000),1,30000,repeat("b",50000))); length(repeat("a",65500)) length(concat(repeat("a",32000),repeat("a",32000))) length(replace("aaaaa","a",concat(repeat("a",10000)))) length(insert(repeat("a",40000),1,30000,repeat("b",50000))) 65500 64000 50000 60000 +select length(repeat("a",1000000)),length(concat(repeat("a",32000),repeat("a",32000),repeat("a",32000))),length(replace("aaaaa","a",concat(repeat("a",32000)))),length(insert(repeat("a",48000),1,1000,repeat("a",48000))); length(repeat("a",1000000)) length(concat(repeat("a",32000),repeat("a",32000),repeat("a",32000))) length(replace("aaaaa","a",concat(repeat("a",32000)))) length(insert(repeat("a",48000),1,1000,repeat("a",48000))) 1000000 96000 160000 95000 +create table t1 ( domain char(50) ); +insert into t1 VALUES ("hello.de" ), ("test.de" ); +select domain from t1 where concat('@', trim(leading '.' from concat('.', domain))) = '@hello.de'; domain hello.de +select domain from t1 where concat('@', trim(leading '.' from concat('.', domain))) = '@test.de'; domain test.de +drop table t1; +CREATE TABLE t1 ( +id int(10) unsigned NOT NULL, +title varchar(255) default NULL, +prio int(10) unsigned default NULL, +category int(10) unsigned default NULL, +program int(10) unsigned default NULL, +bugdesc text, +created datetime default NULL, +modified timestamp(14) NOT NULL, +bugstatus int(10) unsigned default NULL, +submitter int(10) unsigned default NULL +) TYPE=MyISAM; +INSERT INTO t1 VALUES (1,'Link',1,1,1,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa','2001-02-28 08:40:16',20010228084016,0,4); +SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified,bugstatus,submitter), '"') FROM t1; CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified,bugstatus,submitter), '"') "Link";"1";"1";"1";"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";"2001-02-28 08:40:16";"20010228084016";"0";"4" +SELECT CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugstatus,submitter), '"') FROM t1; CONCAT('"',CONCAT_WS('";"',title,prio,category,program,bugstatus,submitter), '"') "Link";"1";"1";"1";"0";"4" +SELECT CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified,bugstatus,submitter) FROM t1; CONCAT_WS('";"',title,prio,category,program,bugdesc,created,modified,bugstatus,submitter) Link";"1";"1";"1";"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";"2001-02-28 08:40:16";"20010228084016";"0";"4 +drop table t1; diff --git a/mysql-test/r/func_system.result b/mysql-test/r/func_system.result index c6ec28bfd34..5ea4ed5e4e0 100644 --- a/mysql-test/r/func_system.result +++ b/mysql-test/r/func_system.result @@ -1,4 +1,6 @@ -database() user() -test root@localhost +select database(),user() like "%@%"; +database() user() like "%@%" +test 1 +select version()>="3.23.29"; version()>="3.23.29" 1 diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result index 5d2211baf50..0a45f9e8b5c 100644 --- a/mysql-test/r/func_test.result +++ b/mysql-test/r/func_test.result @@ -1,38 +1,61 @@ +select 0=0,1>0,1>=1,1<0,1<=0,1!=0,strcmp("abc","abcd"),strcmp("b","a"),strcmp("a","a") ; 0=0 1>0 1>=1 1<0 1<=0 1!=0 strcmp("abc","abcd") strcmp("b","a") strcmp("a","a") 1 1 1 0 0 1 -1 1 0 +select "a"<"b","a"<="b","b">="a","b">"a","a"="A","a"<>"b"; "a"<"b" "a"<="b" "b">="a" "b">"a" "a"="A" "a"<>"b" 1 1 1 1 1 1 +select "a "="A", "A "="a", "a " <= "A b"; "a "="A" "A "="a" "a " <= "A b" 1 1 1 +select "abc" like "a%", "abc" not like "%d%", "a%" like "a\%","abc%" like "a%\%","abcd" like "a%b_%d", "a" like "%%a","abcde" like "a%_e","abc" like "abc%"; "abc" like "a%" "abc" not like "%d%" "a%" like "a\%" "abc%" like "a%\%" "abcd" like "a%b_%d" "a" like "%%a" "abcde" like "a%_e" "abc" like "abc%" 1 1 1 1 1 1 1 1 +select "a" like "%%b","a" like "%%ab","ab" like "a\%", "ab" like "_", "ab" like "ab_", "abc" like "%_d", "abc" like "abc%d"; "a" like "%%b" "a" like "%%ab" "ab" like "a\%" "ab" like "_" "ab" like "ab_" "abc" like "%_d" "abc" like "abc%d" 0 0 0 0 0 0 0 +select '?' like '|%', '?' like '|%' ESCAPE '|', '%' like '|%', '%' like '|%' ESCAPE '|', '%' like '%'; '?' like '|%' '?' like '|%' ESCAPE '|' '%' like '|%' '%' like '|%' ESCAPE '|' '%' like '%' 0 0 0 1 1 +select 'abc' like '%c','abcabc' like '%c', "ab" like "", "ab" like "a", "ab" like "ab"; 'abc' like '%c' 'abcabc' like '%c' "ab" like "" "ab" like "a" "ab" like "ab" 1 1 0 0 1 +select "Det här är svenska" regexp "h[[:alpha:]]+r", "aba" regexp "^(a|b)*$"; "Det här är svenska" regexp "h[[:alpha:]]+r" "aba" regexp "^(a|b)*$" 1 1 +select "aba" regexp concat("^","a"); "aba" regexp concat("^","a") 1 +select !0,NOT 0=1,!(0=0),1 AND 1,1 && 0,0 OR 1,1 || NULL, 1=1 or 1=1 and 1=0; !0 NOT 0=1 !(0=0) 1 AND 1 1 && 0 0 OR 1 1 || NULL 1=1 or 1=1 and 1=0 1 1 0 1 0 1 1 1 +select IF(0,"ERROR","this"),IF(1,"is","ERROR"),IF(NULL,"ERROR","a"),IF(1,2,3)|0,IF(1,2.0,3.0)+0 ; IF(0,"ERROR","this") IF(1,"is","ERROR") IF(NULL,"ERROR","a") IF(1,2,3)|0 IF(1,2.0,3.0)+0 this is a 2 2.0 +select 2 between 1 and 3, "monty" between "max" and "my",2=2 and "monty" between "max" and "my" and 3=3; 2 between 1 and 3 "monty" between "max" and "my" 2=2 and "monty" between "max" and "my" and 3=3 1 1 1 +select 'b' between 'a' and 'c', 'B' between 'a' and 'c'; 'b' between 'a' and 'c' 'B' between 'a' and 'c' 1 1 +select 2 in (3,2,5,9,5,1),"monty" in ("david","monty","allan"), 1.2 in (1.4,1.2,1.0); 2 in (3,2,5,9,5,1) "monty" in ("david","monty","allan") 1.2 in (1.4,1.2,1.0) 1 1 1 +select -1.49 or -1.49,0.6 or 0.6; -1.49 or -1.49 0.6 or 0.6 1 1 +select 5 between 0 and 10 between 0 and 1,(5 between 0 and 10) between 0 and 1; 5 between 0 and 10 between 0 and 1 (5 between 0 and 10) between 0 and 1 0 1 +select 1 and 2 between 2 and 10, 2 between 2 and 10 and 1; 1 and 2 between 2 and 10 2 between 2 and 10 and 1 1 1 +select 1 and 0 or 2, 2 or 1 and 0; 1 and 0 or 2 2 or 1 and 0 1 1 +drop table if exists t1; +create table t1 (num double(12,2)); +insert into t1 values (144.54); +select sum(if(num is null,0.00,num)) from t1; sum(if(num is null,0.00,num)) 144.54 +drop table t1; diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 52999dfaf10..c5183ef72c6 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1,218 +1,341 @@ +drop table if exists t1,t2; +select from_days(to_days("960101")),to_days(960201)-to_days("19960101"),to_days(date_add(curdate(), interval 1 day))-to_days(curdate()),weekday("1997-11-29"); from_days(to_days("960101")) to_days(960201)-to_days("19960101") to_days(date_add(curdate(), interval 1 day))-to_days(curdate()) weekday("1997-11-29") 1996-01-01 31 1 5 +select period_add("9602",-12),period_diff(199505,"9404") ; period_add("9602",-12) period_diff(199505,"9404") 199502 13 +select now()-now(),weekday(curdate())-weekday(now()),unix_timestamp()-unix_timestamp(now()); now()-now() weekday(curdate())-weekday(now()) unix_timestamp()-unix_timestamp(now()) 0 0 0 +select from_unixtime(unix_timestamp("1994-03-02 10:11:12")),from_unixtime(unix_timestamp("1994-03-02 10:11:12"),"%Y-%m-%d %h:%i:%s"),from_unixtime(unix_timestamp("1994-03-02 10:11:12"))+0; from_unixtime(unix_timestamp("1994-03-02 10:11:12")) from_unixtime(unix_timestamp("1994-03-02 10:11:12"),"%Y-%m-%d %h:%i:%s") from_unixtime(unix_timestamp("1994-03-02 10:11:12"))+0 1994-03-02 10:11:12 1994-03-02 10:11:12 19940302101112 +select sec_to_time(9001),sec_to_time(9001)+0,time_to_sec("15:12:22"), +sec_to_time(time_to_sec("0:30:47")/6.21); sec_to_time(9001) sec_to_time(9001)+0 time_to_sec("15:12:22") sec_to_time(time_to_sec("0:30:47")/6.21) 02:30:01 23001 54742 00:04:57 +select now()-curdate()*1000000-curtime(); now()-curdate()*1000000-curtime() 0 +select strcmp(current_timestamp(),concat(current_date()," ",current_time())); strcmp(current_timestamp(),concat(current_date()," ",current_time())) 0 +select date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w"); date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w") January Thursday 2nd 1997 97 01 02 03 04 05 4 +select date_format("1997-01-02", concat("%M %W %D ","%Y %y %m %d %h %i %s %w")); date_format("1997-01-02", concat("%M %W %D ","%Y %y %m %d %h %i %s %w")) January Thursday 2nd 1997 97 01 02 12 00 00 4 +select dayofmonth("1997-01-02"),dayofmonth(19970323); dayofmonth("1997-01-02") dayofmonth(19970323) 2 23 +select month("1997-01-02"),year("98-02-03"),dayofyear("1997-12-31"); month("1997-01-02") year("98-02-03") dayofyear("1997-12-31") 1 1998 365 +select month("2001-02-00"),year("2001-00-00"); month("2001-02-00") year("2001-00-00") 2 2001 +select DAYOFYEAR("1997-03-03"), WEEK("1998-03-03"), QUARTER(980303); DAYOFYEAR("1997-03-03") WEEK("1998-03-03") QUARTER(980303) 62 9 1 +select HOUR("1997-03-03 23:03:22"), MINUTE("23:03:22"), SECOND(230322); HOUR("1997-03-03 23:03:22") MINUTE("23:03:22") SECOND(230322) 23 3 22 +select week(19980101),week(19970101),week(19980101,1),week(19970101,1); week(19980101) week(19970101) week(19980101,1) week(19970101,1) 0 0 1 1 +select week(19981231),week(19971231),week(19981231,1),week(19971231,1); week(19981231) week(19971231) week(19981231,1) week(19971231,1) 52 52 53 53 +select week(19950101),week(19950101,1); week(19950101) week(19950101,1) 1 0 +select yearweek('1981-12-31',1),yearweek('1982-01-01',1),yearweek('1982-12-31',1),yearweek('1983-01-01',1); yearweek('1981-12-31',1) yearweek('1982-01-01',1) yearweek('1982-12-31',1) yearweek('1983-01-01',1) 198153 198153 198252 198252 +select yearweek('1987-01-01',1),yearweek('1987-01-01'); yearweek('1987-01-01',1) yearweek('1987-01-01') 198701 198652 +select week("2000-01-01",0) as '2000', week("2001-01-01",0) as '2001', week("2002-01-01",0) as '2002',week("2003-01-01",0) as '2003', week("2004-01-01",0) as '2004', week("2005-01-01",0) as '2005', week("2006-01-01",0) as '2006'; 2000 2001 2002 2003 2004 2005 2006 0 0 0 0 0 0 1 +select week("2000-01-06",0) as '2000', week("2001-01-06",0) as '2001', week("2002-01-06",0) as '2002',week("2003-01-06",0) as '2003', week("2004-01-06",0) as '2004', week("2005-01-06",0) as '2005', week("2006-01-06",0) as '2006'; 2000 2001 2002 2003 2004 2005 2006 1 0 1 1 1 1 1 +select week("2000-01-01",1) as '2000', week("2001-01-01",1) as '2001', week("2002-01-01",1) as '2002',week("2003-01-01",1) as '2003', week("2004-01-01",1) as '2004', week("2005-01-01",1) as '2005', week("2006-01-01",1) as '2006'; 2000 2001 2002 2003 2004 2005 2006 0 1 1 1 1 0 0 +select week("2000-01-06",1) as '2000', week("2001-01-06",1) as '2001', week("2002-01-06",1) as '2002',week("2003-01-06",1) as '2003', week("2004-01-06",1) as '2004', week("2005-01-06",1) as '2005', week("2006-01-06",1) as '2006'; 2000 2001 2002 2003 2004 2005 2006 1 1 1 2 2 1 1 +select yearweek("2000-01-01",0) as '2000', yearweek("2001-01-01",0) as '2001', yearweek("2002-01-01",0) as '2002',yearweek("2003-01-01",0) as '2003', yearweek("2004-01-01",0) as '2004', yearweek("2005-01-01",0) as '2005', yearweek("2006-01-01",0) as '2006'; 2000 2001 2002 2003 2004 2005 2006 199952 200053 200152 200252 200352 200452 200601 +select yearweek("2000-01-06",0) as '2000', yearweek("2001-01-06",0) as '2001', yearweek("2002-01-06",0) as '2002',yearweek("2003-01-06",0) as '2003', yearweek("2004-01-06",0) as '2004', yearweek("2005-01-06",0) as '2005', yearweek("2006-01-06",0) as '2006'; 2000 2001 2002 2003 2004 2005 2006 200001 200053 200201 200301 200401 200501 200601 +select yearweek("2000-01-01",1) as '2000', yearweek("2001-01-01",1) as '2001', yearweek("2002-01-01",1) as '2002',yearweek("2003-01-01",1) as '2003', yearweek("2004-01-01",1) as '2004', yearweek("2005-01-01",1) as '2005', yearweek("2006-01-01",1) as '2006'; 2000 2001 2002 2003 2004 2005 2006 199952 200101 200201 200301 200401 200453 200552 +select yearweek("2000-01-06",1) as '2000', yearweek("2001-01-06",1) as '2001', yearweek("2002-01-06",1) as '2002',yearweek("2003-01-06",1) as '2003', yearweek("2004-01-06",1) as '2004', yearweek("2005-01-06",1) as '2005', yearweek("2006-01-06",1) as '2006'; 2000 2001 2002 2003 2004 2005 2006 200001 200101 200201 200302 200402 200501 200601 +select date_format('1998-12-31','%x-%v'),date_format('1999-01-01','%x-%v'); date_format('1998-12-31','%x-%v') date_format('1999-01-01','%x-%v') 1998-53 1998-53 +select date_format('1999-12-31','%x-%v'),date_format('2000-01-01','%x-%v'); date_format('1999-12-31','%x-%v') date_format('2000-01-01','%x-%v') 1999-52 1999-52 +select dayname("1962-03-03"),dayname("1962-03-03")+0; dayname("1962-03-03") dayname("1962-03-03")+0 Saturday 5 +select monthname("1972-03-04"),monthname("1972-03-04")+0; monthname("1972-03-04") monthname("1972-03-04")+0 March 3 +select time_format(19980131000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T'); time_format(19980131000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T') 00|12|0|12|00|AM|12:00:00 AM|00|00:00:00 +select time_format(19980131010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T'); time_format(19980131010203,'%H|%I|%k|%l|%i|%p|%r|%S|%T') 01|01|1|1|02|AM|01:02:03 AM|03|01:02:03 +select time_format(19980131131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T'); time_format(19980131131415,'%H|%I|%k|%l|%i|%p|%r|%S|%T') 13|01|13|1|14|PM|01:14:15 PM|15|13:14:15 +select time_format(19980131010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T'); time_format(19980131010015,'%H|%I|%k|%l|%i|%p|%r|%S|%T') 01|01|1|1|00|AM|01:00:15 AM|15|01:00:15 +select date_format(concat('19980131',131415),'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w'); date_format(concat('19980131',131415),'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w') 13|01|13|1|14|PM|01:14:15 PM|15|13:14:15| January|Saturday|31st|1998|98|Sat|Jan|031|01|31|01|15|6 +select date_format(19980021000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w'); date_format(19980021000000,'%H|%I|%k|%l|%i|%p|%r|%S|%T| %M|%W|%D|%Y|%y|%a|%b|%j|%m|%d|%h|%s|%w') NULL +select date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND); date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND) 1998-01-01 00:00:00 +select date_add("1997-12-31 23:59:59",INTERVAL 1 MINUTE); date_add("1997-12-31 23:59:59",INTERVAL 1 MINUTE) 1998-01-01 00:00:59 +select date_add("1997-12-31 23:59:59",INTERVAL 1 HOUR); date_add("1997-12-31 23:59:59",INTERVAL 1 HOUR) 1998-01-01 00:59:59 +select date_add("1997-12-31 23:59:59",INTERVAL 1 DAY); date_add("1997-12-31 23:59:59",INTERVAL 1 DAY) 1998-01-01 23:59:59 +select date_add("1997-12-31 23:59:59",INTERVAL 1 MONTH); date_add("1997-12-31 23:59:59",INTERVAL 1 MONTH) 1998-01-31 23:59:59 +select date_add("1997-12-31 23:59:59",INTERVAL 1 YEAR); date_add("1997-12-31 23:59:59",INTERVAL 1 YEAR) 1998-12-31 23:59:59 +select date_add("1997-12-31 23:59:59",INTERVAL "1:1" MINUTE_SECOND); date_add("1997-12-31 23:59:59",INTERVAL "1:1" MINUTE_SECOND) 1998-01-01 00:01:00 +select date_add("1997-12-31 23:59:59",INTERVAL "1:1" HOUR_MINUTE); date_add("1997-12-31 23:59:59",INTERVAL "1:1" HOUR_MINUTE) 1998-01-01 01:00:59 +select date_add("1997-12-31 23:59:59",INTERVAL "1:1" DAY_HOUR); date_add("1997-12-31 23:59:59",INTERVAL "1:1" DAY_HOUR) 1998-01-02 00:59:59 +select date_add("1997-12-31 23:59:59",INTERVAL "1 1" YEAR_MONTH); date_add("1997-12-31 23:59:59",INTERVAL "1 1" YEAR_MONTH) 1999-01-31 23:59:59 +select date_add("1997-12-31 23:59:59",INTERVAL "1:1:1" HOUR_SECOND); date_add("1997-12-31 23:59:59",INTERVAL "1:1:1" HOUR_SECOND) 1998-01-01 01:01:00 +select date_add("1997-12-31 23:59:59",INTERVAL "1 1:1" DAY_MINUTE); date_add("1997-12-31 23:59:59",INTERVAL "1 1:1" DAY_MINUTE) 1998-01-02 01:00:59 +select date_add("1997-12-31 23:59:59",INTERVAL "1 1:1:1" DAY_SECOND); date_add("1997-12-31 23:59:59",INTERVAL "1 1:1:1" DAY_SECOND) 1998-01-02 01:01:00 +select date_sub("1998-01-01 00:00:00",INTERVAL 1 SECOND); date_sub("1998-01-01 00:00:00",INTERVAL 1 SECOND) 1997-12-31 23:59:59 +select date_sub("1998-01-01 00:00:00",INTERVAL 1 MINUTE); date_sub("1998-01-01 00:00:00",INTERVAL 1 MINUTE) 1997-12-31 23:59:00 +select date_sub("1998-01-01 00:00:00",INTERVAL 1 HOUR); date_sub("1998-01-01 00:00:00",INTERVAL 1 HOUR) 1997-12-31 23:00:00 +select date_sub("1998-01-01 00:00:00",INTERVAL 1 DAY); date_sub("1998-01-01 00:00:00",INTERVAL 1 DAY) 1997-12-31 00:00:00 +select date_sub("1998-01-01 00:00:00",INTERVAL 1 MONTH); date_sub("1998-01-01 00:00:00",INTERVAL 1 MONTH) 1997-12-01 00:00:00 +select date_sub("1998-01-01 00:00:00",INTERVAL 1 YEAR); date_sub("1998-01-01 00:00:00",INTERVAL 1 YEAR) 1997-01-01 00:00:00 +select date_sub("1998-01-01 00:00:00",INTERVAL "1:1" MINUTE_SECOND); date_sub("1998-01-01 00:00:00",INTERVAL "1:1" MINUTE_SECOND) 1997-12-31 23:58:59 +select date_sub("1998-01-01 00:00:00",INTERVAL "1:1" HOUR_MINUTE); date_sub("1998-01-01 00:00:00",INTERVAL "1:1" HOUR_MINUTE) 1997-12-31 22:59:00 +select date_sub("1998-01-01 00:00:00",INTERVAL "1:1" DAY_HOUR); date_sub("1998-01-01 00:00:00",INTERVAL "1:1" DAY_HOUR) 1997-12-30 23:00:00 +select date_sub("1998-01-01 00:00:00",INTERVAL "1 1" YEAR_MONTH); date_sub("1998-01-01 00:00:00",INTERVAL "1 1" YEAR_MONTH) 1996-12-01 00:00:00 +select date_sub("1998-01-01 00:00:00",INTERVAL "1:1:1" HOUR_SECOND); date_sub("1998-01-01 00:00:00",INTERVAL "1:1:1" HOUR_SECOND) 1997-12-31 22:58:59 +select date_sub("1998-01-01 00:00:00",INTERVAL "1 1:1" DAY_MINUTE); date_sub("1998-01-01 00:00:00",INTERVAL "1 1:1" DAY_MINUTE) 1997-12-30 22:59:00 +select date_sub("1998-01-01 00:00:00",INTERVAL "1 1:1:1" DAY_SECOND); date_sub("1998-01-01 00:00:00",INTERVAL "1 1:1:1" DAY_SECOND) 1997-12-30 22:58:59 +select date_add("1997-12-31 23:59:59",INTERVAL 100000 SECOND); date_add("1997-12-31 23:59:59",INTERVAL 100000 SECOND) 1998-01-02 03:46:39 +select date_add("1997-12-31 23:59:59",INTERVAL -100000 MINUTE); date_add("1997-12-31 23:59:59",INTERVAL -100000 MINUTE) 1997-10-23 13:19:59 +select date_add("1997-12-31 23:59:59",INTERVAL 100000 HOUR); date_add("1997-12-31 23:59:59",INTERVAL 100000 HOUR) 2009-05-29 15:59:59 +select date_add("1997-12-31 23:59:59",INTERVAL -100000 DAY); date_add("1997-12-31 23:59:59",INTERVAL -100000 DAY) 1724-03-17 23:59:59 +select date_add("1997-12-31 23:59:59",INTERVAL 100000 MONTH); date_add("1997-12-31 23:59:59",INTERVAL 100000 MONTH) NULL +select date_add("1997-12-31 23:59:59",INTERVAL -100000 YEAR); date_add("1997-12-31 23:59:59",INTERVAL -100000 YEAR) NULL +select date_add("1997-12-31 23:59:59",INTERVAL "10000:1" MINUTE_SECOND); date_add("1997-12-31 23:59:59",INTERVAL "10000:1" MINUTE_SECOND) 1998-01-07 22:40:00 +select date_add("1997-12-31 23:59:59",INTERVAL "-10000:1" HOUR_MINUTE); date_add("1997-12-31 23:59:59",INTERVAL "-10000:1" HOUR_MINUTE) 1996-11-10 07:58:59 +select date_add("1997-12-31 23:59:59",INTERVAL "10000:1" DAY_HOUR); date_add("1997-12-31 23:59:59",INTERVAL "10000:1" DAY_HOUR) 2025-05-19 00:59:59 +select date_add("1997-12-31 23:59:59",INTERVAL "-100 1" YEAR_MONTH); date_add("1997-12-31 23:59:59",INTERVAL "-100 1" YEAR_MONTH) 1897-11-30 23:59:59 +select date_add("1997-12-31 23:59:59",INTERVAL "10000:99:99" HOUR_SECOND); date_add("1997-12-31 23:59:59",INTERVAL "10000:99:99" HOUR_SECOND) 1999-02-21 17:40:38 +select date_add("1997-12-31 23:59:59",INTERVAL " -10000 99:99" DAY_MINUTE); date_add("1997-12-31 23:59:59",INTERVAL " -10000 99:99" DAY_MINUTE) 1970-08-11 19:20:59 +select date_add("1997-12-31 23:59:59",INTERVAL "10000 99:99:99" DAY_SECOND); date_add("1997-12-31 23:59:59",INTERVAL "10000 99:99:99" DAY_SECOND) 2025-05-23 04:40:38 +select "1997-12-31 23:59:59" + INTERVAL 1 SECOND; "1997-12-31 23:59:59" + INTERVAL 1 SECOND 1998-01-01 00:00:00 +select INTERVAL 1 DAY + "1997-12-31"; INTERVAL 1 DAY + "1997-12-31" 1998-01-01 +select "1998-01-01 00:00:00" - INTERVAL 1 SECOND; "1998-01-01 00:00:00" - INTERVAL 1 SECOND 1997-12-31 23:59:59 +select date_sub("1998-01-02",INTERVAL 31 DAY); date_sub("1998-01-02",INTERVAL 31 DAY) 1997-12-02 +select date_add("1997-12-31",INTERVAL 1 SECOND); date_add("1997-12-31",INTERVAL 1 SECOND) 1997-12-31 00:00:01 +select date_add("1997-12-31",INTERVAL 1 DAY); date_add("1997-12-31",INTERVAL 1 DAY) 1998-01-01 +select date_add(NULL,INTERVAL 100000 SECOND); date_add(NULL,INTERVAL 100000 SECOND) NULL +select date_add("1997-12-31 23:59:59",INTERVAL NULL SECOND); date_add("1997-12-31 23:59:59",INTERVAL NULL SECOND) NULL +select date_add("1997-12-31 23:59:59",INTERVAL NULL MINUTE_SECOND); date_add("1997-12-31 23:59:59",INTERVAL NULL MINUTE_SECOND) NULL +select date_add("9999-12-31 23:59:59",INTERVAL 1 SECOND); date_add("9999-12-31 23:59:59",INTERVAL 1 SECOND) NULL +select date_sub("0000-00-00 00:00:00",INTERVAL 1 SECOND); date_sub("0000-00-00 00:00:00",INTERVAL 1 SECOND) NULL +select date_add('1998-01-30',Interval 1 month); date_add('1998-01-30',Interval 1 month) 1998-02-28 +select date_add('1998-01-30',Interval '2:1' year_month); date_add('1998-01-30',Interval '2:1' year_month) 2000-02-29 +select date_add('1996-02-29',Interval '1' year); date_add('1996-02-29',Interval '1' year) 1997-02-28 +select extract(YEAR FROM "1999-01-02 10:11:12"); extract(YEAR FROM "1999-01-02 10:11:12") 1999 +select extract(YEAR_MONTH FROM "1999-01-02"); extract(YEAR_MONTH FROM "1999-01-02") 199901 +select extract(DAY FROM "1999-01-02"); extract(DAY FROM "1999-01-02") 2 +select extract(DAY_HOUR FROM "1999-01-02 10:11:12"); extract(DAY_HOUR FROM "1999-01-02 10:11:12") 210 +select extract(DAY_MINUTE FROM "02 10:11:12"); extract(DAY_MINUTE FROM "02 10:11:12") 21011 +select extract(DAY_SECOND FROM "225 10:11:12"); extract(DAY_SECOND FROM "225 10:11:12") 225101112 +select extract(HOUR FROM "1999-01-02 10:11:12"); extract(HOUR FROM "1999-01-02 10:11:12") 10 +select extract(HOUR_MINUTE FROM "10:11:12"); extract(HOUR_MINUTE FROM "10:11:12") 1011 +select extract(HOUR_SECOND FROM "10:11:12"); extract(HOUR_SECOND FROM "10:11:12") 101112 +select extract(MINUTE FROM "10:11:12"); extract(MINUTE FROM "10:11:12") 11 +select extract(MINUTE_SECOND FROM "10:11:12"); extract(MINUTE_SECOND FROM "10:11:12") 1112 +select extract(SECOND FROM "1999-01-02 10:11:12"); extract(SECOND FROM "1999-01-02 10:11:12") 12 +select extract(MONTH FROM "2001-02-00"); extract(MONTH FROM "2001-02-00") 2 +create table t1 (ctime varchar(20)); +insert into t1 values ('2001-01-12 12:23:40'); +select ctime, hour(ctime) from t1; ctime hour(ctime) 2001-01-12 12:23:40 12 +drop table t1; +create table t1 (id int); +create table t2 (id int, date date); +insert into t1 values (1); +insert into t2 values (1, "0000-00-00"); +insert into t1 values (2); +insert into t2 values (2, "2000-01-01"); +select monthname(date) from t1 inner join t2 on t1.id = t2.id; monthname(date) NULL January +select monthname(date) from t1 inner join t2 on t1.id = t2.id order by t1.id; monthname(date) NULL January +drop table t1,t2; +CREATE TABLE t1 (updated text) TYPE=MyISAM; +INSERT INTO t1 VALUES (''); +SELECT month(updated) from t1; month(updated) NULL +SELECT year(updated) from t1; year(updated) NULL +drop table t1; diff --git a/mysql-test/r/func_timestamp.result b/mysql-test/r/func_timestamp.result index 4d4a5b541ac..d9912f08b72 100644 --- a/mysql-test/r/func_timestamp.result +++ b/mysql-test/r/func_timestamp.result @@ -1,3 +1,11 @@ +drop table if exists t1; +create table t1 (Zeit time, Tag tinyint not null, Monat tinyint not null, +Jahr smallint not null, index(Tag), index(Monat), index(Jahr) ); +insert into t1 values ("09:26:00",16,9,1998),("09:26:00",16,9,1998); +SELECT CONCAT(Jahr,'-',Monat,'-',Tag,' ',Zeit) AS Date, +UNIX_TIMESTAMP(CONCAT(Jahr,'-',Monat,'-',Tag,' ',Zeit)) AS Unix +FROM t1; Date Unix 1998-9-16 09:26:00 905927160 1998-9-16 09:26:00 905927160 +drop table t1; diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 2c4a5cecbb1..d0b4ab4efff 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -1,15 +1,189 @@ +drop table if exists t1,t2; +CREATE TABLE t1 ( +spID int(10) unsigned, +userID int(10) unsigned, +score smallint(5) unsigned, +lsg char(40), +date date +); +INSERT INTO t1 VALUES (1,1,1,'','0000-00-00'); +INSERT INTO t1 VALUES (2,2,2,'','0000-00-00'); +INSERT INTO t1 VALUES (2,1,1,'','0000-00-00'); +INSERT INTO t1 VALUES (3,3,3,'','0000-00-00'); +CREATE TABLE t2 ( +userID int(10) unsigned DEFAULT '0' NOT NULL auto_increment, +niName char(15), +passwd char(8), +mail char(50), +isAukt enum('N','Y') DEFAULT 'N', +vName char(30), +nName char(40), +adr char(60), +plz char(5), +ort char(35), +land char(20), +PRIMARY KEY (userID) +); +INSERT INTO t2 VALUES (1,'name','pass','mail','Y','v','n','adr','1','1','1'); +INSERT INTO t2 VALUES (2,'name','pass','mail','Y','v','n','adr','1','1','1'); +INSERT INTO t2 VALUES (3,'name','pass','mail','Y','v','n','adr','1','1','1'); +SELECT t2.userid, MIN(t1.score) FROM t1, t2 WHERE t1.userID=t2.userID GROUP BY t2.userid; userid MIN(t1.score) 1 1 2 2 3 3 +SELECT t2.userid, MIN(t1.score) FROM t1, t2 WHERE t1.userID=t2.userID AND t1.spID=2 GROUP BY t2.userid; userid MIN(t1.score) 1 1 2 2 +SELECT t2.userid, MIN(t1.score+0.0) FROM t1, t2 WHERE t1.userID=t2.userID AND t1.spID=2 GROUP BY t2.userid; userid MIN(t1.score+0.0) 1 1.0 2 2.0 +drop table test.t1,test.t2; +CREATE TABLE t1 ( +PID int(10) unsigned DEFAULT '0' NOT NULL auto_increment, +payDate date DEFAULT '0000-00-00' NOT NULL, +recDate datetime DEFAULT '0000-00-00 00:00:00' NOT NULL, +URID int(10) unsigned DEFAULT '0' NOT NULL, +CRID int(10) unsigned DEFAULT '0' NOT NULL, +amount int(10) unsigned DEFAULT '0' NOT NULL, +operator int(10) unsigned, +method enum('unknown','cash','dealer','check','card','lazy','delayed','test') DEFAULT 'unknown' NOT NULL, +DIID int(10) unsigned, +reason char(1) binary DEFAULT '' NOT NULL, +code_id int(10) unsigned, +qty mediumint(8) unsigned DEFAULT '0' NOT NULL, +PRIMARY KEY (PID), +KEY URID (URID), +KEY reason (reason), +KEY method (method), +KEY payDate (payDate) +); +INSERT INTO t1 VALUES (1,'1970-01-01','1997-10-17 00:00:00',2529,1,21000,11886,'check',0,'F',16200,6); +SELECT COUNT(P.URID),SUM(P.amount),P.method, MIN(PP.recdate+0) > 19980501000000 AS IsNew FROM t1 AS P JOIN t1 as PP WHERE P.URID = PP.URID GROUP BY method,IsNew; +Can't group on 'IsNew' +drop table t1; +CREATE TABLE t1 ( +cid mediumint(9) DEFAULT '0' NOT NULL auto_increment, +firstname varchar(32) DEFAULT '' NOT NULL, +surname varchar(32) DEFAULT '' NOT NULL, +PRIMARY KEY (cid) +); +INSERT INTO t1 VALUES (1,'That','Guy'); +INSERT INTO t1 VALUES (2,'Another','Gent'); +CREATE TABLE t2 ( +call_id mediumint(8) DEFAULT '0' NOT NULL auto_increment, +contact_id mediumint(8) DEFAULT '0' NOT NULL, +PRIMARY KEY (call_id), +KEY contact_id (contact_id) +); +lock tables t1 read,t2 write; +INSERT INTO t2 VALUES (10,2); +INSERT INTO t2 VALUES (18,2); +INSERT INTO t2 VALUES (62,2); +INSERT INTO t2 VALUES (91,2); +INSERT INTO t2 VALUES (92,2); +SELECT cid, CONCAT(firstname, ' ', surname), COUNT(call_id) FROM t1 LEFT JOIN t2 ON cid=contact_id WHERE firstname like '%foo%' GROUP BY cid; cid CONCAT(firstname, ' ', surname) COUNT(call_id) +SELECT HIGH_PRIORITY cid, CONCAT(firstname, ' ', surname), COUNT(call_id) FROM t1 LEFT JOIN t2 ON cid=contact_id WHERE firstname like '%foo%' GROUP BY cid ORDER BY surname, firstname; cid CONCAT(firstname, ' ', surname) COUNT(call_id) +drop table t1,t2; +unlock tables; +CREATE TABLE t1 ( +bug_id mediumint(9) DEFAULT '0' NOT NULL auto_increment, +groupset bigint(20) DEFAULT '0' NOT NULL, +assigned_to mediumint(9) DEFAULT '0' NOT NULL, +bug_file_loc text, +bug_severity enum('blocker','critical','major','normal','minor','trivial','enhancement') DEFAULT 'blocker' NOT NULL, +bug_status enum('NEW','ASSIGNED','REOPENED','RESOLVED','VERIFIED','CLOSED') DEFAULT 'NEW' NOT NULL, +creation_ts datetime DEFAULT '0000-00-00 00:00:00' NOT NULL, +delta_ts timestamp(14), +short_desc mediumtext, +long_desc mediumtext, +op_sys enum('All','Windows 3.1','Windows 95','Windows 98','Windows NT','Windows 2000','Linux','other') DEFAULT 'All' NOT NULL, +priority enum('P1','P2','P3','P4','P5') DEFAULT 'P1' NOT NULL, +product varchar(64) DEFAULT '' NOT NULL, +rep_platform enum('All','PC','VTD-8','Other'), +reporter mediumint(9) DEFAULT '0' NOT NULL, +version varchar(16) DEFAULT '' NOT NULL, +component varchar(50) DEFAULT '' NOT NULL, +resolution enum('','FIXED','INVALID','WONTFIX','LATER','REMIND','DUPLICATE','WORKSFORME') DEFAULT '' NOT NULL, +target_milestone varchar(20) DEFAULT '' NOT NULL, +qa_contact mediumint(9) DEFAULT '0' NOT NULL, +status_whiteboard mediumtext NOT NULL, +votes mediumint(9) DEFAULT '0' NOT NULL, +PRIMARY KEY (bug_id), +KEY assigned_to (assigned_to), +KEY creation_ts (creation_ts), +KEY delta_ts (delta_ts), +KEY bug_severity (bug_severity), +KEY bug_status (bug_status), +KEY op_sys (op_sys), +KEY priority (priority), +KEY product (product), +KEY reporter (reporter), +KEY version (version), +KEY component (component), +KEY resolution (resolution), +KEY target_milestone (target_milestone), +KEY qa_contact (qa_contact), +KEY votes (votes) +); +INSERT INTO t1 VALUES (1,0,0,'','normal','','2000-02-10 09:25:12',20000321114747,'','','Linux','P1','TestProduct','PC',3,'other','TestComponent','','M1',0,'',0); +INSERT INTO t1 VALUES (9,0,0,'','enhancement','','2000-03-10 11:49:36',20000321114747,'','','All','P5','AAAAA','PC',3,'2.00 CD - Pre','BBBBBBBBBBBBB - conversion','','',0,'',0); +INSERT INTO t1 VALUES (10,0,0,'','enhancement','','2000-03-10 18:10:16',20000321114747,'','','All','P4','AAAAA','PC',3,'2.00 CD - Pre','BBBBBBBBBBBBB - conversion','','',0,'',0); +INSERT INTO t1 VALUES (7,0,0,'','critical','','2000-03-09 10:50:21',20000321114747,'','','All','P1','AAAAA','PC',3,'2.00 CD - Pre','BBBBBBBBBBBBB - generic','','',0,'',0); +INSERT INTO t1 VALUES (6,0,0,'','normal','','2000-03-09 10:42:44',20000321114747,'','','All','P2','AAAAA','PC',3,'2.00 CD - Pre','kkkkkkkkkkk lllllllllll','','',0,'',0); +INSERT INTO t1 VALUES (8,0,0,'','major','','2000-03-09 11:32:14',20000321114747,'','','All','P3','AAAAA','PC',3,'2.00 CD - Pre','kkkkkkkkkkk lllllllllll','','',0,'',0); +INSERT INTO t1 VALUES (5,0,0,'','enhancement','','2000-03-09 10:38:59',20000321114747,'','','All','P5','CCC/CCCCCC','PC',5,'7.00','Administration','','',0,'',0); +INSERT INTO t1 VALUES (4,0,0,'','normal','','2000-03-08 18:32:14',20000321114747,'','','other','P2','TestProduct','Other',3,'other','TestComponent2','','',0,'',0); +INSERT INTO t1 VALUES (3,0,0,'','normal','','2000-03-08 18:30:52',20000321114747,'','','other','P2','TestProduct','Other',3,'other','TestComponent','','',0,'',0); +INSERT INTO t1 VALUES (2,0,0,'','enhancement','','2000-03-08 18:24:51',20000321114747,'','','All','P2','TestProduct','Other',4,'other','TestComponent2','','',0,'',0); +INSERT INTO t1 VALUES (11,0,0,'','blocker','','2000-03-13 09:43:41',20000321114747,'','','All','P2','CCC/CCCCCC','PC',5,'7.00','DDDDDDDDD','','',0,'',0); +INSERT INTO t1 VALUES (12,0,0,'','normal','','2000-03-13 16:14:31',20000321114747,'','','All','P2','AAAAA','PC',3,'2.00 CD - Pre','kkkkkkkkkkk lllllllllll','','',0,'',0); +INSERT INTO t1 VALUES (13,0,0,'','normal','','2000-03-15 16:20:44',20000321114747,'','','other','P2','TestProduct','Other',3,'other','TestComponent','','',0,'',0); +INSERT INTO t1 VALUES (14,0,0,'','blocker','','2000-03-15 18:13:47',20000321114747,'','','All','P1','AAAAA','PC',3,'2.00 CD - Pre','BBBBBBBBBBBBB - generic','','',0,'',0); +INSERT INTO t1 VALUES (15,0,0,'','minor','','2000-03-16 18:03:28',20000321114747,'','','All','P2','CCC/CCCCCC','Other',5,'7.00','DDDDDDDDD','','',0,'',0); +INSERT INTO t1 VALUES (16,0,0,'','normal','','2000-03-16 18:33:41',20000321114747,'','','All','P2','CCC/CCCCCC','Other',5,'7.00','Administration','','',0,'',0); +INSERT INTO t1 VALUES (17,0,0,'','normal','','2000-03-16 18:34:18',20000321114747,'','','All','P2','CCC/CCCCCC','Other',5,'7.00','Administration','','',0,'',0); +INSERT INTO t1 VALUES (18,0,0,'','normal','','2000-03-16 18:34:56',20000321114747,'','','All','P2','CCC/CCCCCC','Other',5,'7.00','Administration','','',0,'',0); +INSERT INTO t1 VALUES (19,0,0,'','enhancement','','2000-03-16 18:35:34',20000321114747,'','','All','P2','CCC/CCCCCC','Other',5,'7.00','Administration','','',0,'',0); +INSERT INTO t1 VALUES (20,0,0,'','enhancement','','2000-03-16 18:36:23',20000321114747,'','','All','P2','CCC/CCCCCC','Other',5,'7.00','Administration','','',0,'',0); +INSERT INTO t1 VALUES (21,0,0,'','enhancement','','2000-03-16 18:37:23',20000321114747,'','','All','P2','CCC/CCCCCC','Other',5,'7.00','Administration','','',0,'',0); +INSERT INTO t1 VALUES (22,0,0,'','enhancement','','2000-03-16 18:38:16',20000321114747,'','','All','P2','CCC/CCCCCC','Other',5,'7.00','Administration','','',0,'',0); +INSERT INTO t1 VALUES (23,0,0,'','normal','','2000-03-16 18:58:12',20000321114747,'','','All','P2','CCC/CCCCCC','Other',5,'7.00','DDDDDDDDD','','',0,'',0); +INSERT INTO t1 VALUES (24,0,0,'','normal','','2000-03-17 11:08:10',20000321114747,'','','All','P2','AAAAAAAA-AAA','PC',3,'2.8','Web Interface','','',0,'',0); +INSERT INTO t1 VALUES (25,0,0,'','normal','','2000-03-17 11:10:45',20000321114747,'','','All','P2','AAAAAAAA-AAA','PC',3,'2.8','Web Interface','','',0,'',0); +INSERT INTO t1 VALUES (26,0,0,'','normal','','2000-03-17 11:15:47',20000321114747,'','','All','P2','AAAAAAAA-AAA','PC',3,'2.8','Web Interface','','',0,'',0); +INSERT INTO t1 VALUES (27,0,0,'','normal','','2000-03-17 17:45:41',20000321114747,'','','All','P2','CCC/CCCCCC','PC',5,'7.00','DDDDDDDDD','','',0,'',0); +INSERT INTO t1 VALUES (28,0,0,'','normal','','2000-03-20 09:51:45',20000321114747,'','','Windows NT','P2','TestProduct','PC',8,'other','TestComponent','','',0,'',0); +INSERT INTO t1 VALUES (29,0,0,'','normal','','2000-03-20 11:15:09',20000321114747,'','','All','P5','AAAAAAAA-AAA','PC',3,'2.8','Web Interface','','',0,'',0); +CREATE TABLE t2 ( +value tinytext, +program varchar(64), +initialowner tinytext NOT NULL, +initialqacontact tinytext NOT NULL, +description mediumtext NOT NULL +); +INSERT INTO t2 VALUES ('TestComponent','TestProduct','id0001','',''); +INSERT INTO t2 VALUES ('BBBBBBBBBBBBB - conversion','AAAAA','id0001','',''); +INSERT INTO t2 VALUES ('BBBBBBBBBBBBB - generic','AAAAA','id0001','',''); +INSERT INTO t2 VALUES ('TestComponent2','TestProduct','id0001','',''); +INSERT INTO t2 VALUES ('BBBBBBBBBBBBB - eeeeeeeee','AAAAA','id0001','',''); +INSERT INTO t2 VALUES ('kkkkkkkkkkk lllllllllll','AAAAA','id0001','',''); +INSERT INTO t2 VALUES ('Test Procedures','AAAAA','id0001','',''); +INSERT INTO t2 VALUES ('Documentation','AAAAA','id0003','',''); +INSERT INTO t2 VALUES ('DDDDDDDDD','CCC/CCCCCC','id0002','',''); +INSERT INTO t2 VALUES ('Eeeeeeee Lite','CCC/CCCCCC','id0002','',''); +INSERT INTO t2 VALUES ('Eeeeeeee Full','CCC/CCCCCC','id0002','',''); +INSERT INTO t2 VALUES ('Administration','CCC/CCCCCC','id0002','',''); +INSERT INTO t2 VALUES ('Distribution','CCC/CCCCCC','id0002','',''); +INSERT INTO t2 VALUES ('Setup','CCC/CCCCCC','id0002','',''); +INSERT INTO t2 VALUES ('Unspecified','CCC/CCCCCC','id0002','',''); +INSERT INTO t2 VALUES ('Web Interface','AAAAAAAA-AAA','id0001','',''); +INSERT INTO t2 VALUES ('Host communication','AAAAA','id0001','',''); +select value,description,bug_id from t2 left join t1 on t2.program=t1.product and t2.value=t1.component where program="AAAAA"; value description bug_id BBBBBBBBBBBBB - conversion 9 BBBBBBBBBBBBB - conversion 10 @@ -22,6 +196,7 @@ kkkkkkkkkkk lllllllllll 12 Test Procedures NULL Documentation NULL Host communication NULL +select value,description,COUNT(bug_id) from t2 left join t1 on t2.program=t1.product and t2.value=t1.component where program="AAAAA" group by value; value description COUNT(bug_id) BBBBBBBBBBBBB - conversion 2 BBBBBBBBBBBBB - eeeeeeeee 0 @@ -30,7 +205,14 @@ Documentation 0 Host communication 0 kkkkkkkkkkk lllllllllll 3 Test Procedures 0 +drop table t1,t2; +create table t1 (foo int); +insert into t1 values (1); +select 1+1, "a",count(*) from t1 where foo in (2); 1+1 a count(*) 2 a 0 +insert into t1 values (1); +select 1+1,"a",count(*) from t1 where foo in (2); 1+1 a count(*) 2 a 0 +drop table t1; diff --git a/mysql-test/r/handler.result b/mysql-test/r/handler.result index 5dcab296eac..cd39657c470 100644 --- a/mysql-test/r/handler.result +++ b/mysql-test/r/handler.result @@ -1,60 +1,99 @@ +drop table if exists t1; +create table t1 (a int, b char(10), key a(a), key b(a,b)); +insert into t1 values +(17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"), +(14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"), +(20,"ggg"),(21,"hhh"),(22,"iii"); +handler t1 open as t2; +handler t2 read a first; a b 14 aaa +handler t2 read a next; a b 15 bbb +handler t2 read a next; a b 16 ccc +handler t2 read a prev; a b 15 bbb +handler t2 read a last; a b 22 iii +handler t2 read a prev; a b 21 hhh +handler t2 read a prev; a b 20 ggg +handler t2 read a first; a b 14 aaa +handler t2 read a prev; a b +handler t2 read a last; a b 22 iii +handler t2 read a prev; a b 21 hhh +handler t2 read a next; a b 22 iii +handler t2 read a next; a b +handler t2 read a=(15); a b 15 bbb +handler t2 read a=(16); a b 16 ccc +handler t2 read a=(19,"fff"); +Too many key parts specified. Max 1 parts allowed +handler t2 read b=(19,"fff"); a b 19 fff +handler t2 read b=(19,"yyy"); a b 19 yyy +handler t2 read b=(19); a b 19 fff +handler t1 read a last; +Unknown table 't1' in HANDLER +handler t2 read a=(11); a b +handler t2 read a>=(11); a b 14 aaa +handler t2 read a=(18); a b 18 eee +handler t2 read a>=(18); a b 18 eee +handler t2 read a>(18); a b 19 fff +handler t2 read a<=(18); a b 18 eee +handler t2 read a<(18); a b 17 ddd +handler t2 read a first limit 5; a b 14 aaa 15 bbb 16 ccc 16 xxx 17 ddd +handler t2 read a next limit 3; a b 18 eee 19 fff 19 yyy +handler t2 read a prev limit 10; a b 19 fff 18 eee @@ -63,25 +102,37 @@ a b 16 ccc 15 bbb 14 aaa +handler t2 read a>=(16) limit 4; a b 16 ccc 16 xxx 17 ddd 18 eee +handler t2 read a>=(16) limit 2,2; a b 17 ddd 18 eee +handler t2 read a last limit 3; a b 22 iii 21 hhh 20 ggg +handler t2 read a=(19); a b 19 fff +handler t2 read a=(19) where b="yyy"; a b 19 yyy +handler t2 read first; a b 17 ddd +handler t2 read next; a b 18 eee +handler t2 read next; a b 19 fff +handler t2 read last; +You have an error in your SQL syntax near '' at line 1 +handler t2 close; +drop table if exists t1; diff --git a/mysql-test/r/have_openssl.require b/mysql-test/r/have_openssl.require index 9bdffdf0c13..dae48a472b5 100644 --- a/mysql-test/r/have_openssl.require +++ b/mysql-test/r/have_openssl.require @@ -1,2 +1,2 @@ Variable_name Value -have_ssl YES +have_openssl YES diff --git a/mysql-test/r/having.result b/mysql-test/r/having.result index cbd3fbfff4e..229604034d8 100644 --- a/mysql-test/r/having.result +++ b/mysql-test/r/having.result @@ -1,4 +1,11 @@ +drop table if exists t1; +create table t1 (a int); +select count(a) as b from t1 where a=0 having b > 0; b +insert into t1 values (null); +select count(a) as b from t1 where a=0 having b > 0; b +select count(a) as b from t1 where a=0 having b >=0; b 0 +drop table t1; diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result index d3d16128ebd..3acd0d14118 100644 --- a/mysql-test/r/heap.result +++ b/mysql-test/r/heap.result @@ -1,41 +1,75 @@ +drop table if exists t1; +create table t1 (a int not null,b int not null, primary key (a)) type=heap comment="testing heaps" avg_row_length=100 min_rows=1 max_rows=100; +insert into t1 values(1,1),(2,2),(3,3),(4,4); +delete from t1 where a=1 or a=0; +show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 a NULL NULL NULL NULL +select * from t1; a b 2 2 3 3 4 4 +select * from t1 where a=4; a b 4 4 +update t1 set b=5 where a=4; +update t1 set b=b+1 where a>=3; +replace t1 values (3,3); +select * from t1; a b 2 2 3 3 4 6 +alter table t1 add c int not null, add key (c,a); +drop table t1; +create table t1 (a int not null,b int not null, primary key (a)) type=heap comment="testing heaps"; +insert into t1 values(1,1),(2,2),(3,3),(4,4); +alter table t1 modify a int not null auto_increment, type=myisam, comment="new myisam table"; +select * from t1; a b 1 1 2 2 3 3 4 4 +drop table t1; +create table t1 (a int not null) type=heap; +insert into t1 values (869751),(736494),(226312),(802616); +select * from t1 where a > 736494; a 869751 802616 +alter table t1 add unique uniq_id(a); +select * from t1 where a > 736494; a 869751 802616 +select * from t1 where a = 736494; a 736494 +select * from t1 where a=869751 or a=736494; a 736494 869751 +select * from t1 where a in (869751,736494,226312,802616); a 226312 736494 802616 869751 +alter table t1 type=myisam; +explain select * from t1 where a in (869751,736494,226312,802616); table type possible_keys key key_len ref rows Extra t1 range uniq_id uniq_id 4 NULL 4 where used; Using index +drop table t1; +create table t1 (x int not null, y int not null, key x(x), unique y(y)) +type=heap; +insert into t1 values (1,1),(2,2),(1,3),(2,4),(2,5),(2,6); +select * from t1 where x=1; x y 1 3 1 1 +select * from t1,t1 as t2 where t1.x=t2.y; x y x y 1 1 1 1 2 2 2 2 @@ -43,11 +77,20 @@ x y x y 2 4 2 2 2 5 2 2 2 6 2 2 +explain select * from t1,t1 as t2 where t1.x=t2.y; table type possible_keys key key_len ref rows Extra t1 ALL x NULL NULL NULL 6 t2 eq_ref y y 4 t1.x 1 +drop table t1; +create table t1 (a int) type=heap; +insert into t1 values(1); +select max(a) from t1; max(a) 1 +drop table t1; +CREATE TABLE t1 ( a int not null default 0, b int not null default 0, key(a), key(b) ) TYPE=HEAP; +insert into t1 values(1,1),(1,2),(2,3),(1,3),(1,4),(1,5),(1,6); +select * from t1 where a=1; a b 1 6 1 5 @@ -55,6 +98,8 @@ a b 1 3 1 2 1 1 +insert into t1 values(1,1),(1,2),(2,3),(1,3),(1,4),(1,5),(1,6); +select * from t1 where a=1; a b 1 6 1 5 @@ -68,20 +113,55 @@ a b 1 3 1 2 1 1 +drop table t1; +create table t1 (id int unsigned not null, primary key (id)) type=HEAP; +insert into t1 values(1); +select max(id) from t1; max(id) 1 +insert into t1 values(2); +select max(id) from t1; max(id) 2 +replace into t1 values(1); +drop table t1; +create table t1 (n int) type=heap; +drop table t1; +create table t1 (n int) type=heap; +drop table if exists t1; +CREATE table t1(f1 int not null,f2 char(20) not +null,index(f2)) type=heap; +INSERT into t1 set f1=12,f2="bill"; +INSERT into t1 set f1=13,f2="bill"; +INSERT into t1 set f1=14,f2="bill"; +INSERT into t1 set f1=15,f2="bill"; +INSERT into t1 set f1=16,f2="ted"; +INSERT into t1 set f1=12,f2="ted"; +INSERT into t1 set f1=12,f2="ted"; +INSERT into t1 set f1=12,f2="ted"; +INSERT into t1 set f1=12,f2="ted"; +delete from t1 where f2="bill"; +select * from t1; f1 f2 16 ted 12 ted 12 ted 12 ted 12 ted +drop table t1; +create table t1 (btn char(10) not null, key(btn)) type=heap; +insert into t1 values ("hello"),("hello"),("hello"),("hello"),("hello"),("a"),("b"),("c"),("d"),("e"),("f"),("g"),("h"),("i"); +explain select * from t1 where btn like "q%"; table type possible_keys key key_len ref rows Extra t1 ALL btn NULL NULL NULL 14 where used +select * from t1 where btn like "q%"; btn +alter table t1 add column new_col char(1) not null, add key (btn,new_col), drop key btn; +update t1 set new_col=btn; +explain select * from t1 where btn="a"; table type possible_keys key key_len ref rows Extra t1 ALL btn NULL NULL NULL 14 where used +explain select * from t1 where btn="a" and new_col="a"; table type possible_keys key key_len ref rows Extra t1 ref btn btn 11 const,const 10 where used +drop table t1; diff --git a/mysql-test/r/identity.result b/mysql-test/r/identity.result index 45968248d26..39123e9c127 100644 --- a/mysql-test/r/identity.result +++ b/mysql-test/r/identity.result @@ -1,4 +1,6 @@ +select last_insert_id(345); last_insert_id(345) 345 +select @@IDENTITY,last_insert_id(); @@IDENTITY last_insert_id() 345 345 diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 67aa024b117..596edb84705 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1,3 +1,7 @@ +drop table if exists t1,t2; +create table t1 (id int unsigned not null auto_increment, code tinyint unsigned not null, name char(20) not null, primary key (id), key (code), unique (name)) type=innodb; +insert into t1 (code, name) values (1, 'Tim'), (1, 'Monty'), (2, 'David'), (2, 'Erik'), (3, 'Sasha'), (3, 'Jeremy'), (4, 'Matt'); +select id, code, name from t1 order by id; id code name 1 1 Tim 2 1 Monty @@ -6,6 +10,8 @@ id code name 5 3 Sasha 6 3 Jeremy 7 4 Matt +update ignore t1 set id = 8, name = 'Sinisa' where id < 3; +select id, code, name from t1 order by id; id code name 2 1 Monty 3 2 David @@ -14,6 +20,8 @@ id code name 6 3 Jeremy 7 4 Matt 8 1 Sinisa +update ignore t1 set id = id + 10, name = 'Ralph' where id < 4; +select id, code, name from t1 order by id; id code name 3 2 David 4 2 Erik @@ -22,10 +30,26 @@ id code name 7 4 Matt 8 1 Sinisa 12 1 Ralph +drop table t1; +CREATE TABLE t1 ( +id int(11) NOT NULL auto_increment, +parent_id int(11) DEFAULT '0' NOT NULL, +level tinyint(4) DEFAULT '0' NOT NULL, +PRIMARY KEY (id), +KEY parent_id (parent_id), +KEY level (level) +) type=innodb; +INSERT INTO t1 VALUES (1,0,0),(3,1,1),(4,1,1),(8,2,2),(9,2,2),(17,3,2),(22,4,2),(24,4,2),(28,5,2),(29,5,2),(30,5,2),(31,6,2),(32,6,2),(33,6,2),(203,7,2),(202,7,2),(20,3,2),(157,0,0),(193,5,2),(40,7,2),(2,1,1),(15,2,2),(6,1,1),(34,6,2),(35,6,2),(16,3,2),(7,1,1),(36,7,2),(18,3,2),(26,5,2),(27,5,2),(183,4,2),(38,7,2),(25,5,2),(37,7,2),(21,4,2),(19,3,2),(5,1,1),(179,5,2); +update t1 set parent_id=parent_id+100; +select * from t1 where parent_id=102; id parent_id level 8 102 2 9 102 2 15 102 2 +update t1 set id=id+1000; +update t1 set id=1024 where id=1009; +Got one of the listed errors +select * from t1; id parent_id level 1001 100 0 1002 101 1 @@ -66,6 +90,8 @@ id parent_id level 1193 105 2 1202 107 2 1203 107 2 +update ignore t1 set id=id+1; +select * from t1; id parent_id level 1001 100 0 1002 101 1 @@ -106,16 +132,22 @@ id parent_id level 1194 105 2 1202 107 2 1204 107 2 +update ignore t1 set id=1023 where id=1010; +select * from t1 where parent_id=102; id parent_id level 1008 102 2 1010 102 2 1015 102 2 +explain select level from t1 where level=1; table type possible_keys key key_len ref rows Extra t1 index level level 1 NULL 39 where used; Using index +explain select level,id from t1 where level=1; table type possible_keys key key_len ref rows Extra t1 index level level 1 NULL 39 where used; Using index +explain select level,id,parent_id from t1 where level=1; table type possible_keys key key_len ref rows Extra t1 ALL level NULL NULL NULL 39 where used +select level,id from t1 where level=1; level id 1 1002 1 1003 @@ -123,6 +155,7 @@ level id 1 1005 1 1006 1 1007 +select level,id,parent_id from t1 where level=1; level id parent_id 1 1002 101 1 1003 101 @@ -130,72 +163,196 @@ level id parent_id 1 1005 101 1 1006 101 1 1007 101 +optimize table t1; Table Op Msg_type Msg_text test.t1 optimize error The handler for the table doesn't support check/repair +show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 id A 2 NULL NULL t1 1 parent_id 1 parent_id A 4 NULL NULL t1 1 level 1 level A 4 NULL NULL +drop table t1; +CREATE TABLE t1 ( +gesuchnr int(11) DEFAULT '0' NOT NULL, +benutzer_id int(11) DEFAULT '0' NOT NULL, +PRIMARY KEY (gesuchnr,benutzer_id) +) type=innodb; +replace into t1 (gesuchnr,benutzer_id) values (2,1); +replace into t1 (gesuchnr,benutzer_id) values (1,1); +replace into t1 (gesuchnr,benutzer_id) values (1,1); +select * from t1; gesuchnr benutzer_id 1 1 2 1 +drop table t1; +create table t1 (a int) type=innodb; +insert into t1 values (1), (2); +optimize table t1; Table Op Msg_type Msg_text test.t1 optimize error The handler for the table doesn't support check/repair +delete from t1 where a = 1; +select * from t1; a 2 +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +drop table t1; +create table t1 (a int,b varchar(20)) type=innodb; +insert into t1 values (1,""), (2,"testing"); +delete from t1 where a = 1; +select * from t1; a b 2 testing +create index skr on t1 (a); +insert into t1 values (3,""), (4,"testing"); +analyze table t1; Table Op Msg_type Msg_text test.t1 analyze error The handler for the table doesn't support check/repair +show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 1 skr 1 a A 3 NULL NULL +drop table t1; +create table t1 (a int,b varchar(20),key(a)) type=innodb; +insert into t1 values (1,""), (2,"testing"); +select * from t1 where a = 1; a b 1 +drop table t1; +create table t1 (n int not null primary key) type=innodb; +set autocommit=0; +insert into t1 values (4); +rollback; +select n, "after rollback" from t1; n after rollback +insert into t1 values (4); +commit; +select n, "after commit" from t1; n after commit 4 after commit +commit; +insert into t1 values (5); +insert into t1 values (4); +Duplicate entry '4' for key 1 +commit; +select n, "after commit" from t1; n after commit 4 after commit 5 after commit +set autocommit=1; +insert into t1 values (6); +insert into t1 values (4); +Duplicate entry '4' for key 1 +select n from t1; n 4 5 6 +rollback; +drop table t1; +create table t1 ( id int NOT NULL PRIMARY KEY, nom varchar(64)) type=innodb; +begin; +insert into t1 values(1,'hamdouni'); +select id as afterbegin_id,nom as afterbegin_nom from t1; afterbegin_id afterbegin_nom 1 hamdouni +rollback; +select id as afterrollback_id,nom as afterrollback_nom from t1; afterrollback_id afterrollback_nom +set autocommit=0; +insert into t1 values(2,'mysql'); +select id as afterautocommit0_id,nom as afterautocommit0_nom from t1; afterautocommit0_id afterautocommit0_nom 2 mysql +rollback; +select id as afterrollback_id,nom as afterrollback_nom from t1; afterrollback_id afterrollback_nom +set autocommit=1; +drop table t1; +CREATE TABLE t1 (id char(8) not null primary key, val int not null) type=innodb; +insert into t1 values ('pippo', 12); +insert into t1 values ('pippo', 12); +Duplicate entry 'pippo' for key 1 +delete from t1; +delete from t1 where id = 'pippo'; +select * from t1; id val +insert into t1 values ('pippo', 12); +set autocommit=0; +delete from t1; +rollback; +select * from t1; id val pippo 12 +delete from t1; +commit; +select * from t1; id val +drop table t1; +create table t1 (a integer) type=innodb; +begin; +rename table t1 to t2; +create table t1 (b integer) type=innodb; +insert into t1 values (1); +rollback; +drop table t1; +rename table t2 to t1; +drop table t1; +set autocommit=1; +CREATE TABLE t1 (ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(64)) TYPE=innodb; +INSERT INTO t1 VALUES (1, 'Jochen'); +select * from t1; ID NAME 1 Jochen +drop table t1; +CREATE TABLE t1 ( _userid VARCHAR(60) NOT NULL PRIMARY KEY) TYPE=innodb; +set autocommit=0; +INSERT INTO t1 SET _userid='marc@anyware.co.uk'; +COMMIT; +SELECT * FROM t1; _userid marc@anyware.co.uk +SELECT _userid FROM t1 WHERE _userid='marc@anyware.co.uk'; _userid marc@anyware.co.uk +drop table t1; +set autocommit=1; +CREATE TABLE t1 ( +user_id int(10) DEFAULT '0' NOT NULL, +name varchar(100), +phone varchar(100), +ref_email varchar(100) DEFAULT '' NOT NULL, +detail varchar(200), +PRIMARY KEY (user_id,ref_email) +)type=innodb; +INSERT INTO t1 VALUES (10292,'sanjeev','29153373','sansh777@hotmail.com','xxx'),(10292,'shirish','2333604','shirish@yahoo.com','ddsds'),(10292,'sonali','323232','sonali@bolly.com','filmstar'); +select * from t1 where user_id=10292; user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar +INSERT INTO t1 VALUES (10291,'sanjeev','29153373','sansh777@hotmail.com','xxx'),(10293,'shirish','2333604','shirish@yahoo.com','ddsds'); +select * from t1 where user_id=10292; user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar +select * from t1 where user_id>=10292; user_id name phone ref_email detail 10292 sanjeev 29153373 sansh777@hotmail.com xxx 10292 shirish 2333604 shirish@yahoo.com ddsds 10292 sonali 323232 sonali@bolly.com filmstar 10293 shirish 2333604 shirish@yahoo.com ddsds +select * from t1 where user_id>10292; user_id name phone ref_email detail 10293 shirish 2333604 shirish@yahoo.com ddsds +select * from t1 where user_id<10292; user_id name phone ref_email detail 10291 sanjeev 29153373 sansh777@hotmail.com xxx +drop table t1; +CREATE TABLE t1 (a int not null, b int not null,c int not null, +key(a),primary key(a,b), unique(c),key(a),unique(b)); +show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 a A NULL NULL NULL t1 0 PRIMARY 2 b A 0 NULL NULL @@ -203,69 +360,153 @@ t1 0 b 1 b A 0 NULL NULL t1 0 c 1 c A 0 NULL NULL t1 1 a 1 a A NULL NULL NULL t1 1 a_2 1 a A NULL NULL NULL +drop table t1; +create table t1 (col1 int not null, col2 char(4) not null, primary key(col1)); +alter table t1 type=innodb; +insert into t1 values ('1','1'),('5','2'),('2','3'),('3','4'),('4','4'); +select * from t1; col1 col2 1 1 2 3 3 4 4 4 5 2 +update t1 set col2='7' where col1='4'; +select * from t1; col1 col2 1 1 2 3 3 4 4 7 5 2 +alter table t1 add co3 int not null; +select * from t1; col1 col2 co3 1 1 0 2 3 0 3 4 0 4 7 0 5 2 0 +update t1 set col2='9' where col1='2'; +select * from t1; col1 col2 co3 1 1 0 2 9 0 3 4 0 4 7 0 5 2 0 +drop table t1; +create table t1 (a int not null , b int, primary key (a)) type = innodb; +create table t2 (a int not null , b int, primary key (a)) type = myisam; +insert into t1 VALUES (1,3) , (2,3), (3,3); +select * from t1; a b 1 3 2 3 3 3 +insert into t2 select * from t1; +select * from t2; a b 1 3 2 3 3 3 +delete from t1 where b = 3; +select * from t1; a b +insert into t1 select * from t2; +select * from t1; a b 1 3 2 3 3 3 +select * from t2; a b 1 3 2 3 3 3 +drop table t1,t2; +CREATE TABLE t1 ( +id int(11) NOT NULL auto_increment, +ggid varchar(32) binary DEFAULT '' NOT NULL, +email varchar(64) DEFAULT '' NOT NULL, +passwd varchar(32) binary DEFAULT '' NOT NULL, +PRIMARY KEY (id), +UNIQUE ggid (ggid) +) TYPE=innodb; +insert into t1 (ggid,passwd) values ('test1','xxx'); +insert into t1 (ggid,passwd) values ('test2','yyy'); +insert into t1 (ggid,passwd) values ('test2','this will fail'); +Duplicate entry 'test2' for key 2 +insert into t1 (ggid,id) values ('this will fail',1); +Duplicate entry '1' for key 1 +select * from t1 where ggid='test1'; id ggid email passwd 1 test1 xxx +select * from t1 where passwd='xxx'; id ggid email passwd 1 test1 xxx +select * from t1 where id=2; id ggid email passwd 2 test2 yyy +replace into t1 (ggid,id) values ('this will work',1); +replace into t1 (ggid,passwd) values ('test2','this will work'); +update t1 set id=100,ggid='test2' where id=1; +Duplicate entry 'test2' for key 2 +select * from t1; id ggid email passwd 1 this will work 4 test2 this will work +select * from t1 where id=1; id ggid email passwd 1 this will work +select * from t1 where id=999; id ggid email passwd +drop table t1; +CREATE TABLE t1 ( +user_name varchar(12), +password text, +subscribed char(1), +user_id int(11) DEFAULT '0' NOT NULL, +quota bigint(20), +weight double, +access_date date, +access_time time, +approved datetime, +dummy_primary_key int(11) NOT NULL auto_increment, +PRIMARY KEY (dummy_primary_key) +) TYPE=innodb; +INSERT INTO t1 VALUES ('user_0','somepassword','N',0,0,0,'2000-09-07','23:06:59','2000-09-07 23:06:59',1); +INSERT INTO t1 VALUES ('user_1','somepassword','Y',1,1,1,'2000-09-07','23:06:59','2000-09-07 23:06:59',2); +INSERT INTO t1 VALUES ('user_2','somepassword','N',2,2,1.4142135623731,'2000-09-07','23:06:59','2000-09-07 23:06:59',3); +INSERT INTO t1 VALUES ('user_3','somepassword','Y',3,3,1.7320508075689,'2000-09-07','23:06:59','2000-09-07 23:06:59',4); +INSERT INTO t1 VALUES ('user_4','somepassword','N',4,4,2,'2000-09-07','23:06:59','2000-09-07 23:06:59',5); +select user_name, password , subscribed, user_id, quota, weight, access_date, access_time, approved, dummy_primary_key from t1 order by user_name; user_name password subscribed user_id quota weight access_date access_time approved dummy_primary_key user_0 somepassword N 0 0 0 2000-09-07 23:06:59 2000-09-07 23:06:59 1 user_1 somepassword Y 1 1 1 2000-09-07 23:06:59 2000-09-07 23:06:59 2 user_2 somepassword N 2 2 1.4142135623731 2000-09-07 23:06:59 2000-09-07 23:06:59 3 user_3 somepassword Y 3 3 1.7320508075689 2000-09-07 23:06:59 2000-09-07 23:06:59 4 user_4 somepassword N 4 4 2 2000-09-07 23:06:59 2000-09-07 23:06:59 5 +drop table t1; +CREATE TABLE t1 ( +id int(11) NOT NULL auto_increment, +parent_id int(11) DEFAULT '0' NOT NULL, +level tinyint(4) DEFAULT '0' NOT NULL, +KEY (id), +KEY parent_id (parent_id), +KEY level (level) +) type=innodb; +INSERT INTO t1 VALUES (1,0,0),(3,1,1),(4,1,1),(8,2,2),(9,2,2),(17,3,2),(22,4,2),(24,4,2),(28,5,2),(29,5,2),(30,5,2),(31,6,2),(32,6,2),(33,6,2),(203,7,2),(202,7,2),(20,3,2),(157,0,0),(193,5,2),(40,7,2),(2,1,1),(15,2,2),(6,1,1),(34,6,2),(35,6,2),(16,3,2),(7,1,1),(36,7,2),(18,3,2),(26,5,2),(27,5,2),(183,4,2),(38,7,2),(25,5,2),(37,7,2),(21,4,2),(19,3,2),(5,1,1); +INSERT INTO t1 values (179,5,2); +update t1 set parent_id=parent_id+100; +select * from t1 where parent_id=102; id parent_id level 8 102 2 9 102 2 15 102 2 +update t1 set id=id+1000; +update t1 set id=1024 where id=1009; +select * from t1; id parent_id level 1001 100 0 1003 101 1 @@ -306,6 +547,8 @@ id parent_id level 1019 103 2 1005 101 1 1179 105 2 +update ignore t1 set id=id+1; +select * from t1; id parent_id level 1002 100 0 1004 101 1 @@ -346,12 +589,16 @@ id parent_id level 1020 103 2 1006 101 1 1180 105 2 +update ignore t1 set id=1023 where id=1010; +select * from t1 where parent_id=102; id parent_id level 1009 102 2 1025 102 2 1016 102 2 +explain select level from t1 where level=1; table type possible_keys key key_len ref rows Extra t1 ref level level 1 const 6 where used; Using index +select level,id from t1 where level=1; level id 1 1004 1 1005 @@ -359,6 +606,7 @@ level id 1 1007 1 1008 1 1006 +select level,id,parent_id from t1 where level=1; level id parent_id 1 1004 101 1 1005 101 @@ -366,6 +614,7 @@ level id parent_id 1 1007 101 1 1008 101 1 1006 101 +select level,id from t1 where level=1 order by id; level id 1 1003 1 1004 @@ -373,6 +622,8 @@ level id 1 1006 1 1007 1 1008 +delete from t1 where level=1; +select * from t1; id parent_id level 1002 100 0 1009 102 2 @@ -407,77 +658,212 @@ id parent_id level 1022 104 2 1020 103 2 1180 105 2 +drop table t1; +CREATE TABLE t1 ( +sca_code char(6) NOT NULL, +cat_code char(6) NOT NULL, +sca_desc varchar(50), +lan_code char(2) NOT NULL, +sca_pic varchar(100), +sca_sdesc varchar(50), +sca_sch_desc varchar(16), +PRIMARY KEY (sca_code, cat_code, lan_code), +INDEX sca_pic (sca_pic) +) type = innodb ; +INSERT INTO t1 ( sca_code, cat_code, sca_desc, lan_code, sca_pic, sca_sdesc, sca_sch_desc) VALUES ( 'PD', 'J', 'PENDANT', 'EN', NULL, NULL, 'PENDANT'),( 'RI', 'J', 'RING', 'EN', NULL, NULL, 'RING'),( 'QQ', 'N', 'RING', 'EN', 'not null', NULL, 'RING'); +select count(*) from t1 where sca_code = 'PD'; count(*) 1 +select count(*) from t1 where sca_code <= 'PD'; count(*) 1 +select count(*) from t1 where sca_pic is null; count(*) 2 +alter table t1 drop index sca_pic, add index sca_pic (cat_code, sca_pic); +select count(*) from t1 where sca_code='PD' and sca_pic is null; count(*) 1 +select count(*) from t1 where cat_code='E'; count(*) 0 +alter table t1 drop index sca_pic, add index (sca_pic, cat_code); +select count(*) from t1 where sca_code='PD' and sca_pic is null; count(*) 1 +select count(*) from t1 where sca_pic >= 'n'; count(*) 1 +select sca_pic from t1 where sca_pic is null; sca_pic NULL NULL +update t1 set sca_pic="test" where sca_pic is null; +delete from t1 where sca_code='pd'; +drop table t1; +set @a:=now(); +CREATE TABLE t1 (a int not null, b timestamp not null, primary key (a)) type=innodb; +insert into t1 (a) values(1),(2),(3); +select t1.a from t1 natural join t1 as t2 where t1.b >= @a order by t1.a; a 1 2 3 +update t1 set a=5 where a=1; +select a from t1; a 2 3 5 +drop table t1; +create table t1 (a varchar(100) not null, primary key(a), b int not null) type=innodb; +insert into t1 values("hello",1),("world",2); +select * from t1 order by b desc; a b world 2 hello 1 +optimize table t1; Table Op Msg_type Msg_text test.t1 optimize error The handler for the table doesn't support check/repair +show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 a A 2 NULL NULL +drop table t1; +create table t1 (i int, j int ) TYPE=innodb; +insert into t1 values (1,2); +select * from t1 where i=1 and j=2; i j 1 2 +create index ax1 on t1 (i,j); +select * from t1 where i=1 and j=2; i j 1 2 +drop table t1; +CREATE TABLE t1 ( +a int3 unsigned NOT NULL, +b int1 unsigned NOT NULL, +UNIQUE (a, b) +) TYPE = innodb; +INSERT INTO t1 VALUES (1, 1); +SELECT MIN(B),MAX(b) FROM t1 WHERE t1.a = 1; MIN(B) MAX(b) 1 1 +drop table t1; +CREATE TABLE t1 (a int unsigned NOT NULL) type=innodb; +INSERT INTO t1 VALUES (1); +SELECT * FROM t1; a 1 +DROP TABLE t1; +create table t1 (a int primary key,b int, c int, d int, e int, f int, g int, h int, i int, j int, k int, l int, m int, n int, o int, p int, q int, r int, s int, t int, u int, v int, w int, x int, y int, z int, a1 int, a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int, b1 int, b2 int, b3 int, b4 int, b5 int, b6 int) type = innodb; +insert into t1 values (1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1); +explain select * from t1 where a > 0 and a < 50; table type possible_keys key key_len ref rows Extra t1 range PRIMARY PRIMARY 4 NULL 1 where used +drop table t1; +create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) type=innodb; +insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL'); +LOCK TABLES t1 WRITE; +insert into t1 values (99,1,2,'D'),(1,1,2,'D'); +Duplicate entry '1-1' for key 1 +select id from t1; id 0 1 2 +select id from t1; id 0 1 2 +UNLOCK TABLES; +DROP TABLE t1; +create table t1 (id int NOT NULL,id2 int NOT NULL,id3 int NOT NULL,dummy1 char(30),primary key (id,id2),index index_id3 (id3)) type=innodb; +insert into t1 values (0,0,0,'ABCDEFGHIJ'),(2,2,2,'BCDEFGHIJK'),(1,1,1,'CDEFGHIJKL'); +LOCK TABLES t1 WRITE; +begin; +insert into t1 values (99,1,2,'D'),(1,1,2,'D'); +Duplicate entry '1-1' for key 1 +select id from t1; id 0 1 2 +insert ignore into t1 values (100,1,2,'D'),(1,1,99,'D'); +commit; +select id,id3 from t1; id id3 0 0 1 1 2 2 100 2 +UNLOCK TABLES; +DROP TABLE t1; +create table t1 (a char(20), unique (a(5))) type=innodb; +Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the table handler doesn't support unique sub keys +create table t1 (a char(20), index (a(5))) type=innodb; +show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` char(20) default NULL, KEY `a` (`a`) ) TYPE=InnoDB +drop table t1; +create temporary table t1 (a int not null auto_increment, primary key(a)) type=innodb; +insert into t1 values (NULL),(NULL),(NULL); +delete from t1 where a=3; +insert into t1 values (NULL); +select * from t1; a 1 2 4 +drop table t1; +create table t1 +( +id int auto_increment primary key, +name varchar(32) not null, +value text not null, +uid int not null, +unique key(name,uid) +) type=innodb; +insert into t1 values (1,'one','one value',101), +(2,'two','two value',102),(3,'three','three value',103); +set insert_id=5; +replace into t1 (value,name,uid) values ('other value','two',102); +delete from t1 where uid=102; +set insert_id=5; +replace into t1 (value,name,uid) values ('other value','two',102); +set insert_id=6; +replace into t1 (value,name,uid) values ('other value','two',102); +select * from t1; id name value uid 1 one one value 101 3 three three value 103 6 two other value 102 +drop table t1; +create database test_$1; +create table test_$1.t1 (a int not null) type= innodb; +insert into test_$1.t1 values(1); +create table test_$1.t2 (a int not null) type= myisam; +insert into test_$1.t2 values(1); +create table test_$1.t3 (a int not null) type= heap; +insert into test_$1.t3 values(1); +commit; +drop database test_$1; +show tables from test_$1; +Can't read dir of './test_$1/' (Errcode: 2) +create table t1 (a int not null) type= innodb; +insert into t1 values(1),(2); +truncate table t1; +Can't execute the given command because you have active locked tables or an active transaction +commit; +truncate table t1; +select * from t1; a +insert into t1 values(1),(2); +delete from t1; +select * from t1; a +commit; +drop table t1; diff --git a/mysql-test/r/ins000001.result b/mysql-test/r/ins000001.result index 283f31ffb43..ec4f73e7a5d 100644 --- a/mysql-test/r/ins000001.result +++ b/mysql-test/r/ins000001.result @@ -1,3 +1,12 @@ +use test; +drop table if exists t1,t2; +create table t1 (email varchar(50)); +insert into t1 values ('sasha@mysql.com'),('monty@mysql.com'), +('foo@hotmail.com'),('foo@aol.com'),('bar@aol.com'); +create table t2(id int not null auto_increment primary key, +t2 varchar(50), unique(t2)); +insert into t2 (t2) select distinct substring(email, locate('@', email)+1) from t1; +select * from t2; id t2 1 mysql.com 2 hotmail.com diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result index 145ec8a5cf4..f57efa33020 100644 --- a/mysql-test/r/insert.result +++ b/mysql-test/r/insert.result @@ -1,6 +1,21 @@ +drop table if exists t1; +create table t1 (a int not null); +insert into t1 values (1); +insert into t1 values (a+2); +insert into t1 values (a+3); +insert into t1 values (4),(a+5); +select * from t1; a 1 2 3 4 5 +drop table t1; +create table t1 (id int not null auto_increment primary key, username varchar(32) not null, unique (username)); +insert into t1 values (0,"mysql"); +insert into t1 values (0,"mysql ab"); +insert into t1 values (0,"mysql a"); +insert into t1 values (0,"r1manic"); +insert into t1 values (0,"r1man"); +drop table t1; diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 04498add5e9..682e711a6e8 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -1,3 +1,10 @@ +drop table if exists t1,t2; +create table t1 (bandID MEDIUMINT UNSIGNED NOT NULL PRIMARY KEY, payoutID SMALLINT UNSIGNED NOT NULL); +insert into t1 (bandID,payoutID) VALUES (1,6),(2,6),(3,4),(4,9),(5,10),(6,1),(7,12),(8,12); +create table t2 (payoutID SMALLINT UNSIGNED NOT NULL PRIMARY KEY); +insert into t2 (payoutID) SELECT DISTINCT payoutID FROM t1; +insert into t2 (payoutID) SELECT payoutID+10 FROM t1; +select * from t2; payoutID 1 4 @@ -11,5 +18,49 @@ payoutID 19 20 22 +drop table t1,t2; +DROP TABLE IF EXISTS crash1,crash2; +CREATE TABLE `crash1` ( +`numeropost` bigint(20) unsigned NOT NULL default '0', +`icone` tinyint(4) unsigned NOT NULL default '0', +`numreponse` bigint(20) unsigned NOT NULL auto_increment, +`contenu` text NOT NULL, +`pseudo` varchar(50) NOT NULL default '', +`date` datetime NOT NULL default '0000-00-00 00:00:00', +`ip` bigint(11) NOT NULL default '0', +`signature` tinyint(1) unsigned NOT NULL default '0', +PRIMARY KEY (`numeropost`,`numreponse`) +,KEY `ip` (`ip`), +KEY `date` (`date`), +KEY `pseudo` (`pseudo`), +KEY `numreponse` (`numreponse`) +) TYPE=MyISAM; +CREATE TABLE `crash2` ( +`numeropost` bigint(20) unsigned NOT NULL default '0', +`icone` tinyint(4) unsigned NOT NULL default '0', +`numreponse` bigint(20) unsigned NOT NULL auto_increment, +`contenu` text NOT NULL, +`pseudo` varchar(50) NOT NULL default '', +`date` datetime NOT NULL default '0000-00-00 00:00:00', +`ip` bigint(11) NOT NULL default '0', +`signature` tinyint(1) unsigned NOT NULL default '0', +PRIMARY KEY (`numeropost`,`numreponse`), +KEY `ip` (`ip`), +KEY `date` (`date`), +KEY `pseudo` (`pseudo`), +KEY `numreponse` (`numreponse`) +) TYPE=MyISAM; +INSERT INTO crash2 +(numeropost,icone,numreponse,contenu,pseudo,date,ip,signature) VALUES +(9,1,56,'test','joce','2001-07-25 13:50:53' +,3649052399,0); +INSERT INTO crash1 (numeropost,icone,contenu,pseudo,date,signature,ip) +SELECT 1618,icone,contenu,pseudo,date,signature,ip FROM crash2 +WHERE numeropost=9 ORDER BY numreponse ASC; +show variables like '%bulk%'; Variable_name Value myisam_bulk_insert_tree_size 8388608 +INSERT INTO crash1 (numeropost,icone,contenu,pseudo,date,signature,ip) +SELECT 1718,icone,contenu,pseudo,date,signature,ip FROM crash2 +WHERE numeropost=9 ORDER BY numreponse ASC; +DROP TABLE IF EXISTS crash1,crash2; diff --git a/mysql-test/r/isam.result b/mysql-test/r/isam.result index ba12ca05feb..d80f47d3483 100644 --- a/mysql-test/r/isam.result +++ b/mysql-test/r/isam.result @@ -1,10 +1,91 @@ +drop table if exists t1,t2; +create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a)); +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +repair table t1; Table Op Msg_type Msg_text test.t1 repair status OK +delete from t1 where (a & 1); +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +repair table t1; Table Op Msg_type Msg_text test.t1 repair status OK +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +drop table t1; +create table t1 (a int not null auto_increment,b int, primary key (a)) type=isam; +insert into t1 values (1,1),(NULL,2),(3,3),(NULL,4); +delete from t1 where a=4 or a=2; +insert into t1 values (NULL,4),(NULL,5),(6,6); +select * from t1; +a b +1 1 +5 5 +3 3 +4 4 +6 6 +delete from t1 where a=6; +replace t1 values (3,1); +replace t1 values (3,3); +ALTER TABLE t1 add c int; +insert into t1 values (NULL,6,6); +select * from t1; +a b c +1 1 NULL +5 5 NULL +3 3 NULL +4 4 NULL +6 6 6 +drop table t1; +create table t1 (a int,b text, index(a)) type=isam; +Column 'a' is used with UNIQUE or INDEX but is not defined as NOT NULL +create table t1 (a int,b text, index(b)) type=isam; +BLOB column 'b' can't be used in key specification with the used table type +create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ord,ordid)) type=isam; +Incorrect table definition; There can only be one auto column and it must be defined as a key +create table t1 (ordid int(8), unique (ordid)) type=isam; +Column 'ordid' is used with UNIQUE or INDEX but is not defined as NOT NULL +drop table if exists t1; +create table t1 (a int not null primary key, b int not null,c int not null, key(b,c)); +insert into t1 values (1,2,2),(2,2,3),(3,2,4),(4,2,4); +create table t2 type=isam select * from t1; +optimize table t1; +Table Op Msg_type Msg_text +test.t1 optimize status OK +check table t1,t2; +Table Op Msg_type Msg_text +test.t1 check status OK +test.t2 check error The handler for the table doesn't support check/repair +repair table t1,t2; +Table Op Msg_type Msg_text +test.t1 repair status OK +test.t2 repair error The handler for the table doesn't support check/repair +check table t2,t1; +Table Op Msg_type Msg_text +test.t2 check error The handler for the table doesn't support check/repair +test.t1 check status OK +lock tables t1 write; +check table t2,t1; +Table Op Msg_type Msg_text +test.t2 check error Table 't2' was not locked with LOCK TABLES +test.t1 check status OK +show columns from t1; +Field Type Null Key Default Extra +a int(11) PRI 0 +b int(11) MUL 0 +c int(11) 0 +show full columns from t1; +Field Type Null Key Default Extra Privileges +a int(11) PRI 0 select,insert,update,references +b int(11) MUL 0 select,insert,update,references +c int(11) 0 select,insert,update,references +show index from t1; +Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment +t1 0 PRIMARY 1 a A 4 NULL NULL +t1 1 b 1 b A 1 NULL NULL +t1 1 b 2 c A 4 NULL NULL +drop table t1,t2; diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index 3c5a72edc68..d738ff6be73 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -1,22 +1,107 @@ +drop table if exists t1,t2; +create table t1 (id int primary key); +create table t2 (id int); +insert into t1 values (75); +insert into t1 values (79); +insert into t1 values (78); +insert into t1 values (77); +replace into t1 values (76); +replace into t1 values (76); +insert into t1 values (104); +insert into t1 values (103); +insert into t1 values (102); +insert into t1 values (101); +insert into t1 values (105); +insert into t1 values (106); +insert into t1 values (107); +insert into t2 values (107); +insert into t2 values (75); +select t1.id, t2.id from t1, t2 where t2.id = t1.id; id id 107 107 75 75 +select t1.id, count(t2.id) from t1,t2 where t2.id = t1.id group by t1.id; id count(t2.id) 75 1 107 1 +select t1.id, count(t2.id) from t1,t2 where t2.id = t1.id group by t2.id; id count(t2.id) 75 1 107 1 +drop table t1,t2; +CREATE TABLE t1 ( +id int(11) NOT NULL auto_increment, +token varchar(100) DEFAULT '' NOT NULL, +count int(11) DEFAULT '0' NOT NULL, +qty int(11), +phone char(1) DEFAULT '' NOT NULL, +timestamp datetime DEFAULT '0000-00-00 00:00:00' NOT NULL, +PRIMARY KEY (id), +KEY token (token(15)), +KEY timestamp (timestamp), +UNIQUE token_2 (token(75),count,phone) +); +INSERT INTO t1 VALUES (21,'e45703b64de71482360de8fec94c3ade',3,7800,'n','1999-12-23 17:22:21'); +INSERT INTO t1 VALUES (22,'e45703b64de71482360de8fec94c3ade',4,5000,'y','1999-12-23 17:22:21'); +INSERT INTO t1 VALUES (18,'346d1cb63c89285b2351f0ca4de40eda',3,13200,'b','1999-12-23 11:58:04'); +INSERT INTO t1 VALUES (17,'ca6ddeb689e1b48a04146b1b5b6f936a',4,15000,'b','1999-12-23 11:36:53'); +INSERT INTO t1 VALUES (16,'ca6ddeb689e1b48a04146b1b5b6f936a',3,13200,'b','1999-12-23 11:36:53'); +INSERT INTO t1 VALUES (26,'a71250b7ed780f6ef3185bfffe027983',5,1500,'b','1999-12-27 09:44:24'); +INSERT INTO t1 VALUES (24,'4d75906f3c37ecff478a1eb56637aa09',3,5400,'y','1999-12-23 17:29:12'); +INSERT INTO t1 VALUES (25,'4d75906f3c37ecff478a1eb56637aa09',4,6500,'y','1999-12-23 17:29:12'); +INSERT INTO t1 VALUES (27,'a71250b7ed780f6ef3185bfffe027983',3,6200,'b','1999-12-27 09:44:24'); +INSERT INTO t1 VALUES (28,'a71250b7ed780f6ef3185bfffe027983',3,5400,'y','1999-12-27 09:44:36'); +INSERT INTO t1 VALUES (29,'a71250b7ed780f6ef3185bfffe027983',4,17700,'b','1999-12-27 09:45:05'); +CREATE TABLE t2 ( +id int(11) NOT NULL auto_increment, +category int(11) DEFAULT '0' NOT NULL, +county int(11) DEFAULT '0' NOT NULL, +state int(11) DEFAULT '0' NOT NULL, +phones int(11) DEFAULT '0' NOT NULL, +nophones int(11) DEFAULT '0' NOT NULL, +PRIMARY KEY (id), +KEY category (category,county,state) +); +INSERT INTO t2 VALUES (3,2,11,12,5400,7800); +INSERT INTO t2 VALUES (4,2,25,12,6500,11200); +INSERT INTO t2 VALUES (5,1,37,6,10000,12000); +select a.id, b.category as catid, b.state as stateid, b.county as +countyid from t1 a, t2 b where (a.token = +'a71250b7ed780f6ef3185bfffe027983') and (a.count = b.id); id catid stateid countyid 27 2 12 11 28 2 12 11 29 2 12 25 26 1 6 37 +select a.id, b.category as catid, b.state as stateid, b.county as +countyid from t1 a, t2 b where (a.token = +'a71250b7ed780f6ef3185bfffe027983') and (a.count = b.id) order by a.id; id catid stateid countyid 26 1 6 37 27 2 12 11 28 2 12 11 29 2 12 25 +drop table t1, t2; +create table t1 (a int primary key); +insert into t1 values(1),(2); +select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a); a 1 2 +select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a); +Too many tables. MySQL can only use 31 tables in a join +drop table t1; +CREATE TABLE t1 ( +a int(11) NOT NULL, +b int(11) NOT NULL, +PRIMARY KEY (a,b) +) TYPE=MyISAM; +INSERT INTO t1 VALUES (1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(2,3); +CREATE TABLE t2 ( +a int(11) default NULL +) TYPE=MyISAM; +INSERT INTO t2 VALUES (2),(3); +SELECT t1.a,t2.a,b FROM t1,t2 WHERE t1.a=t2.a AND (t1.a=1 OR t1.a=2) AND b>=1 AND b<=3; +a a b +2 2 3 +DROP TABLE t1, t2; diff --git a/mysql-test/r/join_crash.result b/mysql-test/r/join_crash.result index f7bef8af8ec..c7bca9f7497 100644 --- a/mysql-test/r/join_crash.result +++ b/mysql-test/r/join_crash.result @@ -1 +1,110 @@ +DROP TABLE IF EXISTS t1,t2,t3,t4; +CREATE TABLE t1 ( +project_id int(11) NOT NULL auto_increment, +project_row_lock int(11) NOT NULL default '0', +project_name varchar(80) NOT NULL default '', +client_ptr int(11) NOT NULL default '0', +project_contact_ptr int(11) default NULL, +client_contact_ptr int(11) default NULL, +billing_contact_ptr int(11) default NULL, +comments mediumtext, +PRIMARY KEY (project_id), +UNIQUE KEY project (client_ptr,project_name) +) TYPE=MyISAM PACK_KEYS=1; +INSERT INTO t1 VALUES (1,0,'Rejected Time',1,NULL,NULL,NULL,NULL); +INSERT INTO t1 VALUES (209,0,'MDGRAD Proposal/Investigation',97,NULL,NULL,NULL,''); +INSERT INTO t1 VALUES (208,0,'Font 9 Design',84,NULL,NULL,NULL,''); +INSERT INTO t1 VALUES (207,0,'Web Based Order Processing',95,NULL,NULL,NULL,''); +INSERT INTO t1 VALUES (205,0,'Mac Screen Saver',95,NULL,NULL,NULL,''); +INSERT INTO t1 VALUES (206,0,'Web Site',96,NULL,NULL,NULL,''); +INSERT INTO t1 VALUES (204,0,'Magnafire Glue',94,NULL,NULL,NULL,''); +INSERT INTO t1 VALUES (203,0,'Print Bid',93,NULL,NULL,NULL,''); +INSERT INTO t1 VALUES (202,0,'EPOC Port',92,NULL,NULL,NULL,''); +INSERT INTO t1 VALUES (201,0,'TravelMate',88,NULL,NULL,NULL,''); +CREATE TABLE t2 ( +period_id int(11) NOT NULL auto_increment, +period_type enum('user_table','client_table','role_table','member_table','project_table') default NULL, +period_key int(11) default NULL, +start_date datetime default NULL, +end_date datetime default NULL, +work_load int(11) default NULL, +PRIMARY KEY (period_id), +KEY period_index (period_type,period_key), +KEY date_index (start_date,end_date) +) TYPE=MyISAM PACK_KEYS=1; +INSERT INTO t2 VALUES (1,'user_table',98,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (2,'user_table',99,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (3,'user_table',100,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (49,'project_table',148,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (50,'client_table',68,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (51,'project_table',149,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (52,'project_table',150,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (53,'client_table',69,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (54,'project_table',151,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (55,'client_table',70,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (155,'role_table',1,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (156,'role_table',2,'2000-01-01 00:00:00',NULL,NULL); +INSERT INTO t2 VALUES (160,'member_table',1,'2000-01-01 00:00:00',NULL,1); +INSERT INTO t2 VALUES (161,'member_table',2,'2000-01-01 00:00:00',NULL,1); +INSERT INTO t2 VALUES (162,'member_table',3,'2000-01-01 00:00:00',NULL,1); +CREATE TABLE t3 ( +budget_id int(11) NOT NULL auto_increment, +project_ptr int(11) NOT NULL default '0', +po_number varchar(20) NOT NULL default '', +status enum('open','closed') default NULL, +date_received datetime default NULL, +amount_received float(10,2) default NULL, +adjustment float(10,2) default NULL, +PRIMARY KEY (budget_id), +UNIQUE KEY po (project_ptr,po_number) +) TYPE=MyISAM PACK_KEYS=1; +CREATE TABLE t4 ( +client_id int(11) NOT NULL auto_increment, +client_row_lock int(11) NOT NULL default '0', +client_name varchar(80) NOT NULL default '', +contact_ptr int(11) default NULL, +comments mediumtext, +PRIMARY KEY (client_id), +UNIQUE KEY client_name (client_name) +) TYPE=MyISAM PACK_KEYS=1; +INSERT INTO t4 VALUES (1,0,'CPS',NULL,NULL); +select distinct +t1.project_id as project_id, +t1.project_name as project_name, +t1.client_ptr as client_ptr, +t1.comments as comments, +sum( t3.amount_received ) + sum( t3.adjustment ) as total_budget +from +t1 , +t2 as client_period , +t2 as project_period +left join +t3 +on +t3.project_ptr = t1.project_id +and t3.date_received <= '2001-03-22 14:15:09' + left join +t4 +on +t4.client_id = t1.client_ptr +where +1 +and ( client_period.period_type = 'client_table' + and client_period.period_key = t4.client_id +and ( client_period.start_date <= '2001-03-22 14:15:09' or isnull( client_period.start_date )) +and ( client_period.end_date > '2001-03-21 14:15:09' or isnull( client_period.end_date )) +) +and ( project_period.period_type = 'project_table' + and project_period.period_key = t1.project_id +and ( project_period.start_date <= '2001-03-22 14:15:09' or isnull( project_period.start_date )) +and ( project_period.end_date > '2001-03-21 14:15:09' or isnull( project_period.end_date )) ) +group by +client_id, +project_id , +client_period.period_id , +project_period.period_id +order by +client_name asc, +project_name asc; project_id project_name client_ptr comments total_budget +DROP TABLE t1,t2,t3,t4; diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index 65b4c2ec73a..79f12ce9b2c 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -1,8 +1,19 @@ +drop table if exists t1,t2,t3,t4,t5; +CREATE TABLE t1 ( +grp int(11) default NULL, +a bigint(20) unsigned default NULL, +c char(10) NOT NULL default '' +) TYPE=MyISAM; +INSERT INTO t1 VALUES (1,1,'a'),(2,2,'b'),(2,3,'c'),(3,4,'E'),(3,5,'C'),(3,6,'D'),(NULL,NULL,''); +create table t2 (id int, a bigint unsigned not null, c char(10), d int, primary key (a)); +insert into t2 values (1,1,"a",1),(3,4,"A",4),(3,5,"B",5),(3,6,"C",6),(4,7,"D",7); +select t1.*,t2.* from t1 JOIN t2 where t1.a=t2.a; grp a c id a c d 1 1 a 1 1 a 1 3 4 E 3 4 A 4 3 5 C 3 5 B 5 3 6 D 3 6 C 6 +select t1.*,t2.* from t1 left join t2 on (t1.a=t2.a) order by t1.grp,t1.a,t2.c; grp a c id a c d NULL NULL NULL NULL NULL NULL 1 1 a 1 1 a 1 @@ -11,18 +22,21 @@ NULL NULL NULL NULL NULL NULL 3 4 E 3 4 A 4 3 5 C 3 5 B 5 3 6 D 3 6 C 6 +select t1.*,t2.* from { oj t2 left outer join t1 on (t1.a=t2.a) }; grp a c id a c d 1 1 a 1 1 a 1 3 4 E 3 4 A 4 3 5 C 3 5 B 5 3 6 D 3 6 C 6 NULL NULL NULL 4 7 D 7 +select t1.*,t2.* from t1 as t0,{ oj t2 left outer join t1 on (t1.a=t2.a) } WHERE t0.a=2; grp a c id a c d 1 1 a 1 1 a 1 3 4 E 3 4 A 4 3 5 C 3 5 B 5 3 6 D 3 6 C 6 NULL NULL NULL 4 7 D 7 +select t1.*,t2.* from t1 left join t2 using (a); grp a c id a c d 1 1 a 1 1 a 1 2 2 b NULL NULL NULL NULL @@ -31,11 +45,13 @@ grp a c id a c d 3 5 C 3 5 B 5 3 6 D 3 6 C 6 NULL NULL NULL NULL NULL NULL +select t1.*,t2.* from t1 left join t2 using (a) where t1.a=t2.a; grp a c id a c d 1 1 a 1 1 a 1 3 4 E 3 4 A 4 3 5 C 3 5 B 5 3 6 D 3 6 C 6 +select t1.*,t2.* from t1 left join t2 using (a,c); grp a c id a c d 1 1 a 1 1 a 1 2 2 b NULL NULL NULL NULL @@ -44,6 +60,7 @@ grp a c id a c d 3 5 C NULL NULL NULL NULL 3 6 D NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL +select t1.*,t2.* from t1 left join t2 using (c); grp a c id a c d 1 1 a 1 1 a 1 1 1 a 3 4 A 4 @@ -53,6 +70,7 @@ grp a c id a c d 3 5 C 3 6 C 6 3 6 D 4 7 D 7 NULL NULL NULL NULL NULL NULL +select t1.*,t2.* from t1 natural left outer join t2; grp a c id a c d 1 1 a 1 1 a 1 2 2 b NULL NULL NULL NULL @@ -61,19 +79,24 @@ grp a c id a c d 3 5 C NULL NULL NULL NULL 3 6 D NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL +select t1.*,t2.* from t1 left join t2 on (t1.a=t2.a) where t2.id=3; grp a c id a c d 3 4 E 3 4 A 4 3 5 C 3 5 B 5 3 6 D 3 6 C 6 +select t1.*,t2.* from t1 left join t2 on (t1.a=t2.a) where t2.id is null; grp a c id a c d 2 2 b NULL NULL NULL NULL 2 3 c NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL +explain select t1.*,t2.* from t1,t2 where t1.a=t2.a and isnull(t2.a)=1; Comment Impossible WHERE noticed after reading const tables +explain select t1.*,t2.* from t1 left join t2 on t1.a=t2.a where isnull(t2.a)=1; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 7 t2 eq_ref PRIMARY PRIMARY 8 t1.a 1 where used +select t1.*,t2.*,t3.a from t1 left join t2 on (t1.a=t2.a) left join t1 as t3 on (t2.a=t3.a); grp a c id a c d a 1 1 a 1 1 a 1 1 2 2 b NULL NULL NULL NULL NULL @@ -82,28 +105,161 @@ grp a c id a c d a 3 5 C 3 5 B 5 5 3 6 D 3 6 C 6 6 NULL NULL NULL NULL NULL NULL NULL +explain select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a); +Cross dependency found in OUTER JOIN. Examine your ON conditions +select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t1.a=t3.a); +Cross dependency found in OUTER JOIN. Examine your ON conditions +select t1.*,t2.*,t3.a from t1 left join t2 on (t3.a=t2.a) left join t1 as t3 on (t2.a=t3.a); +Cross dependency found in OUTER JOIN. Examine your ON conditions +select t1.*,t2.* from t1 inner join t2 using (a); grp a c id a c d 1 1 a 1 1 a 1 3 4 E 3 4 A 4 3 5 C 3 5 B 5 3 6 D 3 6 C 6 +select t1.*,t2.* from t1 inner join t2 on (t1.a=t2.a); grp a c id a c d 1 1 a 1 1 a 1 3 4 E 3 4 A 4 3 5 C 3 5 B 5 3 6 D 3 6 C 6 +select t1.*,t2.* from t1 natural join t2; grp a c id a c d 1 1 a 1 1 a 1 +drop table t1,t2; +CREATE TABLE t1 ( +usr_id INT unsigned NOT NULL, +uniq_id INT unsigned NOT NULL AUTO_INCREMENT, +start_num INT unsigned NOT NULL DEFAULT 1, +increment INT unsigned NOT NULL DEFAULT 1, +PRIMARY KEY (uniq_id), +INDEX usr_uniq_idx (usr_id, uniq_id), +INDEX uniq_usr_idx (uniq_id, usr_id) +); +CREATE TABLE t2 ( +id INT unsigned NOT NULL DEFAULT 0, +usr2_id INT unsigned NOT NULL DEFAULT 0, +max INT unsigned NOT NULL DEFAULT 0, +c_amount INT unsigned NOT NULL DEFAULT 0, +d_max INT unsigned NOT NULL DEFAULT 0, +d_num INT unsigned NOT NULL DEFAULT 0, +orig_time INT unsigned NOT NULL DEFAULT 0, +c_time INT unsigned NOT NULL DEFAULT 0, +active ENUM ("no","yes") NOT NULL, +PRIMARY KEY (id,usr2_id), +INDEX id_idx (id), +INDEX usr2_idx (usr2_id) +); +INSERT INTO t1 VALUES (3,NULL,0,50),(3,NULL,0,200),(3,NULL,0,25),(3,NULL,0,84676),(3,NULL,0,235),(3,NULL,0,10),(3,NULL,0,3098),(3,NULL,0,2947),(3,NULL,0,8987),(3,NULL,0,8347654),(3,NULL,0,20398),(3,NULL,0,8976),(3,NULL,0,500),(3,NULL,0,198); +SELECT t1.usr_id,t1.uniq_id,t1.increment, +t2.usr2_id,t2.c_amount,t2.max +FROM t1 +LEFT JOIN t2 ON t2.id = t1.uniq_id +WHERE t1.uniq_id = 4 +ORDER BY t2.c_amount; usr_id uniq_id increment usr2_id c_amount max 3 4 84676 NULL NULL NULL +SELECT t1.usr_id,t1.uniq_id,t1.increment, +t2.usr2_id,t2.c_amount,t2.max +FROM t2 +RIGHT JOIN t1 ON t2.id = t1.uniq_id +WHERE t1.uniq_id = 4 +ORDER BY t2.c_amount; usr_id uniq_id increment usr2_id c_amount max 3 4 84676 NULL NULL NULL +INSERT INTO t2 VALUES (2,3,3000,6000,0,0,746584,837484,'yes'); +INSERT INTO t2 VALUES (2,3,3000,6000,0,0,746584,837484,'yes'); +Duplicate entry '2-3' for key 1 +INSERT INTO t2 VALUES (7,3,1000,2000,0,0,746294,937484,'yes'); +SELECT t1.usr_id,t1.uniq_id,t1.increment,t2.usr2_id,t2.c_amount,t2.max FROM t1 LEFT JOIN t2 ON t2.id = t1.uniq_id WHERE t1.uniq_id = 4 ORDER BY t2.c_amount; usr_id uniq_id increment usr2_id c_amount max 3 4 84676 NULL NULL NULL +SELECT t1.usr_id,t1.uniq_id,t1.increment,t2.usr2_id,t2.c_amount,t2.max FROM t1 LEFT JOIN t2 ON t2.id = t1.uniq_id WHERE t1.uniq_id = 4 GROUP BY t2.c_amount; usr_id uniq_id increment usr2_id c_amount max 3 4 84676 NULL NULL NULL +SELECT t1.usr_id,t1.uniq_id,t1.increment,t2.usr2_id,t2.c_amount,t2.max FROM t1 LEFT JOIN t2 ON t2.id = t1.uniq_id WHERE t1.uniq_id = 4; usr_id uniq_id increment usr2_id c_amount max 3 4 84676 NULL NULL NULL +drop table t1,t2; +drop table if exists t1,t2,t3,t4; +CREATE TABLE t1 ( +cod_asig int(11) DEFAULT '0' NOT NULL, +desc_larga_cat varchar(80) DEFAULT '' NOT NULL, +desc_larga_cas varchar(80) DEFAULT '' NOT NULL, +desc_corta_cat varchar(40) DEFAULT '' NOT NULL, +desc_corta_cas varchar(40) DEFAULT '' NOT NULL, +cred_total double(3,1) DEFAULT '0.0' NOT NULL, +pre_requisit int(11), +co_requisit int(11), +preco_requisit int(11), +PRIMARY KEY (cod_asig) +); +INSERT INTO t1 VALUES (10360,'asdfggfg','Introduccion a los Ordenadores I','asdfggfg','Introduccio Ordinadors I',6.0,NULL,NULL,NULL); +INSERT INTO t1 VALUES (10361,'Components i Circuits Electronics I','Componentes y Circuitos Electronicos I','Components i Circuits Electronics I','Comp. i Circ. Electr. I',6.0,NULL,NULL,NULL); +INSERT INTO t1 VALUES (10362,'Laboratori d`Ordinadors','Laboratorio de Ordenadores','Laboratori d`Ordinadors','Laboratori Ordinadors',4.5,NULL,NULL,NULL); +INSERT INTO t1 VALUES (10363,'Tecniques de Comunicacio Oral i Escrita','Tecnicas de Comunicacion Oral y Escrita','Tecniques de Comunicacio Oral i Escrita','Tec. Com. Oral i Escrita',4.5,NULL,NULL,NULL); +INSERT INTO t1 VALUES (11403,'Projecte Fi de Carrera','Proyecto Fin de Carrera','Projecte Fi de Carrera','PFC',9.0,NULL,NULL,NULL); +INSERT INTO t1 VALUES (11404,'+lgebra lineal','Algebra lineal','+lgebra lineal','+lgebra lineal',15.0,NULL,NULL,NULL); +INSERT INTO t1 VALUES (11405,'+lgebra lineal','Algebra lineal','+lgebra lineal','+lgebra lineal',18.0,NULL,NULL,NULL); +INSERT INTO t1 VALUES (11406,'Calcul Infinitesimal','Cßlculo Infinitesimal','Calcul Infinitesimal','Calcul Infinitesimal',15.0,NULL,NULL,NULL); +CREATE TABLE t2 ( +idAssignatura int(11) DEFAULT '0' NOT NULL, +Grup int(11) DEFAULT '0' NOT NULL, +Places smallint(6) DEFAULT '0' NOT NULL, +PlacesOcupades int(11) DEFAULT '0', +PRIMARY KEY (idAssignatura,Grup) +); +INSERT INTO t2 VALUES (10360,12,333,0); +INSERT INTO t2 VALUES (10361,30,2,0); +INSERT INTO t2 VALUES (10361,40,3,0); +INSERT INTO t2 VALUES (10360,45,10,0); +INSERT INTO t2 VALUES (10362,10,12,0); +INSERT INTO t2 VALUES (10360,55,2,0); +INSERT INTO t2 VALUES (10360,70,0,0); +INSERT INTO t2 VALUES (10360,565656,0,0); +INSERT INTO t2 VALUES (10360,32767,7,0); +INSERT INTO t2 VALUES (10360,33,8,0); +INSERT INTO t2 VALUES (10360,7887,85,0); +INSERT INTO t2 VALUES (11405,88,8,0); +INSERT INTO t2 VALUES (10360,0,55,0); +INSERT INTO t2 VALUES (10360,99,0,0); +INSERT INTO t2 VALUES (11411,30,10,0); +INSERT INTO t2 VALUES (11404,0,0,0); +INSERT INTO t2 VALUES (10362,11,111,0); +INSERT INTO t2 VALUES (10363,33,333,0); +INSERT INTO t2 VALUES (11412,55,0,0); +INSERT INTO t2 VALUES (50003,66,6,0); +INSERT INTO t2 VALUES (11403,5,0,0); +INSERT INTO t2 VALUES (11406,11,11,0); +INSERT INTO t2 VALUES (11410,11410,131,0); +INSERT INTO t2 VALUES (11416,11416,32767,0); +INSERT INTO t2 VALUES (11409,0,0,0); +CREATE TABLE t3 ( +id int(11) DEFAULT '0' NOT NULL auto_increment, +dni_pasaporte char(16) DEFAULT '' NOT NULL, +idPla int(11) DEFAULT '0' NOT NULL, +cod_asig int(11) DEFAULT '0' NOT NULL, +any smallint(6) DEFAULT '0' NOT NULL, +quatrimestre smallint(6) DEFAULT '0' NOT NULL, +estat char(1) DEFAULT 'M' NOT NULL, +PRIMARY KEY (id), +UNIQUE dni_pasaporte (dni_pasaporte,idPla), +UNIQUE dni_pasaporte_2 (dni_pasaporte,idPla,cod_asig,any,quatrimestre) +); +INSERT INTO t3 VALUES (1,'11111111',1,10362,98,1,'M'); +CREATE TABLE t4 ( +id int(11) DEFAULT '0' NOT NULL auto_increment, +papa int(11) DEFAULT '0' NOT NULL, +fill int(11) DEFAULT '0' NOT NULL, +idPla int(11) DEFAULT '0' NOT NULL, +PRIMARY KEY (id), +KEY papa (idPla,papa), +UNIQUE papa_2 (idPla,papa,fill) +); +INSERT INTO t4 VALUES (1,-1,10360,1); +INSERT INTO t4 VALUES (2,-1,10361,1); +INSERT INTO t4 VALUES (3,-1,10362,1); +SELECT DISTINCT fill,desc_larga_cat,cred_total,Grup,Places,PlacesOcupades FROM t4 LEFT JOIN t3 ON t3.cod_asig=fill AND estat='S' AND dni_pasaporte='11111111' AND t3.idPla=1 , t2,t1 WHERE fill=t1.cod_asig AND Places>PlacesOcupades AND fill=idAssignatura AND t4.idPla=1 AND papa=-1; fill desc_larga_cat cred_total Grup Places PlacesOcupades 10360 asdfggfg 6.0 0 55 0 10360 asdfggfg 6.0 12 333 0 @@ -116,49 +272,82 @@ fill desc_larga_cat cred_total Grup Places PlacesOcupades 10361 Components i Circuits Electronics I 6.0 40 3 0 10362 Laboratori d`Ordinadors 4.5 10 12 0 10362 Laboratori d`Ordinadors 4.5 11 111 0 +SELECT DISTINCT fill,t3.idPla FROM t4 LEFT JOIN t3 ON t3.cod_asig=t4.fill AND t3.estat='S' AND t3.dni_pasaporte='1234' AND t3.idPla=1 ; fill idPla 10360 NULL 10361 NULL 10362 NULL +INSERT INTO t3 VALUES (3,'1234',1,10360,98,1,'S'); +SELECT DISTINCT fill,t3.idPla FROM t4 LEFT JOIN t3 ON t3.cod_asig=t4.fill AND t3.estat='S' AND t3.dni_pasaporte='1234' AND t3.idPla=1 ; fill idPla 10360 1 10361 NULL 10362 NULL +drop table t1,t2,t3,test.t4; +CREATE TABLE t1 ( +id smallint(5) unsigned DEFAULT '0' NOT NULL auto_increment, +name char(60) DEFAULT '' NOT NULL, +PRIMARY KEY (id) +); +INSERT INTO t1 VALUES (1,'Antonio Paz'); +INSERT INTO t1 VALUES (2,'Lilliana Angelovska'); +INSERT INTO t1 VALUES (3,'Thimble Smith'); +CREATE TABLE t2 ( +id smallint(5) unsigned DEFAULT '0' NOT NULL auto_increment, +owner smallint(5) unsigned DEFAULT '0' NOT NULL, +name char(60), +PRIMARY KEY (id) +); +INSERT INTO t2 VALUES (1,1,'El Gato'); +INSERT INTO t2 VALUES (2,1,'Perrito'); +INSERT INTO t2 VALUES (3,3,'Happy'); +select t1.name, t2.name, t2.id from t1 left join t2 on (t1.id = t2.owner); name name id Antonio Paz El Gato 1 Antonio Paz Perrito 2 Lilliana Angelovska NULL NULL Thimble Smith Happy 3 +select t1.name, t2.name, t2.id from t1 left join t2 on (t1.id = t2.owner) where t2.id is null; name name id Lilliana Angelovska NULL NULL +explain select t1.name, t2.name, t2.id from t1 left join t2 on (t1.id = t2.owner) where t2.id is null; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 3 t2 ALL NULL NULL NULL NULL 3 where used; Not exists +explain select t1.name, t2.name, t2.id from t1 left join t2 on (t1.id = t2.owner) where t2.name is null; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 3 t2 ALL NULL NULL NULL NULL 3 where used +select count(*) from t1 left join t2 on (t1.id = t2.owner); count(*) 4 +select t1.name, t2.name, t2.id from t2 right join t1 on (t1.id = t2.owner); name name id Antonio Paz El Gato 1 Antonio Paz Perrito 2 Lilliana Angelovska NULL NULL Thimble Smith Happy 3 +select t1.name, t2.name, t2.id from t2 right join t1 on (t1.id = t2.owner) where t2.id is null; name name id Lilliana Angelovska NULL NULL +explain select t1.name, t2.name, t2.id from t2 right join t1 on (t1.id = t2.owner) where t2.id is null; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 3 t2 ALL NULL NULL NULL NULL 3 where used; Not exists +explain select t1.name, t2.name, t2.id from t2 right join t1 on (t1.id = t2.owner) where t2.name is null; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 3 t2 ALL NULL NULL NULL NULL 3 where used +select count(*) from t2 right join t1 on (t1.id = t2.owner); count(*) 4 +select t1.name, t2.name, t2.id,t3.id from t2 right join t1 on (t1.id = t2.owner) left join t1 as t3 on t3.id=t2.owner; name name id id Antonio Paz El Gato 1 1 Antonio Paz Perrito 2 1 Lilliana Angelovska NULL NULL NULL Thimble Smith Happy 3 3 +select t1.name, t2.name, t2.id,t3.id from t1 right join t2 on (t1.id = t2.owner) right join t1 as t3 on t3.id=t2.owner; name name id id Antonio Paz El Gato 1 1 Antonio Paz Perrito 2 1 @@ -169,6 +358,7 @@ NULL Happy 3 2 NULL El Gato 1 3 NULL Perrito 2 3 Thimble Smith Happy 3 3 +select t1.name, t2.name, t2.id, t2.owner, t3.id from t1 left join t2 on (t1.id = t2.owner) right join t1 as t3 on t3.id=t2.owner; name name id owner id Antonio Paz El Gato 1 1 1 Antonio Paz Perrito 2 1 1 @@ -180,49 +370,136 @@ Thimble Smith NULL NULL NULL 2 Antonio Paz NULL NULL NULL 3 Lilliana Angelovska NULL NULL NULL 3 Thimble Smith Happy 3 3 3 +drop table t1,t2; +create table t1 (id int not null, str char(10), index(str)); +insert into t1 values (1, null), (2, null), (3, "foo"), (4, "bar"); +select * from t1 where str is not null; id str 4 bar 3 foo +select * from t1 where str is null; id str 1 NULL 2 NULL +drop table t1; +CREATE TABLE t1 ( +t1_id bigint(21) DEFAULT '0' NOT NULL auto_increment, +PRIMARY KEY (t1_id) +); +CREATE TABLE t2 ( +t2_id bigint(21) DEFAULT '0' NOT NULL auto_increment, +PRIMARY KEY (t2_id) +); +CREATE TABLE t3 ( +t3_id bigint(21) DEFAULT '0' NOT NULL auto_increment, +PRIMARY KEY (t3_id) +); +CREATE TABLE t4 ( +seq_0_id bigint(21) DEFAULT '0' NOT NULL, +seq_1_id bigint(21) DEFAULT '0' NOT NULL, +KEY seq_0_id (seq_0_id), +KEY seq_1_id (seq_1_id) +); +CREATE TABLE t5 ( +seq_0_id bigint(21) DEFAULT '0' NOT NULL, +seq_1_id bigint(21) DEFAULT '0' NOT NULL, +KEY seq_1_id (seq_1_id), +KEY seq_0_id (seq_0_id) +); +insert into t1 values (1); +insert into t2 values (1); +insert into t3 values (1); +insert into t4 values (1,1); +insert into t5 values (1,1); +explain select * from t3 left join t4 on t4.seq_1_id = t2.t2_id left join t1 on t1.t1_id = t4.seq_0_id left join t5 on t5.seq_0_id = t1.t1_id left join t2 on t2.t2_id = t5.seq_1_id where t3.t3_id = 23; +Cross dependency found in OUTER JOIN. Examine your ON conditions +drop table t1,t2,t3,t4,t5; +create table t1 (n int, m int, o int, key(n)); +create table t2 (n int not null, m int, o int, primary key(n)); +insert into t1 values (1, 2, 11), (1, 2, 7), (2, 2, 8), (1,2,9),(1,3,9); +insert into t2 values (1, 2, 3),(2, 2, 8), (4,3,9),(3,2,10); +select t1.*, t2.* from t1 left join t2 on t1.n = t2.n and +t1.m = t2.m where t1.n = 1; n m o n m o 1 2 11 1 2 3 1 2 7 1 2 3 1 2 9 1 2 3 1 3 9 NULL NULL NULL +select t1.*, t2.* from t1 left join t2 on t1.n = t2.n and +t1.m = t2.m where t1.n = 1 order by t1.o; n m o n m o 1 2 7 1 2 3 1 2 9 1 2 3 1 3 9 NULL NULL NULL 1 2 11 1 2 3 +drop table t1,t2; +CREATE TABLE t1 (id1 INT NOT NULL PRIMARY KEY, dat1 CHAR(1), id2 INT); +INSERT INTO t1 VALUES (1,'a',1); +INSERT INTO t1 VALUES (2,'b',1); +INSERT INTO t1 VALUES (3,'c',2); +CREATE TABLE t2 (id2 INT NOT NULL PRIMARY KEY, dat2 CHAR(1)); +INSERT INTO t2 VALUES (1,'x'); +INSERT INTO t2 VALUES (2,'y'); +INSERT INTO t2 VALUES (3,'z'); +SELECT t2.id2 FROM t2 LEFT OUTER JOIN t1 ON t1.id2 = t2.id2 WHERE id1 IS NULL; id2 3 +SELECT t2.id2 FROM t2 NATURAL LEFT OUTER JOIN t1 WHERE id1 IS NULL; id2 3 +drop table t1,t2; +create table t1 ( color varchar(20), name varchar(20) ); +insert into t1 values ( 'red', 'apple' ); +insert into t1 values ( 'yellow', 'banana' ); +insert into t1 values ( 'green', 'lime' ); +insert into t1 values ( 'black', 'grape' ); +insert into t1 values ( 'blue', 'blueberry' ); +create table t2 ( count int, color varchar(20) ); +insert into t2 values (10, 'green'); +insert into t2 values (5, 'black'); +insert into t2 values (15, 'white'); +insert into t2 values (7, 'green'); +select * from t1; color name red apple yellow banana green lime black grape blue blueberry +select * from t2; count color 10 green 5 black 15 white 7 green +select * from t2 natural join t1; count color color name 10 green green lime 7 green green lime 5 black black grape +select t2.count, t1.name from t2 natural join t1; count name 10 lime 7 lime 5 grape +select t2.count, t1.name from t2 inner join t1 using (color); count name 10 lime 7 lime 5 grape +drop table t1; +drop table t2; +CREATE TABLE t1 ( +pcode varchar(8) DEFAULT '' NOT NULL +); +INSERT INTO t1 VALUES ('kvw2000'),('kvw2001'),('kvw3000'),('kvw3001'),('kvw3002'),('kvw3500'),('kvw3501'),('kvw3502'),('kvw3800'),('kvw3801'),('kvw3802'),('kvw3900'),('kvw3901'),('kvw3902'),('kvw4000'),('kvw4001'),('kvw4002'),('kvw4200'),('kvw4500'),('kvw5000'),('kvw5001'),('kvw5500'),('kvw5510'),('kvw5600'),('kvw5601'),('kvw6000'),('klw1000'),('klw1020'),('klw1500'),('klw2000'),('klw2001'),('klw2002'),('kld2000'),('klw2500'),('kmw1000'),('kmw1500'),('kmw2000'),('kmw2001'),('kmw2100'),('kmw3000'),('kmw3200'); +CREATE TABLE t2 ( +pcode varchar(8) DEFAULT '' NOT NULL, +KEY pcode (pcode) +); +INSERT INTO t2 VALUES ('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw2000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3000'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw3500'),('kvw6000'),('kvw6000'),('kld2000'); +SELECT t1.pcode, IF(ISNULL(t2.pcode), 0, COUNT(*)) AS count FROM t1 +LEFT JOIN t2 ON t1.pcode = t2.pcode GROUP BY t1.pcode; pcode count kld2000 1 klw1000 0 @@ -265,6 +542,7 @@ kvw5510 0 kvw5600 0 kvw5601 0 kvw6000 2 +SELECT SQL_BIG_RESULT t1.pcode, IF(ISNULL(t2.pcode), 0, COUNT(*)) AS count FROM t1 LEFT JOIN t2 ON t1.pcode = t2.pcode GROUP BY t1.pcode; pcode count kld2000 1 klw1000 0 @@ -307,14 +585,43 @@ kvw5510 0 kvw5600 0 kvw5601 0 kvw6000 2 +drop table t1,t2; +CREATE TABLE t1 ( +id int(11), +pid int(11), +rep_del tinyint(4), +KEY id (id), +KEY pid (pid) +); +INSERT INTO t1 VALUES (1,NULL,NULL); +INSERT INTO t1 VALUES (2,1,NULL); +select * from t1 LEFT JOIN t1 t2 ON (t1.id=t2.pid) AND t2.rep_del IS NULL; id pid rep_del id pid rep_del 1 NULL NULL 2 1 NULL 2 1 NULL NULL NULL NULL +create index rep_del ON t1(rep_del); +select * from t1 LEFT JOIN t1 t2 ON (t1.id=t2.pid) AND t2.rep_del IS NULL; id pid rep_del id pid rep_del 1 NULL NULL 2 1 NULL 2 1 NULL NULL NULL NULL +drop table t1; +CREATE TABLE t1 ( +id int(11) DEFAULT '0' NOT NULL, +name tinytext DEFAULT '' NOT NULL, +UNIQUE id (id) +); +INSERT INTO t1 VALUES (1,'yes'),(2,'no'); +CREATE TABLE t2 ( +id int(11) DEFAULT '0' NOT NULL, +idx int(11) DEFAULT '0' NOT NULL, +UNIQUE id (id,idx) +); +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 where used; 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 +drop table t1,t2; diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result index dbdec824d3b..0c73fc086c5 100644 --- a/mysql-test/r/key.result +++ b/mysql-test/r/key.result @@ -1,19 +1,140 @@ +drop table if exists t1,t2,t3; +CREATE TABLE t1 ( +ID CHAR(32) NOT NULL, +name CHAR(32) NOT NULL, +value CHAR(255), +INDEX indexIDname (ID(8),name(8)) +) ; +INSERT INTO t1 VALUES +('keyword','indexdir','/export/home/local/www/database/indexes/keyword'); +INSERT INTO t1 VALUES ('keyword','urlprefix','text/ /text'); +INSERT INTO t1 VALUES ('keyword','urlmap','/text/ /'); +INSERT INTO t1 VALUES ('keyword','attr','personal employee company'); +INSERT INTO t1 VALUES +('emailgids','indexdir','/export/home/local/www/database/indexes/emailgids'); +INSERT INTO t1 VALUES ('emailgids','urlprefix','text/ /text'); +INSERT INTO t1 VALUES ('emailgids','urlmap','/text/ /'); +INSERT INTO t1 VALUES ('emailgids','attr','personal employee company'); +SELECT value FROM t1 WHERE ID='emailgids' AND name='attr'; value personal employee company +drop table t1; +CREATE TABLE t1 ( +price int(5) DEFAULT '0' NOT NULL, +area varchar(40) DEFAULT '' NOT NULL, +type varchar(40) DEFAULT '' NOT NULL, +transityes enum('Y','N') DEFAULT 'Y' NOT NULL, +shopsyes enum('Y','N') DEFAULT 'Y' NOT NULL, +schoolsyes enum('Y','N') DEFAULT 'Y' NOT NULL, +petsyes enum('Y','N') DEFAULT 'Y' NOT NULL, +KEY price (price,area,type,transityes,shopsyes,schoolsyes,petsyes) +); +INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','N','N','N','N'); +INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','N','N','N','N'); +INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','','','',''); +INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','Y','Y','Y','Y'); +INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','Y','Y','Y','Y'); +INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','Y','Y','Y','Y'); +INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','Y','Y','Y','Y'); +INSERT INTO t1 VALUES (900,'Vancouver','Shared/Roomate','Y','Y','Y','Y'); +SELECT * FROM t1 WHERE area='Vancouver' and transityes='y' and schoolsyes='y' and ( ((type='1 Bedroom' or type='Studio/Bach') and (price<=500)) or ((type='2 Bedroom') and (price<=550)) or ((type='Shared/Roomate') and (price<=300)) or ((type='Room and Board') and (price<=500)) ) and price <= 400; price area type transityes shopsyes schoolsyes petsyes +drop table t1; +CREATE TABLE t1 (program enum('signup','unique','sliding') not null, type enum('basic','sliding','signup'), sites set('mt'), PRIMARY KEY (program)); +ALTER TABLE t1 modify program enum('signup','unique','sliding'); +All parts of a PRIMARY KEY must be NOT NULL; If you need NULL in a key, use UNIQUE instead +drop table t1; +CREATE TABLE t1 ( +name varchar(50) DEFAULT '' NOT NULL, +author varchar(50) DEFAULT '' NOT NULL, +category decimal(10,0) DEFAULT '0' NOT NULL, +email varchar(50), +password varchar(50), +proxy varchar(50), +bitmap varchar(20), +msg varchar(255), +urlscol varchar(127), +urlhttp varchar(127), +timeout decimal(10,0), +nbcnx decimal(10,0), +creation decimal(10,0), +livinguntil decimal(10,0), +lang decimal(10,0), +type decimal(10,0), +subcat decimal(10,0), +subtype decimal(10,0), +reg char(1), +scs varchar(255), +capacity decimal(10,0), +userISP varchar(50), +CCident varchar(50) DEFAULT '' NOT NULL, +PRIMARY KEY (name,author,category) +); +INSERT INTO t1 VALUES +('patnom','patauteur',0,'p.favre@cryo-networks.fr',NULL,NULL,'#p2sndnq6ae5g1u6t','essai\nsalut','scol://195.242.78.119:patauteur.patnom',NULL,NULL,NULL,950036174,-882087474,NULL,3,0,3,'1','Pub/patnom/futur_divers.scs',NULL,'pat','CC1'); +INSERT INTO t1 VALUES +('LeNomDeMonSite','Marc',0,'m.barilley@cryo-networks.fr',NULL,NULL,NULL,NULL,'scol://195.242.78.119:Marc.LeNomDeMonSite',NULL,NULL,NULL,950560434,-881563214,NULL,3,0,3,'1','Pub/LeNomDeMonSite/domus_hibere.scs',NULL,'Marq','CC1'); +select * from t1 where name='patnom' and author='patauteur' and category=0; name author category email password proxy bitmap msg urlscol urlhttp timeout nbcnx creation livinguntil lang type subcat subtype reg scs capacity userISP CCident patnom patauteur 0 p.favre@cryo-networks.fr NULL NULL #p2sndnq6ae5g1u6t essai salut scol://195.242.78.119:patauteur.patnom NULL NULL NULL 950036174 -882087474 NULL 3 0 3 1 Pub/patnom/futur_divers.scs NULL pat CC1 +drop table t1; +create table t1 +( +name_id int not null auto_increment, +name blob, +INDEX name_idx (name(5)), +primary key (name_id) +); +INSERT t1 VALUES(NULL,'/'); +INSERT t1 VALUES(NULL,'[T,U]_axpby'); +SELECT * FROM t1 WHERE name='[T,U]_axpy'; name_id name +SELECT * FROM t1 WHERE name='[T,U]_axpby'; name_id name 2 [T,U]_axpby +create table t2 +( +name_id int not null auto_increment, +name char(255) binary, +INDEX name_idx (name(5)), +primary key (name_id) +); +INSERT t2 select * from t1; +SELECT * FROM t2 WHERE name='[T,U]_axpy'; name_id name +SELECT * FROM t2 WHERE name='[T,U]_axpby'; name_id name 2 [T,U]_axpby +drop table t1,t2; +create table t1 +( +SEQNO numeric(12 ) not null, +MOTYPEID numeric(12 ) not null, +MOINSTANCEID numeric(12 ) not null, +ATTRID numeric(12 ) not null, +VALUE varchar(120) not null, +primary key (SEQNO, MOTYPEID, MOINSTANCEID, ATTRID, VALUE ) +); +INSERT INTO t1 VALUES (1, 1, 1, 1, 'a'); +INSERT INTO t1 VALUES (1, 1, 1, 1, 'b'); +INSERT INTO t1 VALUES (1, 1, 1, 1, 'a'); +Duplicate entry '1-1-1-1-a' for key 1 +drop table t1; +CREATE TABLE t1 ( +a tinytext NOT NULL, +b tinyint(3) unsigned NOT NULL default '0', +PRIMARY KEY (a(32),b) +) TYPE=MyISAM; +INSERT INTO t1 VALUES ('a',1),('a',2); +SELECT * FROM t1 WHERE a='a' AND b=2; a b a 2 +SELECT * FROM t1 WHERE a='a' AND b in (2); a b a 2 +SELECT * FROM t1 WHERE a='a' AND b in (1,2); a b a 1 a 2 +drop table t1; diff --git a/mysql-test/r/key_diff.result b/mysql-test/r/key_diff.result index ab5b9bcc0e7..0886850f38a 100644 --- a/mysql-test/r/key_diff.result +++ b/mysql-test/r/key_diff.result @@ -1,3 +1,12 @@ +drop table if exists t1; +CREATE TABLE t1 ( +a char(5) NOT NULL, +b char(4) NOT NULL, +KEY (a), +KEY (b) +); +INSERT INTO t1 VALUES ('A','B'),('b','A'),('C','c'),('D','E'),('a','a'); +select * from t1,t1 as t2; a b a b A B A B b A A B @@ -24,9 +33,11 @@ b A a a C c a a D E a a a a a a +explain select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B; table type possible_keys key key_len ref rows Extra t1 ALL a NULL NULL NULL 5 t2 ALL b NULL NULL NULL 5 where used +select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B order by binary t1.a,t2.a; a b a b A B a a A B b A @@ -34,6 +45,8 @@ C c C c a a a a a a b A b A A B +select * from t1 where a='a'; a b A B a a +drop table t1; diff --git a/mysql-test/r/key_primary.result b/mysql-test/r/key_primary.result index ee0c1c957dc..10771a134fc 100644 --- a/mysql-test/r/key_primary.result +++ b/mysql-test/r/key_primary.result @@ -1,9 +1,19 @@ +create table t1 (t1 char(3) primary key); +insert into t1 values("ABC"); +insert into t1 values("ABA"); +insert into t1 values("AB%"); +select * from t1 where t1="ABC"; t1 ABC +select * from t1 where t1="ABCD"; t1 +select * from t1 where t1 like "a_\%"; t1 AB% +describe select * from t1 where t1="ABC"; table type possible_keys key key_len ref rows Extra t1 const PRIMARY PRIMARY 3 const 1 +describe select * from t1 where t1="ABCD"; Comment Impossible WHERE noticed after reading const tables +drop table t1; diff --git a/mysql-test/r/keywords.result b/mysql-test/r/keywords.result index f49681ad93b..9553fffc23d 100644 --- a/mysql-test/r/keywords.result +++ b/mysql-test/r/keywords.result @@ -1,4 +1,10 @@ +drop table if exists t1; +create table t1 (time time, date date, timestamp timestamp); +insert into t1 values ("12:22:22","97:02:03","1997-01-02"); +select * from t1; time date timestamp 12:22:22 1997-02-03 19970102000000 +select t1.time+0,t1.date+0,t1.timestamp+0,concat(date," ",time) from t1; t1.time+0 t1.date+0 t1.timestamp+0 concat(date," ",time) 122222 19970203 19970102000000 1997-02-03 12:22:22 +drop table t1; diff --git a/mysql-test/r/kill.result b/mysql-test/r/kill.result index 628c6d21094..788fab8d31a 100644 --- a/mysql-test/r/kill.result +++ b/mysql-test/r/kill.result @@ -1,4 +1,11 @@ +drop table if exists t1; +create table t1 (kill_id int); +insert into t1 values(connection_id()); +select ((@id := kill_id) - kill_id) from t1; ((@id := kill_id) - kill_id) 0 +kill @id; +select 4; 4 4 +drop table t1; diff --git a/mysql-test/r/limit.result b/mysql-test/r/limit.result index 6c3a1ed17e4..f341eebb968 100644 --- a/mysql-test/r/limit.result +++ b/mysql-test/r/limit.result @@ -1,25 +1,50 @@ +drop table if exists t1; +create table t1 (a int primary key, b int not null); +insert into t1 () values (); +insert into t1 values (1,1),(2,1),(3,1); +update t1 set a=4 where b=1 limit 1; +select * from t1; a b 0 0 4 1 2 1 3 1 +update t1 set b=2 where b=1 limit 2; +select * from t1; a b 0 0 4 2 2 2 3 1 +update t1 set b=4 where b=1; +select * from t1; a b 0 0 4 2 2 2 3 4 +delete from t1 where b=2 limit 1; +select * from t1; a b 0 0 2 2 3 4 +delete from t1 limit 1; +select * from t1; a b 2 2 3 4 +drop table t1; +create table t1 (i int); +insert into t1 (i) values(1); +insert into t1 (i) values(1); +insert into t1 (i) values(1); +delete from t1 limit 1; +update t1 set i=2 limit 1; +delete from t1 limit 0; +update t1 set i=3 limit 0; +select * from t1; i 2 1 +drop table t1; diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result index ccd3c02558d..ad5251b9110 100644 --- a/mysql-test/r/lock.result +++ b/mysql-test/r/lock.result @@ -1,10 +1,45 @@ +drop table if exists t1,t2; +CREATE TABLE t1 ( `id` int(11) NOT NULL default '0', `id2` int(11) NOT NULL default '0', `id3` int(11) NOT NULL default '0', `dummy1` char(30) default NULL, PRIMARY KEY (`id`,`id2`), KEY `index_id3` (`id3`)) TYPE=MyISAM; +insert into t1 (id,id2) values (1,1),(1,2),(1,3); +LOCK TABLE t1 WRITE; +select dummy1,count(distinct id) from t1 group by dummy1; dummy1 count(distinct id) NULL 1 +update t1 set id=-1 where id=1; +LOCK TABLE t1 READ; +update t1 set id=1 where id=1; +Table 't1' was locked with a READ lock and can't be updated +create table t2 SELECT * from t1; +Table 't2' was not locked with LOCK TABLES +create temporary table t2 SELECT * from t1; +drop table if exists t2; +unlock tables; +create table t2 SELECT * from t1; +LOCK TABLE t1 WRITE,t2 write; +insert into t2 SELECT * from t1; +update t1 set id=1 where id=-1; +drop table t1,t2; +CREATE TABLE t1 ( +index1 smallint(6) default NULL, +nr smallint(6) default NULL, +KEY index1(index1) +) TYPE=MyISAM; +CREATE TABLE t2 ( +nr smallint(6) default NULL, +name varchar(20) default NULL +) TYPE=MyISAM; +INSERT INTO t2 VALUES (1,'item1'); +INSERT INTO t2 VALUES (2,'item2'); +lock tables t1 write, t2 read; +insert into t1 select 1,nr from t2 where name='item1'; +insert into t1 select 2,nr from t2 where name='item2'; +unlock tables; +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +lock tables t1 write; +check table t2; Table Op Msg_type Msg_text test.t2 check error Table 't2' was not locked with LOCK TABLES -n -4 -n -1 +unlock tables; +drop table t1,t2; diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result new file mode 100644 index 00000000000..6fe8cc71185 --- /dev/null +++ b/mysql-test/r/lock_multi.result @@ -0,0 +1,18 @@ +create table t1(n int); +insert into t1 values (1); +lock tables t1 write; + update low_priority t1 set n = 4; + select n from t1; +unlock tables; +n +4 +drop table t1; +create table t1(n int); +insert into t1 values (1); +lock tables t1 read; + update low_priority t1 set n = 4; + select n from t1; +unlock tables; +n +1 +drop table t1; diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 653e25af799..9b72ff26350 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -1,3 +1,10 @@ +drop table if exists t1,t2,t3,t4,t5,t6; +create table t1 (a int not null primary key auto_increment, message char(20)); +create table t2 (a int not null primary key auto_increment, message char(20)); +INSERT INTO t1 (message) VALUES ("Testing"),("table"),("t1"); +INSERT INTO t2 (message) VALUES ("Testing"),("table"),("t2"); +create table t3 (a int not null, b char(20), key(a)) type=MERGE UNION=(t1,t2); +select * from t3; a b 1 Testing 2 table @@ -5,6 +12,7 @@ a b 1 Testing 2 table 3 t2 +select * from t3 order by a desc; a b 3 t1 3 t2 @@ -12,13 +20,30 @@ a b 2 table 1 Testing 1 Testing +drop table t3; +insert into t1 select NULL,message from t2; +insert into t2 select NULL,message from t1; +insert into t1 select NULL,message from t2; +insert into t2 select NULL,message from t1; +insert into t1 select NULL,message from t2; +insert into t2 select NULL,message from t1; +insert into t1 select NULL,message from t2; +insert into t2 select NULL,message from t1; +insert into t1 select NULL,message from t2; +insert into t2 select NULL,message from t1; +insert into t1 select NULL,message from t2; +create table t3 (a int not null, b char(20), key(a)) type=MERGE UNION=(test.t1,test.t2); +explain select * from t3 where a < 10; table type possible_keys key key_len ref rows Extra t3 range a a 4 NULL 10 where used +explain select * from t3 where a > 10 and a < 20; table type possible_keys key key_len ref rows Extra t3 range a a 4 NULL 10 where used +select * from t3 where a = 10; a b 10 Testing 10 Testing +select * from t3 where a < 10; a b 1 Testing 1 Testing @@ -38,6 +63,7 @@ a b 8 table 9 t2 9 t2 +select * from t3 where a > 10 and a < 20; a b 11 table 11 table @@ -57,8 +83,10 @@ a b 18 t2 19 Testing 19 Testing +explain select a from t3 order by a desc limit 10; table type possible_keys key key_len ref rows Extra t3 index NULL a 4 NULL 1131 Using index +select a from t3 order by a desc limit 10; a 699 698 @@ -70,6 +98,7 @@ a 692 691 690 +select a from t3 order by a desc limit 300,10; a 416 415 @@ -81,12 +110,87 @@ a 412 412 411 +delete from t3 where a=3; +select * from t3 where a < 10; +a b +1 Testing +1 Testing +2 table +2 table +4 Testing +4 Testing +5 table +5 table +6 t2 +6 t1 +7 Testing +7 Testing +8 table +8 table +9 t2 +9 t2 +delete from t3 where a >= 6 and a <= 8; +select * from t3 where a < 10; +a b +1 Testing +1 Testing +2 table +2 table +4 Testing +4 Testing +5 table +5 table +9 t2 +9 t2 +update t3 set a=3 where a=9; +select * from t3 where a < 10; +a b +1 Testing +1 Testing +2 table +2 table +3 t2 +3 t2 +4 Testing +4 Testing +5 table +5 table +update t3 set a=6 where a=7; +select * from t3 where a < 10; +a b +1 Testing +1 Testing +2 table +2 table +3 t2 +3 t2 +4 Testing +4 Testing +5 table +5 table +show create table t3; Table Create Table t3 CREATE TABLE `t3` ( `a` int(11) NOT NULL default '0', `b` char(20) default NULL, KEY `a` (`a`) ) TYPE=MRG_MyISAM UNION=(t1,t2) +create table t4 (a int not null, b char(10), key(a)) type=MERGE UNION=(t1,t2); +select * from t4; +Can't open file: 't4.MRG'. (errno: 143) +create table t5 (a int not null, b char(10), key(a)) type=MERGE UNION=(test.t1,test_2.t2); +Incorrect table definition; All MERGE tables must be in the same database +drop table if exists t5,t4,t3,t1,t2; +create table t1 (c char(10)) type=myisam; +create table t2 (c char(10)) type=myisam; +create table t3 (c char(10)) union=(t1,t2) type=merge; +insert into t1 (c) values ('test1'); +insert into t1 (c) values ('test1'); +insert into t1 (c) values ('test1'); +insert into t2 (c) values ('test2'); +insert into t2 (c) values ('test2'); +insert into t2 (c) values ('test2'); +select * from t3; c test1 test1 @@ -94,6 +198,7 @@ test1 test2 test2 test2 +select * from t3; c test1 test1 @@ -101,32 +206,259 @@ test1 test2 test2 test2 +delete from t3 where 1=1; +select * from t3; c +select * from t1; c +drop table t3,t2,t1; +CREATE TABLE t1 (incr int not null, othr int not null, primary key(incr)); +CREATE TABLE t2 (incr int not null, othr int not null, primary key(incr)); +CREATE TABLE t3 (incr int not null, othr int not null, primary key(incr)) +TYPE=MERGE UNION=(t1,t2); +SELECT * from t3; incr othr +INSERT INTO t1 VALUES ( 1,10),( 3,53),( 5,21),( 7,12),( 9,17); +INSERT INTO t2 VALUES ( 2,24),( 4,33),( 6,41),( 8,26),( 0,32); +INSERT INTO t1 VALUES (11,20),(13,43),(15,11),(17,22),(19,37); +INSERT INTO t2 VALUES (12,25),(14,31),(16,42),(18,27),(10,30); +SELECT * from t3 where incr in (1,2,3,4) order by othr; incr othr 1 10 2 24 4 33 3 53 +alter table t3 UNION=(t1); +select count(*) from t3; count(*) 10 +alter table t3 UNION=(t1,t2); +select count(*) from t3; count(*) 20 +alter table t3 TYPE=MYISAM; +select count(*) from t3; count(*) 20 +drop table t3; +CREATE TABLE t3 (incr int not null, othr int not null, primary key(incr)) +TYPE=MERGE UNION=(t1,t2); +show create table t3; Table Create Table t3 CREATE TABLE `t3` ( `incr` int(11) NOT NULL default '0', `othr` int(11) NOT NULL default '0', PRIMARY KEY (`incr`) ) TYPE=MRG_MyISAM UNION=(t1,t2) +alter table t3 drop primary key; +show create table t3; Table Create Table t3 CREATE TABLE `t3` ( `incr` int(11) NOT NULL default '0', `othr` int(11) NOT NULL default '0' ) TYPE=MRG_MyISAM UNION=(t1,t2) +drop table t3,t2,t1; +create table t1 (a int not null) type=merge; +select * from t1; a +drop table t1; +drop table if exists t3, t2, t1; +create table t1 (a int not null, b int not null, key(a,b)); +create table t2 (a int not null, b int not null, key(a,b)); +create table t3 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2); +insert into t1 values (1,2),(2,1),(0,0),(4,4),(5,5),(6,6); +insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6); +flush tables; +select * from t3 where a=1 order by b limit 2; +a b +1 1 +1 2 +drop table t3,t1,t2; +drop table if exists t6, t5, t4, t3, t2, t1; +create table t1 (a int not null, b int not null, key(a,b)); +create table t2 (a int not null, b int not null, key(a,b)); +create table t3 (a int not null, b int not null, key(a,b)) UNION=(t1,t2) INSERT_METHOD=NO; +create table t4 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2) INSERT_METHOD=NO; +create table t5 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2) INSERT_METHOD=FIRST; +create table t6 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2) INSERT_METHOD=LAST; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MyISAM +show create table t4; +Table Create Table +t4 CREATE TABLE `t4` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MRG_MyISAM UNION=(t1,t2) +show create table t5; +Table Create Table +t5 CREATE TABLE `t5` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MRG_MyISAM INSERT_METHOD=FIRST UNION=(t1,t2) +show create table t6; +Table Create Table +t6 CREATE TABLE `t6` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MRG_MyISAM INSERT_METHOD=LAST UNION=(t1,t2) +insert into t1 values (1,1),(1,2),(1,3),(1,4); +insert into t2 values (2,1),(2,2),(2,3),(2,4); +select * from t3 order by b,a limit 3; +a b +select * from t4 order by b,a limit 3; +a b +1 1 +2 1 +1 2 +select * from t5 order by b,a limit 3,3; +a b +2 2 +1 3 +2 3 +select * from t6 order by b,a limit 6,3; +a b +1 4 +2 4 +insert into t5 values (5,1),(5,2); +insert into t6 values (6,1),(6,2); +select * from t1 order by a,b; +a b +1 1 +1 2 +1 3 +1 4 +5 1 +5 2 +select * from t2 order by a,b; +a b +2 1 +2 2 +2 3 +2 4 +6 1 +6 2 +select * from t4 order by a,b; +a b +1 1 +1 2 +1 3 +1 4 +2 1 +2 2 +2 3 +2 4 +5 1 +5 2 +6 1 +6 2 +insert into t3 values (3,1),(3,2),(3,3),(3,4); +select * from t3 order by a,b; +a b +3 1 +3 2 +3 3 +3 4 +alter table t4 UNION=(t1,t2,t3); +show create table t4; +Table Create Table +t4 CREATE TABLE `t4` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MRG_MyISAM UNION=(t1,t2,t3) +select * from t4 order by a,b; +a b +1 1 +1 2 +1 3 +1 4 +2 1 +2 2 +2 3 +2 4 +3 1 +3 2 +3 3 +3 4 +5 1 +5 2 +6 1 +6 2 +alter table t4 INSERT_METHOD=FIRST; +show create table t4; +Table Create Table +t4 CREATE TABLE `t4` ( + `a` int(11) NOT NULL default '0', + `b` int(11) NOT NULL default '0', + KEY `a` (`a`,`b`) +) TYPE=MRG_MyISAM INSERT_METHOD=FIRST UNION=(t1,t2,t3) +insert into t4 values (4,1),(4,2); +select * from t1 order by a,b; +a b +1 1 +1 2 +1 3 +1 4 +4 1 +4 2 +5 1 +5 2 +select * from t2 order by a,b; +a b +2 1 +2 2 +2 3 +2 4 +6 1 +6 2 +select * from t3 order by a,b; +a b +3 1 +3 2 +3 3 +3 4 +select * from t4 order by a,b; +a b +1 1 +1 2 +1 3 +1 4 +2 1 +2 2 +2 3 +2 4 +3 1 +3 2 +3 3 +3 4 +4 1 +4 2 +5 1 +5 2 +6 1 +6 2 +select * from t5 order by a,b; a b 1 1 1 2 +1 3 +1 4 +2 1 +2 2 +2 3 +2 4 +4 1 +4 2 +5 1 +5 2 +6 1 +6 2 +drop table if exists t6, t5, t4, t3, t2, t1; diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 6358e2a81cd..f8bc19dd065 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -1,22 +1,40 @@ +drop table if exists t1,t2,t3; +create table t1(id1 int not null auto_increment primary key, t char(12)); +create table t2(id2 int not null, t char(12)); +create table t3(id3 int not null, t char(12), index(id3)); +delete t1.*, t2.*, t3.* from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3 and t1.id1 > 9500; +check table t1, t2, t3; Table Op Msg_type Msg_text test.t1 check status OK test.t2 check status OK test.t3 check status OK +select count(*) from t1 where id1 > 9500; count(*) 0 +select count(*) from t2 where id2 > 9500; count(*) 0 +select count(*) from t3 where id3 > 9500; count(*) 0 +delete t1, t2, t3 from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3 and t1.id1 > 500; +select count(*) from t1 where id1 > 500; count(*) 0 +select count(*) from t2 where id2 > 500; count(*) 0 +select count(*) from t3 where id3 > 500; count(*) 0 +delete t1, t2, t3 from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3 and t1.id1 > 0; +select count(*) from t1 where id1; count(*) 0 +select count(*) from t2 where id2; count(*) 0 +select count(*) from t3 where id3; count(*) 0 +drop table t1,t2,t3; diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 1152ca24f38..dae87d88765 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -1,12 +1,33 @@ +drop table if exists t1; +CREATE TABLE t1 ( +STRING_DATA char(255) default NULL, +KEY STRING_DATA (STRING_DATA) +) TYPE=MyISAM; +INSERT INTO t1 VALUES ('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); +INSERT INTO t1 VALUES ('DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD'); +INSERT INTO t1 VALUES ('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF'); +INSERT INTO t1 VALUES ('FGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG'); +INSERT INTO t1 VALUES ('HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH'); +INSERT INTO t1 VALUES ('WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW'); +CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK +drop table t1; +create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a)); +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +repair table t1; Table Op Msg_type Msg_text test.t1 repair status OK +delete from t1 where (a & 1); +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +repair table t1; Table Op Msg_type Msg_text test.t1 repair status OK +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +drop table t1; diff --git a/mysql-test/r/not_embedded.require b/mysql-test/r/not_embedded.require new file mode 100644 index 00000000000..b2ea98bcd0a --- /dev/null +++ b/mysql-test/r/not_embedded.require @@ -0,0 +1,2 @@ +have_embedded +0 diff --git a/mysql-test/r/null.result b/mysql-test/r/null.result index 6109456b8c0..4758304afa0 100644 --- a/mysql-test/r/null.result +++ b/mysql-test/r/null.result @@ -1,25 +1,42 @@ +select null,\N,isnull(null),isnull(1/0),isnull(1/0 = null),ifnull(null,1),ifnull(null,"TRUE"),ifnull("TRUE","ERROR"),1/0 is null,1 is not null; NULL NULL isnull(null) isnull(1/0) isnull(1/0 = null) ifnull(null,1) ifnull(null,"TRUE") ifnull("TRUE","ERROR") 1/0 is null 1 is not null NULL NULL 1 1 1 1 TRUE TRUE 1 1 +select 1 | NULL,1 & NULL,1+NULL,1-NULL; 1 | NULL 1 & NULL 1+NULL 1-NULL NULL NULL NULL NULL +select NULL=NULL,NULL<>NULL,IFNULL(NULL,1.1)+0,IFNULL(NULL,1) | 0; NULL=NULL NULL<>NULL IFNULL(NULL,1.1)+0 IFNULL(NULL,1) | 0 NULL NULL 1.1 1 +select strcmp("a",NULL),(1<NULL)+0.0,NULL regexp "a",null like "a%","a%" like null; strcmp("a",NULL) (1<NULL)+0.0 NULL regexp "a" null like "a%" "a%" like null NULL NULL NULL NULL NULL +select concat("a",NULL),replace(NULL,"a","b"),replace("string","i",NULL),replace("string",NULL,"i"),insert("abc",1,1,NULL),left(NULL,1); concat("a",NULL) replace(NULL,"a","b") replace("string","i",NULL) replace("string",NULL,"i") insert("abc",1,1,NULL) left(NULL,1) NULL NULL NULL NULL NULL NULL +select repeat("a",0),repeat("ab",5+5),repeat("ab",-1),reverse(NULL); repeat("a",0) repeat("ab",5+5) repeat("ab",-1) reverse(NULL) abababababababababab NULL +select field(NULL,"a","b","c"); field(NULL,"a","b","c") 0 +select 2 between null and 1,2 between 3 AND NULL,NULL between 1 and 2,2 between NULL and 3, 2 between 1 AND null; 2 between null and 1 2 between 3 AND NULL NULL between 1 and 2 2 between NULL and 3 2 between 1 AND null 0 0 NULL NULL NULL +SELECT NULL AND NULL, 1 AND NULL, NULL AND 1, NULL OR NULL, 0 OR NULL, NULL OR 0; NULL AND NULL 1 AND NULL NULL AND 1 NULL OR NULL 0 OR NULL NULL OR 0 NULL NULL NULL NULL NULL NULL +SELECT (NULL OR NULL) IS NULL; (NULL OR NULL) IS NULL 1 +select NULL AND 0, 0 and NULL; NULL AND 0 0 and NULL NULL 0 +select inet_ntoa(null),inet_aton(null),inet_aton("122.256"),inet_aton("122.226."),inet_aton(""); inet_ntoa(null) inet_aton(null) inet_aton("122.256") inet_aton("122.226.") inet_aton("") NULL NULL NULL NULL NULL +drop table if exists t1; +create table t1 (x int); +insert into t1 values (null); +select * from t1 where x != 0; x +drop table t1; diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result index 87ba8961ad6..9906c7c5b2c 100644 --- a/mysql-test/r/null_key.result +++ b/mysql-test/r/null_key.result @@ -1,101 +1,164 @@ +drop table if exists t1; +create table t1 (a int, b int not null,unique key (a,b),index(b)) type=myisam; +insert ignore into t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(null,7),(9,9),(8,8),(7,7),(null,9),(null,9),(6,6); +explain select * from t1 where a is null; table type possible_keys key key_len ref rows Extra t1 ref a a 5 const 3 where used; Using index +explain select * from t1 where a is null and b = 2; table type possible_keys key key_len ref rows Extra t1 ref a,b a 9 const,const 1 where used; Using index +explain select * from t1 where a is null and b = 7; table type possible_keys key key_len ref rows Extra t1 ref a,b a 9 const,const 1 where used; Using index +explain select * from t1 where a=2 and b = 2; table type possible_keys key key_len ref rows Extra t1 const a,b a 9 const,const 1 +explain select * from t1 where a<=>b limit 2; table type possible_keys key key_len ref rows Extra t1 index NULL a 9 NULL 12 where used; Using index +explain select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3; table type possible_keys key key_len ref rows Extra t1 range a,b a 9 NULL 3 where used; Using index +explain select * from t1 where (a is null or a = 7) and b=7; table type possible_keys key key_len ref rows Extra -t1 ref a,b b 4 const 2 where used +t1 range a,b a 9 NULL 2 where used; Using index +explain select * from t1 where (a is null and b>a) or a is null and b=7 limit 2; table type possible_keys key key_len ref rows Extra t1 ref a,b a 5 const 3 where used; Using index +explain select * from t1 where a is null and b=9 or a is null and b=7 limit 3; table type possible_keys key key_len ref rows Extra t1 range a,b a 9 NULL 2 where used; Using index +explain select * from t1 where a > 1 and a < 3 limit 1; table type possible_keys key key_len ref rows Extra t1 range a a 5 NULL 1 where used; Using index +explain select * from t1 where a > 8 and a < 9; table type possible_keys key key_len ref rows Extra t1 range a a 5 NULL 1 where used; Using index +select * from t1 where a is null; a b NULL 7 NULL 9 NULL 9 +select * from t1 where a is null and b = 7; a b NULL 7 +select * from t1 where a<=>b limit 2; a b 1 1 2 2 +select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3; a b 1 1 2 2 +select * from t1 where (a is null or a > 0 and a < 3) and b > 7 limit 3; a b NULL 9 NULL 9 +select * from t1 where (a is null or a = 7) and b=7; a b NULL 7 7 7 +select * from t1 where a is null and b=9 or a is null and b=7 limit 3; a b NULL 7 NULL 9 NULL 9 +alter table t1 modify b blob not null, add c int not null, drop key a, add unique key (a,b(20),c), drop key b, add key (b(10)); +explain select * from t1 where a is null and b = 2; table type possible_keys key key_len ref rows Extra t1 ref a,b a 5 const 3 where used +explain select * from t1 where a is null and b = 2 and c=0; table type possible_keys key key_len ref rows Extra t1 ref a,b a 5 const 3 where used +explain select * from t1 where a is null and b = 7 and c=0; table type possible_keys key key_len ref rows Extra t1 ref a,b a 5 const 3 where used +explain select * from t1 where a=2 and b = 2; table type possible_keys key key_len ref rows Extra t1 ref a,b a 5 const 1 where used +explain select * from t1 where a<=>b limit 2; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 12 where used +explain select * from t1 where (a is null or a > 0 and a < 3) and b < 5 and c=0 limit 3; table type possible_keys key key_len ref rows Extra t1 range a,b a 5 NULL 5 where used +explain select * from t1 where (a is null or a = 7) and b=7 and c=0; table type possible_keys key key_len ref rows Extra t1 range a,b a 5 NULL 4 where used +explain select * from t1 where (a is null and b>a) or a is null and b=7 limit 2; table type possible_keys key key_len ref rows Extra t1 ref a,b a 5 const 3 where used +explain select * from t1 where a is null and b=9 or a is null and b=7 limit 3; table type possible_keys key key_len ref rows Extra t1 ref a,b a 5 const 3 where used +explain select * from t1 where a > 1 and a < 3 limit 1; table type possible_keys key key_len ref rows Extra t1 range a a 5 NULL 1 where used +explain select * from t1 where a is null and b=7 or a > 1 and a < 3 limit 1; table type possible_keys key key_len ref rows Extra t1 range a,b a 5 NULL 4 where used +explain select * from t1 where a > 8 and a < 9; table type possible_keys key key_len ref rows Extra t1 range a a 5 NULL 1 where used +explain select * from t1 where b like "6%"; table type possible_keys key key_len ref rows Extra t1 range b b 12 NULL 1 where used +select * from t1 where a is null; a b c NULL 7 0 NULL 9 0 NULL 9 0 +select * from t1 where a is null and b = 7 and c=0; a b c NULL 7 0 +select * from t1 where a<=>b limit 2; a b c 1 1 0 2 2 0 +select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3; a b c 1 1 0 2 2 0 +select * from t1 where (a is null or a > 0 and a < 3) and b > 7 limit 3; a b c NULL 9 0 NULL 9 0 +select * from t1 where (a is null or a = 7) and b=7 and c=0; a b c NULL 7 0 7 7 0 +select * from t1 where a is null and b=9 or a is null and b=7 limit 3; a b c NULL 7 0 NULL 9 0 NULL 9 0 +select * from t1 where b like "6%"; a b c 6 6 0 +drop table t1; +DROP TABLE IF EXISTS t1,t2; +CREATE TABLE t1 ( +id int(10) unsigned NOT NULL auto_increment, +uniq_id int(10) unsigned default NULL, +PRIMARY KEY (id), +UNIQUE KEY idx1 (uniq_id) +) TYPE=MyISAM; +CREATE TABLE t2 ( +id int(10) unsigned NOT NULL auto_increment, +uniq_id int(10) unsigned default NULL, +PRIMARY KEY (id) +) TYPE=MyISAM; +INSERT INTO t1 VALUES (1,NULL),(2,NULL),(3,1),(4,2),(5,NULL),(6,NULL),(7,3),(8,4),(9,NULL),(10,NULL); +INSERT INTO t2 VALUES (1,NULL),(2,NULL),(3,1),(4,2),(5,NULL),(6,NULL),(7,3),(8,4),(9,NULL),(10,NULL); +explain select id from t1 where uniq_id is null; table type possible_keys key key_len ref rows Extra t1 ref idx1 idx1 5 const 1 where used +explain select id from t1 where uniq_id =1; table type possible_keys key key_len ref rows Extra t1 const idx1 idx1 5 const 1 +UPDATE t1 SET id=id+100 where uniq_id is null; +UPDATE t2 SET id=id+100 where uniq_id is null; +select id from t1 where uniq_id is null; id 101 102 @@ -103,6 +166,7 @@ id 106 109 110 +select id from t2 where uniq_id is null; id 101 102 @@ -110,13 +174,18 @@ id 106 109 110 +DELETE FROM t1 WHERE uniq_id IS NULL; +DELETE FROM t2 WHERE uniq_id IS NULL; +SELECT * FROM t1 ORDER BY uniq_id, id; id uniq_id 3 1 4 2 7 3 8 4 +SELECT * FROM t2 ORDER BY uniq_id, id; id uniq_id 3 1 4 2 7 3 8 4 +DROP table t1,t2; diff --git a/mysql-test/r/odbc.result b/mysql-test/r/odbc.result index 753d80e4539..c696cf94e9d 100644 --- a/mysql-test/r/odbc.result +++ b/mysql-test/r/odbc.result @@ -1,7 +1,15 @@ +select {fn length("hello")}, { date "1997-10-20" }; {fn length("hello")} 1997-10-20 5 1997-10-20 +create table t1 (a int not null auto_increment,b int not null,primary key (a,b)); +insert into t1 SET A=NULL,B=1; +insert into t1 SET a=null,b=2; +select * from t1 where a is null and b=2; a b 2 2 +select * from t1 where a is null; a b +explain select * from t1 where b is null; Comment Impossible WHERE noticed after reading const tables +drop table t1; diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result index 6636a336c45..b5c67dfbcb0 100644 --- a/mysql-test/r/openssl_1.result +++ b/mysql-test/r/openssl_1.result @@ -1,16 +1,2 @@ +SHOW STATUS LIKE 'SSL%'; Variable_name Value -SSL_CTX_sess_accept 0 -SSL_CTX_sess_accept_good 0 -SSL_CTX_sess_accept_renegotiate 0 -SSL_CTX_sess_cb_hits 0 -SSL_CTX_sess_number 0 -SSL_CTX_get_session_cache_mode SERVER -SSL_CTX_sess_get_cache_size 128 -SSL_CTX_get_verify_mode 7 -SSL_CTX_get_verify_depth 4294967295 -SSL_get_verify_mode 0 -SSL_get_verify_depth 0 -SSL_session_reused 0 -SSL_get_version -SSL_get_cipher -SSL_get_default_timeout 0 diff --git a/mysql-test/r/openssl_2.result b/mysql-test/r/openssl_2.result index 6636a336c45..b5c67dfbcb0 100644 --- a/mysql-test/r/openssl_2.result +++ b/mysql-test/r/openssl_2.result @@ -1,16 +1,2 @@ +SHOW STATUS LIKE 'SSL%'; Variable_name Value -SSL_CTX_sess_accept 0 -SSL_CTX_sess_accept_good 0 -SSL_CTX_sess_accept_renegotiate 0 -SSL_CTX_sess_cb_hits 0 -SSL_CTX_sess_number 0 -SSL_CTX_get_session_cache_mode SERVER -SSL_CTX_sess_get_cache_size 128 -SSL_CTX_get_verify_mode 7 -SSL_CTX_get_verify_depth 4294967295 -SSL_get_verify_mode 0 -SSL_get_verify_depth 0 -SSL_session_reused 0 -SSL_get_version -SSL_get_cipher -SSL_get_default_timeout 0 diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result index f6fc3b6090a..a9d18e838cb 100644 --- a/mysql-test/r/order_by.result +++ b/mysql-test/r/order_by.result @@ -1,3 +1,39 @@ +drop table if exists t1,t2,t3; +CREATE TABLE t1 ( +id int(6) DEFAULT '0' NOT NULL, +idservice int(5), +clee char(20) NOT NULL, +flag char(1), +KEY id (id), +PRIMARY KEY (clee) +); +INSERT INTO t1 VALUES (2,4,'6067169d','Y'); +INSERT INTO t1 VALUES (2,5,'606716d1','Y'); +INSERT INTO t1 VALUES (2,1,'606717c1','Y'); +INSERT INTO t1 VALUES (3,1,'6067178d','Y'); +INSERT INTO t1 VALUES (2,6,'60671515','Y'); +INSERT INTO t1 VALUES (2,7,'60671569','Y'); +INSERT INTO t1 VALUES (2,3,'dd','Y'); +CREATE TABLE t2 ( +id int(6) DEFAULT '0' NOT NULL auto_increment, +description varchar(40) NOT NULL, +idform varchar(40), +ordre int(6) unsigned DEFAULT '0' NOT NULL, +image varchar(60), +PRIMARY KEY (id), +KEY id (id,ordre) +); +INSERT INTO t2 VALUES (1,'Emettre un appel d''offres','en_construction.html',10,'emettre.gif'); +INSERT INTO t2 VALUES (2,'Emettre des soumissions','en_construction.html',20,'emettre.gif'); +INSERT INTO t2 VALUES (7,'Liste des t2','t2_liste_form.phtml',51060,'link.gif'); +INSERT INTO t2 VALUES (8,'Consulter les soumissions','consulter_soumissions.phtml',200,'link.gif'); +INSERT INTO t2 VALUES (9,'Ajouter un type de materiel','typeMateriel_ajoute_form.phtml',51000,'link.gif'); +INSERT INTO t2 VALUES (10,'Lister/modifier un type de materiel','typeMateriel_liste_form.phtml',51010,'link.gif'); +INSERT INTO t2 VALUES (3,'Créer une fiche de client','clients_ajoute_form.phtml',40000,'link.gif'); +INSERT INTO t2 VALUES (4,'Modifier des clients','en_construction.html',40010,'link.gif'); +INSERT INTO t2 VALUES (5,'Effacer des clients','en_construction.html',40020,'link.gif'); +INSERT INTO t2 VALUES (6,'Ajouter un service','t2_ajoute_form.phtml',51050,'link.gif'); +select t1.id,t1.idservice,t2.ordre,t2.description from t1, t2 where t1.id = 2 and t1.idservice = t2.id order by t2.ordre; id idservice ordre description 2 1 10 Emettre un appel d'offres 2 3 40000 Créer une fiche de client @@ -5,34 +41,53 @@ id idservice ordre description 2 5 40020 Effacer des clients 2 6 51050 Ajouter un service 2 7 51060 Liste des t2 +drop table t1,t2; +create table t1 (first char(10),last char(10)); +insert into t1 values ("Michael","Widenius"); +insert into t1 values ("Allan","Larsson"); +insert into t1 values ("David","Axmark"); +select concat(first," ",last) as name from t1 order by name; name Allan Larsson David Axmark Michael Widenius +select concat(last," ",first) as name from t1 order by name; name Axmark David Larsson Allan Widenius Michael +drop table t1; +create table t1 (i int); +insert into t1 values(1),(2),(1),(2),(1),(2),(3); +select distinct i from t1; i 1 2 3 +select distinct i from t1 order by rand(5); i 1 3 2 +select distinct i from t1 order by i desc; i 3 2 1 +select distinct i from t1 order by 1-i; i 3 2 1 +select distinct i from t1 order by mod(i,2),i; i 2 1 3 +drop table t1; +create table t1 (id int not null,col1 int not null,col2 int not null,index(col1)); +insert into t1 values(1,2,2),(2,2,1),(3,1,2),(4,1,1),(5,1,4),(6,2,3),(7,3,1),(8,2,4); +select * from t1 order by col1,col2; id col1 col2 4 1 1 3 1 2 @@ -42,6 +97,7 @@ id col1 col2 6 2 3 8 2 4 7 3 1 +select col1 from t1 order by id; col1 2 2 @@ -51,6 +107,7 @@ col1 2 3 2 +select col1 as id from t1 order by t1.id; id 1 1 @@ -60,6 +117,7 @@ id 2 2 3 +select concat(col1) as id from t1 order by t1.id; id 2 2 @@ -69,21 +127,75 @@ id 2 3 2 +drop table t1; +CREATE TABLE t1 (id int auto_increment primary key,aika varchar(40),aikakentta timestamp); +insert into t1 (aika) values ('Keskiviikko'); +insert into t1 (aika) values ('Tiistai'); +insert into t1 (aika) values ('Maanantai'); +insert into t1 (aika) values ('Sunnuntai'); +SELECT FIELD(SUBSTRING(t1.aika,1,2),'Ma','Ti','Ke','To','Pe','La','Su') AS test FROM t1 ORDER by test; test 1 2 3 7 +drop table t1; +CREATE TABLE t1 +( +a int unsigned NOT NULL, +b int unsigned NOT NULL, +c int unsigned NOT NULL, +UNIQUE(a), +INDEX(b), +INDEX(c) +); +CREATE TABLE t2 +( +c int unsigned NOT NULL, +i int unsigned NOT NULL, +INDEX(c) +); +CREATE TABLE t3 +( +c int unsigned NOT NULL, +v varchar(64), +INDEX(c) +); +INSERT INTO t1 VALUES (1,1,1); +INSERT INTO t1 VALUES (2,1,2); +INSERT INTO t1 VALUES (3,2,1); +INSERT INTO t1 VALUES (4,2,2); +INSERT INTO t2 VALUES (1,50); +INSERT INTO t2 VALUES (2,25); +INSERT INTO t3 VALUES (1,'123 Park Place'); +INSERT INTO t3 VALUES (2,'453 Boardwalk'); +SELECT a,b,if(b = 1,i,if(b = 2,v,'')) +FROM t1 +LEFT JOIN t2 USING(c) +LEFT JOIN t3 ON t3.c = t1.c; a b if(b = 1,i,if(b = 2,v,'')) 1 1 50 2 1 25 3 2 123 Park Place 4 2 453 Boardwalk +SELECT a,b,if(b = 1,i,if(b = 2,v,'')) +FROM t1 +LEFT JOIN t2 USING(c) +LEFT JOIN t3 ON t3.c = t1.c +ORDER BY a; a b if(b = 1,i,if(b = 2,v,'')) 1 1 50 2 1 25 3 2 123 Park Place 4 2 453 Boardwalk +drop table t1,t2,t3; +create table t1 (ID int not null primary key, TransactionID int not null); +insert into t1 (ID, TransactionID) values (1, 87), (2, 89), (3, 92), (4, 94), (5, 486), (6, 490), (7, 753), (9, 828), (10, 832), (11, 834), (12, 840); +create table t2 (ID int not null primary key, GroupID int not null); +insert into t2 (ID, GroupID) values (87, 87), (89, 89), (92, 92), (94, 94), (486, 486), (490, 490),(753, 753), (828, 828), (832, 832), (834, 834), (840, 840); +create table t3 (ID int not null primary key, DateOfAction date not null); +insert into t3 (ID, DateOfAction) values (87, '1999-07-19'), (89, '1999-07-19'), (92, '1999-07-19'), (94, '1999-07-19'), (486, '1999-07-18'), (490, '2000-03-27'), (753, '2000-03-28'), (828, '1999-07-27'), (832, '1999-07-27'),(834, '1999-07-27'), (840, '1999-07-27'); +select t3.DateOfAction, t1.TransactionID from t1 join t2 join t3 where t2.ID = t1.TransactionID and t3.ID = t2.GroupID order by t3.DateOfAction, t1.TransactionID; DateOfAction TransactionID 1999-07-18 486 1999-07-19 87 @@ -96,6 +208,7 @@ DateOfAction TransactionID 1999-07-27 840 2000-03-27 490 2000-03-28 753 +select t3.DateOfAction, t1.TransactionID from t1 join t2 join t3 where t2.ID = t1.TransactionID and t3.ID = t2.GroupID order by t1.TransactionID,t3.DateOfAction; DateOfAction TransactionID 1999-07-19 87 1999-07-19 89 @@ -108,15 +221,57 @@ DateOfAction TransactionID 1999-07-27 832 1999-07-27 834 1999-07-27 840 +drop table t1,t2,t3; +drop table if exists t1; +CREATE TABLE t1 ( +member_id int(11) NOT NULL auto_increment, +inschrijf_datum varchar(20) NOT NULL default '', +lastchange_datum varchar(20) NOT NULL default '', +nickname varchar(20) NOT NULL default '', +password varchar(8) NOT NULL default '', +voornaam varchar(30) NOT NULL default '', +tussenvoegsels varchar(10) NOT NULL default '', +achternaam varchar(50) NOT NULL default '', +straat varchar(100) NOT NULL default '', +postcode varchar(10) NOT NULL default '', +wijk varchar(40) NOT NULL default '', +plaats varchar(50) NOT NULL default '', +telefoon varchar(10) NOT NULL default '', +geboortedatum date NOT NULL default '0000-00-00', +geslacht varchar(5) NOT NULL default '', +email varchar(80) NOT NULL default '', +uin varchar(15) NOT NULL default '', +homepage varchar(100) NOT NULL default '', +internet varchar(15) NOT NULL default '', +scherk varchar(30) NOT NULL default '', +favo_boek varchar(50) NOT NULL default '', +favo_tijdschrift varchar(50) NOT NULL default '', +favo_tv varchar(50) NOT NULL default '', +favo_eten varchar(50) NOT NULL default '', +favo_muziek varchar(30) NOT NULL default '', +info text NOT NULL, +ipnr varchar(30) NOT NULL default '', +PRIMARY KEY (member_id) +) TYPE=MyISAM PACK_KEYS=1; +insert into t1 (member_id) values (1),(2),(3); +select member_id, nickname, voornaam FROM t1 +ORDER by lastchange_datum DESC LIMIT 2; member_id nickname voornaam 1 2 +drop table t1; +create table t1 (a int not null, b int, c varchar(10), key (a, b, c)); +insert into t1 values (1, NULL, NULL), (1, NULL, 'b'), (1, 1, NULL), (1, 1, 'b'), (1, 1, 'b'), (2, 1, 'a'), (2, 1, 'b'), (2, 2, 'a'), (2, 2, 'b'), (2, 3, 'c'),(1,3,'b'); +explain select * from t1 where (a = 1 and b is null and c = 'b') or (a > 2) order by a desc; table type possible_keys key key_len ref rows Extra t1 range a a 20 NULL 2 where used; Using index +select * from t1 where (a = 1 and b is null and c = 'b') or (a > 2) order by a desc; a b c 1 NULL b +explain select * from t1 where a >= 1 and a < 3 order by a desc; table type possible_keys key key_len ref rows Extra t1 range a a 4 NULL 10 where used; Using index +select * from t1 where a >= 1 and a < 3 order by a desc; a b c 2 3 c 2 2 b @@ -129,8 +284,10 @@ a b c 1 1 NULL 1 NULL b 1 NULL NULL +explain select * from t1 where a = 1 order by a desc, b desc; table type possible_keys key key_len ref rows Extra t1 ref a a 4 const 5 where used; Using index; Using filesort +select * from t1 where a = 1 order by a desc, b desc; a b c 1 3 b 1 1 NULL @@ -138,25 +295,37 @@ a b c 1 1 b 1 NULL NULL 1 NULL b +explain select * from t1 where a = 1 and b is null order by a desc, b desc; table type possible_keys key key_len ref rows Extra t1 ref a a 9 const,const 2 where used; Using index; Using filesort +select * from t1 where a = 1 and b is null order by a desc, b desc; a b c 1 NULL NULL 1 NULL b +explain select * from t1 where a >= 1 and a < 3 and b >0 order by a desc,b desc; table type possible_keys key key_len ref rows Extra t1 range a a 9 NULL 8 where used; Using index; Using filesort +explain select * from t1 where a = 2 and b >0 order by a desc,b desc; table type possible_keys key key_len ref rows Extra t1 range a a 9 NULL 5 where used; Using index +explain select * from t1 where a = 2 and b is null order by a desc,b desc; table type possible_keys key key_len ref rows Extra t1 ref a a 9 const,const 1 where used; Using index; Using filesort +explain select * from t1 where a = 2 and (b is null or b > 0) order by a +desc,b desc; table type possible_keys key key_len ref rows Extra t1 range a a 9 NULL 6 where used; Using index +explain select * from t1 where a = 2 and b > 0 order by a desc,b desc; table type possible_keys key key_len ref rows Extra t1 range a a 9 NULL 5 where used; Using index +explain select * from t1 where a = 2 and b < 2 order by a desc,b desc; table type possible_keys key key_len ref rows Extra t1 range a a 9 NULL 2 where used; Using index; Using filesort +alter table t1 modify b int not null, modify c varchar(10) not null; +explain select * from t1 order by a, b, c; table type possible_keys key key_len ref rows Extra t1 index NULL a 18 NULL 11 Using index +select * from t1 order by a, b, c; a b c 1 0 1 0 b @@ -169,8 +338,10 @@ a b c 2 2 a 2 2 b 2 3 c +explain select * from t1 order by a desc, b desc, c desc; table type possible_keys key key_len ref rows Extra t1 index NULL a 18 NULL 11 Using index +select * from t1 order by a desc, b desc, c desc; a b c 2 3 c 2 2 b @@ -183,21 +354,27 @@ a b c 1 1 1 0 b 1 0 +explain select * from t1 where (a = 1 and b = 1 and c = 'b') or (a > 2) order by a desc; table type possible_keys key key_len ref rows Extra t1 range a a 18 NULL 3 where used; Using index +select * from t1 where (a = 1 and b = 1 and c = 'b') or (a > 2) order by a desc; a b c 1 1 b 1 1 b +explain select * from t1 where a < 2 and b <= 1 order by a desc, b desc; table type possible_keys key key_len ref rows Extra t1 range a a 4 NULL 6 where used; Using index +select * from t1 where a < 2 and b <= 1 order by a desc, b desc; a b c 1 1 b 1 1 b 1 1 1 0 b 1 0 +select count(*) from t1 where a < 5 and b > 0; count(*) 9 +select * from t1 where a < 5 and b > 0 order by a desc,b desc; a b c 2 3 c 2 2 b @@ -208,8 +385,10 @@ a b c 1 1 b 1 1 b 1 1 +explain select * from t1 where a between 1 and 3 and b <= 1 order by a desc, b desc; table type possible_keys key key_len ref rows Extra t1 range a a 8 NULL 10 where used; Using index +select * from t1 where a between 1 and 3 and b <= 1 order by a desc, b desc; a b c 2 1 b 2 1 a @@ -218,8 +397,10 @@ a b c 1 1 1 0 b 1 0 +explain select * from t1 where a between 0 and 1 order by a desc, b desc; table type possible_keys key key_len ref rows Extra t1 range a a 4 NULL 5 where used; Using index +select * from t1 where a between 0 and 1 order by a desc, b desc; a b c 1 3 b 1 1 b @@ -227,6 +408,31 @@ a b c 1 1 1 0 b 1 0 +drop table t1; +CREATE TABLE t1 ( +gid int(10) unsigned NOT NULL auto_increment, +cid smallint(5) unsigned NOT NULL default '0', +PRIMARY KEY (gid), +KEY component_id (cid) +) TYPE=MyISAM; +INSERT INTO t1 VALUES (103853,108),(103867,108),(103962,108),(104505,108),(104619,108),(104620,108); +ALTER TABLE t1 add skr int(10) not null; +CREATE TABLE t2 ( +gid int(10) unsigned NOT NULL default '0', +uid smallint(5) unsigned NOT NULL default '1', +sid tinyint(3) unsigned NOT NULL default '1', +PRIMARY KEY (gid), +KEY uid (uid), +KEY status_id (sid) +) TYPE=MyISAM; +INSERT INTO t2 VALUES (103853,250,5),(103867,27,5),(103962,27,5),(104505,117,5),(104619,75,5),(104620,15,5); +CREATE TABLE t3 ( +uid smallint(6) NOT NULL auto_increment, +PRIMARY KEY (uid) +) TYPE=MyISAM; +INSERT INTO t3 VALUES (1),(15),(27),(75),(117),(250); +ALTER TABLE t3 add skr int(10) not null; +select t1.gid, t2.sid, t3.uid from t2, t1, t3 where t2.gid = t1.gid and t2.uid = t3.uid order by t3.uid, t1.gid; gid sid uid 104620 5 15 103867 5 27 @@ -234,6 +440,7 @@ gid sid uid 104619 5 75 104505 5 117 103853 5 250 +select t1.gid, t2.sid, t3.uid from t3, t2, t1 where t2.gid = t1.gid and t2.uid = t3.uid order by t3.uid, t1.gid; gid sid uid 104620 5 15 103867 5 27 @@ -241,20 +448,26 @@ gid sid uid 104619 5 75 104505 5 117 103853 5 250 +EXPLAIN select t1.gid, t2.sid, t3.uid from t3, t2, t1 where t2.gid = t1.gid and t2.uid = t3.uid order by t1.gid, t3.uid; table type possible_keys key key_len ref rows Extra t1 index PRIMARY PRIMARY 4 NULL 6 Using index t2 eq_ref PRIMARY,uid PRIMARY 4 t1.gid 1 t3 eq_ref PRIMARY PRIMARY 2 t2.uid 1 where used; Using index +EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.gid = t3.uid order by t1.gid,t3.skr; table type possible_keys key key_len ref rows Extra t1 index PRIMARY PRIMARY 4 NULL 6 Using index t3 eq_ref PRIMARY PRIMARY 2 t1.gid 1 where used +EXPLAIN SELECT t1.gid, t2.sid, t3.uid from t2, t1, t3 where t2.gid = t1.gid and t2.uid = t3.uid order by t3.uid, t1.gid; table type possible_keys key key_len ref rows Extra t1 index PRIMARY PRIMARY 4 NULL 6 Using index; Using temporary; Using filesort t2 eq_ref PRIMARY,uid PRIMARY 4 t1.gid 1 t3 eq_ref PRIMARY PRIMARY 2 t2.uid 1 where used; Using index +EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.gid = t3.uid order by t3.skr,t1.gid; table type possible_keys key key_len ref rows Extra t1 index PRIMARY PRIMARY 4 NULL 6 Using index; Using temporary; Using filesort t3 eq_ref PRIMARY PRIMARY 2 t1.gid 1 where used +EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.skr = t3.uid order by t1.gid,t3.skr; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 6 Using temporary; Using filesort t3 eq_ref PRIMARY PRIMARY 2 t1.skr 1 where used +drop table t1,t2,t3; diff --git a/mysql-test/r/order_fill_sortbuf.result b/mysql-test/r/order_fill_sortbuf.result index cb3349cc433..2226e842901 100644 --- a/mysql-test/r/order_fill_sortbuf.result +++ b/mysql-test/r/order_fill_sortbuf.result @@ -1,2 +1,10 @@ +drop table if exists t1,t2; +CREATE TABLE `t1` ( +`id` int(11) NOT NULL default '0', +`id2` int(11) NOT NULL default '0', +`id3` int(11) NOT NULL default '0'); +create table t2 select id2 from t1 order by id3; +select count(*) from t2; count(*) 4000 +drop table t1,t2; diff --git a/mysql-test/r/overflow.result b/mysql-test/r/overflow.result new file mode 100644 index 00000000000..a5fa7154833 --- /dev/null +++ b/mysql-test/r/overflow.result @@ -0,0 +1,2 @@ +drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA; +Got one of the listed errors diff --git a/mysql-test/r/raid.result b/mysql-test/r/raid.result index ffda2a6966d..41af50851e9 100644 --- a/mysql-test/r/raid.result +++ b/mysql-test/r/raid.result @@ -1,8 +1,196 @@ +DROP TABLE IF EXISTS t1,t2; +CREATE TABLE t1 ( +id int unsigned not null auto_increment primary key, +c char(255) not null +) RAID_TYPE=STRIPED RAID_CHUNKS=2 RAID_CHUNKSIZE=123; +INSERT INTO t1 VALUES +(NULL,'1'),(NULL,'a'),(NULL,'a'),(NULL,'a'),(NULL,'p'),(NULL,'a'), +(NULL,'2'),(NULL,'b'),(NULL,'a'),(NULL,'a'),(NULL,'q'),(NULL,'a'), +(NULL,'3'),(NULL,'c'),(NULL,'a'),(NULL,'a'),(NULL,'r'),(NULL,'a'), +(NULL,'4'),(NULL,'d'),(NULL,'a'),(NULL,'a'),(NULL,'s'),(NULL,'a'), +(NULL,'5'),(NULL,'e'),(NULL,'a'),(NULL,'a'),(NULL,'t'),(NULL,'a'), +(NULL,'6'),(NULL,'f'),(NULL,'a'),(NULL,'a'),(NULL,'u'),(NULL,'a'), +(NULL,'7'),(NULL,'g'),(NULL,'a'),(NULL,'a'),(NULL,'v'),(NULL,'a'), +(NULL,'8'),(NULL,'h'),(NULL,'a'),(NULL,'a'),(NULL,'w'),(NULL,'a'), +(NULL,'9'),(NULL,'i'),(NULL,'a'),(NULL,'a'),(NULL,'x'),(NULL,'a'), +(NULL,'0'),(NULL,'j'),(NULL,'a'),(NULL,'a'),(NULL,'y'),(NULL,'a'), +(NULL,'1'),(NULL,'k'),(NULL,'a'),(NULL,'a'),(NULL,'z'),(NULL,'a'), +(NULL,'2'),(NULL,'l'),(NULL,'a'),(NULL,'a'),(NULL,'/'),(NULL,'a'), +(NULL,'3'),(NULL,'m'),(NULL,'a'),(NULL,'a'),(NULL,'*'),(NULL,'a'), +(NULL,'4'),(NULL,'n'),(NULL,'a'),(NULL,'a'),(NULL,'+'),(NULL,'a'), +(NULL,'5'),(NULL,'o'),(NULL,'a'),(NULL,'a'),(NULL,'?'),(NULL,'a'); +INSERT INTO t1 VALUES +(NULL,'1'),(NULL,'a'),(NULL,'a'),(NULL,'a'),(NULL,'p'),(NULL,'a'), +(NULL,'2'),(NULL,'b'),(NULL,'a'),(NULL,'a'),(NULL,'q'),(NULL,'a'), +(NULL,'3'),(NULL,'c'),(NULL,'a'),(NULL,'a'),(NULL,'r'),(NULL,'a'), +(NULL,'4'),(NULL,'d'),(NULL,'a'),(NULL,'a'),(NULL,'s'),(NULL,'a'), +(NULL,'5'),(NULL,'e'),(NULL,'a'),(NULL,'a'),(NULL,'t'),(NULL,'a'), +(NULL,'6'),(NULL,'f'),(NULL,'a'),(NULL,'a'),(NULL,'u'),(NULL,'a'), +(NULL,'7'),(NULL,'g'),(NULL,'a'),(NULL,'a'),(NULL,'v'),(NULL,'a'), +(NULL,'8'),(NULL,'h'),(NULL,'a'),(NULL,'a'),(NULL,'w'),(NULL,'a'), +(NULL,'9'),(NULL,'i'),(NULL,'a'),(NULL,'a'),(NULL,'x'),(NULL,'a'), +(NULL,'0'),(NULL,'j'),(NULL,'a'),(NULL,'a'),(NULL,'y'),(NULL,'a'), +(NULL,'1'),(NULL,'k'),(NULL,'a'),(NULL,'a'),(NULL,'z'),(NULL,'a'), +(NULL,'2'),(NULL,'l'),(NULL,'a'),(NULL,'a'),(NULL,'/'),(NULL,'a'), +(NULL,'3'),(NULL,'m'),(NULL,'a'),(NULL,'a'),(NULL,'*'),(NULL,'a'), +(NULL,'4'),(NULL,'n'),(NULL,'a'),(NULL,'a'),(NULL,'+'),(NULL,'a'), +(NULL,'5'),(NULL,'o'),(NULL,'a'),(NULL,'a'),(NULL,'?'),(NULL,'a'); +INSERT INTO t1 VALUES +(NULL,'1'),(NULL,'a'),(NULL,'a'),(NULL,'a'),(NULL,'p'),(NULL,'a'), +(NULL,'2'),(NULL,'b'),(NULL,'a'),(NULL,'a'),(NULL,'q'),(NULL,'a'), +(NULL,'3'),(NULL,'c'),(NULL,'a'),(NULL,'a'),(NULL,'r'),(NULL,'a'), +(NULL,'4'),(NULL,'d'),(NULL,'a'),(NULL,'a'),(NULL,'s'),(NULL,'a'), +(NULL,'5'),(NULL,'e'),(NULL,'a'),(NULL,'a'),(NULL,'t'),(NULL,'a'), +(NULL,'6'),(NULL,'f'),(NULL,'a'),(NULL,'a'),(NULL,'u'),(NULL,'a'), +(NULL,'7'),(NULL,'g'),(NULL,'a'),(NULL,'a'),(NULL,'v'),(NULL,'a'), +(NULL,'8'),(NULL,'h'),(NULL,'a'),(NULL,'a'),(NULL,'w'),(NULL,'a'), +(NULL,'9'),(NULL,'i'),(NULL,'a'),(NULL,'a'),(NULL,'x'),(NULL,'a'), +(NULL,'0'),(NULL,'j'),(NULL,'a'),(NULL,'a'),(NULL,'y'),(NULL,'a'), +(NULL,'1'),(NULL,'k'),(NULL,'a'),(NULL,'a'),(NULL,'z'),(NULL,'a'), +(NULL,'2'),(NULL,'l'),(NULL,'a'),(NULL,'a'),(NULL,'/'),(NULL,'a'), +(NULL,'3'),(NULL,'m'),(NULL,'a'),(NULL,'a'),(NULL,'*'),(NULL,'a'), +(NULL,'4'),(NULL,'n'),(NULL,'a'),(NULL,'a'),(NULL,'+'),(NULL,'a'), +(NULL,'5'),(NULL,'o'),(NULL,'a'),(NULL,'a'),(NULL,'?'),(NULL,'a'); +INSERT INTO t1 VALUES +(NULL,'1'),(NULL,'a'),(NULL,'a'),(NULL,'a'),(NULL,'p'),(NULL,'a'), +(NULL,'2'),(NULL,'b'),(NULL,'a'),(NULL,'a'),(NULL,'q'),(NULL,'a'), +(NULL,'3'),(NULL,'c'),(NULL,'a'),(NULL,'a'),(NULL,'r'),(NULL,'a'), +(NULL,'4'),(NULL,'d'),(NULL,'a'),(NULL,'a'),(NULL,'s'),(NULL,'a'), +(NULL,'5'),(NULL,'e'),(NULL,'a'),(NULL,'a'),(NULL,'t'),(NULL,'a'), +(NULL,'6'),(NULL,'f'),(NULL,'a'),(NULL,'a'),(NULL,'u'),(NULL,'a'), +(NULL,'7'),(NULL,'g'),(NULL,'a'),(NULL,'a'),(NULL,'v'),(NULL,'a'), +(NULL,'8'),(NULL,'h'),(NULL,'a'),(NULL,'a'),(NULL,'w'),(NULL,'a'), +(NULL,'9'),(NULL,'i'),(NULL,'a'),(NULL,'a'),(NULL,'x'),(NULL,'a'), +(NULL,'0'),(NULL,'j'),(NULL,'a'),(NULL,'a'),(NULL,'y'),(NULL,'a'), +(NULL,'1'),(NULL,'k'),(NULL,'a'),(NULL,'a'),(NULL,'z'),(NULL,'a'), +(NULL,'2'),(NULL,'l'),(NULL,'a'),(NULL,'a'),(NULL,'/'),(NULL,'a'), +(NULL,'3'),(NULL,'m'),(NULL,'a'),(NULL,'a'),(NULL,'*'),(NULL,'a'), +(NULL,'4'),(NULL,'n'),(NULL,'a'),(NULL,'a'),(NULL,'+'),(NULL,'a'), +(NULL,'5'),(NULL,'o'),(NULL,'a'),(NULL,'a'),(NULL,'?'),(NULL,'a'); +INSERT INTO t1 VALUES +(NULL,'1'),(NULL,'a'),(NULL,'a'),(NULL,'a'),(NULL,'p'),(NULL,'a'), +(NULL,'2'),(NULL,'b'),(NULL,'a'),(NULL,'a'),(NULL,'q'),(NULL,'a'), +(NULL,'3'),(NULL,'c'),(NULL,'a'),(NULL,'a'),(NULL,'r'),(NULL,'a'), +(NULL,'4'),(NULL,'d'),(NULL,'a'),(NULL,'a'),(NULL,'s'),(NULL,'a'), +(NULL,'5'),(NULL,'e'),(NULL,'a'),(NULL,'a'),(NULL,'t'),(NULL,'a'), +(NULL,'6'),(NULL,'f'),(NULL,'a'),(NULL,'a'),(NULL,'u'),(NULL,'a'), +(NULL,'7'),(NULL,'g'),(NULL,'a'),(NULL,'a'),(NULL,'v'),(NULL,'a'), +(NULL,'8'),(NULL,'h'),(NULL,'a'),(NULL,'a'),(NULL,'w'),(NULL,'a'), +(NULL,'9'),(NULL,'i'),(NULL,'a'),(NULL,'a'),(NULL,'x'),(NULL,'a'), +(NULL,'0'),(NULL,'j'),(NULL,'a'),(NULL,'a'),(NULL,'y'),(NULL,'a'), +(NULL,'1'),(NULL,'k'),(NULL,'a'),(NULL,'a'),(NULL,'z'),(NULL,'a'), +(NULL,'2'),(NULL,'l'),(NULL,'a'),(NULL,'a'),(NULL,'/'),(NULL,'a'), +(NULL,'3'),(NULL,'m'),(NULL,'a'),(NULL,'a'),(NULL,'*'),(NULL,'a'), +(NULL,'4'),(NULL,'n'),(NULL,'a'),(NULL,'a'),(NULL,'+'),(NULL,'a'), +(NULL,'5'),(NULL,'o'),(NULL,'a'),(NULL,'a'),(NULL,'?'),(NULL,'a'); +select count(*) from t1; count(*) 450 +ALTER TABLE t1 ADD COLUMN x INT UNSIGNED NOT NULL; +ALTER TABLE t1 ADD KEY c (c); +ALTER TABLE t1 DROP KEY c; +ALTER TABLE t1 DROP COLUMN x; +ALTER TABLE t1 RENAME t2; +select count(*) from t2; count(*) 450 +DROP TABLE t2; +/* variable rows */ +DROP TABLE IF EXISTS t2; +CREATE TABLE t1 ( +id int unsigned not null auto_increment primary key, +c varchar(255) not null +) RAID_TYPE=STRIPED RAID_CHUNKS=5 RAID_CHUNKSIZE=121; +INSERT INTO t1 VALUES +(NULL,'1'),(NULL,'a'),(NULL,'a'),(NULL,'a'),(NULL,'p'),(NULL,'a'), +(NULL,'2'),(NULL,'b'),(NULL,'a'),(NULL,'a'),(NULL,'q'),(NULL,'a'), +(NULL,'3'),(NULL,'c'),(NULL,'a'),(NULL,'a'),(NULL,'r'),(NULL,'a'), +(NULL,'4'),(NULL,'d'),(NULL,'a'),(NULL,'a'),(NULL,'s'),(NULL,'a'), +(NULL,'5'),(NULL,'e'),(NULL,'a'),(NULL,'a'),(NULL,'t'),(NULL,'a'), +(NULL,'6'),(NULL,'f'),(NULL,'a'),(NULL,'a'),(NULL,'u'),(NULL,'a'), +(NULL,'7'),(NULL,'g'),(NULL,'a'),(NULL,'a'),(NULL,'v'),(NULL,'a'), +(NULL,'8'),(NULL,'h'),(NULL,'a'),(NULL,'a'),(NULL,'w'),(NULL,'a'), +(NULL,'9'),(NULL,'i'),(NULL,'a'),(NULL,'a'),(NULL,'x'),(NULL,'a'), +(NULL,'0'),(NULL,'j'),(NULL,'a'),(NULL,'a'),(NULL,'y'),(NULL,'a'), +(NULL,'1'),(NULL,'k'),(NULL,'a'),(NULL,'a'),(NULL,'z'),(NULL,'a'), +(NULL,'2'),(NULL,'l'),(NULL,'a'),(NULL,'a'),(NULL,'/'),(NULL,'a'), +(NULL,'3'),(NULL,'m'),(NULL,'a'),(NULL,'a'),(NULL,'*'),(NULL,'a'), +(NULL,'4'),(NULL,'n'),(NULL,'a'),(NULL,'a'),(NULL,'+'),(NULL,'a'), +(NULL,'5'),(NULL,'o'),(NULL,'a'),(NULL,'a'),(NULL,'?'),(NULL,'a'); +INSERT INTO t1 VALUES +(NULL,'1'),(NULL,'a'),(NULL,'a'),(NULL,'a'),(NULL,'p'),(NULL,'a'), +(NULL,'2'),(NULL,'b'),(NULL,'a'),(NULL,'a'),(NULL,'q'),(NULL,'a'), +(NULL,'3'),(NULL,'c'),(NULL,'a'),(NULL,'a'),(NULL,'r'),(NULL,'a'), +(NULL,'4'),(NULL,'d'),(NULL,'a'),(NULL,'a'),(NULL,'s'),(NULL,'a'), +(NULL,'5'),(NULL,'e'),(NULL,'a'),(NULL,'a'),(NULL,'t'),(NULL,'a'), +(NULL,'6'),(NULL,'f'),(NULL,'a'),(NULL,'a'),(NULL,'u'),(NULL,'a'), +(NULL,'7'),(NULL,'g'),(NULL,'a'),(NULL,'a'),(NULL,'v'),(NULL,'a'), +(NULL,'8'),(NULL,'h'),(NULL,'a'),(NULL,'a'),(NULL,'w'),(NULL,'a'), +(NULL,'9'),(NULL,'i'),(NULL,'a'),(NULL,'a'),(NULL,'x'),(NULL,'a'), +(NULL,'0'),(NULL,'j'),(NULL,'a'),(NULL,'a'),(NULL,'y'),(NULL,'a'), +(NULL,'1'),(NULL,'k'),(NULL,'a'),(NULL,'a'),(NULL,'z'),(NULL,'a'), +(NULL,'2'),(NULL,'l'),(NULL,'a'),(NULL,'a'),(NULL,'/'),(NULL,'a'), +(NULL,'3'),(NULL,'m'),(NULL,'a'),(NULL,'a'),(NULL,'*'),(NULL,'a'), +(NULL,'4'),(NULL,'n'),(NULL,'a'),(NULL,'a'),(NULL,'+'),(NULL,'a'), +(NULL,'5'),(NULL,'o'),(NULL,'a'),(NULL,'a'),(NULL,'?'),(NULL,'a'); +INSERT INTO t1 VALUES +(NULL,'1'),(NULL,'a'),(NULL,'a'),(NULL,'a'),(NULL,'p'),(NULL,'a'), +(NULL,'2'),(NULL,'b'),(NULL,'a'),(NULL,'a'),(NULL,'q'),(NULL,'a'), +(NULL,'3'),(NULL,'c'),(NULL,'a'),(NULL,'a'),(NULL,'r'),(NULL,'a'), +(NULL,'4'),(NULL,'d'),(NULL,'a'),(NULL,'a'),(NULL,'s'),(NULL,'a'), +(NULL,'5'),(NULL,'e'),(NULL,'a'),(NULL,'a'),(NULL,'t'),(NULL,'a'), +(NULL,'6'),(NULL,'f'),(NULL,'a'),(NULL,'a'),(NULL,'u'),(NULL,'a'), +(NULL,'7'),(NULL,'g'),(NULL,'a'),(NULL,'a'),(NULL,'v'),(NULL,'a'), +(NULL,'8'),(NULL,'h'),(NULL,'a'),(NULL,'a'),(NULL,'w'),(NULL,'a'), +(NULL,'9'),(NULL,'i'),(NULL,'a'),(NULL,'a'),(NULL,'x'),(NULL,'a'), +(NULL,'0'),(NULL,'j'),(NULL,'a'),(NULL,'a'),(NULL,'y'),(NULL,'a'), +(NULL,'1'),(NULL,'k'),(NULL,'a'),(NULL,'a'),(NULL,'z'),(NULL,'a'), +(NULL,'2'),(NULL,'l'),(NULL,'a'),(NULL,'a'),(NULL,'/'),(NULL,'a'), +(NULL,'3'),(NULL,'m'),(NULL,'a'),(NULL,'a'),(NULL,'*'),(NULL,'a'), +(NULL,'4'),(NULL,'n'),(NULL,'a'),(NULL,'a'),(NULL,'+'),(NULL,'a'), +(NULL,'5'),(NULL,'o'),(NULL,'a'),(NULL,'a'),(NULL,'?'),(NULL,'a'); +INSERT INTO t1 VALUES +(NULL,'1'),(NULL,'a'),(NULL,'a'),(NULL,'a'),(NULL,'p'),(NULL,'a'), +(NULL,'2'),(NULL,'b'),(NULL,'a'),(NULL,'a'),(NULL,'q'),(NULL,'a'), +(NULL,'3'),(NULL,'c'),(NULL,'a'),(NULL,'a'),(NULL,'r'),(NULL,'a'), +(NULL,'4'),(NULL,'d'),(NULL,'a'),(NULL,'a'),(NULL,'s'),(NULL,'a'), +(NULL,'5'),(NULL,'e'),(NULL,'a'),(NULL,'a'),(NULL,'t'),(NULL,'a'), +(NULL,'6'),(NULL,'f'),(NULL,'a'),(NULL,'a'),(NULL,'u'),(NULL,'a'), +(NULL,'7'),(NULL,'g'),(NULL,'a'),(NULL,'a'),(NULL,'v'),(NULL,'a'), +(NULL,'8'),(NULL,'h'),(NULL,'a'),(NULL,'a'),(NULL,'w'),(NULL,'a'), +(NULL,'9'),(NULL,'i'),(NULL,'a'),(NULL,'a'),(NULL,'x'),(NULL,'a'), +(NULL,'0'),(NULL,'j'),(NULL,'a'),(NULL,'a'),(NULL,'y'),(NULL,'a'), +(NULL,'1'),(NULL,'k'),(NULL,'a'),(NULL,'a'),(NULL,'z'),(NULL,'a'), +(NULL,'2'),(NULL,'l'),(NULL,'a'),(NULL,'a'),(NULL,'/'),(NULL,'a'), +(NULL,'3'),(NULL,'m'),(NULL,'a'),(NULL,'a'),(NULL,'*'),(NULL,'a'), +(NULL,'4'),(NULL,'n'),(NULL,'a'),(NULL,'a'),(NULL,'+'),(NULL,'a'), +(NULL,'5'),(NULL,'o'),(NULL,'a'),(NULL,'a'),(NULL,'?'),(NULL,'a'); +INSERT INTO t1 VALUES +(NULL,'1'),(NULL,'a'),(NULL,'a'),(NULL,'a'),(NULL,'p'),(NULL,'a'), +(NULL,'2'),(NULL,'b'),(NULL,'a'),(NULL,'a'),(NULL,'q'),(NULL,'a'), +(NULL,'3'),(NULL,'c'),(NULL,'a'),(NULL,'a'),(NULL,'r'),(NULL,'a'), +(NULL,'4'),(NULL,'d'),(NULL,'a'),(NULL,'a'),(NULL,'s'),(NULL,'a'), +(NULL,'5'),(NULL,'e'),(NULL,'a'),(NULL,'a'),(NULL,'t'),(NULL,'a'), +(NULL,'6'),(NULL,'f'),(NULL,'a'),(NULL,'a'),(NULL,'u'),(NULL,'a'), +(NULL,'7'),(NULL,'g'),(NULL,'a'),(NULL,'a'),(NULL,'v'),(NULL,'a'), +(NULL,'8'),(NULL,'h'),(NULL,'a'),(NULL,'a'),(NULL,'w'),(NULL,'a'), +(NULL,'9'),(NULL,'i'),(NULL,'a'),(NULL,'a'),(NULL,'x'),(NULL,'a'), +(NULL,'0'),(NULL,'j'),(NULL,'a'),(NULL,'a'),(NULL,'y'),(NULL,'a'), +(NULL,'1'),(NULL,'k'),(NULL,'a'),(NULL,'a'),(NULL,'z'),(NULL,'a'), +(NULL,'2'),(NULL,'l'),(NULL,'a'),(NULL,'a'),(NULL,'/'),(NULL,'a'), +(NULL,'3'),(NULL,'m'),(NULL,'a'),(NULL,'a'),(NULL,'*'),(NULL,'a'), +(NULL,'4'),(NULL,'n'),(NULL,'a'),(NULL,'a'),(NULL,'+'),(NULL,'a'), +(NULL,'5'),(NULL,'o'),(NULL,'a'),(NULL,'a'),(NULL,'?'),(NULL,'a'); +select count(*) from t1; count(*) 450 +ALTER TABLE t1 ADD COLUMN x INT UNSIGNED NOT NULL; +ALTER TABLE t1 ADD KEY c (c); +ALTER TABLE t1 DROP KEY c; +ALTER TABLE t1 DROP COLUMN x; +ALTER TABLE t1 RENAME t2; +ALTER TABLE t2 CHANGE COLUMN c c VARCHAR(251) NOT NULL; +select count(*) from t2; count(*) 450 +DROP TABLE t2; diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result index e0e43f44a4b..990b00fc818 100644 --- a/mysql-test/r/range.result +++ b/mysql-test/r/range.result @@ -1,3 +1,12 @@ +drop table if exists t1; +CREATE TABLE t1 ( +event_date date DEFAULT '0000-00-00' NOT NULL, +type int(11) DEFAULT '0' NOT NULL, +event_id int(11) DEFAULT '0' NOT NULL, +PRIMARY KEY (event_date,type,event_id) +); +INSERT INTO t1 VALUES ('1999-07-10',100100,24),('1999-07-11',100100,25),('1999-07-13',100600,0),('1999-07-13',100600,4),('1999-07-13',100600,26),('1999-07-14',100600,10),('1999-07-15',100600,16),('1999-07-15',100800,45),('1999-07-15',101000,47),('1999-07-16',100800,46),('1999-07-20',100600,5),('1999-07-20',100600,27),('1999-07-21',100600,11),('1999-07-22',100600,17),('1999-07-23',100100,39),('1999-07-24',100100,39),('1999-07-24',100500,40),('1999-07-25',100100,39),('1999-07-27',100600,1),('1999-07-27',100600,6),('1999-07-27',100600,28),('1999-07-28',100600,12),('1999-07-29',100500,41),('1999-07-29',100600,18),('1999-07-30',100500,41),('1999-07-31',100500,41),('1999-08-01',100700,34),('1999-08-03',100600,7),('1999-08-03',100600,29),('1999-08-04',100600,13),('1999-08-05',100500,42),('1999-08-05',100600,19),('1999-08-06',100500,42),('1999-08-07',100500,42),('1999-08-08',100500,42),('1999-08-10',100600,2),('1999-08-10',100600,9),('1999-08-10',100600,30),('1999-08-11',100600,14),('1999-08-12',100600,20),('1999-08-17',100500,8),('1999-08-17',100600,31),('1999-08-18',100600,15),('1999-08-19',100600,22),('1999-08-24',100600,3),('1999-08-24',100600,32),('1999-08-27',100500,43),('1999-08-31',100600,33),('1999-09-17',100100,37),('1999-09-18',100100,37),('1999-09-19',100100,37),('2000-12-18',100700,38); +select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date; event_date type event_id 1999-07-10 100100 24 1999-07-11 100100 25 @@ -5,8 +14,10 @@ event_date type event_id 1999-07-13 100600 4 1999-07-13 100600 26 1999-07-14 100600 10 +explain select event_date,type,event_id from t1 WHERE type = 100601 and event_date >= "1999-07-01" AND event_date < "1999-07-15" AND (type=100600 OR type=100100) ORDER BY event_date; Comment Impossible WHERE +select event_date,type,event_id from t1 WHERE event_date >= "1999-07-01" AND event_date <= "1999-07-15" AND (type=100600 OR type=100100) or event_date >= "1999-07-01" AND event_date <= "1999-07-15" AND type=100099; event_date type event_id 1999-07-10 100100 24 1999-07-11 100100 25 @@ -15,6 +26,45 @@ event_date type event_id 1999-07-13 100600 26 1999-07-14 100600 10 1999-07-15 100600 16 +drop table t1; +CREATE TABLE t1 ( +PAPER_ID smallint(6) DEFAULT '0' NOT NULL, +YEAR smallint(6) DEFAULT '0' NOT NULL, +ISSUE smallint(6) DEFAULT '0' NOT NULL, +CLOSED tinyint(4) DEFAULT '0' NOT NULL, +ISS_DATE date DEFAULT '0000-00-00' NOT NULL, +PRIMARY KEY (PAPER_ID,YEAR,ISSUE) +); +INSERT INTO t1 VALUES (3,1999,34,0,'1999-07-12'); +INSERT INTO t1 VALUES (1,1999,111,0,'1999-03-23'); +INSERT INTO t1 VALUES (1,1999,222,0,'1999-03-23'); +INSERT INTO t1 VALUES (3,1999,33,0,'1999-07-12'); +INSERT INTO t1 VALUES (3,1999,32,0,'1999-07-12'); +INSERT INTO t1 VALUES (3,1999,31,0,'1999-07-12'); +INSERT INTO t1 VALUES (3,1999,30,0,'1999-07-12'); +INSERT INTO t1 VALUES (3,1999,29,0,'1999-07-12'); +INSERT INTO t1 VALUES (3,1999,28,0,'1999-07-12'); +INSERT INTO t1 VALUES (1,1999,40,1,'1999-05-01'); +INSERT INTO t1 VALUES (1,1999,41,1,'1999-05-01'); +INSERT INTO t1 VALUES (1,1999,42,1,'1999-05-01'); +INSERT INTO t1 VALUES (1,1999,46,1,'1999-05-01'); +INSERT INTO t1 VALUES (1,1999,47,1,'1999-05-01'); +INSERT INTO t1 VALUES (1,1999,48,1,'1999-05-01'); +INSERT INTO t1 VALUES (1,1999,49,1,'1999-05-01'); +INSERT INTO t1 VALUES (1,1999,50,0,'1999-05-01'); +INSERT INTO t1 VALUES (1,1999,51,0,'1999-05-01'); +INSERT INTO t1 VALUES (1,1999,200,0,'1999-06-28'); +INSERT INTO t1 VALUES (1,1999,52,0,'1999-06-28'); +INSERT INTO t1 VALUES (1,1999,53,0,'1999-06-28'); +INSERT INTO t1 VALUES (1,1999,54,0,'1999-06-28'); +INSERT INTO t1 VALUES (1,1999,55,0,'1999-06-28'); +INSERT INTO t1 VALUES (1,1999,56,0,'1999-07-01'); +INSERT INTO t1 VALUES (1,1999,57,0,'1999-07-01'); +INSERT INTO t1 VALUES (1,1999,58,0,'1999-07-01'); +INSERT INTO t1 VALUES (1,1999,59,0,'1999-07-01'); +INSERT INTO t1 VALUES (1,1999,60,0,'1999-07-01'); +INSERT INTO t1 VALUES (3,1999,35,0,'1999-07-12'); +select YEAR,ISSUE from t1 where PAPER_ID=3 and (YEAR>1999 or (YEAR=1999 and ISSUE>28)) order by YEAR,ISSUE; YEAR ISSUE 1999 29 1999 30 @@ -23,10 +73,23 @@ YEAR ISSUE 1999 33 1999 34 1999 35 +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +repair table t1; Table Op Msg_type Msg_text test.t1 repair status OK +drop table t1; +CREATE TABLE t1 ( +id int(11) NOT NULL auto_increment, +parent_id int(11) DEFAULT '0' NOT NULL, +level tinyint(4) DEFAULT '0' NOT NULL, +PRIMARY KEY (id), +KEY parent_id (parent_id), +KEY level (level) +); +INSERT INTO t1 VALUES (1,0,0),(3,1,1),(4,1,1),(8,2,2),(9,2,2),(17,3,2),(22,4,2),(24,4,2),(28,5,2),(29,5,2),(30,5,2),(31,6,2),(32,6,2),(33,6,2),(203,7,2),(202,7,2),(20,3,2),(157,0,0),(193,5,2),(40,7,2),(2,1,1),(15,2,2),(6,1,1),(34,6,2),(35,6,2),(16,3,2),(7,1,1),(36,7,2),(18,3,2),(26,5,2),(27,5,2),(183,4,2),(38,7,2),(25,5,2),(37,7,2),(21,4,2),(19,3,2),(5,1,1),(179,5,2); +SELECT * FROM t1 WHERE level = 1 AND parent_id = 1; id parent_id level 3 1 1 4 1 1 @@ -34,6 +97,7 @@ id parent_id level 6 1 1 7 1 1 5 1 1 +SELECT * FROM t1 WHERE level = 1 AND parent_id = 1 order by id; id parent_id level 2 1 1 3 1 1 @@ -41,17 +105,38 @@ id parent_id level 5 1 1 6 1 1 7 1 1 +drop table t1; +create table t1( +Satellite varchar(25) not null, +SensorMode varchar(25) not null, +FullImageCornersUpperLeftLongitude double not null, +FullImageCornersUpperRightLongitude double not null, +FullImageCornersUpperRightLatitude double not null, +FullImageCornersLowerRightLatitude double not null, +index two (Satellite, SensorMode, FullImageCornersUpperLeftLongitude, FullImageCornersUpperRightLongitude, FullImageCornersUpperRightLatitude, FullImageCornersLowerRightLatitude)); +insert into t1 values("OV-3","PAN1",91,-92,40,50); +insert into t1 values("OV-4","PAN1",91,-92,40,50); +select * from t1 where t1.Satellite = "OV-3" and t1.SensorMode = "PAN1" and t1.FullImageCornersUpperLeftLongitude > -90.000000 and t1.FullImageCornersUpperRightLongitude < -82.000000; Satellite SensorMode FullImageCornersUpperLeftLongitude FullImageCornersUpperRightLongitude FullImageCornersUpperRightLatitude FullImageCornersLowerRightLatitude OV-3 PAN1 91 -92 40 50 +drop table t1; +create table t1 ( aString char(100) not null default "", key aString (aString(10)) ); +insert t1 (aString) values ( "believe in myself" ), ( "believe" ), ("baaa" ), ( "believe in love"); +select * from t1 where aString < "believe in myself" order by aString; aString baaa believe believe in love +select * from t1 where aString > "believe in love" order by aString; aString believe in myself +alter table t1 drop key aString; +select * from t1 where aString < "believe in myself" order by aString; aString baaa believe believe in love +select * from t1 where aString > "believe in love" order by aString; aString believe in myself +drop table t1; diff --git a/mysql-test/r/rename.result b/mysql-test/r/rename.result index 57ef20e41b1..b2bb659502a 100644 --- a/mysql-test/r/rename.result +++ b/mysql-test/r/rename.result @@ -1,14 +1,39 @@ +drop table if exists t0,t1,t2,t3,t4; +create table t0 SELECT 1,"table 1"; +create table t2 SELECT 2,"table 2"; +create table t3 SELECT 3,"table 3"; +rename table t0 to t1; +rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1; +select * from t1; 3 table 3 3 table 3 +rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1; +rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1; +select * from t1; 1 table 1 1 table 1 +rename table t1 to t2; +Got one of the listed errors +rename table t1 to t1; +Got one of the listed errors +rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2; +Got one of the listed errors +show tables like "t_"; Tables_in_test (t_) t1 t2 t3 +rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1; +Got one of the listed errors +rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1; +Got one of the listed errors +select * from t1; 1 table 1 1 table 1 +select * from t2; 2 table 2 2 table 2 +select * from t3; 3 table 3 3 table 3 +drop table if exists t1,t2,t3,t4; diff --git a/mysql-test/r/replace.result b/mysql-test/r/replace.result index 25a6a17da35..0aa80e18ccc 100644 --- a/mysql-test/r/replace.result +++ b/mysql-test/r/replace.result @@ -1,3 +1,26 @@ +drop table if exists t1; +CREATE TABLE t1 ( +gesuchnr int(11) DEFAULT '0' NOT NULL, +benutzer_id int(11) DEFAULT '0' NOT NULL, +PRIMARY KEY (gesuchnr,benutzer_id) +) type=ISAM; +replace into t1 (gesuchnr,benutzer_id) values (2,1); +replace into t1 (gesuchnr,benutzer_id) values (1,1); +replace into t1 (gesuchnr,benutzer_id) values (1,1); +alter table t1 type=myisam; +replace into t1 (gesuchnr,benutzer_id) values (1,1); +alter table t1 type=heap; +replace into t1 (gesuchnr,benutzer_id) values (1,1); +drop table t1; +create table t1 (a tinyint not null auto_increment primary key, b char(20)); +insert into t1 values (126,"first"),(0,"last"); +insert into t1 values (0,"error"); +Duplicate entry '127' for key 1 +replace into t1 values (0,"error"); +Duplicate entry '127' for key 1 +replace into t1 values (126,"first updated"); +select * from t1; a b 126 first updated 127 last +drop table t1; diff --git a/mysql-test/r/rollback.result b/mysql-test/r/rollback.result index ac3743e1dc7..a5eb6f8729f 100644 --- a/mysql-test/r/rollback.result +++ b/mysql-test/r/rollback.result @@ -1,3 +1,12 @@ +drop table if exists t1; +create table t1 (n int not null primary key) type=myisam; +begin work; +insert into t1 values (4); +insert into t1 values (5); +rollback; +Warning: Some non-transactional changed tables couldn't be rolled back +select * from t1; n 4 5 +drop table t1; diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result index ebccb1e1e6b..9cd0496d16e 100644 --- a/mysql-test/r/rpl000001.result +++ b/mysql-test/r/rpl000001.result @@ -1,17 +1,73 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +use test; +drop table if exists t1,t3; +create table t1 (word char(20) not null); +load data infile '../../std_data/words.dat' into table t1; +set password = password('foo'); +set password = password(''); +create table t3(n int); +insert into t3 values(1),(2); +use test; +select * from t3; n 1 2 +select sum(length(word)) from t1; sum(length(word)) 71 +drop table t1,t3; +reset master; +reset slave; +drop table if exists t1,t2; +create table t1(n int); + insert into t1 values(10); + insert into t1 values(9); + insert into t1 values(8); + insert into t1 values(7); + insert into t1 values(6); + insert into t1 values(5); + insert into t1 values(4); + insert into t1 values(3); + insert into t1 values(2); + insert into t1 values(1); +create table t2(id int); +insert into t2 values(connection_id()); +create temporary table t1_temp(n int); +insert into t1_temp select get_lock('crash_lock%20C', 1) from t2; + update t1 set n = n + get_lock('crash_lock%20C', 2); +select (@id := id) - id from t2; (@id := id) - id 0 +kill @id; +drop table t2; +Server shutdown in progress +set sql_slave_skip_counter=1; +slave start; +select count(*) from t1; count(*) 10 +drop table t1; +create table t1 (n int); +insert into t1 values(3456); +use mysql; +insert into user (Host, User, Password) +VALUES ("10.10.10.%", "blafasel2", password("blafasel2")); +select select_priv,user from mysql.user where user = 'blafasel2'; select_priv user N blafasel2 +update user set Select_priv = "Y" where User="blafasel2"; +select select_priv,user from mysql.user where user = 'blafasel2'; select_priv user Y blafasel2 +use test; +select n from t1; n 3456 +select select_priv,user from mysql.user where user = 'blafasel2'; select_priv user Y blafasel2 +drop table t1; diff --git a/mysql-test/r/rpl000002.result b/mysql-test/r/rpl000002.result index 7f518a7339e..27b61a0af1b 100644 --- a/mysql-test/r/rpl000002.result +++ b/mysql-test/r/rpl000002.result @@ -1,10 +1,33 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +use test; +drop table if exists t1; +create table t1 (n int auto_increment primary key); +set insert_id = 2000; +insert into t1 values (NULL),(NULL),(NULL); +use test; +select * from t1; n 2000 2001 2002 +show slave hosts; Server_id Host Port -2 127.0.0.1 9307 +2 127.0.0.1 $SLAVE_MYPORT +drop table t1; +slave stop; +drop table if exists t2; +create table t2(id int auto_increment primary key, created datetime); +set timestamp=12345; +insert into t2 set created=now(); +select * from t2; id created 1 1970-01-01 06:25:45 +slave start; +select * from t2; id created 1 1970-01-01 06:25:45 +drop table t2; diff --git a/mysql-test/r/rpl000003.result b/mysql-test/r/rpl000003.result index f85b057eefa..6ecb649c152 100644 --- a/mysql-test/r/rpl000003.result +++ b/mysql-test/r/rpl000003.result @@ -1,4 +1,15 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +drop table if exists t1; +create table t1(n int primary key); +insert into t1 values (1),(2),(2); +insert into t1 values (3); +select * from t1; n 1 2 3 +drop table t1; diff --git a/mysql-test/r/rpl000004.result b/mysql-test/r/rpl000004.result index a1c135a142e..e5dee880f73 100644 --- a/mysql-test/r/rpl000004.result +++ b/mysql-test/r/rpl000004.result @@ -1,6 +1,34 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +use test; +set SQL_LOG_BIN=0; +drop table if exists t1; +create table t1 (word char(20) not null, index(word)); +load data infile '../../std_data/words.dat' into table t1; +drop table if exists t2; +create table t2 (word char(20) not null); +load data infile '../../std_data/words.dat' into table t2; +create table t3 (word char(20) not null primary key); +use test; +drop table if exists t1; +load table t1 from master; +drop table if exists t2; +load table t2 from master; +drop table if exists t3; +load table t3 from master; +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +select count(*) from t2; count(*) 10 +select count(*) from t3; count(*) 0 +set SQL_LOG_BIN=1; +drop table if exists t1,t2,t3; +create table t1(n int); +drop table t1; diff --git a/mysql-test/r/rpl000005.result b/mysql-test/r/rpl000005.result index 4f1541c75ca..0c91f984db1 100644 --- a/mysql-test/r/rpl000005.result +++ b/mysql-test/r/rpl000005.result @@ -1,8 +1,22 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +drop table if exists t1; +CREATE TABLE t1 (name varchar(64), age smallint(3)); +INSERT INTO t1 SET name='Andy', age=31; +INSERT t1 SET name='Jacob', age=2; +INSERT into t1 SET name='Caleb', age=1; +ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY; +select * from t1; name age id Andy 31 00000001 Jacob 2 00000002 Caleb 1 00000003 +select * from t1; name age id Andy 31 00000001 Jacob 2 00000002 Caleb 1 00000003 +drop table t1; diff --git a/mysql-test/r/rpl000006.result b/mysql-test/r/rpl000006.result index 56cd7166510..f4e965236af 100644 --- a/mysql-test/r/rpl000006.result +++ b/mysql-test/r/rpl000006.result @@ -1,6 +1,30 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +set SQL_LOG_BIN=0,timestamp=200006; +drop table if exists t1; +create table t1(t timestamp not null,a char(1)); +insert into t1 ( a) values ('F'); +select unix_timestamp(t) from t1; unix_timestamp(t) 200006 +drop table if exists t1; +load table t1 from master; +select unix_timestamp(t) from t1; unix_timestamp(t) 200006 +set SQL_LOG_BIN=1,timestamp=default; +drop table t1; +set SQL_LOG_BIN=0; +CREATE TABLE t1 ( +a int not null +) TYPE=MyISAM MAX_ROWS=4000 CHECKSUM=1; +INSERT INTO t1 VALUES (1); +load table t1 from master; +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +drop table t1; +drop table t1; diff --git a/mysql-test/r/rpl000007.result b/mysql-test/r/rpl000007.result index d5b4cdf3bee..7b2b9939228 100644 --- a/mysql-test/r/rpl000007.result +++ b/mysql-test/r/rpl000007.result @@ -1,2 +1,21 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +use test; +drop table if exists foo; +create table foo (n int); +insert into foo values(4); +use test; +drop table if exists foo; +create table foo (s char(20)); +load data infile '../../std_data/words.dat' into table foo; +insert into foo values('five'); +drop table if exists bar; +create table bar (m int); +insert into bar values(15); +select foo.n,bar.m from foo,bar; n m 4 15 +drop table if exists bar,foo; diff --git a/mysql-test/r/rpl000008.result b/mysql-test/r/rpl000008.result index 870e8a5510d..5ca156fecf0 100644 --- a/mysql-test/r/rpl000008.result +++ b/mysql-test/r/rpl000008.result @@ -1,2 +1,24 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +use test; +drop table if exists foo; +create table foo (n int); +insert into foo values(4); +use test; +drop table if exists foo; +create table foo (n int); +insert into foo values(5); +drop table if exists bar; +create table bar (m int); +insert into bar values(15); +drop table if exists choo; +create table choo (k int); +insert into choo values(55); +select foo.n,bar.m,choo.k from foo,bar,choo; n m k 4 15 55 +drop table if exists foo,bar,choo; +drop table if exists foo,bar,choo; diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result index 74452473d0c..5246dadc06b 100644 --- a/mysql-test/r/rpl000009.result +++ b/mysql-test/r/rpl000009.result @@ -1,32 +1,82 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +drop database if exists foo; +create database foo; +drop database if exists bar; +create database bar; +drop table if exists foo.foo; +create table foo.foo (n int); +insert into foo.foo values(4); +drop table if exists foo.foo; +create table foo.foo (n int); +insert into foo.foo values(5); +drop table if exists bar.bar; +create table bar.bar (m int); +insert into bar.bar values(15); +select foo.foo.n,bar.bar.m from foo.foo,bar.bar; n m 4 15 +drop database if exists bar; +drop database if exists foo; +drop database if exists bar; +drop database if exists foo; +set sql_log_bin = 0; +create database foo; +create database bar; +show databases; Database bar foo mysql test +create table foo.t1(n int, s char(20)); +create table foo.t2(n int, s text); +insert into foo.t1 values (1, 'one'), (2, 'two'), (3, 'three'); +insert into foo.t2 values (11, 'eleven'), (12, 'twelve'), (13, 'thirteen'); +create table bar.t1(n int, s char(20)); +create table bar.t2(n int, s text); +insert into bar.t1 values (1, 'one bar'), (2, 'two bar'), (3, 'three bar'); +insert into bar.t2 values (11, 'eleven bar'), (12, 'twelve bar'), +(13, 'thirteen bar'); +set sql_log_bin = 1; +show databases; Database mysql test +load data from master; +show databases; Database bar foo mysql test +use foo; +show tables; Tables_in_foo +use bar; +show tables; Tables_in_bar t1 t2 +select * from bar.t1; n s 1 one bar 2 two bar 3 three bar +select * from bar.t2; n s 11 eleven bar 12 twelve bar 13 thirteen bar +insert into bar.t1 values (4, 'four bar'); +select * from bar.t1; n s 1 one bar 2 two bar 3 three bar 4 four bar +drop database bar; +drop database foo; diff --git a/mysql-test/r/rpl000010.result b/mysql-test/r/rpl000010.result index c52b83d729a..95792a72a6d 100644 --- a/mysql-test/r/rpl000010.result +++ b/mysql-test/r/rpl000010.result @@ -1,3 +1,15 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +drop table if exists t1; +drop table if exists t1; +create table t1 (n int not null auto_increment primary key); +insert into t1 values(NULL); +insert into t1 values(2); +select n from t1; n 1 2 +drop table t1; diff --git a/mysql-test/r/rpl000011.result b/mysql-test/r/rpl000011.result index c52b83d729a..1a46f479677 100644 --- a/mysql-test/r/rpl000011.result +++ b/mysql-test/r/rpl000011.result @@ -1,3 +1,17 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +use test; +drop table if exists t1; +create table t1 (n int); +insert into t1 values(1); +slave stop; +slave start; +insert into t1 values(2); +select * from t1; n 1 2 +drop table t1; diff --git a/mysql-test/r/rpl000012.result b/mysql-test/r/rpl000012.result index 9ce7037101e..9aa52a789c0 100644 --- a/mysql-test/r/rpl000012.result +++ b/mysql-test/r/rpl000012.result @@ -1,3 +1,25 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +drop table if exists t1,t2,t3; +create table t2 (n int); +create temporary table t1 (n int); +insert into t1 values(1),(2),(3); +insert into t2 select * from t1; +drop table if exists test.t3; +create temporary table test.t3 (n int not null); +alter table test.t3 add primary key(n); +insert into t3 values (100); +insert into t2 select * from t3; +drop table if exists test.t3; +insert into t2 values (101); +create temporary table t1 (n int); +insert into t1 values (4),(5); +insert into t2 select * from t1; +insert into t2 values(6); +select * from t2; n 1 2 @@ -7,5 +29,7 @@ n 4 5 6 +show status like 'Slave_open_temp_tables'; Variable_name Value Slave_open_temp_tables 0 +drop table if exists t1,t2; diff --git a/mysql-test/r/rpl000013.result b/mysql-test/r/rpl000013.result index ec2bd0684f1..2c4a7a470cf 100644 --- a/mysql-test/r/rpl000013.result +++ b/mysql-test/r/rpl000013.result @@ -1,3 +1,18 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +drop table if exists t2; +create table t2(n int); +create temporary table t1 (n int); +insert into t1 values(1),(2),(3); +insert into t2 select * from t1; +create temporary table t1 (n int); +insert into t1 values (4),(5); +insert into t2 select * from t1; +insert into t2 values(6); +select * from t2; n 1 2 @@ -5,5 +20,7 @@ n 4 5 6 +show status like 'Slave_open_temp_tables'; Variable_name Value Slave_open_temp_tables 0 +drop table if exists t1,t2; diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result index cdafc7575ab..ec79c4c37e6 100644 --- a/mysql-test/r/rpl000014.result +++ b/mysql-test/r/rpl000014.result @@ -1,16 +1,39 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +show master status; File Position Binlog_do_db Binlog_ignore_db master-bin.001 79 +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 root 9999 1 master-bin.001 79 Yes 0 0 1 +change master to master_log_pos=73; +slave stop; +change master to master_log_pos=73; +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 root 9999 1 master-bin.001 73 No 0 0 1 +slave start; +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 root 9999 1 master-bin.001 73 Yes 0 0 1 +change master to master_log_pos=173; +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 root 9999 1 master-bin.001 173 Yes 0 0 1 +show master status; File Position Binlog_do_db Binlog_ignore_db master-bin.001 79 +create table if not exists foo(n int); +drop table if exists foo; +create table foo (n int); +insert into foo values (1),(2),(3); +change master to master_log_pos=79; +select * from foo; n 1 2 3 +drop table foo; diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result index 0aef660905b..d34c8d21327 100644 --- a/mysql-test/r/rpl000015.result +++ b/mysql-test/r/rpl000015.result @@ -1,14 +1,30 @@ +reset master; +show master status; File Position Binlog_do_db Binlog_ignore_db master-bin.001 79 +reset slave; +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 0 0 0 No 0 0 0 +change master to master_host='127.0.0.1'; +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 test 9998 60 4 No 0 0 0 + change master to master_host='127.0.0.1',master_user='root', +master_password='',master_port=$MASTER_MYPORT; +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 root 9999 60 4 No 0 0 0 +slave start; +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 root 9999 60 master-bin.001 79 Yes 0 0 1 +drop table if exists t1; +create table t1 (n int); +insert into t1 values (10),(45),(90); +select * from t1; n 10 45 90 +drop table t1; diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result index 65f260bd575..899ca3b46b8 100644 --- a/mysql-test/r/rpl000016.result +++ b/mysql-test/r/rpl000016.result @@ -1,30 +1,71 @@ +slave start; +slave start; + change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, +master_user='root'; +reset slave; + change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, +master_user='root'; +reset master; +slave start; +drop table if exists t1; +create table t1 (s text); +insert into t1 values('Could not break slave'),('Tried hard'); +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 root 9999 60 master-bin.001 234 Yes 0 0 3 +select * from t1; s Could not break slave Tried hard +flush logs; +drop table if exists t2; +create table t2(m int not null primary key); +insert into t2 values (34),(67),(123); +flush logs; +show master logs; Log_name master-bin.001 master-bin.002 master-bin.003 +insert into t2 values(1234); +insert into t2 values(1234); +slave stop; +set sql_slave_skip_counter=1; +slave start; +purge master logs to 'master-bin.003'; +show master logs; Log_name master-bin.003 +insert into t2 values (65); +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 root 9999 60 master-bin.003 202 Yes 0 0 3 +select * from t2; m 34 65 67 123 1234 +drop table if exists t3; +create table t3 (n int); +show master logs; Log_name master-bin.003 master-bin.004 master-bin.005 master-bin.006 +show master status; File Position Binlog_do_db Binlog_ignore_db master-bin.006 720 +slave stop; +slave start; +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 root 9999 60 master-bin.006 720 Yes 0 0 11 +lock tables t3 read; +select count(*) from t3 where n >= 4; count(*) 100 +unlock tables; +drop table if exists t1,t2,t3; diff --git a/mysql-test/r/rpl000017.result b/mysql-test/r/rpl000017.result index e4f324047f8..e2c3c089378 100644 --- a/mysql-test/r/rpl000017.result +++ b/mysql-test/r/rpl000017.result @@ -1,2 +1,11 @@ +reset master; +grant file on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab'; +grant file on *.* to replicate@127.0.0.1 identified by 'aaaaaaaaaaaaaaab'; +slave start; +drop table if exists t1; +create table t1(n int); +insert into t1 values(24); +select * from t1; n 24 +drop table t1; diff --git a/mysql-test/r/rpl000018.result b/mysql-test/r/rpl000018.result index 7c89c2ef2b2..ba51406bba0 100644 --- a/mysql-test/r/rpl000018.result +++ b/mysql-test/r/rpl000018.result @@ -1,5 +1,13 @@ +reset slave; +slave start; +show master logs; Log_name master-bin.001 master-bin.002 +drop table if exists t1; +create table t1(n int); +insert into t1 values (3351); +select * from t1; n 3351 +drop table t1; diff --git a/mysql-test/r/rpl_failsafe.result b/mysql-test/r/rpl_failsafe.result new file mode 100644 index 00000000000..789795c0343 --- /dev/null +++ b/mysql-test/r/rpl_failsafe.result @@ -0,0 +1,11 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +show variables like 'rpl_recovery_rank'; +Variable_name Value +rpl_recovery_rank 1 +show variables like 'rpl_recovery_rank'; +Variable_name Value +rpl_recovery_rank 2 diff --git a/mysql-test/r/rpl_get_lock.result b/mysql-test/r/rpl_get_lock.result index c261ee2861b..63342e0e4e6 100644 --- a/mysql-test/r/rpl_get_lock.result +++ b/mysql-test/r/rpl_get_lock.result @@ -1,4 +1,14 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +create table t1(n int); +insert into t1 values(get_lock("lock",2)); +select get_lock("lock",3); get_lock("lock",3) 1 +select * from t1; n 1 +drop table t1; diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 2090781caab..37b2474f9e6 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -1,3 +1,20 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +slave stop; +reset master; +reset slave; +reset master; +drop table if exists t1; +create table t1(n int not null auto_increment primary key); +insert into t1 values (NULL); +drop table t1; +create table t1 (word char(20) not null); +load data infile '../../std_data/words.dat' into table t1; +drop table t1; +show binlog events; Log_name Pos Event_type Server_id Log_seq Info master-bin.001 4 Start 1 1 Server ver: $VERSION, Binlog ver: 2 master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key) @@ -8,13 +25,21 @@ master-bin.001 311 Query 1 6 use test; create table t1 (word char(20) not null) master-bin.001 386 Create_file 1 7 db=test;table=t1;file_id=1;block_len=81 master-bin.001 556 Exec_load 1 8 ;file_id=1 master-bin.001 579 Query 1 9 use test; drop table t1 +show binlog events from 79 limit 1; Log_name Pos Event_type Server_id Log_seq Info master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key) +show binlog events from 79 limit 2; Log_name Pos Event_type Server_id Log_seq Info master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key) master-bin.001 172 Intvar 1 3 INSERT_ID=1 +show binlog events from 79 limit 2,1; Log_name Pos Event_type Server_id Log_seq Info master-bin.001 200 Query 1 4 use test; insert into t1 values (NULL) +flush logs; +create table t1 (n int); +insert into t1 values (1); +drop table t1; +show binlog events; Log_name Pos Event_type Server_id Log_seq Info master-bin.001 4 Start 1 1 Server ver: $VERSION, Binlog ver: 2 master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key) @@ -27,17 +52,22 @@ master-bin.001 556 Exec_load 1 8 ;file_id=1 master-bin.001 579 Query 1 9 use test; drop table t1 master-bin.001 627 Rotate 1 10 master-bin.002;pos=4 master-bin.001 668 Stop 1 11 +show binlog events in 'master-bin.002'; Log_name Pos Event_type Server_id Log_seq Info master-bin.002 4 Start 1 1 Server ver: $VERSION, Binlog ver: 2 master-bin.002 79 Query 1 2 use test; create table t1 (n int) master-bin.002 137 Query 1 3 use test; insert into t1 values (1) master-bin.002 197 Query 1 4 use test; drop table t1 +show master logs; Log_name master-bin.001 master-bin.002 +slave start; +show master logs; Log_name slave-bin.001 slave-bin.002 +show binlog events in 'slave-bin.001' from 4; Log_name Pos Event_type Server_id Log_seq Info slave-bin.001 4 Start 2 1 Server ver: $VERSION, Binlog ver: 2 slave-bin.001 79 Slave 2 3 host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.001,pos=4 @@ -51,21 +81,33 @@ slave-bin.001 618 Exec_load 1 8 ;file_id=1 slave-bin.001 641 Query 1 9 use test; drop table t1 slave-bin.001 689 Rotate 1 4 slave-bin.002;pos=4; forced by master slave-bin.001 729 Stop 2 5 +show binlog events in 'slave-bin.002' from 4; Log_name Pos Event_type Server_id Log_seq Info slave-bin.002 4 Start 2 1 Server ver: $VERSION, Binlog ver: 2 slave-bin.002 79 Slave 2 10 host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4 slave-bin.002 132 Query 1 2 use test; create table t1 (n int) slave-bin.002 190 Query 1 3 use test; insert into t1 values (1) slave-bin.002 250 Query 1 4 use test; drop table t1 +show slave status; Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq 127.0.0.1 root $MASTER_MYPORT 1 master-bin.002 245 Yes 0 0 4 +show new master for slave with master_log_file='master-bin.001' and +master_log_pos=4 and master_log_seq=1 and master_server_id=1; Log_name Log_pos slave-bin.001 132 +show new master for slave with master_log_file='master-bin.001' and +master_log_pos=79 and master_log_seq=2 and master_server_id=1; Log_name Log_pos slave-bin.001 225 +show new master for slave with master_log_file='master-bin.001' and +master_log_pos=311 and master_log_seq=6 and master_server_id=1; Log_name Log_pos slave-bin.001 439 +show new master for slave with master_log_file='master-bin.002' and +master_log_pos=4 and master_log_seq=1 and master_server_id=1; Log_name Log_pos slave-bin.002 132 +show new master for slave with master_log_file='master-bin.002' and +master_log_pos=137 and master_log_seq=3 and master_server_id=1; Log_name Log_pos slave-bin.002 250 diff --git a/mysql-test/r/rpl_magic.result b/mysql-test/r/rpl_magic.result index 449a6bca68c..b30d40d04eb 100644 --- a/mysql-test/r/rpl_magic.result +++ b/mysql-test/r/rpl_magic.result @@ -1,22 +1,36 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +drop table if exists t1; +create table t1 ( n int); +insert into t1 values (1),(2),(3),(4); +insert into t1 values(5); +select * from t1; n 1 2 3 4 5 +select * from t1; n 1 2 3 4 +select * from t1; n 1 2 3 4 +select * from t1; n 1 2 3 4 5 +drop table t1; diff --git a/mysql-test/r/rpl_mystery22.result b/mysql-test/r/rpl_mystery22.result index f85b057eefa..e798d774380 100644 --- a/mysql-test/r/rpl_mystery22.result +++ b/mysql-test/r/rpl_mystery22.result @@ -1,4 +1,23 @@ +drop table if exists t1; +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +create table t1(n int auto_increment primary key); +insert into t1 values (2); +insert into t1 values(NULL); +insert into t1 values(NULL); +delete from t1 where n = 2; +slave start; +slave stop; +create table t2(n int); +drop table t2; +insert into t1 values(NULL); +slave start; +select * from t1; n 1 2 3 +drop table t1; diff --git a/mysql-test/r/rpl_sporadic_master.result b/mysql-test/r/rpl_sporadic_master.result index ed616c26b67..ca74904889b 100644 --- a/mysql-test/r/rpl_sporadic_master.result +++ b/mysql-test/r/rpl_sporadic_master.result @@ -1,3 +1,21 @@ +slave stop; +reset master; +reset slave; +drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; +slave start; +drop table if exists t1,t2; +create table t2(n int); +create table t1(n int not null auto_increment primary key); +insert into t1 values (NULL),(NULL); +truncate table t1; +insert into t1 values (4),(NULL); +slave stop; +slave start; +insert into t1 values (NULL),(NULL); +flush logs; +truncate table t1; +insert into t1 values (10),(NULL),(NULL),(NULL),(NULL),(NULL); +select * from t1; n 10 11 @@ -5,3 +23,4 @@ n 13 14 15 +drop table t1,t2; diff --git a/mysql-test/r/sel000001.result b/mysql-test/r/sel000001.result index bee97cc7b53..28f6d3d1d5a 100644 --- a/mysql-test/r/sel000001.result +++ b/mysql-test/r/sel000001.result @@ -1,2 +1,7 @@ +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 (s CHAR(20) PRIMARY KEY, id INT); +INSERT INTO t1 VALUES ('cat', 1), ('mouse', 3), ('dog', 2), ('snake', 77); +SELECT s, id FROM t1 WHERE s = 'mouse'; s id mouse 3 +drop table t1; diff --git a/mysql-test/r/sel000002.result b/mysql-test/r/sel000002.result index f85b057eefa..b824de8de4a 100644 --- a/mysql-test/r/sel000002.result +++ b/mysql-test/r/sel000002.result @@ -1,4 +1,9 @@ +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 (n INT); +INSERT INTO t1 VALUES (1), (2), (3); +SELECT * FROM t1; n 1 2 3 +drop table t1; diff --git a/mysql-test/r/sel000003.result b/mysql-test/r/sel000003.result index 77312414818..c3853832f87 100644 --- a/mysql-test/r/sel000003.result +++ b/mysql-test/r/sel000003.result @@ -1,3 +1,8 @@ +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 (name CHAR(20) NOT NULL PRIMARY KEY, score SMALLINT NOT NULL, KEY(score)); +INSERT INTO t1 VALUES ('Sasha', 20), ('Matt', 20), ('Monty', 10), ('David', 10), ('Tim', 10), ('Jeremy', 10); +SELECT COUNT(*) as n, score FROM t1 GROUP BY score; n score 4 10 2 20 +drop table t1; diff --git a/mysql-test/r/sel000031.result b/mysql-test/r/sel000031.result index c1caa04a00a..d3f01ab687f 100644 --- a/mysql-test/r/sel000031.result +++ b/mysql-test/r/sel000031.result @@ -1,4 +1,12 @@ +drop table if exists t1,t2; +create table t1 (id int(10) not null unique); +create table t2 (id int(10) not null primary key, +val int(10) not null); +insert into t1 values (1),(2),(4); +insert into t2 values (1,1),(2,1),(3,1),(4,2); +select one.id, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id order by one.id; id elt(two.val,'one','two') 1 one 2 one 4 two +drop table t1,t2; diff --git a/mysql-test/r/sel000032.result b/mysql-test/r/sel000032.result index c1caa04a00a..4cca245d75b 100644 --- a/mysql-test/r/sel000032.result +++ b/mysql-test/r/sel000032.result @@ -1,4 +1,12 @@ +drop table if exists t1,t2; +create table t1 (id int(10) not null unique); +create table t2 (id int(10) not null primary key, +val int(10) not null); +insert into t1 values (1),(2),(4); +insert into t2 values (1,1),(2,1),(3,1),(4,2); +select one.id, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id; id elt(two.val,'one','two') 1 one 2 one 4 two +drop table t1,t2; diff --git a/mysql-test/r/sel000033.result b/mysql-test/r/sel000033.result index 689c94082e7..1bfafaf5b27 100644 --- a/mysql-test/r/sel000033.result +++ b/mysql-test/r/sel000033.result @@ -1,8 +1,14 @@ +drop table if exists t1; +create table t1 (id int(10) primary key); +insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9); +select id from t1 where id in (2,5,9) ; id 2 5 9 +select id from t1 where id=2 or id=5 or id=9 ; id 2 5 9 +drop table t1; diff --git a/mysql-test/r/sel000100.result b/mysql-test/r/sel000100.result index e7d8cf0e7ac..f9234815a2b 100644 --- a/mysql-test/r/sel000100.result +++ b/mysql-test/r/sel000100.result @@ -1,2 +1,28 @@ +DROP TABLE IF EXISTS t1,t2; +CREATE TABLE t1 ( +ID int(11) NOT NULL auto_increment, +NAME varchar(75) DEFAULT '' NOT NULL, +LINK_ID int(11) DEFAULT '0' NOT NULL, +PRIMARY KEY (ID), +KEY NAME (NAME), +KEY LINK_ID (LINK_ID) +); +INSERT INTO t1 (ID, NAME, LINK_ID) VALUES (1,'Mike',0); +INSERT INTO t1 (ID, NAME, LINK_ID) VALUES (2,'Jack',0); +INSERT INTO t1 (ID, NAME, LINK_ID) VALUES (3,'Bill',0); +CREATE TABLE t2 ( +ID int(11) NOT NULL auto_increment, +NAME varchar(150) DEFAULT '' NOT NULL, +PRIMARY KEY (ID), +KEY NAME (NAME) +); +SELECT DISTINCT +t2.id AS key_link_id, +t2.name AS link +FROM t1 +LEFT JOIN t2 ON t1.link_id=t2.id +GROUP BY t1.id +ORDER BY link; key_link_id link NULL NULL +drop table t1,t2; diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 33cd9048774..0c298735d8b 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -1,13 +1,1237 @@ +use test; +drop table if exists t1,t2,t3,t4; +CREATE TABLE t1 ( +Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, +Varor_period smallint(4) unsigned DEFAULT '0' NOT NULL +); +INSERT INTO t1 VALUES (9410,9412); +select period from t1; period 9410 +select * from t1; Period Varor_period 9410 9412 +select t1.* from t1; Period Varor_period 9410 9412 +CREATE TABLE t2 ( +auto int not null auto_increment, +fld1 int(6) unsigned zerofill DEFAULT '000000' NOT NULL, +companynr tinyint(2) unsigned zerofill DEFAULT '00' NOT NULL, +fld3 char(30) DEFAULT '' NOT NULL, +fld4 char(35) DEFAULT '' NOT NULL, +fld5 char(35) DEFAULT '' NOT NULL, +fld6 char(4) DEFAULT '' NOT NULL, +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 +select fld3 from t2 where fld3 like "%cultivation" ; fld3 cultivation +select t2.fld3,companynr from t2 where companynr = 57+1 order by fld3; fld3 companynr concoct 58 druggists 58 @@ -32,6 +1256,7 @@ synergy 58 thanking 58 tying 58 unlocks 58 +select fld3,companynr from t2 where companynr = 58 order by fld3; fld3 companynr concoct 58 druggists 58 @@ -56,6 +1281,7 @@ synergy 58 thanking 58 tying 58 unlocks 58 +select fld3 from t2 order by fld3 desc limit 10; fld3 youthfulness yelped @@ -67,49 +1293,71 @@ Winsett Willy willed wildcats +select fld3 from t2 order by fld3 desc limit 5; fld3 youthfulness yelped Wotan workers Witt +select fld3 from t2 order by fld3 desc limit 5,5; fld3 witchcraft Winsett Willy willed wildcats +select t2.fld3 from t2 where fld3 = 'honeysuckle'; fld3 honeysuckle +select t2.fld3 from t2 where fld3 LIKE 'honeysuckl_'; fld3 honeysuckle +select t2.fld3 from t2 where fld3 LIKE 'hon_ysuckl_'; fld3 honeysuckle +select t2.fld3 from t2 where fld3 LIKE 'honeysuckle%'; fld3 honeysuckle +select t2.fld3 from t2 where fld3 LIKE 'h%le'; fld3 honeysuckle +select t2.fld3 from t2 where fld3 LIKE 'honeysuckle_'; fld3 +select t2.fld3 from t2 where fld3 LIKE 'don_t_find_me_please%'; fld3 +explain select t2.fld3 from t2 where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra t2 ref fld3 fld3 30 const 1 where used; Using index +explain select fld3 from t2 ignore index (fld3) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra t2 index fld3 fld3 30 NULL 1199 where used; Using index +explain select fld3 from t2 use index (fld1) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra t2 index fld3 fld3 30 NULL 1199 where used; Using index +explain select fld3 from t2 use index (fld3) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra t2 ref fld3 fld3 30 const 1 where used; Using index +explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra t2 ref fld3 fld3 30 const 1 where used; Using index +explain select fld3 from t2 ignore index (fld3,not_used); +Key column 'not_used' doesn't exist in table +explain select fld3 from t2 use index (not_used); +Key column 'not_used' doesn't exist in table +select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3; fld3 honeysuckle honoring +explain select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3; table type possible_keys key key_len ref rows Extra t2 range fld3 fld3 30 NULL 2 where used; Using index +select fld1,fld3 from t2 where fld3="Colombo" or fld3 = "nondecreasing" order by fld3; fld1 fld3 148504 Colombo 068305 Colombo 000000 nondecreasing +select fld1,fld3 from t2 where companynr = 37 and fld3 = 'appendixes'; fld1 fld3 232605 appendixes 1232605 appendixes @@ -117,18 +1365,23 @@ fld1 fld3 1232607 appendixes 1232608 appendixes 1232609 appendixes +select fld1 from t2 where fld1=250501 or fld1="250502"; fld1 250501 250502 +explain select fld1 from t2 where fld1=250501 or fld1="250502"; table type possible_keys key key_len ref rows Extra t2 range fld1 fld1 4 NULL 2 where used; Using index +select fld1 from t2 where fld1=250501 or fld1=250502 or fld1 >= 250505 and fld1 <= 250601 or fld1 between 250501 and 250502; fld1 250501 250502 250505 250601 +explain select fld1 from t2 where fld1=250501 or fld1=250502 or fld1 >= 250505 and fld1 <= 250601 or fld1 between 250501 and 250502; table type possible_keys key key_len ref rows Extra t2 range fld1 fld1 4 NULL 4 where used; Using index +select fld1,fld3 from t2 where companynr = 37 and fld3 like 'f%'; fld1 fld3 218401 faithful 018007 fanatic @@ -161,21 +1414,26 @@ fld1 fld3 036002 funereal 226209 furnishings 198006 furthermore +select fld3 from t2 where fld3 like "L%" and fld3 = "ok"; fld3 +select fld3 from t2 where (fld3 like "C%" and fld3 = "Chantilly"); fld3 Chantilly +select fld1,fld3 from t2 where fld1 like "25050%"; fld1 fld3 250501 poisoning 250502 Iraqis 250503 heaving 250504 population 250505 bomb +select fld1,fld3 from t2 where fld1 like "25050_"; fld1 fld3 250501 poisoning 250502 Iraqis 250503 heaving 250504 population 250505 bomb +select distinct companynr from t2; companynr 00 37 @@ -189,6 +1447,7 @@ companynr 41 34 68 +select distinct companynr from t2 order by companynr; companynr 00 29 @@ -202,6 +1461,7 @@ companynr 58 65 68 +select distinct companynr from t2 order by companynr desc; companynr 68 65 @@ -215,6 +1475,7 @@ companynr 34 29 00 +select distinct t2.fld3,period from t2,t1 where companynr=37 and fld3 like "O%"; fld3 period obliterates 9410 offload 9410 @@ -222,6 +1483,7 @@ opaquely 9410 organizer 9410 overestimating 9410 overlay 9410 +select distinct fld3 from t2 where companynr = 34 order by fld3; fld3 absentee accessed @@ -293,6 +1555,7 @@ unexpected uprisings versatility vest +select distinct fld3 from t2 limit 10; fld3 abates abiding @@ -304,6 +1567,7 @@ accessed accruing accumulating accuracies +select distinct fld3 from t2 having fld3 like "A%" limit 10; fld3 abates abiding @@ -315,6 +1579,7 @@ accessed accruing accumulating accuracies +select distinct substring(fld3,1,3) from t2 where fld3 like "A%"; substring(fld3,1,3) aba abi @@ -378,6 +1643,7 @@ avo awe aye Azt +select distinct substring(fld3,1,3) as a from t2 having a like "A%" order by a limit 10; a aba abi @@ -389,6 +1655,7 @@ acq acu Ade adj +select distinct substring(fld3,1,3) from t2 where fld3 like "A%" limit 10; substring(fld3,1,3) aba abi @@ -400,6 +1667,7 @@ acq acu Ade adj +select distinct substring(fld3,1,3) as a from t2 having a like "A%" limit 10; a aba abi @@ -411,6 +1679,47 @@ acq acu Ade adj +create table t3 ( +period int not null, +name char(32) not null, +companynr int not null, +price double(11,0), +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; +insert into t3 select * from tmp; +insert into tmp select * from t3; +insert into t3 select * from tmp; +insert into tmp select * from t3; +insert into t3 select * from tmp; +insert into tmp select * from t3; +insert into t3 select * from tmp; +insert into tmp select * from t3; +insert into t3 select * from tmp; +insert into tmp select * from t3; +insert into t3 select * from tmp; +insert into tmp select * from t3; +insert into t3 select * from tmp; +insert into tmp select * from t3; +insert into t3 select * from tmp; +alter table t3 add t2nr int not null auto_increment primary key first; +drop table tmp; +SET OPTION SQL_BIG_TABLES=1; +select distinct concat(fld3," ",fld3) as namn from t2,t3 where t2.fld1=t3.t2nr order by namn limit 10; namn Abraham Abraham abrogating abrogating @@ -422,6 +1731,8 @@ ammonium ammonium analyzable analyzable animals animals animized animized +SET OPTION SQL_BIG_TABLES=0; +select distinct concat(fld3," ",fld3) from t2,t3 where t2.fld1=t3.t2nr order by fld3 limit 10; concat(fld3," ",fld3) Abraham Abraham abrogating abrogating @@ -433,6 +1744,7 @@ ammonium ammonium analyzable analyzable animals animals animized animized +select distinct fld5 from t2 limit 10; fld5 neat Steinberg @@ -444,6 +1756,7 @@ attainments fanatic measures rightfulness +select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 and 1 @@ -455,6 +1768,8 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 +SET OPTION SQL_BIG_TABLES=1; +select distinct fld3,count(*) from t2 group by companynr,fld3 limit 10; fld3 count(*) affixed 1 and 1 @@ -466,6 +1781,8 @@ attendants 1 bedlam 1 bedpost 1 boasted 1 +SET OPTION SQL_BIG_TABLES=0; +select distinct fld3,repeat("a",length(fld3)),count(*) from t2 group by companynr,fld3 limit 100,10; fld3 repeat("a",length(fld3)) count(*) circus aaaaaa 1 cited aaaaa 1 @@ -477,6 +1794,7 @@ cultivation aaaaaaaaaaa 1 definiteness aaaaaaaaaaaa 1 demultiplex aaaaaaaaaaa 1 disappointing aaaaaaaaaaaaa 1 +select distinct companynr,rtrim(space(512+companynr)) from t3 order by 1,2; companynr rtrim(space(512+companynr)) 37 78 @@ -485,20 +1803,28 @@ companynr rtrim(space(512+companynr)) 311 447 512 +select distinct fld3 from t2,t3 where t2.companynr = 34 and t2.fld1=t3.t2nr order by fld3; fld3 +explain select t3.t2nr,fld3 from t2,t3 where t2.companynr = 34 and t2.fld1=t3.t2nr order by t3.t2nr,fld3; table type possible_keys key key_len ref rows Extra t2 ALL fld1 NULL NULL NULL 1199 where used; Using temporary; Using filesort t3 eq_ref PRIMARY PRIMARY 4 t2.fld1 1 where used; Using index +select period from t1; period 9410 +select period from t1 where period=1900; period +select fld3,period from t1,t2 where fld1 = 011401 order by period; fld3 period breaking 9410 +select fld3,period from t2,t3 where t2.fld1 = 011401 and t2.fld1=t3.t2nr and t3.period=1001; fld3 period breaking 1001 +explain select fld3,period from t2,t3 where t2.fld1 = 011401 and t3.t2nr=t2.fld1 and 1001 = t3.period; table type possible_keys key key_len ref rows Extra t2 const fld1 fld1 4 const 1 t3 const PRIMARY,period PRIMARY 4 const 1 +select fld3,period from t2,t1 where companynr*10 = 37*10; fld3 period breaking 9410 Romans 9410 @@ -1088,6 +2414,7 @@ dusted 9410 encompasses 9410 presentation 9410 Kantian 9410 +select fld3,period,price,price2 from t2,t3 where t2.fld1=t3.t2nr and period >= 1001 and period <= 1002 and t2.companynr = 37 order by fld3,period, price; fld3 period price price2 admonishing 1002 28357832 8723648 analyzable 1002 28357832 8723648 @@ -1148,11 +2475,32 @@ ventilate 1001 5987435 234724 wallet 1001 5987435 234724 Weissmuller 1002 28357832 8723648 Wotan 1002 28357832 8723648 +select t2.fld1,fld3,period,price,price2 from t2,t3 where t2.fld1>= 18201 and t2.fld1 <= 18811 and t2.fld1=t3.t2nr and period = 1001 and t2.companynr = 37; fld1 fld3 period price price2 018201 relaxing 1001 5987435 234724 018601 vacuuming 1001 5987435 234724 018801 inch 1001 5987435 234724 018811 repetitions 1001 5987435 234724 +drop table if exists company; +create table t4 ( +companynr tinyint(2) unsigned zerofill NOT NULL default '00', +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 29 company 1 @@ -1166,6 +2514,7 @@ companynr companyname 58 company 8 65 company 9 68 company 10 +select SQL_SMALL_RESULT t2.companynr,companyname from t4,t2 where t2.companynr=t4.companynr group by t2.companynr; companynr companyname 00 Unknown 29 company 1 @@ -1179,8 +2528,10 @@ companynr companyname 58 company 8 65 company 9 68 company 10 +select * from t1,t1 t12; Period Varor_period Period Varor_period 9410 9412 9410 9412 +select t2.fld1,t22.fld1 from t2,t2 t22 where t2.fld1 >= 250501 and t2.fld1 <= 250505 and t22.fld1 >= 250501 and t22.fld1 <= 250505; fld1 fld1 250501 250501 250502 250501 @@ -1207,44 +2558,58 @@ fld1 fld1 250503 250505 250504 250505 250505 250505 +select t2.companynr,companyname from t2 left join t4 using (companynr) where t4.companynr is null; companynr companyname +explain select t2.companynr,companyname from t2 left join t4 using (companynr) where t4.companynr is null; table type possible_keys key key_len ref rows Extra t2 ALL NULL NULL NULL NULL 1199 t4 eq_ref PRIMARY PRIMARY 1 test.t2.companynr 1 where used; Not exists +explain select t2.companynr,companyname from t4 left join t2 using (companynr) where t2.companynr is null; table type possible_keys key key_len ref rows Extra t4 ALL NULL NULL NULL NULL 12 t2 ALL NULL NULL NULL NULL 1199 where used; Not exists +select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.companynr+1; companynr companynr 37 36 41 40 +explain select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.companynr+1; table type possible_keys key key_len ref rows Extra t2 ALL NULL NULL NULL NULL 1199 Using temporary t4 index NULL PRIMARY 1 NULL 12 where used; Using index +select t2.fld1,t2.companynr,fld3,period from t3,t2 where t2.fld1 = 38208 and t2.fld1=t3.t2nr and period = 1008 or t2.fld1 = 38008 and t2.fld1 =t3.t2nr and period = 1008; fld1 companynr fld3 period 038008 37 reporters 1008 038208 37 Selfridge 1008 +select t2.fld1,t2.companynr,fld3,period from t3,t2 where (t2.fld1 = 38208 or t2.fld1 = 38008) and t2.fld1=t3.t2nr and period>=1008 and period<=1009; fld1 companynr fld3 period 038008 37 reporters 1008 038208 37 Selfridge 1008 +select t2.fld1,t2.companynr,fld3,period from t3,t2 where (t3.t2nr = 38208 or t3.t2nr = 38008) and t2.fld1=t3.t2nr and period>=1008 and period<=1009; fld1 companynr fld3 period 038008 37 reporters 1008 038208 37 Selfridge 1008 +select period from t1 where (((period > 0) or period < 10000 or (period = 1900)) and (period=1900 and period <= 1901) or (period=1903 and (period=1903)) and period>=1902) or ((period=1904 or period=1905) or (period=1906 or period>1907)) or (period=1908 and period = 1909); period 9410 +select period from t1 where ((period > 0 and period < 1) or (((period > 0 and period < 100) and (period > 10)) or (period > 10)) or (period > 0 and (period > 5 or period > 6))); period 9410 +select a.fld1 from t2 as a,t2 b where ((a.fld1 = 250501 and a.fld1=b.fld1) or a.fld1=250502 or a.fld1=250503 or (a.fld1=250505 and a.fld1<=b.fld1 and b.fld1>=a.fld1)) and a.fld1=b.fld1; fld1 250501 250502 250503 250505 +select fld1 from t2 where fld1 in (250502,98005,98006,250503,250605,250606) and fld1 >=250502 and fld1 not in (250605,250606); fld1 250502 250503 +select fld1 from t2 where fld1 between 250502 and 250504; fld1 250502 250503 250504 +select fld3 from t2 where (((fld3 like "_%L%" ) or (fld3 like "%ok%")) and ( fld3 like "L%" or fld3 like "G%")) and fld3 like "L%" ; fld3 label labeled @@ -1255,8 +2620,10 @@ leaflet lewdly Lillian luckily +select count(*) from t1; count(*) 1 +select companynr,count(*),sum(fld1) from t2 group by companynr; companynr count(*) sum(fld1) 00 82 10355753 29 95 14473298 @@ -1270,18 +2637,22 @@ companynr count(*) sum(fld1) 58 23 2254293 65 10 2284055 68 12 3097288 +select companynr,count(*) from t2 group by companynr order by companynr desc limit 5; companynr count(*) 68 12 65 10 58 23 53 4 50 11 +select count(*),min(fld4),max(fld4),sum(fld1),avg(fld1),std(fld1) from t2 where companynr = 34 and fld4<>""; count(*) min(fld4) max(fld4) sum(fld1) avg(fld1) std(fld1) 70 absentee vest 17788966 254128.0857 3272.5940 +select companynr,count(*),min(fld4),max(fld4),sum(fld1),avg(fld1),std(fld1) from t2 group by companynr limit 3; companynr count(*) min(fld4) max(fld4) sum(fld1) avg(fld1) std(fld1) 00 82 Anthony windmills 10355753 126289.6707 115550.9757 29 95 abut wetness 14473298 152350.5053 8368.5480 34 70 absentee vest 17788966 254128.0857 3272.5940 +select companynr,t2nr,count(price),sum(price),min(price),max(price),avg(price) from t3 where companynr = 37 group by companynr,t2nr limit 10; companynr t2nr count(price) sum(price) min(price) max(price) avg(price) 37 1 1 5987435 5987435 5987435 5987435.0000 37 2 1 28357832 28357832 28357832 28357832.0000 @@ -1293,6 +2664,7 @@ companynr t2nr count(price) sum(price) min(price) max(price) avg(price) 37 22 1 28357832 28357832 28357832 28357832.0000 37 23 1 39654943 39654943 39654943 39654943.0000 37 31 1 5987435 5987435 5987435 5987435.0000 +select /*! SQL_SMALL_RESULT */ companynr,t2nr,count(price),sum(price),min(price),max(price),avg(price) from t3 where companynr = 37 group by companynr,t2nr limit 10; companynr t2nr count(price) sum(price) min(price) max(price) avg(price) 37 1 1 5987435 5987435 5987435 5987435.0000 37 2 1 28357832 28357832 28357832 28357832.0000 @@ -1304,6 +2676,7 @@ companynr t2nr count(price) sum(price) min(price) max(price) avg(price) 37 22 1 28357832 28357832 28357832 28357832.0000 37 23 1 39654943 39654943 39654943 39654943.0000 37 31 1 5987435 5987435 5987435 5987435.0000 +select companynr,count(price),sum(price),min(price),max(price),avg(price) from t3 group by companynr ; companynr count(price) sum(price) min(price) max(price) avg(price) 37 12543 309394878010 5987435 39654943 24666736.6667 78 8362 414611089292 726498 98439034 49582766.0000 @@ -1312,6 +2685,7 @@ companynr count(price) sum(price) min(price) max(price) avg(price) 311 4181 979599938 234298 234298 234298.0000 447 4181 9929180954 2374834 2374834 2374834.0000 512 4181 3288532102 786542 786542 786542.0000 +select distinct mod(companynr,10) from t4 group by companynr; mod(companynr,10) 0 9 @@ -1322,10 +2696,13 @@ mod(companynr,10) 3 8 5 +select distinct 1 from t4 group by companynr; 1 1 +select count(distinct fld1) from t2; count(distinct fld1) 1199 +select companynr,count(distinct fld1) from t2 group by companynr; companynr count(distinct fld1) 00 82 29 95 @@ -1339,6 +2716,7 @@ companynr count(distinct fld1) 58 23 65 10 68 12 +select companynr,count(*) from t2 group by companynr; companynr count(*) 00 82 29 95 @@ -1352,6 +2730,7 @@ companynr count(*) 58 23 65 10 68 12 +select companynr,count(distinct concat(fld1,repeat(65,1000))) from t2 group by companynr; companynr count(distinct concat(fld1,repeat(65,1000))) 00 82 29 95 @@ -1365,6 +2744,7 @@ companynr count(distinct concat(fld1,repeat(65,1000))) 58 23 65 10 68 12 +select companynr,count(distinct concat(fld1,repeat(65,200))) from t2 group by companynr; companynr count(distinct concat(fld1,repeat(65,200))) 00 82 29 95 @@ -1378,6 +2758,7 @@ companynr count(distinct concat(fld1,repeat(65,200))) 58 23 65 10 68 12 +select companynr,count(distinct floor(fld1/100)) from t2 group by companynr; companynr count(distinct floor(fld1/100)) 00 47 29 35 @@ -1391,6 +2772,7 @@ companynr count(distinct floor(fld1/100)) 58 1 65 1 68 1 +select companynr,count(distinct concat(repeat(65,1000),floor(fld1/100))) from t2 group by companynr; companynr count(distinct concat(repeat(65,1000),floor(fld1/100))) 00 47 29 35 @@ -1404,16 +2786,22 @@ companynr count(distinct concat(repeat(65,1000),floor(fld1/100))) 58 1 65 1 68 1 +select sum(fld1),fld3 from t2 where fld3="Romans" group by fld1 limit 10; sum(fld1) fld3 11402 Romans +select name,count(*) from t3 where name='cloakroom' group by name; name count(*) cloakroom 4181 +select name,count(*) from t3 where name='cloakroom' and price>10 group by name; name count(*) cloakroom 4181 +select count(*) from t3 where name='cloakroom' and price2=823742; count(*) 4181 +select name,count(*) from t3 where name='cloakroom' and price2=823742 group by name; name count(*) cloakroom 4181 +select name,count(*) from t3 where name >= "extramarital" and price <= 39654943 group by name; name count(*) extramarital 4181 gazer 4181 @@ -1422,8 +2810,10 @@ Iranizes 4181 spates 4181 tucked 4181 violinist 4181 +select t2.fld3,count(*) from t2,t3 where t2.fld1=158402 and t3.name=t2.fld3 group by t3.name; fld3 count(*) spates 4181 +select companynr|0,companyname from t4 group by 1; companynr|0 companyname 0 Unknown 29 company 1 @@ -1437,6 +2827,7 @@ companynr|0 companyname 58 company 8 65 company 9 68 company 10 +select t2.companynr,companyname,count(*) from t2,t4 where t2.companynr=t4.companynr group by t2.companynr order by companyname; companynr companyname count(*) 29 company 1 95 68 company 10 12 @@ -1450,10 +2841,13 @@ companynr companyname count(*) 58 company 8 23 65 company 9 10 00 Unknown 82 +select t2.fld1,count(*) from t2,t3 where t2.fld1=158402 and t3.name=t2.fld3 group by t3.name; fld1 count(*) 158402 4181 +select sum(Period)/count(*) from t1; sum(Period)/count(*) 9410.00 +select companynr,count(price) as "count",sum(price) as "sum" ,abs(sum(price)/count(price)-avg(price)) as "diff",(0+count(price))*companynr as func from t3 group by companynr; companynr count sum diff func 37 12543 309394878010 0.0000 464091 78 8362 414611089292 0.0000 652236 @@ -1462,8 +2856,10 @@ companynr count sum diff func 311 4181 979599938 0.0000 1300291 447 4181 9929180954 0.0000 1868907 512 4181 3288532102 0.0000 2140672 +select companynr,sum(price)/count(price) as avg from t3 group by companynr having avg > 70000000 order by avg; companynr avg 154 983543950.00 +select companynr,count(*) from t2 group by companynr order by 2 desc; companynr count(*) 37 588 36 215 @@ -1477,6 +2873,7 @@ companynr count(*) 50 11 65 10 53 4 +select companynr,count(*) from t2 where companynr > 40 group by companynr order by 2 desc; companynr count(*) 41 52 58 23 @@ -1484,6 +2881,7 @@ companynr count(*) 50 11 65 10 53 4 +select t2.fld4,t2.fld1,count(price),sum(price),min(price),max(price),avg(price) from t3,t2 where t3.companynr = 37 and t2.fld1 = t3.t2nr group by fld1,t2.fld4; fld4 fld1 count(price) sum(price) min(price) max(price) avg(price) teethe 000001 1 5987435 5987435 5987435 5987435.0000 dreaded 011401 1 5987435 5987435 5987435 5987435.0000 @@ -1572,6 +2970,7 @@ partridges 038103 1 39654943 39654943 39654943 39654943.0000 recruited 038201 1 5987435 5987435 5987435 5987435.0000 dimensions 038202 1 28357832 28357832 28357832 28357832.0000 Chicana 038203 1 39654943 39654943 39654943 39654943.0000 +select t3.companynr,fld3,sum(price) from t3,t2 where t2.fld1 = t3.t2nr and t3.companynr = 512 group by companynr,fld3; companynr fld3 sum(price) 512 boat 786542 512 capably 786542 @@ -1583,11 +2982,13 @@ companynr fld3 sum(price) 512 Micronesia 786542 512 Miles 786542 512 skies 786542 +select t2.companynr,count(*),min(fld3),max(fld3),sum(price),avg(price) from t2,t3 where t3.companynr >= 30 and t3.companynr <= 58 and t3.t2nr = t2.fld1 and 1+1=2 group by t2.companynr; companynr count(*) min(fld3) max(fld3) sum(price) avg(price) 00 1 Omaha Omaha 5987435 5987435.0000 36 1 dubbed dubbed 28357832 28357832.0000 37 83 Abraham Wotan 1908978016 22999735.1325 50 2 scribbled tapestry 68012775 34006387.5000 +select t3.companynr+0,t3.t2nr,fld3,sum(price) from t3,t2 where t2.fld1 = t3.t2nr and t3.companynr = 37 group by 1,t3.t2nr,fld3,fld3,fld3,fld3,fld3 order by fld1; t3.companynr+0 t2nr fld3 sum(price) 37 1 Omaha 5987435 37 11401 breaking 5987435 @@ -1676,32 +3077,41 @@ t3.companynr+0 t2nr fld3 sum(price) 37 38201 resumes 5987435 37 38202 analyzable 28357832 37 38203 terminator 39654943 +select sum(price) from t3,t2 where t2.fld1 = t3.t2nr and t3.companynr = 512 and t3.t2nr = 38008 and t2.fld1 = 38008 or t2.fld1= t3.t2nr and t3.t2nr = 38008 and t2.fld1 = 38008; sum(price) 234298 +select t2.fld1,sum(price) from t3,t2 where t2.fld1 = t3.t2nr and t3.companynr = 512 and t3.t2nr = 38008 and t2.fld1 = 38008 or t2.fld1 = t3.t2nr and t3.t2nr = 38008 and t2.fld1 = 38008 or t3.t2nr = t2.fld1 and t2.fld1 = 38008 group by t2.fld1; fld1 sum(price) 038008 234298 +explain select fld3 from t2 where 1>2 or 2>3; Comment Impossible WHERE +explain select fld3 from t2 where fld1=fld1; table type possible_keys key key_len ref rows Extra t2 ALL NULL NULL NULL NULL 1199 +select companynr,fld1 from t2 HAVING fld1=250501 or fld1=250502; companynr fld1 34 250501 34 250502 +select companynr,fld1 from t2 WHERE fld1>=250501 HAVING fld1<=250502; companynr fld1 34 250501 34 250502 +select companynr,count(*) as count,sum(fld1) as sum from t2 group by companynr having count > 40 and sum/count >= 120000; companynr count sum 00 82 10355753 29 95 14473298 34 70 17788966 37 588 83602098 41 52 12816335 +select companynr from t2 group by companynr having count(*) > 40 and sum(fld1)/count(*) >= 120000 ; companynr 00 29 34 37 41 +select t2.companynr,companyname,count(*) from t2,t4 where t2.companynr=t4.companynr group by companyname having t2.companynr >= 40; companynr companyname count(*) 68 company 10 12 50 company 11 11 @@ -1710,26 +3120,37 @@ companynr companyname count(*) 53 company 7 4 58 company 8 23 65 company 9 10 +select count(*) from t2; count(*) 1199 +select count(*) from t2 where fld1 < 098024; count(*) 387 +select min(fld1) from t2 where fld1>= 098024; min(fld1) 98024 +select max(fld1) from t2 where fld1>= 098024; max(fld1) 1232609 +select count(*) from t3 where price2=76234234; count(*) 4181 +select count(*) from t3 where companynr=512 and price2=76234234; count(*) 4181 +explain select min(fld1),max(fld1),count(*) from t2; Comment Select tables optimized away +select min(fld1),max(fld1),count(*) from t2; min(fld1) max(fld1) count(*) 0 1232609 1199 +select min(t2nr),max(t2nr) from t3 where t2nr=2115 and price2=823742; min(t2nr) max(t2nr) 2115 2115 +select count(*),min(t2nr),max(t2nr) from t3 where name='spates' and companynr=78; count(*) min(t2nr) max(t2nr) 4181 4 41804 +select t2nr,count(*) from t3 where name='gems' group by t2nr limit 20; t2nr count(*) 9 1 19 1 @@ -1751,29 +3172,41 @@ t2nr count(*) 179 1 189 1 199 1 +select max(t2nr) from t3 where price=983543950; max(t2nr) 41807 +select t1.period from t3 = t1 limit 1; period 1001 +select t1.period from t1 as t1 limit 1; period 9410 +select t1.period as "Nuvarande period" from t1 as t1 limit 1; Nuvarande period 9410 +select period as ok_period from t1 limit 1; ok_period 9410 +select period as ok_period from t1 group by ok_period limit 1; ok_period 9410 +select 1+1 as summa from t1 group by summa limit 1; summa 2 +select period as "Nuvarande period" from t1 group by "Nuvarande period" limit 1; Nuvarande period 9410 +show tables; Tables_in_test t1 t2 t3 t4 +show tables from test like "s%"; Tables_in_test (s%) +show tables from test like "t?"; Tables_in_test (t?) +show full columns from t2; Field Type Null Key Default Extra Privileges auto int(11) PRI NULL auto_increment select,insert,update,references fld1 int(6) unsigned zerofill UNI 000000 select,insert,update,references @@ -1782,14 +3215,18 @@ fld3 char(30) MUL select,insert,update,references fld4 char(35) select,insert,update,references fld5 char(35) select,insert,update,references fld6 char(4) select,insert,update,references +show full columns from t2 from test like 'f%'; Field Type Null Key Default Extra Privileges fld1 int(6) unsigned zerofill UNI 000000 select,insert,update,references fld3 char(30) MUL select,insert,update,references fld4 char(35) select,insert,update,references fld5 char(35) select,insert,update,references fld6 char(4) select,insert,update,references +show full columns from t2 from test like 's%'; Field Type Null Key Default Extra Privileges +show keys from t2; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t2 0 PRIMARY 1 auto A 1199 NULL NULL t2 0 fld1 1 fld1 A 1199 NULL NULL t2 1 fld3 1 fld3 A NULL NULL NULL +drop table t4, t3,t2, t1; diff --git a/mysql-test/r/select_found.result b/mysql-test/r/select_found.result index b3fa281e76d..2fab1642cc5 100644 --- a/mysql-test/r/select_found.result +++ b/mysql-test/r/select_found.result @@ -1,3 +1,7 @@ +drop table if exists t1; +create table t1 (a int not null auto_increment, b int not null, primary key(a)); +insert into t1 (b) values (2),(3),(5),(5),(5),(6),(7),(9); +select SQL_CALC_FOUND_ROWS * from t1; a b 1 2 2 3 @@ -7,25 +11,37 @@ a b 6 6 7 7 8 9 +select found_rows(); FOUND_ROWS() 8 +select SQL_CALC_FOUND_ROWS * from t1 limit 1; a b 1 2 +select found_rows(); FOUND_ROWS() 8 +select SQL_CALC_FOUND_ROWS * from t1 order by b desc limit 1; a b 8 9 +select found_rows(); FOUND_ROWS() 8 +select SQL_CALC_FOUND_ROWS distinct b from t1 limit 1; b 2 +select found_rows(); FOUND_ROWS() 6 +select SQL_CALC_FOUND_ROWS b,count(*) as c from t1 group by b order by c desc limit 1; b c 5 3 +select found_rows(); FOUND_ROWS() 6 +select SQL_CALC_FOUND_ROWS * from t1 left join t1 as t2 on (t1.b=t2.a) limit 2,1; a b a b 3 5 5 5 +select found_rows(); FOUND_ROWS() 8 +drop table t1; diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result index 1111ba00cd9..e225a0e3995 100644 --- a/mysql-test/r/select_safe.result +++ b/mysql-test/r/select_safe.result @@ -1,10 +1,39 @@ +drop table if exists t1; +SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=4, SQL_MAX_JOIN_SIZE=9; +create table t1 (a int primary key, b char(20)); +insert into t1 values(1,"test"); +SELECT SQL_BUFFER_RESULT * from t1; a b 1 test +update t1 set b="a" where a=1; +delete from t1 where a=1; +insert into t1 values(1,"test"),(2,"test2"); +SELECT SQL_BUFFER_RESULT * from t1; a b 1 test 2 test2 +update t1 set b="a" where a=1; +select 1 from t1,t1 as t2,t1 as t3,t1 as t4; 1 1 1 1 1 +update t1 set b="a"; +You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column +update t1 set b="a" where b="test"; +You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column +delete from t1; +You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column +delete from t1 where b="test"; +You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column +delete from t1 where a+0=1; +You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column +select 1 from t1,t1 as t2,t1 as t3,t1 as t4,t1 as t5; +The SELECT would examine too many records and probably take a very long time. Check your WHERE and use SET OPTION SQL_BIG_SELECTS=1 if the SELECT is ok +update t1 set b="a" limit 1; +update t1 set b="a" where b="b" limit 2; +delete from t1 where b="test" limit 1; +delete from t1 where a+0=1 limit 2; +drop table t1; +SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, SQL_MAX_JOIN_SIZE=DEFAULT; diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index a8be3f04249..f66bf22b224 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -1,95 +1,145 @@ -Table Op Msg_type Msg_text -test.t1 optimize status OK -Table Op Msg_type Msg_text -test.t1 check status OK -test.t2 check error The handler for the table doesn't support check/repair -Table Op Msg_type Msg_text -test.t1 repair status OK -test.t2 repair error The handler for the table doesn't support check/repair -Table Op Msg_type Msg_text -test.t2 check error The handler for the table doesn't support check/repair -test.t1 check status OK -Table Op Msg_type Msg_text -test.t2 check error Table 't2' was not locked with LOCK TABLES -test.t1 check status OK -Field Type Null Key Default Extra -a int(11) PRI 0 -b int(11) MUL 0 -c int(11) 0 -Field Type Null Key Default Extra Privileges -a int(11) PRI 0 select,insert,update,references -b int(11) MUL 0 select,insert,update,references -c int(11) 0 select,insert,update,references -Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment -t1 0 PRIMARY 1 a A 4 NULL NULL -t1 1 b 1 b A 1 NULL NULL -t1 1 b 2 c A 4 NULL NULL +drop table if exists t1,t2; +create table t1 (a int not null primary key, b int not null,c int not null, key(b,c)); +insert into t1 values (1,2,2),(2,2,3),(3,2,4),(4,2,4); +check table t1 type=fast; Table Op Msg_type Msg_text test.t1 check status Table is already up to date +check table t1 type=fast; Table Op Msg_type Msg_text test.t1 check status Table is already up to date +check table t1 type=changed; Table Op Msg_type Msg_text test.t1 check status OK +insert into t1 values (5,5,5); +check table t1 type=changed; Table Op Msg_type Msg_text test.t1 check status OK +check table t1 type=medium; Table Op Msg_type Msg_text test.t1 check status OK +check table t1 type=extended; Table Op Msg_type Msg_text test.t1 check status OK +show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 a A 5 NULL NULL t1 1 b 1 b A 1 NULL NULL t1 1 b 2 c A 5 NULL NULL +insert into t1 values (5,5,5); +Duplicate entry '5' for key 1 +optimize table t1; Table Op Msg_type Msg_text test.t1 optimize status OK +optimize table t1; Table Op Msg_type Msg_text test.t1 optimize status Table is already up to date +drop table t1; +show variables like "wait_timeout%"; Variable_name Value wait_timeout 28800 +show variables like "this_doesn't_exists%"; Variable_name Value +show table status from test like "this_doesn't_exists%"; Name Type Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Create_options Comment +show databases; Database mysql test +show databases like "test%"; Database (test%) test +create table t1 (f1 int not null, f2 int not null, f3 int not null, f4 int not null, primary key(f1,f2,f3,f4)); +insert into t1 values (1,1,1,0),(1,1,2,0),(1,1,3,0),(1,2,1,0),(1,2,2,0),(1,2,3,0),(1,3,1,0),(1,3,2,0),(1,3,3,0),(1,1,1,1),(1,1,2,1),(1,1,3,1),(1,2,1,1),(1,2,2,1),(1,2,3,1),(1,3,1,1),(1,3,2,1),(1,3,3,1); +analyze table t1; Table Op Msg_type Msg_text test.t1 analyze status OK +show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 f1 A 1 NULL NULL t1 0 PRIMARY 2 f2 A 3 NULL NULL t1 0 PRIMARY 3 f3 A 9 NULL NULL t1 0 PRIMARY 4 f4 A 18 NULL NULL +repair table t1; Table Op Msg_type Msg_text test.t1 repair status OK +show index from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 f1 A 1 NULL NULL t1 0 PRIMARY 2 f2 A 3 NULL NULL t1 0 PRIMARY 3 f3 A 9 NULL NULL t1 0 PRIMARY 4 f4 A 18 NULL NULL +drop table t1; +create temporary table t1 (a int not null); +show create table t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( `a` int(11) NOT NULL default '0' ) TYPE=MyISAM +alter table t1 rename t2; +show create table t2; Table Create Table t2 CREATE TEMPORARY TABLE `t2` ( `a` int(11) NOT NULL default '0' ) TYPE=MyISAM +drop table t2; +create table t1 ( +test_set set( 'val1', 'val2', 'val3' ) not null default '', +name char(20) default 'O''Brien' + ) comment = 'it\'s a table' ; +show create table t1 ; Table Create Table t1 CREATE TABLE `t1` ( `test_set` set('val1','val2','val3') NOT NULL default '', `name` char(20) default 'O''Brien' ) TYPE=MyISAM COMMENT='it''s a table' +drop table t1; +create table t1 (a int not null, unique aa (a)); +show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL default '0', UNIQUE KEY `aa` (`a`) ) TYPE=MyISAM +drop table t1; +create table t1 (a int not null, primary key (a)); +show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL default '0', PRIMARY KEY (`a`) ) TYPE=MyISAM +drop table t1; +flush tables; +show open tables; Database Table In_use Name_locked +create table t1(n int); +insert into t1 values (1); +show open tables; Database Table In_use Name_locked test t1 0 0 +drop table t1; +create table t1 (a int not null, b VARCHAR(10), INDEX (b) ) AVG_ROW_LENGTH=10 CHECKSUM=1 COMMENT="test" TYPE=MYISAM MIN_ROWS=10 MAX_ROWS=100 PACK_KEYS=1 DELAY_KEY_WRITE=1 ROW_FORMAT=fixed; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL default '0', + `b` char(10) default NULL, + KEY `b` (`b`) +) TYPE=MyISAM MIN_ROWS=10 MAX_ROWS=100 AVG_ROW_LENGTH=10 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=FIXED COMMENT='test' +alter table t1 MAX_ROWS=200 ROW_FORMAT=dynamic PACK_KEYS=0; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL default '0', + `b` varchar(10) default NULL, + KEY `b` (`b`) +) TYPE=MyISAM MIN_ROWS=10 MAX_ROWS=200 AVG_ROW_LENGTH=10 PACK_KEYS=0 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC COMMENT='test' +ALTER TABLE t1 AVG_ROW_LENGTH=0 CHECKSUM=0 COMMENT="" MIN_ROWS=0 MAX_ROWS=0 PACK_KEYS=DEFAULT DELAY_KEY_WRITE=0 ROW_FORMAT=default; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL default '0', + `b` varchar(10) default NULL, + KEY `b` (`b`) +) TYPE=MyISAM +drop table t1; diff --git a/mysql-test/r/slave-running.result b/mysql-test/r/slave-running.result index 794d0935ef4..3699390a7d3 100644 --- a/mysql-test/r/slave-running.result +++ b/mysql-test/r/slave-running.result @@ -1,2 +1,3 @@ +show status like 'Slave_running'; Variable_name Value Slave_running ON diff --git a/mysql-test/r/slave-stopped.result b/mysql-test/r/slave-stopped.result index 29ab2ac73e4..90b416b7bd7 100644 --- a/mysql-test/r/slave-stopped.result +++ b/mysql-test/r/slave-stopped.result @@ -1,2 +1,3 @@ +show status like 'Slave_running'; Variable_name Value Slave_running OFF diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index 8f3ad3e0d59..3ef6cec32b3 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -1,6 +1,19 @@ +flush status; +show status like 'Table_lock%'; Variable_name Value Table_locks_immediate 0 Table_locks_waited 0 +SET SQL_LOG_BIN=0; +drop table if exists t1; +create table t1(n int) type=myisam; +insert into t1 values(1); +lock tables t1 read; +unlock tables; +lock tables t1 read; +update t1 set n = 3; +unlock tables; +show status like 'Table_lock%'; Variable_name Value Table_locks_immediate 3 Table_locks_waited 1 +drop table t1; diff --git a/mysql-test/r/symlink.result b/mysql-test/r/symlink.result index 71e8f79b890..3f8132d2296 100644 --- a/mysql-test/r/symlink.result +++ b/mysql-test/r/symlink.result @@ -1,9 +1,39 @@ +drop table if exists t1,t2,t7,t8,t9; +create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)); +create table t2 (a int not null auto_increment, b char(16) not null, primary key (a)); +insert into t1 (b) values ("test"),("test1"),("test2"),("test3"); +insert into t2 (b) select b from t1; +insert into t1 (b) select b from t2; +insert into t2 (b) select b from t1; +insert into t1 (b) select b from t2; +insert into t2 (b) select b from t1; +insert into t1 (b) select b from t2; +insert into t2 (b) select b from t1; +insert into t1 (b) select b from t2; +insert into t2 (b) select b from t1; +insert into t1 (b) select b from t2; +insert into t2 (b) select b from t1; +insert into t1 (b) select b from t2; +insert into t2 (b) select b from t1; +insert into t1 (b) select b from t2; +insert into t2 (b) select b from t1; +insert into t1 (b) select b from t2; +insert into t2 (b) select b from t1; +insert into t1 (b) select b from t2; +drop table t2; + create table t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam data directory="/home/sasha/bk/mysql-4.0/mysql-test/var/tmp" index directory="/home/sasha/bk/mysql-4.0/mysql-test/var/run"; +insert into t9 select * from t1; +check table t9; Table Op Msg_type Msg_text test.t9 check status OK +optimize table t9; Table Op Msg_type Msg_text test.t9 optimize status OK +repair table t9; Table Op Msg_type Msg_text test.t9 repair status OK +alter table t9 add column c int not null; +show create table t9; Table Create Table t9 CREATE TABLE `t9` ( `a` int(11) NOT NULL auto_increment, @@ -11,8 +41,27 @@ t9 CREATE TABLE `t9` ( `c` int(11) NOT NULL default '0', PRIMARY KEY (`a`) ) TYPE=MyISAM +alter table t9 rename t8, add column d int not null; +alter table t8 rename t7; +rename table t7 to t9; +drop table t1; +create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam data directory="tmp"; +Incorrect table name 'tmp' +drop database if exists test_mysqltest; +create database test_mysqltest; +create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="/this-dir-does-not-exist"; +Can't create/write to file '/this-dir-does-not-exist/t9.MYI' (Errcode: 2) +create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="not-hard-path"; +Incorrect table name 'not-hard-path' + create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam index directory="/home/sasha/bk/mysql-4.0/mysql-test/var/run"; +Can't create/write to file '/home/sasha/bk/mysql-4.0/mysql-test/var/run/t9.MYI' (Errcode: 17) + create table test_mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) type=myisam data directory="/home/sasha/bk/mysql-4.0/mysql-test/var/tmp"; +Can't create/write to file '/home/sasha/bk/mysql-4.0/mysql-test/var/tmp/t9.MYD' (Errcode: 17) +alter table t9 rename test_mysqltest.t9; +select count(*) from test_mysqltest.t9; count(*) 16724 +show create table test_mysqltest.t9; Table Create Table t9 CREATE TABLE `t9` ( `a` int(11) NOT NULL auto_increment, @@ -21,3 +70,4 @@ t9 CREATE TABLE `t9` ( `d` int(11) NOT NULL default '0', PRIMARY KEY (`a`) ) TYPE=MyISAM +drop database test_mysqltest; diff --git a/mysql-test/r/tablelock.result b/mysql-test/r/tablelock.result index 4fbeac979b1..2ffd8f928a9 100644 --- a/mysql-test/r/tablelock.result +++ b/mysql-test/r/tablelock.result @@ -1,12 +1,48 @@ +drop table if exists t1,t2; +create table t1 ( n int auto_increment primary key); +lock tables t1 write; +insert into t1 values(NULL); +unlock tables; +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +lock tables t1 write, t1 as t0 read; +insert into t1 values(NULL); +unlock tables; +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +lock tables t1 write, t1 as t0 read, t1 as t2 read; +insert into t1 values(NULL); +unlock tables; +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +lock tables t1 write, t1 as t0 write, t1 as t2 read; +insert into t1 values(NULL); +unlock tables; +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +lock tables t1 write, t1 as t0 write, t1 as t2 read, t1 as t3 read; +insert into t1 values(NULL); +unlock tables; +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +lock tables t1 write, t1 as t0 write, t1 as t2 write; +insert into t1 values(NULL); +unlock tables; +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +drop table t1; +CREATE TABLE t1 (a int); +CREATE TABLE t2 (a int); +lock tables t1 write,t1 as b write, t2 write, t2 as c read; +drop table t1,t2; +CREATE TABLE t1 (a int); +CREATE TABLE t2 (a int); +lock tables t1 write,t1 as b write, t2 write, t2 as c read; +drop table t2,t1; +unlock tables; diff --git a/mysql-test/r/temp_table.result b/mysql-test/r/temp_table.result index 12e76bba3f7..84a00bfea34 100644 --- a/mysql-test/r/temp_table.result +++ b/mysql-test/r/temp_table.result @@ -1,30 +1,74 @@ +drop table if exists t1,t2; +CREATE TABLE t1 (c int not null, d char (10) not null); +insert into t1 values(1,""),(2,"a"),(3,"b"); +CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null); +insert into t1 values(4,"e"),(5,"f"),(6,"g"); +alter table t1 rename t2; +select * from t1; c d 1 2 a 3 b +select * from t2; a b 4 e 5 f 6 g +CREATE TABLE t2 (x int not null, y int not null); +alter table t2 rename t1; +select * from t1; a b 4 e 5 f 6 g +create TEMPORARY TABLE t2 type=heap select * from t1; +create TEMPORARY TABLE IF NOT EXISTS t2 (a int) type=heap; +CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null); +Table 't1' already exists +ALTER TABLE t1 RENAME t2; +Table 't2' already exists +select * from t2; a b 4 e 5 f 6 g +alter table t2 add primary key (a,b); +drop table t1,t2; +select * from t1; c d 1 2 a 3 b +drop table t2; +create temporary table t1 select *,2 as "e" from t1; +select * from t1; c d e 1 2 2 a 2 3 b 2 +drop table t1; +drop table t1; +drop table if exists t1; +CREATE TABLE t1 (pkCrash INTEGER PRIMARY KEY,strCrash VARCHAR(255)); +INSERT INTO t1 ( pkCrash, strCrash ) VALUES ( 1, '1'); +SELECT CONCAT_WS(pkCrash, strCrash) FROM t1; CONCAT_WS(pkCrash, strCrash) 1 +drop table t1; +create temporary table t1 select 1 as 'x'; +drop table t1; +CREATE TABLE t1 (x INT); +INSERT INTO t1 VALUES (1), (2), (3); +CREATE TEMPORARY TABLE tmp SELECT *, NULL FROM t1; +drop table t1; +create temporary table t1 (id int(10) not null unique); +create temporary table t2 (id int(10) not null primary key, +val int(10) not null); +insert into t1 values (1),(2),(4); +insert into t2 values (1,1),(2,1),(3,1),(4,2); +select one.id, two.val, elt(two.val,'one','two') from t1 one, t2 two where two.id=one.id order by one.id; id val elt(two.val,'one','two') 1 1 one 2 1 one 4 2 two +drop table t1,t2; diff --git a/mysql-test/r/truncate.result b/mysql-test/r/truncate.result index e091bb8c73a..79471611638 100644 --- a/mysql-test/r/truncate.result +++ b/mysql-test/r/truncate.result @@ -1,5 +1,16 @@ +create table t1 (a integer, b integer,c1 CHAR(10)); +insert into t1 (a) values (1),(2); +truncate table t1; +select count(*) from t1; count(*) 0 +insert into t1 values(1,2,"test"); +select count(*) from t1; count(*) 1 +delete from t1; +select * from t1; a b c1 +drop table t1; +select count(*) from t1; +Table 'test.t1' doesn't exist diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result index bc80ba38452..2047eed6227 100644 --- a/mysql-test/r/type_blob.result +++ b/mysql-test/r/type_blob.result @@ -1,5 +1,12 @@ +drop table if exists t1,t2,t3,t4,t5,t6,t7; +create table t1 (nr int(5) not null auto_increment,b blob,str char(10), primary key (nr)); +insert into t1 values (null,"a","A"); +insert into t1 values (null,"bbb","BBB"); +insert into t1 values (null,"ccc","CCC"); +select last_insert_id(); last_insert_id() 3 +select * from t1,t1 as t2; nr b str nr b str 1 a A 1 a A 2 bbb BBB 1 a A @@ -10,54 +17,88 @@ nr b str nr b str 1 a A 3 ccc CCC 2 bbb BBB 3 ccc CCC 3 ccc CCC 3 ccc CCC +drop table t1; +create table t1 (a text); +insert into t1 values ('where'); +update t1 set a='Where'; +select * from t1; a Where +drop table t1; +create table t1 (t text,c char(10),b blob, d char(10) binary); +insert into t1 values (NULL,NULL,NULL,NULL); +insert into t1 values ("","","",""); +insert into t1 values ("hello","hello","hello","hello"); +insert into t1 values ("HELLO","HELLO","HELLO","HELLO"); +insert into t1 values ("HELLO MY","HELLO MY","HELLO MY","HELLO MY"); +insert into t1 values ("a","a","a","a"); +insert into t1 values (1,1,1,1); +insert into t1 values (NULL,NULL,NULL,NULL); +update t1 set c="",b=null where c="1"; +lock tables t1 READ; +show full fields from t1; Field Type Null Key Default Extra Privileges t text YES NULL select,insert,update,references c varchar(10) YES NULL select,insert,update,references b blob YES NULL select,insert,update,references d varchar(10) binary YES NULL select,insert,update,references +lock tables t1 WRITE; +show full fields from t1; Field Type Null Key Default Extra Privileges t text YES NULL select,insert,update,references c varchar(10) YES NULL select,insert,update,references b blob YES NULL select,insert,update,references d varchar(10) binary YES NULL select,insert,update,references +unlock tables; +select t from t1 where t like "hello"; t hello HELLO +select c from t1 where c like "hello"; c hello HELLO +select b from t1 where b like "hello"; b hello +select d from t1 where d like "hello"; d hello +select c from t1 having c like "hello"; c hello HELLO +select d from t1 having d like "hello"; d hello +select t from t1 where t like "%HELLO%"; t hello HELLO HELLO MY +select c from t1 where c like "%HELLO%"; c hello HELLO HELLO MY +select b from t1 where b like "%HELLO%"; b HELLO HELLO MY +select d from t1 where d like "%HELLO%"; d HELLO HELLO MY +select c from t1 having c like "%HELLO%"; c hello HELLO HELLO MY +select d from t1 having d like "%HELLO%"; d HELLO HELLO MY +select t from t1 order by t; t NULL NULL @@ -67,6 +108,7 @@ a hello HELLO HELLO MY +select c from t1 order by c; c NULL NULL @@ -76,6 +118,7 @@ a hello HELLO HELLO MY +select b from t1 order by b; b NULL NULL @@ -85,6 +128,7 @@ HELLO HELLO MY a hello +select d from t1 order by d; d NULL NULL @@ -94,6 +138,7 @@ HELLO HELLO MY a hello +select distinct t from t1; t NULL @@ -101,6 +146,7 @@ hello HELLO MY a 1 +select distinct b from t1; b NULL @@ -108,6 +154,7 @@ hello HELLO HELLO MY a +select distinct t from t1 order by t; t NULL @@ -115,6 +162,7 @@ NULL a hello HELLO MY +select distinct b from t1 order by b; b NULL @@ -122,6 +170,7 @@ HELLO HELLO MY a hello +select t from t1 group by t; t NULL @@ -129,6 +178,7 @@ NULL a hello HELLO MY +select b from t1 group by b; b NULL @@ -136,6 +186,8 @@ HELLO HELLO MY a hello +set option sql_big_tables=1; +select distinct t from t1; t NULL @@ -143,6 +195,7 @@ hello HELLO MY a 1 +select distinct b from t1; b NULL @@ -150,6 +203,7 @@ hello HELLO HELLO MY a +select distinct t from t1 order by t; t NULL @@ -157,6 +211,7 @@ NULL a hello HELLO MY +select distinct b from t1 order by b; b NULL @@ -164,12 +219,14 @@ HELLO HELLO MY a hello +select distinct c from t1; c NULL hello HELLO MY a +select distinct d from t1; d NULL @@ -178,12 +235,14 @@ HELLO HELLO MY a 1 +select distinct c from t1 order by c; c NULL a hello HELLO MY +select distinct d from t1 order by d; d NULL @@ -192,12 +251,14 @@ HELLO HELLO MY a hello +select c from t1 group by c; c NULL a hello HELLO MY +select d from t1 group by d; d NULL @@ -206,6 +267,8 @@ HELLO HELLO MY a hello +set option sql_big_tables=0; +select distinct * from t1; t c b d NULL NULL NULL NULL @@ -214,6 +277,7 @@ HELLO HELLO HELLO HELLO HELLO MY HELLO MY HELLO MY HELLO MY a a a a 1 NULL 1 +select t,count(*) from t1 group by t; t count(*) NULL 2 1 @@ -221,6 +285,7 @@ NULL 2 a 1 hello 2 HELLO MY 1 +select b,count(*) from t1 group by b; b count(*) NULL 3 1 @@ -228,12 +293,14 @@ HELLO 1 HELLO MY 1 a 1 hello 1 +select c,count(*) from t1 group by c; c count(*) NULL 2 2 a 1 hello 2 HELLO MY 1 +select d,count(*) from t1 group by d; d count(*) NULL 2 1 @@ -242,22 +309,142 @@ HELLO 1 HELLO MY 1 a 1 hello 1 +drop table t1; +create table t1 (a text, key (a(300))); +Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the table handler doesn't support unique sub keys +create table t1 (a text, key (a(255))); +drop table t1; +CREATE TABLE t1 ( +t1_id bigint(21) DEFAULT '0' NOT NULL auto_increment, +_field_72 varchar(128) DEFAULT '' NOT NULL, +_field_95 varchar(32), +_field_115 tinyint(4) DEFAULT '0' NOT NULL, +_field_122 tinyint(4) DEFAULT '0' NOT NULL, +_field_126 tinyint(4), +_field_134 tinyint(4), +PRIMARY KEY (t1_id), +UNIQUE _field_72 (_field_72), +KEY _field_115 (_field_115), +KEY _field_122 (_field_122) +); +INSERT INTO t1 VALUES (1,'admin','21232f297a57a5a743894a0e4a801fc3',0,1,NULL,NULL); +INSERT INTO t1 VALUES (2,'hroberts','7415275a8c95952901e42b13a6b78566',0,1,NULL,NULL); +INSERT INTO t1 VALUES (3,'guest','d41d8cd98f00b204e9800998ecf8427e',1,0,NULL,NULL); +CREATE TABLE t2 ( +seq_0_id bigint(21) DEFAULT '0' NOT NULL, +seq_1_id bigint(21) DEFAULT '0' NOT NULL, +PRIMARY KEY (seq_0_id,seq_1_id) +); +INSERT INTO t2 VALUES (1,1); +INSERT INTO t2 VALUES (2,1); +INSERT INTO t2 VALUES (2,2); +CREATE TABLE t3 ( +t3_id bigint(21) DEFAULT '0' NOT NULL auto_increment, +_field_131 varchar(128), +_field_133 tinyint(4) DEFAULT '0' NOT NULL, +_field_135 datetime DEFAULT '0000-00-00 00:00:00' NOT NULL, +_field_137 tinyint(4), +_field_139 datetime DEFAULT '0000-00-00 00:00:00' NOT NULL, +_field_140 blob, +_field_142 tinyint(4) DEFAULT '0' NOT NULL, +_field_145 tinyint(4) DEFAULT '0' NOT NULL, +_field_148 tinyint(4) DEFAULT '0' NOT NULL, +PRIMARY KEY (t3_id), +KEY _field_133 (_field_133), +KEY _field_135 (_field_135), +KEY _field_139 (_field_139), +KEY _field_142 (_field_142), +KEY _field_145 (_field_145), +KEY _field_148 (_field_148) +); +INSERT INTO t3 VALUES (1,'test job 1',0,'0000-00-00 00:00:00',0,'1999-02-25 22:43:32','test\r\njob\r\n1',0,0,0); +INSERT INTO t3 VALUES (2,'test job 2',0,'0000-00-00 00:00:00',0,'1999-02-26 21:08:04','',0,0,0); +CREATE TABLE t4 ( +seq_0_id bigint(21) DEFAULT '0' NOT NULL, +seq_1_id bigint(21) DEFAULT '0' NOT NULL, +PRIMARY KEY (seq_0_id,seq_1_id) +); +INSERT INTO t4 VALUES (1,1); +INSERT INTO t4 VALUES (2,1); +CREATE TABLE t5 ( +t5_id bigint(21) DEFAULT '0' NOT NULL auto_increment, +_field_149 tinyint(4), +_field_156 varchar(128) DEFAULT '' NOT NULL, +_field_157 varchar(128) DEFAULT '' NOT NULL, +_field_158 varchar(128) DEFAULT '' NOT NULL, +_field_159 varchar(128) DEFAULT '' NOT NULL, +_field_160 varchar(128) DEFAULT '' NOT NULL, +_field_161 varchar(128) DEFAULT '' NOT NULL, +PRIMARY KEY (t5_id), +KEY _field_156 (_field_156), +KEY _field_157 (_field_157), +KEY _field_158 (_field_158), +KEY _field_159 (_field_159), +KEY _field_160 (_field_160), +KEY _field_161 (_field_161) +); +INSERT INTO t5 VALUES (1,0,'tomato','','','','',''); +INSERT INTO t5 VALUES (2,0,'cilantro','','','','',''); +CREATE TABLE t6 ( +seq_0_id bigint(21) DEFAULT '0' NOT NULL, +seq_1_id bigint(21) DEFAULT '0' NOT NULL, +PRIMARY KEY (seq_0_id,seq_1_id) +); +INSERT INTO t6 VALUES (1,1); +INSERT INTO t6 VALUES (1,2); +INSERT INTO t6 VALUES (2,2); +CREATE TABLE t7 ( +t7_id bigint(21) DEFAULT '0' NOT NULL auto_increment, +_field_143 tinyint(4), +_field_165 varchar(32), +_field_166 smallint(6) DEFAULT '0' NOT NULL, +PRIMARY KEY (t7_id), +KEY _field_166 (_field_166) +); +INSERT INTO t7 VALUES (1,0,'High',1); +INSERT INTO t7 VALUES (2,0,'Medium',2); +INSERT INTO t7 VALUES (3,0,'Low',3); +select replace(t3._field_140, "\r","^M"),t3_id,min(t3._field_131), min(t3._field_135), min(t3._field_139), min(t3._field_137), min(link_alias_142._field_165), min(link_alias_133._field_72), min(t3._field_145), min(link_alias_148._field_156), replace(min(t3._field_140), "\r","^M"),t3.t3_id from t3 left join t4 on t4.seq_0_id = t3.t3_id left join t7 link_alias_142 on t4.seq_1_id = link_alias_142.t7_id left join t6 on t6.seq_0_id = t3.t3_id left join t1 link_alias_133 on t6.seq_1_id = link_alias_133.t1_id left join t2 on t2.seq_0_id = t3.t3_id left join t5 link_alias_148 on t2.seq_1_id = link_alias_148.t5_id where t3.t3_id in (1) group by t3.t3_id order by link_alias_142._field_166, _field_139, link_alias_133._field_72, _field_135, link_alias_148._field_156; replace(t3._field_140, "\r","^M") t3_id min(t3._field_131) min(t3._field_135) min(t3._field_139) min(t3._field_137) min(link_alias_142._field_165) min(link_alias_133._field_72) min(t3._field_145) min(link_alias_148._field_156) replace(min(t3._field_140), "\r","^M") t3_id test^M job^M 1 1 test job 1 0000-00-00 00:00:00 1999-02-25 22:43:32 0 High admin 0 tomato test^M job^M 1 1 +drop table t1,t2,t3,t4,t5,t6,t7; +create table t1 (a blob); +insert into t1 values ("empty"),(""); +select a,reverse(a) from t1; a reverse(a) empty ytpme +drop table t1; +create table t1 (a blob, key (a(10))); +insert into t1 values ("bye"),("hello"),("hello"),("hello word"); +select * from t1 where a like "hello%"; a hello hello hello word +drop table t1; +CREATE TABLE t1 ( +f1 int(11) DEFAULT '0' NOT NULL, +f2 varchar(16) DEFAULT '' NOT NULL, +f5 text, +KEY index_name (f1,f2,f5(16)) +); +INSERT INTO t1 VALUES (0,'traktor','1111111111111'); +INSERT INTO t1 VALUES (1,'traktor','1111111111111111111111111'); +select count(*) from t1 where f2='traktor'; count(*) 2 +drop table t1; +create table t1 (foobar tinyblob not null, boggle smallint not null, key (foobar(32), boggle)); +insert into t1 values ('fish', 10),('bear', 20); +select foobar, boggle from t1 where foobar = 'fish'; foobar boggle fish 10 +select foobar, boggle from t1 where foobar = 'fish' and boggle = 10; foobar boggle fish 10 +drop table t1; diff --git a/mysql-test/r/type_date.result b/mysql-test/r/type_date.result index 9aa6d6fb9b7..642a8a7004d 100644 --- a/mysql-test/r/type_date.result +++ b/mysql-test/r/type_date.result @@ -1,20 +1,61 @@ +create table t1 (a char(16), b date, c datetime); +insert into t1 SET a='test 2000-01-01', b='2000-01-01', c='2000-01-01'; +select * from t1 where c = '2000-01-01'; a b c test 2000-01-01 2000-01-01 2000-01-01 00:00:00 +select * from t1 where b = '2000-01-01'; a b c test 2000-01-01 2000-01-01 2000-01-01 00:00:00 +drop table t1; +drop table if exists t1,t2; +CREATE TABLE t1 (name char(6),cdate date); +INSERT INTO t1 VALUES ('name1','1998-01-01'); +INSERT INTO t1 VALUES ('name2','1998-01-01'); +INSERT INTO t1 VALUES ('name1','1998-01-02'); +INSERT INTO t1 VALUES ('name2','1998-01-02'); +CREATE TABLE t2 (cdate date, note char(6)); +INSERT INTO t2 VALUES ('1998-01-01','note01'); +INSERT INTO t2 VALUES ('1998-01-02','note02'); +select name,t1.cdate,note from t1,t2 where t1.cdate=t2.cdate and t1.cdate='1998-01-01'; name cdate note name1 1998-01-01 note01 name2 1998-01-01 note01 +drop table t1,t2; +CREATE TABLE t1 ( datum DATE ); +INSERT INTO t1 VALUES ( "2000-1-1" ); +INSERT INTO t1 VALUES ( "2000-1-2" ); +INSERT INTO t1 VALUES ( "2000-1-3" ); +INSERT INTO t1 VALUES ( "2000-1-4" ); +INSERT INTO t1 VALUES ( "2000-1-5" ); +SELECT * FROM t1 WHERE datum BETWEEN "2000-1-2" AND "2000-1-4"; datum 2000-01-02 2000-01-03 2000-01-04 +DROP TABLE t1; +CREATE TABLE t1 ( +user_id char(10), +summa int(11), +rdate date +); +INSERT INTO t1 VALUES ('aaa',100,'1998-01-01'); +INSERT INTO t1 VALUES ('aaa',200,'1998-01-03'); +INSERT INTO t1 VALUES ('bbb',50,'1998-01-02'); +INSERT INTO t1 VALUES ('bbb',200,'1998-01-04'); +select max(rdate) as s from t1 where rdate < '1998-01-03' having s> "1998-01-01"; s 1998-01-02 +select max(rdate) as s from t1 having s="1998-01-04"; s 1998-01-04 +select max(rdate+0) as s from t1 having s="19980104"; s 19980104 +drop table t1; +create table t1 (date date); +insert into t1 values ("2000-08-10"),("2000-08-11"); +select date_add(date,INTERVAL 1 DAY),date_add(date,INTERVAL 1 SECOND) from t1; date_add(date,INTERVAL 1 DAY) date_add(date,INTERVAL 1 SECOND) 2000-08-11 2000-08-10 00:00:01 2000-08-12 2000-08-11 00:00:01 +drop table t1; diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result index 97365811785..3e13485c872 100644 --- a/mysql-test/r/type_datetime.result +++ b/mysql-test/r/type_datetime.result @@ -1,3 +1,7 @@ +drop table if exists t1; +create table t1 (t datetime); +insert into t1 values(101),(691231),(700101),(991231),(10000101),(99991231),(101000000),(691231000000),(700101000000),(991231235959),(10000101000000),(99991231235959); +select * from t1; t 2000-01-01 00:00:00 2069-12-31 00:00:00 @@ -11,10 +15,15 @@ t 1999-12-31 23:59:59 1000-01-01 00:00:00 9999-12-31 23:59:59 +delete from t1 where t > 0; +optimize table t1; Table Op Msg_type Msg_text test.t1 optimize status OK +check table t1; Table Op Msg_type Msg_text test.t1 check status OK +insert into t1 values("000101"),("691231"),("700101"),("991231"),("00000101"),("00010101"),("99991231"),("00101000000"),("691231000000"),("700101000000"),("991231235959"),("10000101000000"),("99991231235959"); +select * from t1; t 2000-01-01 00:00:00 2069-12-31 00:00:00 @@ -29,9 +38,22 @@ t 1999-12-31 23:59:59 1000-01-01 00:00:00 9999-12-31 23:59:59 +drop table t1; +CREATE TABLE t1 (a timestamp, b date, c time, d datetime); +insert into t1 (b,c,d) values(now(),curtime(),now()); +select date_format(a,"%Y-%m-%d")=b,right(a,6)=c+0,a=d+0 from t1; date_format(a,"%Y-%m-%d")=b right(a,6)=c+0 a=d+0 1 1 1 +drop table t1; +CREATE TABLE t1 (a datetime not null); +insert into t1 values (0); +select * from t1 where a is null; a 0000-00-00 00:00:00 +drop table t1; +create table t1 (id int, dt datetime); +insert into t1 values (1,"2001-08-14 00:00:00"),(2,"2001-08-15 00:00:00"),(3,"2001-08-16 00:00:00"); +select * from t1 where dt='2001-08-14 00:00:00' and dt = if(id=1,'2001-08-14 00:00:00','1999-08-15'); id dt 1 2001-08-14 00:00:00 +drop table t1; diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result index 0877424648b..9fee88f4bf8 100644 --- a/mysql-test/r/type_decimal.result +++ b/mysql-test/r/type_decimal.result @@ -1,5 +1,152 @@ +DROP TABLE IF EXISTS t1; +CREATE TABLE t1 ( +id int(11) DEFAULT '0' NOT NULL auto_increment, +datatype_id int(11) DEFAULT '0' NOT NULL, +minvalue decimal(20,10) DEFAULT '0.0000000000' NOT NULL, +maxvalue decimal(20,10) DEFAULT '0.0000000000' NOT NULL, +valuename varchar(20), +forecolor int(11), +backcolor int(11), +PRIMARY KEY (id), +UNIQUE datatype_id (datatype_id, minvalue, maxvalue) +); +INSERT INTO t1 VALUES ( '1', '4', '0.0000000000', '0.0000000000', 'Ei saja', '0', '16776960'); +INSERT INTO t1 VALUES ( '2', '4', '1.0000000000', '1.0000000000', 'Sajab', '16777215', '255'); +INSERT INTO t1 VALUES ( '3', '1', '2.0000000000', '49.0000000000', '', '0', '16777215'); +INSERT INTO t1 VALUES ( '60', '11', '0.0000000000', '0.0000000000', 'Rikkis', '16777215', '16711680'); +INSERT INTO t1 VALUES ( '4', '12', '1.0000000000', '1.0000000000', 'nork sadu', '65280', '14474460'); +INSERT INTO t1 VALUES ( '5', '12', '2.0000000000', '2.0000000000', 'keskmine sadu', '255', '14474460'); +INSERT INTO t1 VALUES ( '6', '12', '3.0000000000', '3.0000000000', 'tugev sadu', '127', '14474460'); +INSERT INTO t1 VALUES ( '43', '39', '6.0000000000', '6.0000000000', 'lobjakas', '13107327', '16763080'); +INSERT INTO t1 VALUES ( '40', '39', '2.0000000000', '2.0000000000', 'vihm', '8355839', '16777215'); +INSERT INTO t1 VALUES ( '53', '1', '-35.0000000000', '-5.0000000000', '', '0', '16777215'); +INSERT INTO t1 VALUES ( '41', '39', '3.0000000000', '3.0000000000', 'külm vihm', '120', '16763080'); +INSERT INTO t1 VALUES ( '12', '21', '21.0000000000', '21.0000000000', 'Kuiv', '13158600', '16777215'); +INSERT INTO t1 VALUES ( '13', '21', '13.0000000000', '13.0000000000', 'Märg', '5263615', '16777215'); +INSERT INTO t1 VALUES ( '14', '21', '22.0000000000', '22.0000000000', 'Niiske', '9869055', '16777215'); +INSERT INTO t1 VALUES ( '19', '21', '33.0000000000', '33.0000000000', 'Märg', '5263615', '16777215'); +INSERT INTO t1 VALUES ( '15', '21', '23.0000000000', '23.0000000000', 'Märg', '5263615', '16777215'); +INSERT INTO t1 VALUES ( '16', '21', '31.0000000000', '31.0000000000', 'Kuiv', '13158600', '16777215'); +INSERT INTO t1 VALUES ( '17', '21', '12.0000000000', '12.0000000000', 'Niiske', '9869055', '16777215'); +INSERT INTO t1 VALUES ( '18', '21', '32.0000000000', '32.0000000000', 'Niiske', '9869055', '16777215'); +INSERT INTO t1 VALUES ( '20', '21', '331.0000000000', '331.0000000000', 'Härmatise hoiatus!', '14448840', '13158600'); +INSERT INTO t1 VALUES ( '21', '21', '11.0000000000', '11.0000000000', 'Kuiv', '13158600', '16777215'); +INSERT INTO t1 VALUES ( '22', '33', '21.0000000000', '21.0000000000', 'Pilves, kuiv', '8355711', '12632256'); +INSERT INTO t1 VALUES ( '23', '33', '13.0000000000', '13.0000000000', 'Sajab, märg', '0', '8355839'); +INSERT INTO t1 VALUES ( '24', '33', '22.0000000000', '22.0000000000', 'Pilves, niiske', '8355711', '12632319'); +INSERT INTO t1 VALUES ( '29', '33', '33.0000000000', '33.0000000000', 'Selge, märg', '16777215', '8355839'); +INSERT INTO t1 VALUES ( '25', '33', '23.0000000000', '23.0000000000', 'Pilves, märg', '8355711', '8355839'); +INSERT INTO t1 VALUES ( '26', '33', '31.0000000000', '31.0000000000', 'Selge, kuiv', '16777215', '12632256'); +INSERT INTO t1 VALUES ( '27', '33', '12.0000000000', '12.0000000000', 'Sajab, niiske', '0', '12632319'); +INSERT INTO t1 VALUES ( '28', '33', '32.0000000000', '32.0000000000', 'Selge, niiske', '16777215', '12632319'); +INSERT INTO t1 VALUES ( '30', '33', '331.0000000000', '331.0000000000', 'Härmatis! selge,kuiv', '16711680', '12632256'); +INSERT INTO t1 VALUES ( '31', '33', '11.0000000000', '11.0000000000', 'Sajab, kuiv', '0', '12632256'); +INSERT INTO t1 VALUES ( '32', '11', '1.0000000000', '1.0000000000', 'Korras', '16777215', '49152'); +INSERT INTO t1 VALUES ( '33', '21', '335.0000000000', '335.0000000000', 'Härmatis!', '14448840', '11842740'); +INSERT INTO t1 VALUES ( '34', '21', '134.0000000000', '134.0000000000', 'Hoiatus, M+S!', '255', '13158600'); +INSERT INTO t1 VALUES ( '35', '21', '133.0000000000', '133.0000000000', 'Hoiatus, märg!', '5263615', '13158600'); +INSERT INTO t1 VALUES ( '36', '21', '135.0000000000', '135.0000000000', 'Härmatis!', '14448840', '11842740'); +INSERT INTO t1 VALUES ( '37', '21', '334.0000000000', '334.0000000000', 'Härmatise hoiatus!', '14448840', '13158600'); +INSERT INTO t1 VALUES ( '38', '21', '132.0000000000', '132.0000000000', 'Hoiatus, niiske!', '9869055', '13158600'); +INSERT INTO t1 VALUES ( '39', '39', '1.0000000000', '1.0000000000', 'ei saja', '11206570', '16777215'); +INSERT INTO t1 VALUES ( '44', '39', '4.0000000000', '5.0000000000', 'lumi', '16711680', '16763080'); +INSERT INTO t1 VALUES ( '45', '12', '0.0000000000', '0.0000000000', '', '16777215', '14474460'); +INSERT INTO t1 VALUES ( '46', '39', '8.0000000000', '8.0000000000', 'rahe', '9830400', '16763080'); +INSERT INTO t1 VALUES ( '47', '39', '9.0000000000', '9.0000000000', 'tüüp ebaselge', '12582912', '16777215'); +INSERT INTO t1 VALUES ( '48', '39', '7.0000000000', '7.0000000000', 'lumetuisk', '7209070', '16763080'); +INSERT INTO t1 VALUES ( '142', '15', '2.0000000000', '49.0000000000', '', '0', '16777215'); +INSERT INTO t1 VALUES ( '52', '1', '-4.9000000000', '-0.1000000000', '', '0', '15774720'); +INSERT INTO t1 VALUES ( '141', '15', '-4.9000000000', '-0.1000000000', '', '0', '15774720'); +INSERT INTO t1 VALUES ( '55', '8', '0.0000000000', '0.0000000000', '', '0', '16777215'); +INSERT INTO t1 VALUES ( '56', '8', '0.0100000000', '0.1000000000', '', '0', '16770560'); +INSERT INTO t1 VALUES ( '57', '8', '0.1100000000', '25.0000000000', '', '0', '15774720'); +INSERT INTO t1 VALUES ( '58', '2', '90.0000000000', '94.9000000000', '', NULL, '16770560'); +INSERT INTO t1 VALUES ( '59', '6', '0.0000000000', '360.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '61', '21', '38.0000000000', '38.0000000000', 'Niiske', '9869055', '16777215'); +INSERT INTO t1 VALUES ( '62', '38', '500.0000000000', '999.0000000000', '', '0', '16770560'); +INSERT INTO t1 VALUES ( '63', '38', '1000.0000000000', '2000.0000000000', '', '0', '16777215'); +INSERT INTO t1 VALUES ( '64', '17', '0.0000000000', '0.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '65', '17', '0.1000000000', '10.0000000000', '', NULL, '16770560'); +INSERT INTO t1 VALUES ( '67', '21', '412.0000000000', '412.0000000000', 'Niiske', '9869055', '16777215'); +INSERT INTO t1 VALUES ( '68', '21', '413.0000000000', '413.0000000000', 'Märg', '5263615', '16777215'); +INSERT INTO t1 VALUES ( '69', '21', '113.0000000000', '113.0000000000', 'Märg', '5263615', '16777215'); +INSERT INTO t1 VALUES ( '70', '21', '416.0000000000', '416.0000000000', 'Lumine!', '16711680', '11842740'); +INSERT INTO t1 VALUES ( '71', '38', '0.0000000000', '499.0000000000', '', NULL, '16711680'); +INSERT INTO t1 VALUES ( '72', '22', '-49.0000000000', '49.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '73', '13', '0.0000000000', '9.9000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '74', '13', '10.0000000000', '14.9000000000', '', NULL, '16770560'); +INSERT INTO t1 VALUES ( '75', '7', '0.0000000000', '50.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '76', '18', '0.0000000000', '0.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '77', '18', '0.1000000000', '10.0000000000', '', NULL, '16770560'); +INSERT INTO t1 VALUES ( '78', '19', '300.0000000000', '400.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '79', '19', '0.0000000000', '299.0000000000', '', NULL, '16770560'); +INSERT INTO t1 VALUES ( '80', '23', '0.0000000000', '100.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '81', '24', '0.0000000000', '200.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '82', '26', '0.0000000000', '0.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '83', '26', '0.1000000000', '5.0000000000', '', NULL, '16776960'); +INSERT INTO t1 VALUES ( '84', '21', '422.0000000000', '422.0000000000', 'Niiske', '9869055', '16777215'); +INSERT INTO t1 VALUES ( '85', '21', '411.0000000000', '411.0000000000', 'Saju hoiat.,kuiv!', '16777215', '13158600'); +INSERT INTO t1 VALUES ( '86', '21', '423.0000000000', '423.0000000000', 'Märg', '5263615', '16777215'); +INSERT INTO t1 VALUES ( '144', '16', '-49.0000000000', '-5.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '88', '16', '2.0000000000', '49.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '89', '21', '338.0000000000', '338.0000000000', 'Härm.hoiatus, N+S!', '16744319', '13158600'); +INSERT INTO t1 VALUES ( '90', '21', '332.0000000000', '332.0000000000', 'Härm.hoiat., niiske!', '16744319', '13158600'); +INSERT INTO t1 VALUES ( '91', '21', '114.0000000000', '114.0000000000', 'Hoiatus, M+S!', '255', '13158600'); +INSERT INTO t1 VALUES ( '92', '21', '117.0000000000', '117.0000000000', 'Hoiatus, JÄÄ!', '14448840', '16711680'); +INSERT INTO t1 VALUES ( '93', '21', '116.0000000000', '116.0000000000', 'Lumine!', '16711680', '11842740'); +INSERT INTO t1 VALUES ( '94', '21', '414.0000000000', '414.0000000000', 'Hoiatus, M+S!', '255', '13158600'); +INSERT INTO t1 VALUES ( '95', '21', '325.0000000000', '325.0000000000', 'Härmatis!', '14448840', '11842740'); +INSERT INTO t1 VALUES ( '96', '21', '321.0000000000', '321.0000000000', 'Härmatise hoiatus!', '14448840', '13158600'); +INSERT INTO t1 VALUES ( '97', '21', '328.0000000000', '328.0000000000', 'Härm.hoiatus, N+S!', '16744319', '13158600'); +INSERT INTO t1 VALUES ( '98', '21', '28.0000000000', '28.0000000000', 'Niiske ja sool', '9869055', '16777215'); +INSERT INTO t1 VALUES ( '99', '21', '118.0000000000', '118.0000000000', 'Hoiatus, N+S!', '9869055', '13158600'); +INSERT INTO t1 VALUES ( '100', '21', '418.0000000000', '418.0000000000', 'Hoiatus, N+S!', '9869055', '13158600'); +INSERT INTO t1 VALUES ( '101', '21', '322.0000000000', '322.0000000000', 'Härm.hoiat., niiske!', '16744319', '13158600'); +INSERT INTO t1 VALUES ( '102', '21', '428.0000000000', '428.0000000000', 'Hoiatus, N+S!', '9869055', '13158600'); +INSERT INTO t1 VALUES ( '103', '21', '432.0000000000', '432.0000000000', 'Hoiatus, niiske!', '7895240', '13158600'); +INSERT INTO t1 VALUES ( '104', '21', '421.0000000000', '421.0000000000', 'Saju hoiat.,kuiv!', '16777215', '13158600'); +INSERT INTO t1 VALUES ( '105', '21', '24.0000000000', '24.0000000000', 'Märg ja sool', '255', '16777215'); +INSERT INTO t1 VALUES ( '106', '21', '438.0000000000', '438.0000000000', 'Hoiatus, N+S!', '9869055', '13158600'); +INSERT INTO t1 VALUES ( '107', '21', '112.0000000000', '112.0000000000', 'Hoiatus, niiske!', '9869055', '13158600'); +INSERT INTO t1 VALUES ( '108', '21', '34.0000000000', '34.0000000000', 'Märg ja sool', '255', '16777215'); +INSERT INTO t1 VALUES ( '109', '21', '434.0000000000', '434.0000000000', 'Hoiatus, M+S!', '255', '13158600'); +INSERT INTO t1 VALUES ( '110', '21', '124.0000000000', '124.0000000000', 'Hoiatus, M+S!', '255', '13158600'); +INSERT INTO t1 VALUES ( '111', '21', '424.0000000000', '424.0000000000', 'Hoiatus, M+S!', '255', '13158600'); +INSERT INTO t1 VALUES ( '112', '21', '123.0000000000', '123.0000000000', 'Hoiatus, märg!', '5263615', '13158600'); +INSERT INTO t1 VALUES ( '140', '15', '-49.0000000000', '-5.0000000000', '', '0', '16777215'); +INSERT INTO t1 VALUES ( '114', '21', '18.0000000000', '18.0000000000', 'Niiske ja sool', '9869055', '16777215'); +INSERT INTO t1 VALUES ( '115', '21', '122.0000000000', '122.0000000000', 'Hoiatus, niiske!', '9869055', '13158600'); +INSERT INTO t1 VALUES ( '116', '21', '14.0000000000', '14.0000000000', 'Märg ja sool', '255', '16777215'); +INSERT INTO t1 VALUES ( '117', '21', '311.0000000000', '311.0000000000', 'Härmatise hoiatus!', '14448840', '13158600'); +INSERT INTO t1 VALUES ( '121', '2', '95.0000000000', '100.0000000000', '', NULL, '15774720'); +INSERT INTO t1 VALUES ( '118', '2', '0.0000000000', '89.9000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '119', '21', '16.0000000000', '16.0000000000', 'Lumine!', '16711680', '11842740'); +INSERT INTO t1 VALUES ( '120', '21', '26.0000000000', '26.0000000000', 'Lumine!', '16711680', '11842740'); +INSERT INTO t1 VALUES ( '122', '13', '15.0000000000', '50.0000000000', '', NULL, '15774720'); +INSERT INTO t1 VALUES ( '123', '5', '0.0000000000', '9.9000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '124', '5', '10.0000000000', '14.9000000000', '', NULL, '16770560'); +INSERT INTO t1 VALUES ( '125', '5', '15.0000000000', '50.0000000000', '', NULL, '15774720'); +INSERT INTO t1 VALUES ( '126', '21', '128.0000000000', '128.0000000000', 'Hoiatus, N+S!', '9869055', '13158600'); +INSERT INTO t1 VALUES ( '127', '21', '318.0000000000', '318.0000000000', 'Härm.hoiatus, N+S!', '16744319', '13158600'); +INSERT INTO t1 VALUES ( '128', '21', '312.0000000000', '312.0000000000', 'Härm.hoiat., niiske!', '16744319', '13158600'); +INSERT INTO t1 VALUES ( '129', '21', '126.0000000000', '126.0000000000', 'Lumine!', '16711680', '11842740'); +INSERT INTO t1 VALUES ( '130', '21', '324.0000000000', '324.0000000000', 'Härmatise hoiatus!', '14448840', '13158600'); +INSERT INTO t1 VALUES ( '131', '21', '316.0000000000', '316.0000000000', 'Lumine!', '16711680', '11842740'); +INSERT INTO t1 VALUES ( '132', '1', '0.0000000000', '1.9000000000', '', NULL, '16769024'); +INSERT INTO t1 VALUES ( '134', '3', '-50.0000000000', '50.0000000000', '', NULL, '16777215'); +INSERT INTO t1 VALUES ( '135', '8', '26.0000000000', '2000.0000000000', '', '9868950', '15774720'); +INSERT INTO t1 VALUES ( '136', '21', '426.0000000000', '426.0000000000', 'Lumine!', '16711680', '11842740'); +INSERT INTO t1 VALUES ( '137', '21', '127.0000000000', '127.0000000000', 'Hoiatus, JÄÄ!', '14448840', '16711680'); +INSERT INTO t1 VALUES ( '138', '21', '121.0000000000', '121.0000000000', 'Kuiv', '13158600', '16777215'); +INSERT INTO t1 VALUES ( '139', '21', '326.0000000000', '326.0000000000', 'Lumine!', '16711680', '11842740'); +INSERT INTO t1 VALUES ( '143', '16', '-4.9000000000', '-0.1000000000', '', NULL, '15774720'); +INSERT INTO t1 VALUES ( '145', '15', '0.0000000000', '1.9000000000', '', '0', '16769024'); +INSERT INTO t1 VALUES ( '146', '16', '0.0000000000', '1.9000000000', '', '0', '16769024'); +select * from t1 where minvalue<=1 and maxvalue>=-1 and datatype_id=16; id datatype_id minvalue maxvalue valuename forecolor backcolor 143 16 -4.9000000000 -0.1000000000 NULL 15774720 146 16 0.0000000000 1.9000000000 0 16769024 +select * from t1 where minvalue<=-1 and maxvalue>=-1 and datatype_id=16; id datatype_id minvalue maxvalue valuename forecolor backcolor 143 16 -4.9000000000 -0.1000000000 NULL 15774720 +drop table t1; diff --git a/mysql-test/r/type_enum.result b/mysql-test/r/type_enum.result index de48527edad..355133532bf 100644 --- a/mysql-test/r/type_enum.result +++ b/mysql-test/r/type_enum.result @@ -1,3 +1,10 @@ +DROP TABLE if exists t1; +CREATE TABLE t1 ( +field enum('001001','001004','001010','001018','001019','001020','001021','001027','001028','001029','001030','001031','001100','002003','002004','002005','002007','002008','002009','002012','002013','002014','003002','003003','003004','003005','003006','003007','003008','003009','003010','003011','003012','003013','003014','003015','003016','003017','003018','003019','004002','004003','004005','004006','004007','004008','004010','004012','004014','004016','004017','004020','004021','004022','004023','004024','004025','004026','006002','006004','006006','006010','006011','006012','006013','006014','007001','007002','007003','007004','007005','007006','007007','007008','007009','007010','007011','007012','007013','007014','007015','007016','007017','007018','007019','007020','007021','007022','007023','007024','007025','007026','007027','007028','007029','007030','007031','007032','007033','007034','007035','007036','007037','007038','007039','007040','007043','007044','009001','009002','009004','009005','009006','009007','009008','009009','009010','009011','009012','009013','010002','010003','010004','010005','010006','010007','010008','010009','010010','010011','010012','010013','010015','010016','010017','010018','010019','010020','010021','010022','010023','010024','010025','010026','010027','010028','011001','011002','011003','011004','011006','011012','011013','011014','011015','011016','012017','012018','012019','012023','012027','012028','012029','012030','012031','012032','012033','012034','012035','012036','012037','012038','012039','014001','016002','016003','016004','016007','016010','016011','016016','016019','016020','016021','016022','016023','016024','016026','016027','016028','016029','016030','016031','016032','016033','016034','017002','018001','019002','019004','020001','020003','020004','020005','020006','020007','020008','020009','022001','022002','022003','023001','023002','023003','023004','023005','023006','023007','023008','023010','023011','023012','023017','023019','023020','023021','023025','023026','023027','023028','023029','023030','023031','023032','023033','023034','023035','025001','025003','025004','025005','025006','025007','025008','025009','025010','025011','025012','025013','025014','025015','025016','025017','025018','025019','025020','025021','025022','025023','025024','025025','025026','025027','025028','025029','025030','025031','025032','025033','025034','025035','025036','025037','025038','025039','025040','025041','025042','025043','025044','025045','025046','025047','025048','025049','025050','025051','025052','025053','025054','025055','025056','025057','025058','025059','025060','025061','025062','025063','027001','027002','027011','035008','035012','036001','037001','037003','037004','037005','037006','037007','037008','037009','038004','038005','038006','038007','038009','039001','039002','039003','039004','039005','039006','046001','046002','046003','046004','046005','046007','046008','046009','046010','046011','046012','046013','046014','047001','047002','048001','051001','051002','051003','051004','052001','052002','052005','053015','053016','053019','053020','053023','053024','053026','053028','053029','053033','053034','053036','053037','053038','053039','053041','053042','053043','053045','053046','053047','053048','053051','053052','053054','053055','053056','053057','053068','053069','053070','053073','053074','053075','053086','053094','053095','053096','053097','053098','053099','053100','053101','053102','053103','053104','053105','053107','053122','053123','053124','053125','053127','053128','054001','054002','054003','054004','054005','054006','054007','054009','054010','056001','056002','056003','056004','056005','056006','056009','056010','056011','056016','056017','056018','056019','056020','056021','056022','057001','057002','057003','057004','058002','058003','058004','058005','060001','060003','060004','060005','060006','060007','061002','061003','061004','061005','061006','069006','069007','069010','069011','069012','069013','069014','069015','069016','069017','069018','069020','069021','069022','069023','069024','071002','071003','071004','071005','071006','071008','071011','071013','071020','071021','071022','072001','073001','073002','073003','073004','074001','074002','074003','074004','074005','074006','074007','074008','074009','074010','074011','074012','075001','075007','076101','076102','076103','077001','077002','077003','077004','077006','077007','077008','077009','078005','079002','079003','079004','079005','079006','079007','081001','082006','082007','082011','082013','082014','082015','082016','082017','082021','082022','082023','082024','082025','082026','082027','082028','082029','082030','082031','082032','082033','082034','082035','082036','082037','082038','082039','082040','082041','082042','082043','082044','084001','084002','084003','084004','084005','084007','084008','084009','084011','084013','084014','084016','084017','084027','084031','084032','084033','084035','084036','084037','084038','084039','084040','084041','084042','084043','084044','084045','084046','084047','084048','084049','084050','084051','085001','085002','085003','085004','085005','085006','085007','085009','085011','085012','085013','085014','085015','085016','085017','085018','085019','085020','085021','085022','085023','085028','085029','085030','085031','085033','085034','085035','085036','085037','085038','085040','085041','085042','085043','085044','085045','085046','085047','085048','085063','085064','085065','085068','085070','085071','085073','085082','085083','085086','085088','085089','085090','085091','085092','085093','085094','085095','085096','085097','085098','085099','085100','085101','085102','085103','085104','085105','085106','085107','085108','085109','085110','085111','085112','085113','085115','085119','085120','085121','085122','085123','085124','085125','085126','085127','085128','085129','085130','085132','085133','085134','085135','085136','085137','086001','086002','086003','086004','086005','088001','088003','088005','088006','088007','088008','088009','089001','090001','090002','090003','090004','090005','090006','090007','090008','090009','090010','090013','090015','090016','090017','090018','090019','090022','090027','090028','091001','091002','091005','091008','091009','091010','091011','091012','091013','091014','091015','091016','091017','091018','093001','093003','093098','093100','093102','093104','093141','093142','093146','093151','093153','093167','093168','093176','094001','094002','094004','094005','095004','099001','099002','100001','101001','102002','102003','105001','105002','106001','113001','113002','113003','113004','113005','113006','113007','113008','113009','113010','113011','113012','113013','113014','113015','113016','113017','113018','113019','113020','113021','113022','113023','113024','113025','113026','113027','113028','114001','115001','115002','115003','115004','115005','115006','115007','115008','115009','115010','115011','115012','115013','115014','115015','115016','115017','115018','115020','115021','115022','115023','115025','115026','115027','115028','115029','115030','115031','115032','115033','115034','115035','115036','115039','115040','115041','115042','115043','115044','115045','115046','115047','115048','115049','115050','115051','115052','115053','115054','115055','115056','115057','115059','115060','115061','115062','115063','115064','115065','115066','115067','115068','115069','115070','115071','115072','115073','115075','115076','115081','115082','115085','115086','115087','115088','115095','115096','115097','115098','115099','115101','115102','115103','115104','115105','115106','115108','115109','115110','115111','115112','115113','115114','115115','115116','115117','115118','115119','115120','115121','115122','116001','116002','116003','116004','116005','116006','116007','116008','116009','116010','116011','116012','117001','117002','117003','123001','124010','124014','124015','124019','124024','124025','124026','124027','124028','124029','124030','124031','124032','124033','124035','124036','124037','124038','124039','124040','124041','124042','124043','124044','124045','124046','124047','124048','124049','124050','124051','124052','124053','124054','124055','124056','124057','124058','124059','124060','124061','124062','124063','124064','124065','126001','126002','126003','126004','126005','126006','126007','126008','126009','126010','126011','126012','130001','132001','132002','132003','133001','133008','133009','133010','133011','133012','133013','133014','133015','133016','133017','133018','133019','133020','133021','133022','133023','133024','133025','133027','133028','133029','133030','133031','134001','135001','135002','135003','135004','135005','135006','135007','135008','135009','135010','136001','137009','137010','137011','137012','137013','137014','137015','137016','137017','137018','137019','138001','138002','138003','138004','139001','139003','140001','141001','141002','141003','141006','141007','141008','141009','141011','141012','141014','141015','141016','141017','141018','141019','141020','141021','141022','141023','141024','141025','141026','141027','141028','142001','142002','142003','142004','142005','142006','142007','142008','142010','142011','142012','144001','145001','145002','145003','145004','145005','145006','145007','145008','145009','145010','145011','145012','145013','145014','145015','145016','147001','150003','150005','150009','150013','150014','150015','150016','150017','150020','150021','152001','152002','152003','152004','152005','152006','152007','154001','154002','154003','155001','155002','155003','155004','155005','155006','159001','159002','159003','159004','160001','160002','160003','161001','162001','162002','162003','162004','162007','162010','162011','162012','163001','163002','163003','163005','163010','163011','163014','163015','163016','165001','165002','165003','165004','165005','165006','165007','165008','165009','165010','165011','165012','165013','165014','165015','165016','165017','165018','165019','165020','165021','165022','165023','165024','165025','165026','165027','165028','165029','165030','165031','165032','165033','165034','165035','165036','167001','168001','168002','168003','168004','168005','168007','168008','168009','168010','168011','168012','168013','168014','169001','169002','169003','169007','169008','169009','169010','170001','171001','171002','171003','171004','171005','171006','171007','171008','171009','172001','174001','174002','174003','176001','176002','176003','177001','177002','179001','179002','179003','179004','179005','179006','179007','179008','179009','179010','179011','179012','179013','179014','179015','179016','179017','179018','179019','179020','179021','179022','179023','179024','179025','179026','179027','179028','179029','179030','179031','179032','179033','179034','179035','179036','179037','179038','179039','179040','179041','179042','179043','179044','179045','179046','179047','180001','180010','180012','180013','180014','180015','180016','180017','180018','180019','180020','180021','180022','180023','180024','180025','180026','180027','180028','180030','180031','180032','180033','180034','180035','180036','180037','180038','180039','180041','180042','180043','180044','180045','180046','180047','180048','180049','180050','180051','180052','180053','180054','180055','180056','180057','180058','180059','180060','180061','180062','180063','180064','180065','180066','180067','180068','180069','180070','180071','182001','184001','184002','184005','184006','184007','184008','184009','184010','184011','185001','185003','187001','188001','188002','188003','188004','188005','188006','188007','188008','188009','188010','188011','191001','191002','192002','194001','194002','194003','194004','194005','194006','194007','195001','195002','195003','195004','195005','195006','195007','196001','196002','197001','197002','197003','197004','197005','197006','198001','198003','198004','198005','198006','198007','198008','198009','198010','198011','198012','198013','198014','198015','198016','198017','201001','201002','201005','202001','203001','203002','203003','203017','203018','203019','204001','204002','204003','205001','208001','208002','208003','208004','208005','209001','209002','209003','210001','210002','210003','210004','210005','210006','210007','210008','210009','210010','210011','210012','210013','211017','212001','212002','212003','212004','212005','212006','212007','212008','212009','212010','212011','212012','212013','218001','218003','218004','218006','218007','218008','218009','218011','218015','218016','218017','218018','218019','218020','218021','218022','218023','218024','218025','218026','218027','218028','218029','218030','218031','218032','218033','218034','218035','218036','221001','221002','221003','221004','221005','221006','221007','221008','221009','221010','221011','221012','221013','223001','223002','223003','224001','224002','224003','224006','224007','224008','225001','225002','225003','225004','225005','225006','225007','225008','225009','225010','225011','225012','225013','226001','226002','226003','226004','226005','226006','226007','226008','226009','227001','227002','227003','227004','227005','227006','227007','227008','227009','227010','227011','227012','227013','227014','227015','227016','227017','227018','227019','227020','227021','227022','227023','227024','227025','227026','227027','227028','227029','227030','227031','227032','227033','227034','227035','227036','227037','227038','227039','227040','227041','227042','227043','227044','227045','227046','227047','227048','227049','227050','227051','227052','227053','227054','227055','227056','227057','227058','227059','227060','227061','227062','227063','227064','227065','227066','227067','227068','227069','227070','227071','227072','227073','227074','227075','227076','227077','227078','227079','227080','227081','227082','227083','227084','227085','227086','227087','227088','227089','227090','227091','227092','227093','227094','227095','227096','227097','227098','227099','227100','227101','227102','227103','227104','227105','227106','227107','227108','227109','227110','227111','227112','227113','227114','227115','227116','227117','227118','227119','227120','227122','227123','227124','227125','227126','227127','227128','227129','227130','227131','227132','227133','227134','227135','227136','227137','227138','227139','227140','227141','227142','227143','227144','227145','227146','227147','227148','227149','227150','227151','227152','228001','229001','229002','229003','229004','229005','230001','230002','232001','233001','233002','233003','233004','233005','233006','233007','233008','234001','234002','234003','234004','234005','234006','234007','234008','234009','234010','234011','234012','234013','234014','234015','234016','234017','234018','234019','234020','234021','234022','234023','234024','234025','234026','234027','234028','234029','234030','235001','235002','235003','235004','235005','236001','236002','236003','237001','238002','238003','238004','238005','238006','238007','238008','333013','333014','333015','333016','333017','333018','333019','333020','333021','333022','333023','333024','333025','333030','333031','333032','333033','333034','333035','334001','334002','334003','334004','334005','334006','334007','336004','337001','337002','337003','337004','339001','339002','343001','344001','344002','344003','344004','344005','345001','345002','345003','347001','347002','348001','348002','348003','348004','348005','349001','349002','349003','350001','353001','353002','353003','353004','355001','355002','355003','355004','355005','355006','356001','358001','359001','359002','360001','360002','360003','360004','360005','366001','366002','366003','366004','369001','373001','373002','373003','373004','373005','373006','373007','373008','373009','373010','373011','373012','373013','373014','373015','373016','373017','373018','373019','373020','373021','374001','374002','374003','374004','374005','374006','374007','374008','374009','374010','374011','374012','374013','374014','374015','374016','376001','376002','376003','376004','376005','376006','376007','376008','376009','376010','376011','376012','376013','376016','376017','376018','376019','376020','376021','379003','382001','382002','383001','384001','384002','385001','385002','386001','386002','386003','386004','386005','386006','386007','386008','386009','386010','386011','386012','386013','386014','387001','389001','389002','389003','389004','392001','393001','393002','393003','393004','395001','396001','397001','397002','399001','399002','399003','400001','400002','401001','401002','401003','402001','402002','402003','402004','402005','403001','403002','403003','504001','504002','504004','504005','504006','504007','504008','504009','504010','504011','504012','504013','504014','504017','504018','504019','504021','504022','504023','504024','504025','506001','506002','508001','508002','511001','511002','511003','511004','511005','511006','511007','511008','511009','511010','511011','511012','511013','511014','511017','511018','511020','511021','511022','511024','511028','511029','513001','513002','513003','513004','514001','515001','515002','515003','515007','515008','515009','515010','515011','515012','515013','515014','515015','518001','518002','518003','520001','520002','521001','521002','521003','521004','521005','521006','521007','521008','521009','521010','521011','521012','521013','521014','521015','521016','523001','523002','523003','523004','523005','523006','523007','524001','700001','701001','701002','701003','702001','702002','702003','702004','702005','702006','702007','702008','703001','703002','703003','704001','704002','704003','704004','705001','706001','706002','707001','707002','707003','708001','709001','709002','710001','710002','711001','711002','712001','713001','713002','714001','714002','715001','716001','718001','718002','719001','719002','991001','991002','991003','991004','991005','991006','991007','991008','992001','995001','996001','996002','996003','998001','998002','998003','998004','998005','998006','998007','999001','999002','011017','011018','034001','034002','071010','208006','239001','519001','519003','126013','184012','053071','374017','374018','374019','374020','374021','404001','405002','405001','405003','405007','405006','405005','405004','240011','240010','240009','240008','240007','240006','240005','240004','240003','240002','240001','240012','240013','240014','240015','240016','240017','357001','235006','235007','712002','355008','355007','056023','999999','046015','019005','126014','241003','241002','241001','240018','240020','240019','242001','242002','242003','242004','242005','242006','089002','406001','406002','406003','406004','406005','406006','243001','243002','243003','243004','243005','243006','243007','243008','010030','010029','407001','407006','407005','407004','407003','407002','408001','366005','133032','016035','077010','996004','025064','011019','407007','407008','407009','409001','115123','504026','039007','039009','039008','039010','039011','039012','180072','240021','240023','408002','405008','235008','525001','525002','525003','525004','410001','410002','410003','410004','410005','410006','410007','410008','410009','410010','410011','410012','410013','410014','410015','410016','344006','240031','240030','240029','240028','240027','240026','240025','240024','240034','240033','240032','410017','410018','411001','411002','411003','411004','411005','411006','411007','411008','203020','203021','203022','412001','412002','412003','412004','069025','244001','244002','244009','244008','244007','244006','244005','244004','244003','244015','244014','244013','244012','244011','244010','244016','244017','240042','240041','240040','240039','240038','240037','240036','240035','405009','405010','240043','504034','504033','504032','504031','504030','504029','504028','504027','504042','504041','504040','504039','504038','504037','504036','504035','800001','410019','410020','410021','244018','244019','244020','399004','413001','504043','198018','198019','344007','082045','010031','010032','010033','010034','010035','504044','515016','801002','801003','801004','801005','802001','801001','414001','414002','414003','141029','141030','803001','803002','803003','803004','803005','803006','803007','803008','803009','803010','803011','803012','803013','803014','803015','803016','803017','410022','410023','803018','803019','803020','415002','415001','244021','011020','011023','011022','011021','025065','165037','165038','165039','416001','416002','416003','417001','418001','504045','803022','803021','240022','419001','420001','804010','804009','804008','804007','804006','804005','804004','804003','804002','804001','804020','804019','804018','804017','804016','804015','804014','804013','804012','804011','804024','804021','804023','804022','511019','511016','511015','511032','511031','511030','511027','511026','511025','511033','511023','133034','133033','169011','344008','344009','244022','244026','244025','244030','244023','244024','244027','244028','244029','244031','082046','082047','082048','126015','126016','416004','416005','421001','421002','016037','016036','115124','115125','115126','240049','240048','240047','240046','240045','240044','244032','244033','422001','422002','422003','422004','422005','184013','239002','805001','805002','805003','805004','805005','056024','423001','344010','235009','212014','056025','056026','802002','244034','244035','244036','244037','244038','244039','515017','504046','203015','245002','245001','071023','056027','056028','056029','056030','056031','056032','424001','056034','056033','805006','805007','805008','805009','805010','422008','422007','422006','422010','422009','422011','209004','150022','150023','100002','056035','023036','185004','185005','246001','247001','247002','425001','416006','165042','165041','165040','165043','010040','010039','010038','010037','010036','422012','422013','422014','422015','426000','248001','248002','248003','248004','248005','249001','249002','249003','249004','249005','249006','250007','250001','250002','250003','250004','250005','250006','250008','250009','250010','250011','250012','250013','251001','251002','422016','422017','422018','806001','806002','116013','235010','235011','091026','091027','091028','091029','091019','091020','091021','091022','091023','091024','091025','252001','243009','249007','249008','249009','011024','011025','427001','428002','428001','169012','429001','429002','429003') DEFAULT '001001' NOT NULL, +KEY field (field) +); +INSERT INTO t1 VALUES ('001001'),('001001'),('001001'),('001001'),('001001'),('001001'),('001001'),('001001'),('001001'),('001010'),('001010'),('001010'),('001010'),('001010'),('001018'),('001018'),('001018'),('001018'),('001018'),('001018'),('001020'),('001020'),('001020'),('001020'),('001020'),('001020'),('001020'),('001020'),('001021'),('001021'),('001021'),('001021'),('001021'),('001021'),('001027'),('001027'),('001028'),('001030'),('001030'),('001030'),('001030'),('001031'),('001031'),('001031'),('001031'),('001031'),('001100'),('001100'),('002003'),('002003'),('002003'),('002003'),('002003'),('002003'),('002003'),('002003'),('002003'),('002004'),('002004'),('002004'),('002004'),('002004'),('002004'),('002004'),('002004'),('002004'),('002005'),('002005'),('002005'),('002005'),('002005'),('002005'),('002005'),('002005'),('002007'),('002007'),('002007'),('002007'),('002007'),('002007'),('002007'),('002008'),('002008'),('002008'),('002008'),('002008'),('002008'),('002008'),('002008'),('002009'),('002009'),('002009'),('002009'),('002009'),('002009'),('002009'),('002009'),('002012'),('002012'),('002012'),('002012'),('002012'),('002012'),('002012'),('002013'),('002013'),('002013'),('002013'),('002013'),('002013'),('002013'),('002013'),('002013'),('002014'),('002014'),('002014'),('002014'),('002014'),('002014'),('002014'),('002014'),('003002'),('003002'),('003002'),('003002'),('003002'),('003002'),('003003'),('003003'),('003003'),('003003'),('003003'),('003003'),('003004'),('003004'),('003004'),('003004'),('003004'),('003004'),('003005'),('003005'),('003005'),('003005'),('003005'),('003005'),('003005'),('003005'),('003005'),('003006'),('003006'),('003006'),('003006'),('003006'),('003006'),('003006'),('003006'),('003007'),('003007'),('003007'),('003007'),('003007'),('003008'),('003008'),('003008'),('003008'),('003008'),('003008'),('003009'),('003009'),('003009'),('003009'),('003009'),('003009'),('003009'),('003009'),('003009'),('003010'),('003010'),('003010'),('003010'),('003010'),('003010'),('003010'),('003010'),('003010'),('003011'),('003011'),('003011'),('003011'),('003011'),('003011'),('003011'),('003011'),('003012'),('003012'),('003012'),('003012'),('003012'),('003012'),('003012'),('003012'),('003013'),('003013'),('003013'),('003013'),('003013'),('003013'),('003013'),('003013'),('003014'),('003014'),('003014'),('003014'),('003014'),('003014'),('003014'),('003014'),('003015'),('003015'),('003015'),('003015'),('003015'),('003015'),('003016'),('003016'),('003016'),('003016'),('003016'),('003016'),('003017'),('003017'),('003017'),('003017'),('003017'),('003018'),('003018'),('003018'),('003018'),('003018'),('003019'),('003019'),('004003'),('004005'),('004005'),('004005'),('004005'),('004005'),('004005'),('004006'),('004008'),('004010'),('004012'),('004012'),('004014'),('004014'),('004014'),('004014'),('004014'),('004016'),('004017'),('004017'),('004017'),('004017'),('004017'),('004017'),('004017'),('004017'),('004020'),('004020'),('004020'),('004020'),('004020'),('004020'),('004021'),('004021'),('004021'),('004021'),('004021'),('004021'),('004021'),('004022'),('004023'),('004023'),('004023'),('004023'),('004023'),('004023'),('004023'),('004025'),('004026'),('004026'),('004026'),('004026'),('004026'),('006004'),('006006'),('006010'),('006010'),('006010'),('006010'),('006010'),('006010'),('006010'),('006011'),('006011'),('006011'),('006011'),('006011'),('006011'),('006012'),('006012'),('006012'),('006012'),('006012'),('006012'),('006014'),('006014'),('006014'),('007001'),('007001'),('007002'),('007003'),('007005'),('007007'),('007008'),('007009'),('007011'),('007012'),('007013'),('007015'),('007016'),('007017'),('007018'),('007019'),('007019'),('007020'),('007021'),('007021'),('007022'),('007023'),('007023'),('007025'),('007025'),('007025'),('007027'),('007029'),('007031'),('007031'),('007032'),('007034'),('007034'),('007036'),('007036'),('007036'),('007037'),('007037'),('007038'),('007040'),('007040'),('007040'),('007043'),('009001'),('009001'),('009001'),('009001'),('009001'),('009001'),('009001'),('009002'),('009002'),('009002'),('009002'),('009002'),('009004'),('009004'),('009004'),('009004'),('009005'),('009005'),('009005'),('009005'),('009005'),('009005'),('009005'),('009005'),('009006'),('009006'),('009006'),('009006'),('009007'),('009007'),('009007'),('009007'),('009007'),('009007'),('009008'),('009010'),('009010'),('009010'),('009010'),('009010'),('009010'),('009011'),('009011'),('009011'),('009011'),('009011'),('009012'),('009013'),('009013'),('009013'),('010002'),('010002'),('010002'),('010002'),('010002'),('010002'),('010002'),('010002'),('010003'),('010003'),('010003'),('010003'),('010003'),('010003'),('010003'),('010003'),('010003'),('010004'),('010004'),('010004'),('010004'),('010004'),('010004'),('010004'),('010004'),('010004'),('010005'),('010005'),('010005'),('010005'),('010006'),('010006'),('010006'),('010006'),('010006'),('010006'),('010006'),('010006'),('010006'),('010007'),('010007'),('010007'),('010007'),('010007'),('010007'),('010008'),('010008'),('010008'),('010008'),('010008'),('010008'),('010008'),('010009'),('010009'),('010009'),('010009'),('010009'),('010009'),('010010'),('010010'),('010010'),('010010'),('010010'),('010010'),('010010'),('010011'),('010011'),('010011'),('010011'),('010011'),('010011'),('010011'),('010011'),('010012'),('010012'),('010012'),('010012'),('010012'),('010012'),('010012'),('010013'),('010013'),('010013'),('010013'),('010013'),('010013'),('010015'),('010016'),('010016'),('010016'),('010016'),('010016'),('010016'),('010016'),('010016'),('010017'),('010017'),('010017'),('010017'),('010017'),('010017'),('010018'),('010018'),('010018'),('010018'),('010018'),('010018'),('010018'),('010018'),('010018'),('010019'),('010019'),('010019'),('010019'),('010019'),('010019'),('010020'),('010020'),('010020'),('010021'),('010021'),('010021'),('010021'),('010021'),('010021'),('010022'),('010022'),('010022'),('010022'),('010022'),('010022'),('010022'),('010022'),('010023'),('010023'),('010023'),('010023'),('010023'),('010023'),('010023'),('010023'),('010026'),('010027'),('010028'),('010028'),('011001'),('011001'),('011001'),('011001'),('011001'),('011001'),('011001'),('011002'),('011002'),('011002'),('011002'),('011002'),('011002'),('011002'),('011003'),('011003'),('011003'),('011003'),('011003'),('011003'),('011003'),('011003'),('011004'),('011004'),('011004'),('011004'),('011004'),('011004'),('011004'),('011006'),('011006'),('011006'),('011006'),('011006'),('011006'),('011006'),('011012'),('011012'),('011012'),('011013'),('011013'),('011013'),('011013'),('011013'),('011013'),('011014'),('011014'),('011014'),('011014'),('011015'),('011015'),('011015'),('011015'),('011015'),('011016'),('011016'),('011016'),('011016'),('011016'),('012017'),('012017'),('012027'),('012027'),('012032'),('012034'),('012036'),('012036'),('012037'),('012037'),('012038'),('012039'),('014001'),('014001'),('016016'),('016016'),('016016'),('016019'),('016020'),('016020'),('016020'),('016020'),('016020'),('016020'),('016020'),('016020'),('016021'),('016021'),('016021'),('016021'),('016021'),('016021'),('016021'),('016022'),('016022'),('016022'),('016023'),('016023'),('016023'),('016024'),('016024'),('016024'),('016024'),('016024'),('016024'),('016024'),('016026'),('016026'),('016026'),('016026'),('016026'),('016026'),('016028'),('016028'),('016028'),('016028'),('016028'),('016028'),('016028'),('016029'),('016029'),('016030'),('016031'),('016032'),('016032'),('016032'),('016032'),('016032'),('016032'),('016032'),('016033'),('016033'),('016033'),('016033'),('016033'),('016034'),('016034'),('016034'),('016034'),('016034'),('017002'),('017002'),('017002'),('017002'),('017002'),('018001'),('018001'),('018001'),('018001'),('018001'),('018001'),('018001'),('018001'),('019002'),('019002'),('019002'),('019002'),('019002'),('019002'),('019004'),('019004'),('019004'),('019004'),('019004'),('019004'),('020001'),('020001'),('020001'),('020001'),('020004'),('020006'),('020006'),('020006'),('020006'),('020006'),('020006'),('020008'),('020009'),('020009'),('020009'),('020009'),('020009'),('022001'),('022001'),('022001'),('022001'),('022002'),('022002'),('022002'),('022002'),('022003'),('022003'),('022003'),('022003'),('023001'),('023002'),('023002'),('023002'),('023002'),('023002'),('023002'),('023003'),('023003'),('023003'),('023003'),('023004'),('023004'),('023005'),('023005'),('023006'),('023006'),('023006'),('023006'),('023006'),('023006'),('023007'),('023007'),('023010'),('023010'),('023011'),('023011'),('023017'),('023019'),('023019'),('023019'),('023020'),('023020'),('023025'),('023025'),('023025'),('023026'),('023026'),('023026'),('023027'),('023027'),('023027'),('023028'),('023028'),('023029'),('023029'),('023030'),('023030'),('023032'),('023033'),('023033'),('023033'),('023033'),('023033'),('023033'),('023034'),('023035'),('023035'),('025001'),('025001'),('025001'),('025001'),('025001'),('025001'),('025001'),('025003'),('025003'),('025004'),('025004'),('025005'),('025005'),('025007'),('025007'),('025008'),('025008'),('025009'),('025010'),('025010'),('025010'),('025011'),('025011'),('025012'),('025012'),('025013'),('025013'),('025013'),('025014'),('025015'),('025016'),('025018'),('025018'),('025019'),('025019'),('025020'),('025020'),('025021'),('025022'),('025022'),('025023'),('025023'),('025024'),('025025'),('025025'),('025026'),('025026'),('025027'),('025027'),('025027'),('025028'),('025030'),('025031'),('025033'),('025034'),('025035'),('025037'),('025041'),('025042'),('025043'),('025046'),('025048'),('025048'),('025048'),('025049'),('025049'),('025049'),('025050'),('025050'),('025050'),('025051'),('025051'),('025052'),('025052'),('025052'),('025053'),('025053'),('025054'),('025054'),('025054'),('025054'),('025055'),('025056'),('025056'),('025056'),('025056'),('025056'),('025056'),('025056'),('025056'),('025056'),('025057'),('025057'),('025058'),('025058'),('025060'),('025060'),('025061'),('025062'),('025063'),('027001'),('027002'),('027011'),('036001'),('036001'),('036001'),('036001'),('036001'),('037003'),('037006'),('037007'),('037008'),('037008'),('038009'),('039001'),('039001'),('039001'),('039001'),('039001'),('039001'),('039002'),('039002'),('039002'),('039002'),('039002'),('039003'),('039003'),('039003'),('039003'),('039003'),('039003'),('039004'),('039004'),('039004'),('039004'),('039004'),('039005'),('039005'),('039005'),('039005'),('039005'),('039006'),('039006'),('039006'),('039006'),('046001'),('046001'),('046001'),('046001'),('046001'),('046001'),('046001'),('046001'),('046002'),('046002'),('046002'),('046002'),('046002'),('046002'),('046002'),('046002'),('046003'),('046003'),('046003'),('046003'),('046003'),('046003'),('046003'),('046005'),('046005'),('046005'),('046005'),('046005'),('046005'),('046005'),('046007'),('046007'),('046007'),('046007'),('046007'),('046007'),('046008'),('046008'),('046008'),('046008'),('046008'),('046009'),('046009'),('046009'),('046010'),('046012'),('046012'),('046012'),('046013'),('046014'),('046014'),('046014'),('047001'),('047001'),('047001'),('047001'),('047001'),('047001'),('047001'),('047001'),('047002'),('047002'),('047002'),('047002'),('047002'),('047002'),('047002'),('047002'),('048001'),('048001'),('048001'),('048001'),('048001'),('048001'),('048001'),('048001'),('051003'),('051003'),('051003'),('051003'),('051003'),('051004'),('051004'),('051004'),('051004'),('052001'),('052001'),('052001'),('052001'),('052001'),('052001'),('052001'),('052001'),('052002'),('052002'),('052005'),('052005'),('052005'),('052005'),('052005'),('052005'),('053016'),('053019'),('053019'),('053023'),('053023'),('053023'),('053023'),('053024'),('053024'),('053024'),('053026'),('053026'),('053026'),('053026'),('053028'),('053028'),('053029'),('053029'),('053029'),('053029'),('053033'),('053033'),('053033'),('053045'),('053046'),('053051'),('053051'),('053051'),('053054'),('053054'),('053054'),('053054'),('053057'),('053069'),('053069'),('053097'),('053107'),('053125'),('053125'),('053127'),('054001'),('054001'),('054001'),('054001'),('054001'),('054001'),('054001'),('054002'),('054002'),('054002'),('054002'),('054002'),('054002'),('054003'),('054003'),('054003'),('054003'),('054003'),('054003'),('054003'),('054004'),('054004'),('054004'),('054004'),('054004'),('054004'),('054004'),('054006'),('054006'),('054006'),('054007'),('054007'),('054007'),('054007'),('054007'),('054009'),('054009'),('054009'),('054009'),('054010'),('054010'),('054010'),('054010'),('054010'),('054010'),('054010'),('056001'),('056001'),('056001'),('056001'),('056001'),('056001'),('056001'),('056001'),('056001'),('056002'),('056002'),('056002'),('056002'),('056002'),('056002'),('056002'),('056002'),('056003'),('056003'),('056003'),('056003'),('056003'),('056003'),('056004'),('056004'),('056004'),('056004'),('056004'),('056004'),('056004'),('056005'),('056005'),('056005'),('056005'),('056005'),('056005'),('056005'),('056005'),('056005'),('056006'),('056006'),('056006'),('056006'),('056006'),('056006'),('056006'),('056006'),('056006'),('056009'),('056009'),('056009'),('056011'),('056016'),('056016'),('056016'),('056016'),('056016'),('056016'),('056016'),('056017'),('056017'),('056017'),('056017'),('056017'),('056017'),('056017'),('056017'),('056017'),('056018'),('056018'),('056018'),('056018'),('056018'),('056018'),('056019'),('056019'),('056019'),('056019'),('056019'),('056019'),('056019'),('056019'),('056020'),('056020'),('056020'),('056020'),('056022'),('056022'),('056022'),('056022'),('056022'),('057003'),('057003'),('057004'),('058002'),('058002'),('058002'),('058002'),('058003'),('058003'),('058003'),('058003'),('058004'),('058004'),('058004'),('058005'),('058005'),('058005'),('060001'),('060001'),('060001'),('060001'),('060001'),('060004'),('060004'),('060004'),('060004'),('060004'),('060004'),('060005'),('060005'),('060005'),('060005'),('060005'),('060005'),('060007'),('060007'),('060007'),('060007'),('060007'),('060007'),('060007'),('061004'),('061004'),('061004'),('061004'),('061004'),('061004'),('061006'),('061006'),('061006'),('061006'),('061006'),('061006'),('069006'),('069006'),('069006'),('069006'),('069006'),('069006'),('069006'),('069006'),('069006'),('069007'),('069007'),('069007'),('069007'),('069007'),('069007'),('069007'),('069007'),('069010'),('069010'),('069010'),('069010'),('069010'),('069010'),('069011'),('069012'),('069012'),('069012'),('069012'),('069012'),('069012'),('069012'),('069012'),('069012'),('069012'),('069013'),('069013'),('069013'),('069013'),('069013'),('069013'),('069013'),('069013'),('069013'),('069014'),('069014'),('069014'),('069014'),('069014'),('069014'),('069014'),('069014'),('069014'),('069015'),('069015'),('069015'),('069015'),('069015'),('069015'),('069015'),('069015'),('069015'),('069015'),('069016'),('069016'),('069016'),('069016'),('069016'),('069018'),('069018'),('069018'),('069018'),('069018'),('069018'),('069018'),('069018'),('069018'),('069020'),('069020'),('069020'),('069020'),('069021'),('069023'),('071002'),('071002'),('071002'),('071002'),('071002'),('071003'),('071003'),('071003'),('071003'),('071003'),('071004'),('071004'),('071004'),('071004'),('071004'),('071005'),('071005'),('071005'),('071005'),('071005'),('071005'),('071006'),('071006'),('071006'),('071006'),('071008'),('071008'),('071008'),('071008'),('071008'),('071008'),('071011'),('071011'),('071011'),('071011'),('071011'),('071020'),('071020'),('071020'),('071020'),('071020'),('071021'),('071022'),('071022'),('071022'),('072001'),('072001'),('074001'),('074002'),('074002'),('074002'),('074002'),('074002'),('074002'),('074002'),('074002'),('074003'),('074003'),('074003'),('074003'),('074003'),('074003'),('074003'),('074003'),('074004'),('074004'),('074004'),('074004'),('074004'),('074004'),('074004'),('074004'),('074005'),('074005'),('074005'),('074005'),('074005'),('074005'),('074005'),('074005'),('074006'),('074006'),('074006'),('074006'),('074006'),('074006'),('074006'),('074006'),('074007'),('074007'),('074007'),('074007'),('074007'),('074007'),('074007'),('074007'),('074008'),('074008'),('074008'),('074008'),('074008'),('074008'),('074008'),('074008'),('074009'),('074009'),('074009'),('074009'),('074009'),('074009'),('074009'),('074009'),('074010'),('074010'),('074010'),('074010'),('074010'),('074010'),('074010'),('074010'),('074011'),('074011'),('074011'),('074011'),('074011'),('074011'),('074011'),('074011'),('074012'),('074012'),('074012'),('074012'),('074012'),('074012'),('074012'),('075001'),('075001'),('075001'),('075007'),('075007'),('075007'),('075007'),('076101'),('076101'),('076101'),('076101'),('076102'),('076102'),('076102'),('076103'),('076103'),('076103'),('076103'),('076103'),('077001'),('077001'),('077001'),('077002'),('077002'),('077002'),('077002'),('077002'),('077002'),('077002'),('077003'),('077003'),('077003'),('077003'),('077003'),('077003'),('077003'),('077004'),('077004'),('077004'),('077004'),('077004'),('077004'),('077006'),('077006'),('077008'),('077008'),('077008'),('077008'),('077008'),('077008'),('077008'),('077009'),('077009'),('077009'),('077009'),('077009'),('077009'),('077009'),('078005'),('078005'),('078005'),('079002'),('079002'),('079002'),('079002'),('079002'),('079002'),('079002'),('079003'),('079003'),('079004'),('079004'),('079005'),('079005'),('079005'),('079005'),('079005'),('079005'),('079006'),('079006'),('079006'),('079006'),('079007'),('079007'),('079007'),('079007'),('079007'),('081001'),('081001'),('081001'),('081001'),('081001'),('082011'),('082011'),('082011'),('082011'),('082011'),('082013'),('082013'),('082013'),('082013'),('082013'),('082013'),('082014'),('082014'),('082014'),('082014'),('082014'),('082014'),('082014'),('082015'),('082015'),('082015'),('082015'),('082015'),('082016'),('082016'),('082016'),('082016'),('082016'),('082016'),('082017'),('082017'),('082017'),('082017'),('082017'),('082017'),('082017'),('082021'),('082021'),('082022'),('082022'),('082022'),('082022'),('082022'),('082023'),('082023'),('082023'),('082023'),('082023'),('082024'),('082024'),('082024'),('082024'),('082024'),('082025'),('082025'),('082025'),('082025'),('082025'),('082026'),('082026'),('082026'),('082026'),('082026'),('082027'),('082027'),('082027'),('082027'),('082027'),('082028'),('082028'),('082028'),('082028'),('082029'),('082029'),('082029'),('082029'),('082029'),('082030'),('082030'),('082030'),('082030'),('082031'),('082031'),('082031'),('082031'),('082031'),('082032'),('082032'),('082032'),('082033'),('082033'),('082034'),('082034'),('082034'),('082034'),('082034'),('082034'),('082034'),('082035'),('082035'),('082035'),('082036'),('082036'),('082036'),('082036'),('082037'),('082037'),('082037'),('082038'),('082038'),('082038'),('082038'),('082039'),('082039'),('082039'),('082039'),('082040'),('082040'),('082040'),('082040'),('082040'),('082041'),('082041'),('082041'),('082041'),('082042'),('082042'),('082043'),('082043'),('082043'),('082043'),('082043'),('082044'),('082044'),('082044'),('082044'),('084001'),('084002'),('084002'),('084002'),('084002'),('084003'),('084003'),('084003'),('084003'),('084003'),('084003'),('084003'),('084003'),('084004'),('084004'),('084004'),('084004'),('084004'),('084005'),('084005'),('084005'),('084005'),('084005'),('084007'),('084007'),('084007'),('084007'),('084007'),('084007'),('084008'),('084008'),('084008'),('084008'),('084008'),('084008'),('084009'),('084009'),('084009'),('084009'),('084009'),('084009'),('084011'),('084013'),('084013'),('084013'),('084013'),('084013'),('084014'),('084014'),('084014'),('084016'),('084016'),('084016'),('084016'),('084016'),('084016'),('084016'),('084016'),('084017'),('084017'),('084017'),('084017'),('084017'),('084017'),('084017'),('084017'),('084017'),('084027'),('084027'),('084027'),('084027'),('084027'),('084027'),('084032'),('084032'),('084033'),('084033'),('084033'),('084035'),('084035'),('084035'),('084036'),('084036'),('084036'),('084036'),('084036'),('084036'),('084037'),('084037'),('084038'),('084038'),('084038'),('084038'),('084038'),('084038'),('084039'),('084039'),('084039'),('084039'),('084040'),('084040'),('084040'),('084040'),('084040'),('084041'),('084041'),('084041'),('084041'),('084042'),('084042'),('084043'),('084043'),('084043'),('084043'),('084044'),('084044'),('084044'),('084044'),('084044'),('084045'),('084046'),('084046'),('084046'),('084047'),('084048'),('084048'),('084049'),('084049'),('084050'),('084051'),('084051'),('085001'),('085001'),('085001'),('085001'),('085001'),('085001'),('085002'),('085002'),('085002'),('085002'),('085003'),('085003'),('085003'),('085003'),('085003'),('085003'),('085003'),('085004'),('085004'),('085004'),('085004'),('085004'),('085004'),('085004'),('085005'),('085005'),('085005'),('085005'),('085005'),('085005'),('085006'),('085006'),('085006'),('085006'),('085006'),('085006'),('085006'),('085006'),('085007'),('085007'),('085007'),('085007'),('085007'),('085007'),('085007'),('085009'),('085009'),('085009'),('085009'),('085009'),('085009'),('085011'),('085011'),('085011'),('085011'),('085011'),('085011'),('085011'),('085011'),('085012'),('085012'),('085012'),('085012'),('085012'),('085012'),('085012'),('085014'),('085014'),('085014'),('085014'),('085014'),('085014'),('085014'),('085014'),('085014'),('085015'),('085015'),('085015'),('085015'),('085015'),('085015'),('085015'),('085015'),('085016'),('085016'),('085016'),('085016'),('085016'),('085016'),('085016'),('085016'),('085017'),('085017'),('085017'),('085017'),('085017'),('085018'),('085018'),('085018'),('085018'),('085018'),('085019'),('085019'),('085019'),('085019'),('085019'),('085019'),('085019'),('085019'),('085019'),('085020'),('085020'),('085020'),('085020'),('085020'),('085020'),('085022'),('085022'),('085022'),('085022'),('085022'),('085022'),('085023'),('085023'),('085023'),('085023'),('085023'),('085028'),('085028'),('085028'),('085028'),('085028'),('085028'),('085028'),('085029'),('085029'),('085029'),('085029'),('085029'),('085029'),('085029'),('085030'),('085030'),('085030'),('085030'),('085030'),('085030'),('085030'),('085031'),('085031'),('085031'),('085031'),('085031'),('085031'),('085031'),('085033'),('085034'),('085034'),('085034'),('085034'),('085034'),('085034'),('085034'),('085035'),('085035'),('085035'),('085035'),('085035'),('085035'),('085036'),('085036'),('085036'),('085036'),('085036'),('085036'),('085037'),('085037'),('085037'),('085037'),('085037'),('085037'),('085038'),('085038'),('085038'),('085038'),('085038'),('085038'),('085038'),('085040'),('085040'),('085040'),('085040'),('085040'),('085040'),('085040'),('085040'),('085041'),('085041'),('085041'),('085041'),('085041'),('085041'),('085041'),('085041'),('085042'),('085042'),('085042'),('085042'),('085042'),('085042'),('085042'),('085043'),('085043'),('085043'),('085043'),('085043'),('085043'),('085044'),('085044'),('085044'),('085044'),('085044'),('085044'),('085044'),('085045'),('085045'),('085045'),('085045'),('085045'),('085046'),('085046'),('085046'),('085046'),('085046'),('085046'),('085046'),('085046'),('085047'),('085047'),('085047'),('085047'),('085047'),('085047'),('085047'),('085047'),('085048'),('085048'),('085048'),('085048'),('085048'),('085048'),('085048'),('085063'),('085063'),('085063'),('085063'),('085063'),('085064'),('085064'),('085064'),('085064'),('085064'),('085065'),('085065'),('085068'),('085068'),('085068'),('085068'),('085068'),('085068'),('085071'),('085071'),('085071'),('085071'),('085071'),('085071'),('085073'),('085073'),('085082'),('085082'),('085082'),('085082'),('085082'),('085086'),('085086'),('085086'),('085088'),('085088'),('085088'),('085088'),('085088'),('085088'),('085088'),('085089'),('085089'),('085090'),('085090'),('085090'),('085090'),('085090'),('085090'),('085090'),('085090'),('085091'),('085091'),('085091'),('085091'),('085091'),('085092'),('085092'),('085092'),('085093'),('085093'),('085095'),('085095'),('085095'),('085095'),('085095'),('085096'),('085096'),('085096'),('085096'),('085096'),('085096'),('085097'),('085097'),('085097'),('085097'),('085097'),('085098'),('085098'),('085098'),('085098'),('085098'),('085098'),('085098'),('085099'),('085099'),('085099'),('085099'),('085099'),('085099'),('085099'),('085100'),('085100'),('085100'),('085100'),('085100'),('085100'),('085100'),('085100'),('085100'),('085100'),('085101'),('085101'),('085101'),('085101'),('085101'),('085101'),('085101'),('085101'),('085102'),('085102'),('085103'),('085103'),('085103'),('085104'),('085104'),('085104'),('085104'),('085104'),('085105'),('085105'),('085106'),('085106'),('085106'),('085106'),('085106'),('085106'),('085108'),('085108'),('085109'),('085109'),('085109'),('085109'),('085109'),('085109'),('085109'),('085109'),('085110'),('085110'),('085110'),('085110'),('085110'),('085111'),('085111'),('085111'),('085112'),('085112'),('085112'),('085112'),('085113'),('085113'),('085113'),('085113'),('085113'),('085115'),('085120'),('085121'),('085121'),('085121'),('085121'),('085122'),('085122'),('085122'),('085122'),('085122'),('085122'),('085122'),('085122'),('085123'),('085123'),('085123'),('085123'),('085123'),('085123'),('085123'),('085123'),('085125'),('085125'),('085125'),('085125'),('085125'),('085126'),('085126'),('085126'),('085126'),('085126'),('085127'),('085127'),('085127'),('085127'),('085127'),('085127'),('085127'),('085127'),('085128'),('085128'),('085128'),('085128'),('085128'),('085129'),('085129'),('085129'),('085129'),('085129'),('085130'),('085130'),('085130'),('085130'),('085130'),('085132'),('085132'),('085132'),('085132'),('085132'),('085132'),('085133'),('085133'),('085133'),('085133'),('085133'),('085134'),('085134'),('085134'),('085135'),('085135'),('085135'),('085136'),('085136'),('085136'),('085136'),('085137'),('085137'),('085137'),('085137'),('085137'),('085137'),('085137'),('086002'),('086002'),('086002'),('086002'),('086003'),('086003'),('086003'),('086003'),('086005'),('088001'),('088001'),('088001'),('088001'),('088001'),('088003'),('088003'),('088003'),('088003'),('088003'),('088003'),('088005'),('088005'),('088005'),('088005'),('088005'),('088006'),('088006'),('088006'),('088006'),('088006'),('088007'),('088007'),('088007'),('088008'),('088008'),('088008'),('088008'),('088009'),('088009'),('088009'),('088009'),('088009'),('089001'),('089001'),('089001'),('089001'),('089001'),('089001'),('089001'),('090001'),('090001'),('090001'),('090001'),('090001'),('090001'),('090001'),('090002'),('090002'),('090002'),('090002'),('090002'),('090002'),('090003'),('090003'),('090003'),('090003'),('090003'),('090003'),('090003'),('090004'),('090004'),('090004'),('090004'),('090004'),('090004'),('090004'),('090006'),('090006'),('090006'),('090006'),('090006'),('090006'),('090006'),('090008'),('090008'),('090008'),('090008'),('090008'),('090009'),('090009'),('090009'),('090009'),('090009'),('090010'),('090010'),('090013'),('090013'),('090013'),('090016'),('090016'),('090017'),('090018'),('090022'),('090027'),('091001'),('091001'),('091001'),('091001'),('091001'),('091001'),('091002'),('091002'),('091002'),('091002'),('091002'),('091002'),('091009'),('091009'),('091009'),('091009'),('091009'),('091011'),('091011'),('091011'),('091011'),('091011'),('091011'),('091011'),('091012'),('091012'),('091013'),('091013'),('091013'),('091013'),('091013'),('091013'),('091015'),('091015'),('091015'),('091015'),('091015'),('091015'),('091016'),('091016'),('091016'),('091016'),('091016'),('091017'),('091017'),('091018'),('091018'),('091018'),('091018'),('093003'),('093003'),('093003'),('093003'),('093003'),('093003'),('099001'),('099001'),('099001'),('099001'),('099001'),('099001'),('099001'),('100001'),('100001'),('100001'),('100001'),('106001'),('113005'),('113005'),('113005'),('113006'),('113006'),('113018'),('113019'),('113020'),('115001'),('115001'),('115001'),('115002'),('115002'),('115003'),('115004'),('115004'),('115004'),('115004'),('115005'),('115005'),('115005'),('115006'),('115006'),('115006'),('115007'),('115007'),('115007'),('115007'),('115007'),('115008'),('115008'),('115008'),('115009'),('115010'),('115010'),('115010'),('115010'),('115010'),('115011'),('115011'),('115011'),('115011'),('115012'),('115012'),('115013'),('115013'),('115013'),('115014'),('115014'),('115014'),('115014'),('115015'),('115015'),('115015'),('115016'),('115016'),('115016'),('115016'),('115017'),('115017'),('115017'),('115017'),('115017'),('115018'),('115018'),('115020'),('115020'),('115021'),('115021'),('115022'),('115022'),('115022'),('115023'),('115023'),('115023'),('115023'),('115023'),('115025'),('115025'),('115025'),('115026'),('115026'),('115027'),('115027'),('115027'),('115028'),('115028'),('115028'),('115028'),('115029'),('115029'),('115029'),('115030'),('115030'),('115030'),('115031'),('115031'),('115032'),('115032'),('115032'),('115033'),('115033'),('115033'),('115033'),('115034'),('115034'),('115034'),('115035'),('115035'),('115036'),('115036'),('115036'),('115036'),('115036'),('115039'),('115040'),('115040'),('115040'),('115041'),('115041'),('115041'),('115041'),('115041'),('115042'),('115042'),('115042'),('115042'),('115042'),('115043'),('115043'),('115043'),('115044'),('115044'),('115044'),('115044'),('115046'),('115046'),('115046'),('115047'),('115048'),('115050'),('115050'),('115050'),('115050'),('115050'),('115051'),('115051'),('115051'),('115052'),('115053'),('115053'),('115054'),('115054'),('115054'),('115055'),('115055'),('115055'),('115057'),('115059'),('115059'),('115059'),('115059'),('115060'),('115060'),('115060'),('115060'),('115060'),('115060'),('115061'),('115061'),('115061'),('115062'),('115062'),('115062'),('115062'),('115064'),('115064'),('115064'),('115065'),('115065'),('115065'),('115065'),('115066'),('115066'),('115066'),('115067'),('115067'),('115067'),('115068'),('115068'),('115068'),('115069'),('115069'),('115069'),('115069'),('115069'),('115070'),('115070'),('115070'),('115071'),('115071'),('115071'),('115072'),('115072'),('115072'),('115073'),('115073'),('115075'),('115075'),('115075'),('115076'),('115076'),('115076'),('115076'),('115076'),('115076'),('115081'),('115081'),('115081'),('115082'),('115082'),('115082'),('115085'),('115085'),('115085'),('115085'),('115085'),('115086'),('115086'),('115086'),('115087'),('115087'),('115088'),('115088'),('115088'),('115088'),('115088'),('115095'),('115095'),('115095'),('115096'),('115096'),('115097'),('115097'),('115098'),('115098'),('115099'),('115101'),('115102'),('115102'),('115102'),('115103'),('115103'),('115104'),('115104'),('115104'),('115104'),('115105'),('115105'),('115106'),('115106'),('115106'),('115106'),('115106'),('115108'),('115109'),('115111'),('115111'),('115111'),('115111'),('115112'),('115112'),('115112'),('115112'),('115112'),('115113'),('115113'),('115113'),('115114'),('115114'),('115114'),('115114'),('115114'),('115115'),('115115'),('115115'),('115115'),('115116'),('115117'),('115117'),('115117'),('115118'),('115118'),('115119'),('115119'),('115119'),('115119'),('115120'),('115121'),('115121'),('115122'),('115122'),('116001'),('116003'),('116003'),('116003'),('116003'),('116004'),('116004'),('116005'),('116005'),('116006'),('116006'),('116006'),('116007'),('116007'),('116008'),('116008'),('116009'),('116009'),('116009'),('116010'),('116010'),('116010'),('116010'),('116011'),('116011'),('116011'),('116011'),('116012'),('116012'),('123001'),('123001'),('123001'),('123001'),('123001'),('124065'),('126001'),('126001'),('126001'),('126001'),('126001'),('126001'),('126001'),('126001'),('126002'),('126002'),('126002'),('126002'),('126002'),('126002'),('126002'),('126002'),('126003'),('126003'),('126003'),('126003'),('126003'),('126003'),('126003'),('126003'),('126003'),('126004'),('126004'),('126004'),('126004'),('126004'),('126004'),('126004'),('126004'),('126004'),('126004'),('126005'),('126005'),('126005'),('126005'),('126005'),('126005'),('126005'),('126005'),('126005'),('126006'),('126006'),('126006'),('126006'),('126006'),('126006'),('126006'),('126006'),('126006'),('126007'),('126007'),('126007'),('126007'),('126007'),('126007'),('126007'),('126008'),('126008'),('126008'),('126008'),('126008'),('126008'),('126008'),('126008'),('126009'),('126009'),('126009'),('126009'),('126009'),('126009'),('126009'),('126009'),('126010'),('126010'),('126010'),('126010'),('126010'),('126010'),('126010'),('126010'),('126010'),('126011'),('126011'),('126011'),('126011'),('126011'),('126011'),('126011'),('126012'),('126012'),('126012'),('126012'),('130001'),('130001'),('130001'),('130001'),('132001'),('132001'),('132001'),('132001'),('132001'),('132002'),('132002'),('132002'),('132002'),('132002'),('132002'),('132002'),('133001'),('133001'),('133008'),('133009'),('133010'),('133011'),('133011'),('133011'),('133011'),('133011'),('133011'),('133012'),('133015'),('133015'),('133015'),('133015'),('133016'),('133018'),('133018'),('133018'),('133018'),('133018'),('133019'),('133021'),('133021'),('133022'),('133022'),('133023'),('133023'),('133024'),('133024'),('133024'),('133024'),('133024'),('133024'),('133025'),('133027'),('133027'),('133027'),('133027'),('133027'),('133028'),('133028'),('133028'),('133029'),('133029'),('133029'),('133029'),('133029'),('133029'),('133030'),('133030'),('133031'),('133031'),('133031'),('134001'),('134001'),('134001'),('135001'),('135001'),('135001'),('135001'),('135001'),('135002'),('135002'),('135002'),('135004'),('135010'),('135010'),('135010'),('135010'),('135010'),('135010'),('137010'),('137011'),('137012'),('137014'),('137015'),('137015'),('137016'),('137019'),('139001'),('140001'),('140001'),('140001'),('140001'),('140001'),('140001'),('141001'),('141001'),('141001'),('141001'),('141001'),('141002'),('141002'),('141002'),('141002'),('141002'),('141003'),('141003'),('141003'),('141003'),('141003'),('141003'),('141003'),('141003'),('141006'),('141006'),('141006'),('141006'),('141006'),('141006'),('141006'),('141006'),('141007'),('141007'),('141007'),('141007'),('141007'),('141009'),('141009'),('141009'),('141009'),('141009'),('141011'),('141011'),('141011'),('141011'),('141011'),('141011'),('141012'),('141014'),('141014'),('141014'),('141014'),('141014'),('141014'),('141014'),('141014'),('141015'),('141015'),('141015'),('141015'),('141015'),('141016'),('141016'),('141016'),('141016'),('141016'),('141016'),('141017'),('141017'),('141017'),('141017'),('141017'),('141017'),('141018'),('141018'),('141018'),('141018'),('141019'),('141019'),('141019'),('141019'),('141020'),('141020'),('141020'),('141020'),('141020'),('141020'),('141020'),('141021'),('141021'),('141021'),('141021'),('141021'),('141021'),('141022'),('141022'),('141022'),('141022'),('141022'),('141022'),('141023'),('141023'),('141023'),('141023'),('141023'),('141023'),('141023'),('141024'),('141025'),('141025'),('141025'),('141026'),('141026'),('141026'),('141026'),('141026'),('141026'),('141027'),('141027'),('141027'),('141027'),('141027'),('141028'),('141028'),('145001'),('145001'),('145001'),('145001'),('145001'),('145001'),('145001'),('145001'),('145001'),('145002'),('145002'),('145002'),('145002'),('145002'),('145002'),('145002'),('145002'),('145002'),('145003'),('145003'),('145003'),('145003'),('145003'),('145003'),('145003'),('145003'),('145003'),('145003'),('145004'),('145004'),('145004'),('145004'),('145004'),('145004'),('145004'),('145004'),('145004'),('145005'),('145005'),('145005'),('145005'),('145005'),('145005'),('145005'),('145005'),('145005'),('145006'),('145006'),('145006'),('145006'),('145006'),('145006'),('145006'),('145006'),('145006'),('145008'),('145008'),('145008'),('145008'),('145008'),('145008'),('145008'),('145008'),('145009'),('145009'),('145009'),('145009'),('145009'),('145009'),('145009'),('145011'),('145011'),('145011'),('145011'),('145011'),('145011'),('145011'),('145011'),('145012'),('145012'),('145012'),('145012'),('145012'),('145012'),('145012'),('145012'),('145013'),('145013'),('145013'),('145013'),('145013'),('145013'),('145013'),('150009'),('150013'),('150014'),('150015'),('150015'),('150015'),('150016'),('150016'),('150017'),('150017'),('150017'),('150017'),('150020'),('152001'),('152001'),('152001'),('152002'),('152003'),('152003'),('152003'),('152003'),('152004'),('152005'),('152006'),('152006'),('152006'),('152006'),('152007'),('154001'),('154002'),('154002'),('155001'),('155001'),('155002'),('155003'),('155004'),('155004'),('155006'),('159001'),('159003'),('160001'),('160001'),('160001'),('160001'),('160002'),('160002'),('161001'),('162002'),('162002'),('162003'),('162003'),('162003'),('162003'),('162003'),('162007'),('162012'),('162012'),('162012'),('163001'),('163001'),('163001'),('163011'),('163015'),('163016'),('163016'),('165001'),('165001'),('165001'),('165001'),('165002'),('165002'),('165002'),('165002'),('165003'),('165003'),('165003'),('165004'),('165004'),('165004'),('165005'),('165005'),('165005'),('165006'),('165006'),('165006'),('165006'),('165007'),('165007'),('165007'),('165007'),('165008'),('165008'),('165008'),('165008'),('165009'),('165009'),('165009'),('165009'),('165010'),('165010'),('165010'),('165011'),('165011'),('165012'),('165012'),('165012'),('165013'),('165013'),('165013'),('165014'),('165014'),('165014'),('165015'),('165015'),('165015'),('165015'),('165016'),('165016'),('165016'),('165017'),('165017'),('165017'),('165017'),('165018'),('165018'),('165018'),('165018'),('165019'),('165019'),('165019'),('165019'),('165020'),('165020'),('165020'),('165020'),('165021'),('165021'),('165021'),('165021'),('165022'),('165022'),('165022'),('165023'),('165024'),('165024'),('165024'),('165025'),('165025'),('165025'),('165026'),('165026'),('165026'),('165028'),('165029'),('165030'),('165030'),('165030'),('165031'),('165031'),('165033'),('165033'),('165034'),('165034'),('165034'),('165035'),('165035'),('165035'),('165036'),('165036'),('165036'),('168003'),('168003'),('168004'),('168005'),('168014'),('169001'),('169001'),('169001'),('169001'),('169001'),('169001'),('169001'),('169001'),('169001'),('169001'),('169002'),('169002'),('169002'),('169002'),('169002'),('169002'),('169002'),('169002'),('169002'),('169002'),('169003'),('169003'),('169003'),('169003'),('169007'),('169007'),('169007'),('169007'),('169007'),('169007'),('169007'),('169007'),('169007'),('169007'),('169008'),('169008'),('169008'),('169008'),('169008'),('169008'),('169008'),('169009'),('169009'),('169009'),('169009'),('169010'),('171006'),('171006'),('171007'),('171007'),('171008'),('171008'),('171008'),('171009'),('171009'),('171009'),('172001'),('176001'),('176001'),('176001'),('176001'),('176001'),('176001'),('176001'),('176002'),('176002'),('176002'),('176002'),('176002'),('176003'),('176003'),('176003'),('176003'),('176003'),('176003'),('177001'),('177001'),('177001'),('177001'),('177001'),('177001'),('179007'),('179007'),('179012'),('179012'),('179012'),('179012'),('179012'),('179012'),('179013'),('179013'),('179013'),('179013'),('179013'),('179013'),('179042'),('179044'),('179045'),('180001'),('180013'),('180014'),('180014'),('180015'),('180017'),('180018'),('180020'),('180020'),('180021'),('180021'),('180027'),('180030'),('180033'),('180035'),('180036'),('180037'),('180038'),('180041'),('180042'),('180045'),('180045'),('180047'),('180048'),('180049'),('180050'),('180054'),('180060'),('180066'),('180067'),('180068'),('180070'),('182001'),('184001'),('184002'),('184005'),('184005'),('184005'),('184005'),('184006'),('184006'),('184006'),('184006'),('184008'),('184008'),('184008'),('184008'),('184009'),('184009'),('184009'),('184009'),('184010'),('184010'),('184010'),('184010'),('184011'),('184011'),('184011'),('184011'),('185001'),('185001'),('185001'),('185001'),('185001'),('185001'),('185001'),('185003'),('185003'),('185003'),('185003'),('185003'),('185003'),('185003'),('187001'),('191002'),('191002'),('192002'),('194003'),('197001'),('197001'),('197001'),('197001'),('197001'),('197001'),('197001'),('197002'),('197002'),('197002'),('197002'),('197002'),('197002'),('197002'),('197003'),('197003'),('197003'),('197003'),('197003'),('197003'),('197003'),('197004'),('197004'),('197004'),('197004'),('197004'),('197004'),('197004'),('197005'),('197005'),('197005'),('197005'),('197005'),('197005'),('197006'),('197006'),('197006'),('197006'),('197006'),('198001'),('198001'),('198001'),('198001'),('198001'),('198001'),('198003'),('198003'),('198003'),('198004'),('198004'),('198004'),('198004'),('198004'),('198004'),('198005'),('198005'),('198005'),('198005'),('198005'),('198005'),('198005'),('198006'),('198006'),('198006'),('198006'),('198006'),('198006'),('198007'),('198007'),('198007'),('198007'),('198007'),('198007'),('198007'),('198008'),('198008'),('198008'),('198008'),('198008'),('198008'),('198009'),('198009'),('198009'),('198009'),('198009'),('198009'),('198009'),('198010'),('198010'),('198010'),('198010'),('198010'),('198010'),('198011'),('198012'),('198012'),('198012'),('198012'),('198015'),('198015'),('198016'),('198016'),('198016'),('198016'),('198016'),('198016'),('198017'),('198017'),('198017'),('198017'),('198017'),('198017'),('201001'),('201001'),('201001'),('201001'),('201001'),('201002'),('202001'),('202001'),('203001'),('203001'),('203001'),('203001'),('203001'),('203001'),('203001'),('203002'),('203002'),('203002'),('203002'),('203003'),('203003'),('203003'),('203003'),('203003'),('203017'),('203017'),('203017'),('203017'),('203017'),('203017'),('203017'),('203017'),('203017'),('203018'),('203018'),('203018'),('203018'),('203018'),('203019'),('203019'),('203019'),('203019'),('203019'),('204001'),('204002'),('205001'),('205001'),('205001'),('205001'),('205001'),('205001'),('205001'),('208001'),('208001'),('208002'),('208002'),('208002'),('208003'),('208003'),('208003'),('208004'),('208004'),('208004'),('208004'),('208004'),('208004'),('208004'),('208005'),('208005'),('208005'),('208005'),('208005'),('209001'),('209001'),('209001'),('209001'),('209001'),('209002'),('209002'),('209002'),('209002'),('209002'),('209003'),('209003'),('209003'),('209003'),('209003'),('210001'),('210001'),('210001'),('210001'),('210001'),('210004'),('210004'),('210004'),('210004'),('210004'),('210004'),('210009'),('210010'),('212001'),('212001'),('212002'),('212002'),('212002'),('212002'),('212003'),('212003'),('212003'),('212004'),('212004'),('212004'),('212005'),('212005'),('212005'),('212005'),('212005'),('212006'),('212006'),('212006'),('212007'),('212007'),('212008'),('212008'),('212008'),('212008'),('212009'),('212009'),('212009'),('212009'),('212010'),('212010'),('212010'),('212010'),('212011'),('212011'),('212012'),('212012'),('212013'),('212013'),('212013'),('218001'),('218004'),('218009'),('218011'),('218011'),('218015'),('218020'),('218021'),('218021'),('218022'),('218022'),('218022'),('218023'),('218024'),('218025'),('218026'),('218026'),('218027'),('218028'),('218029'),('218029'),('218029'),('218030'),('218031'),('221001'),('221001'),('221001'),('221001'),('221001'),('221001'),('221002'),('221002'),('221002'),('221002'),('221002'),('221002'),('221003'),('221003'),('221003'),('221003'),('221003'),('221003'),('221004'),('221004'),('221004'),('221004'),('221004'),('221004'),('221005'),('221005'),('221005'),('221005'),('221005'),('221006'),('221006'),('221006'),('221006'),('221006'),('221007'),('221007'),('221007'),('221007'),('221007'),('221007'),('221008'),('221008'),('221008'),('221008'),('221008'),('221008'),('221009'),('221009'),('221009'),('221009'),('221009'),('221009'),('221010'),('221010'),('221010'),('221010'),('221011'),('221011'),('221011'),('221011'),('221012'),('221012'),('221012'),('221012'),('221012'),('221012'),('221013'),('221013'),('221013'),('221013'),('221013'),('221013'),('223003'),('223003'),('224001'),('224001'),('224002'),('224002'),('224003'),('224007'),('224008'),('225001'),('225002'),('225002'),('225002'),('225003'),('225003'),('225003'),('225003'),('225004'),('225004'),('225004'),('225005'),('225005'),('225005'),('225005'),('225005'),('225005'),('225006'),('225006'),('225006'),('225007'),('225007'),('225007'),('225008'),('225008'),('225008'),('225008'),('225008'),('225009'),('225009'),('225009'),('225010'),('225010'),('225010'),('225011'),('225011'),('225011'),('225011'),('225011'),('225012'),('225012'),('225012'),('225012'),('225012'),('225012'),('225013'),('225013'),('226001'),('226002'),('226003'),('226003'),('226005'),('226005'),('226006'),('226007'),('226007'),('226007'),('226007'),('227011'),('227015'),('227015'),('227041'),('227045'),('227052'),('227056'),('227063'),('227064'),('227066'),('227067'),('227069'),('227071'),('227073'),('227085'),('227116'),('227119'),('227131'),('227133'),('227147'),('229005'),('229005'),('229005'),('233003'),('233004'),('235001'),('235001'),('235002'),('235003'),('235003'),('235003'),('235004'),('235005'),('235005'),('235005'),('235005'),('235005'),('235005'),('235005'),('236001'),('236001'),('236001'),('236001'),('236002'),('236003'),('236003'),('236003'),('236003'),('236003'),('236003'),('238002'),('238002'),('238002'),('238002'),('238002'),('238002'),('238003'),('238003'),('238003'),('238003'),('238003'),('238003'),('238004'),('238004'),('238004'),('238004'),('238004'),('238005'),('238005'),('238005'),('238007'),('238007'),('238007'),('238007'),('238007'),('238007'),('238007'),('238008'),('238008'),('238008'),('238008'),('238008'),('238008'),('238008'),('334005'),('334006'),('337001'),('337001'),('337001'),('337002'),('337002'),('337003'),('337003'),('337003'),('337004'),('343001'),('343001'),('344001'),('344002'),('344003'),('344004'),('344005'),('344005'),('345001'),('345001'),('348001'),('348004'),('348005'),('348005'),('349001'),('349001'),('349002'),('349002'),('349002'),('350001'),('353002'),('353002'),('353002'),('353003'),('355001'),('355002'),('355005'),('355006'),('355006'),('356001'),('358001'),('358001'),('358001'),('359001'),('359001'),('359002'),('359002'),('359002'),('359002'),('360001'),('360001'),('360002'),('360002'),('360003'),('360003'),('360004'),('360004'),('360005'),('360005'),('360005'),('366001'),('366002'),('366002'),('366003'),('366004'),('369001'),('369001'),('373001'),('373002'),('373002'),('373003'),('373003'),('373005'),('373007'),('373008'),('373009'),('373009'),('373010'),('373010'),('373010'),('373011'),('373011'),('373011'),('373011'),('373012'),('373012'),('373012'),('373013'),('373013'),('373014'),('373014'),('373015'),('373015'),('373015'),('373015'),('373017'),('373017'),('373017'),('373017'),('373018'),('373021'),('374002'),('374004'),('374006'),('374007'),('374008'),('374009'),('374010'),('374011'),('374012'),('374015'),('374016'),('382001'),('382002'),('382002'),('384001'),('386001'),('386001'),('386001'),('386001'),('386001'),('386001'),('386001'),('386002'),('386002'),('386002'),('386002'),('386002'),('386002'),('386002'),('386003'),('386003'),('386003'),('386003'),('386003'),('386003'),('386003'),('386003'),('386003'),('386004'),('386004'),('386004'),('386004'),('386004'),('386004'),('386004'),('386004'),('386005'),('386005'),('386005'),('386005'),('386005'),('386005'),('386005'),('386006'),('386006'),('386006'),('386006'),('386006'),('386006'),('386007'),('386007'),('386007'),('386007'),('386007'),('386007'),('386007'),('386007'),('386007'),('386008'),('386008'),('386008'),('386008'),('386008'),('386008'),('386008'),('386008'),('386009'),('386009'),('386009'),('386010'),('386010'),('386010'),('386010'),('386010'),('386010'),('386010'),('386010'),('386011'),('386011'),('386011'),('386011'),('386011'),('386011'),('386011'),('386011'),('386011'),('386012'),('386012'),('386012'),('386012'),('386012'),('386012'),('386012'),('386012'),('386012'),('386013'),('386013'),('386013'),('386013'),('386013'),('386013'),('386013'),('386014'),('386014'),('386014'),('386014'),('389001'),('389002'),('389002'),('389003'),('389003'),('389003'),('389003'),('389004'),('389004'),('389004'),('389004'),('392001'),('393001'),('393002'),('393002'),('393003'),('393004'),('395001'),('395001'),('397001'),('397001'),('397001'),('397002'),('399001'),('399001'),('399001'),('399001'),('399001'),('399001'),('399001'),('399002'),('399002'),('399002'),('399002'),('399002'),('399002'),('399002'),('399003'),('400001'),('400001'),('400001'),('400001'),('400002'),('403002'),('504001'),('504001'),('504002'),('504002'),('504002'),('504004'),('504004'),('504005'),('504006'),('504007'),('504007'),('504007'),('504008'),('504008'),('504009'),('504009'),('504009'),('504009'),('504009'),('504010'),('504011'),('504011'),('504012'),('504012'),('504014'),('504014'),('504014'),('504014'),('504014'),('504014'),('504014'),('504014'),('504017'),('504017'),('504021'),('504021'),('504021'),('504021'),('504021'),('504021'),('504021'),('504022'),('504023'),('504023'),('504024'),('504024'),('504025'),('504025'),('506001'),('506001'),('506001'),('506001'),('506001'),('506001'),('506002'),('506002'),('506002'),('506002'),('506002'),('511001'),('511001'),('511001'),('511001'),('511001'),('511001'),('511001'),('511002'),('511002'),('511002'),('511002'),('511002'),('511002'),('511002'),('511003'),('511003'),('511003'),('511003'),('511003'),('511003'),('511004'),('511004'),('511004'),('511004'),('511004'),('511004'),('511004'),('511005'),('511005'),('511005'),('511005'),('511005'),('511005'),('511005'),('511006'),('511006'),('511006'),('511006'),('511006'),('511006'),('511006'),('511007'),('511007'),('511007'),('511007'),('511007'),('511008'),('511008'),('511008'),('511008'),('511008'),('511008'),('511009'),('511009'),('511009'),('511009'),('511009'),('511009'),('511010'),('511010'),('511010'),('511010'),('511010'),('511010'),('511011'),('511011'),('511011'),('511011'),('511011'),('511011'),('511012'),('511012'),('511012'),('511012'),('511012'),('511012'),('511012'),('511013'),('511013'),('511013'),('511013'),('511013'),('511013'),('511013'),('511014'),('511014'),('511014'),('511014'),('511014'),('511017'),('511018'),('511020'),('511021'),('511022'),('511024'),('511028'),('511029'),('511029'),('511029'),('511029'),('511029'),('511029'),('513001'),('513001'),('513001'),('513001'),('513001'),('513001'),('513001'),('513001'),('513002'),('513002'),('513002'),('513002'),('513002'),('513002'),('513003'),('513003'),('513003'),('513003'),('513003'),('513003'),('513003'),('513003'),('513004'),('513004'),('513004'),('515001'),('515001'),('515001'),('515001'),('515001'),('515002'),('515002'),('515003'),('515003'),('515007'),('515007'),('515008'),('515011'),('515011'),('515011'),('515011'),('515011'),('515011'),('515012'),('515012'),('515012'),('515012'),('515013'),('515013'),('515013'),('515013'),('515013'),('515014'),('515014'),('515014'),('515014'),('515014'),('515015'),('515015'),('515015'),('515015'),('515015'),('518001'),('518002'),('521001'),('521002'),('521002'),('521002'),('521003'),('521003'),('521003'),('521003'),('521004'),('521004'),('521004'),('521004'),('521005'),('521005'),('521005'),('521005'),('521006'),('521006'),('521006'),('521009'),('521010'),('521010'),('521010'),('521010'),('521011'),('521011'),('521011'),('521011'),('521012'),('521013'),('521013'),('521015'),('521016'),('521016'),('523001'),('523001'),('523001'),('523001'),('523001'),('523001'),('523001'),('523002'),('523002'),('523002'),('523002'),('523002'),('523002'),('523003'),('523003'),('523003'),('523003'),('523003'),('523003'),('523003'),('523004'),('523004'),('523004'),('523004'),('523004'),('523004'),('523005'),('523005'),('523005'),('523005'),('523005'),('523005'),('523005'),('523005'),('523006'),('523006'),('523006'),('523006'),('523006'),('523006'),('523006'),('523007'),('523007'),('523007'),('523007'),('523007'),('523007'),('523007'),('524001'),('700001'),('701001'),('701002'),('701003'),('702001'),('702002'),('702004'),('702005'),('704001'),('704004'),('705001'),('706001'),('706002'),('707001'),('707002'),('707003'),('708001'),('710001'),('710002'),('711001'),('711002'),('712001'),('714001'),('714002'),('715001'),('719001'),('719002'),('991002'),('991002'),('991002'),('991003'),('991003'),('991003'),('991003'),('991003'),('991003'),('991003'),('991004'),('991004'),('991004'),('991005'),('991005'),('991005'),('991006'),('991007'),('995001'),('995001'),('995001'),('995001'),('995001'),('995001'),('995001'),('995001'),('995001'),('995001'),('995001'),('996001'),('996001'),('996001'),('996001'),('996001'),('996001'),('996001'),('996001'),('996002'),('996002'),('996003'),('996003'),('996003'),('996003'),('996003'),('998001'),('998001'),('998001'),('998001'),('998001'),('998001'),('998001'),('998001'),('998001'),('998001'),('998002'),('998002'),('998002'),('998002'),('998002'),('998002'),('998002'),('998002'),('998002'),('998002'),('998003'),('998003'),('998003'),('998003'),('998003'),('998003'),('998003'),('998003'),('998004'),('998004'),('998005'),('998005'),('998006'),('998007'),('999001'),('999001'),('999001'),('999001'),('999001'),('999001'),('999001'),('999001'),('999001'),('999001'),('999001'),('999002'),('999002'),('011017'),('011017'),('011017'),('011017'),('011017'),('011017'),('011017'),('011018'),('011018'),('011018'),('011018'),('034001'),('034001'),('034002'),('034002'),('071010'),('071010'),('071010'),('519001'),('126013'),('126013'),('126013'),('126013'),('126013'),('184012'),('184012'),('184012'),('404001'),('405002'),('405002'),('405001'),('405003'),('405006'),('240011'),('240011'),('240011'),('240011'),('240011'),('240011'),('240010'),('240010'),('240010'),('240009'),('240009'),('240009'),('240009'),('240008'),('240008'),('240008'),('240007'),('240007'),('240007'),('240007'),('240007'),('240007'),('240005'),('240005'),('240005'),('240005'),('240005'),('240004'),('240004'),('240004'),('240004'),('240004'),('240003'),('240003'),('240003'),('240003'),('240002'),('240002'),('240002'),('240002'),('240002'),('240002'),('240002'),('240001'),('240001'),('240001'),('240001'),('240001'),('240012'),('240012'),('240012'),('240012'),('240012'),('240013'),('240014'),('240015'),('240015'),('240015'),('240015'),('240015'),('240015'),('240015'),('240015'),('240016'),('240016'),('240016'),('240016'),('240016'),('240016'),('240017'),('240017'),('240017'),('357001'),('357001'),('235006'),('235006'),('235007'),('235007'),('235007'),('235007'),('235007'),('056023'),('056023'),('056023'),('056023'),('056023'),('046015'),('019005'),('019005'),('126014'),('126014'),('126014'),('126014'),('126014'),('126014'),('241003'),('241003'),('241003'),('241003'),('241003'),('241003'),('241002'),('241002'),('241002'),('241002'),('241002'),('241002'),('241001'),('241001'),('241001'),('241001'),('241001'),('240020'),('240020'),('240020'),('240020'),('240020'),('240020'),('240019'),('240019'),('240019'),('242001'),('242002'),('242004'),('242005'),('242006'),('089002'),('089002'),('089002'),('089002'),('089002'),('089002'),('406001'),('406002'),('406003'),('406004'),('406004'),('243001'),('243005'),('243006'),('243007'),('243008'),('408001'),('408001'),('408001'),('408001'),('408001'),('366005'),('366005'),('016035'),('016035'),('016035'),('016035'),('077010'),('996004'),('996004'),('996004'),('996004'),('996004'),('996004'),('996004'),('996004'),('025064'),('025064'),('025064'),('025064'),('011019'),('011019'),('011019'),('011019'),('011019'),('115123'),('115123'),('504026'),('039007'),('039009'),('039008'),('039008'),('039010'),('039010'),('039011'),('039012'),('180072'),('240021'),('240021'),('240021'),('240021'),('240021'),('240021'),('240021'),('240023'),('240023'),('240023'),('240023'),('405008'),('405008'),('525002'),('410002'),('410002'),('410004'),('410005'),('410005'),('410006'),('410007'),('410007'),('410008'),('410009'),('410010'),('410011'),('410011'),('410012'),('410012'),('410013'),('410013'),('410014'),('410014'),('410016'),('410016'),('344006'),('240031'),('240031'),('240031'),('240031'),('240030'),('240030'),('240030'),('240030'),('240029'),('240029'),('240029'),('240029'),('240028'),('240028'),('240028'),('240028'),('240027'),('240027'),('240026'),('240026'),('240026'),('240025'),('240025'),('240025'),('240025'),('240024'),('240024'),('240034'),('240034'),('240034'),('240033'),('240033'),('240033'),('240032'),('240032'),('240032'),('240032'),('411001'),('411002'),('203020'),('069025'),('069025'),('069025'),('069025'),('069025'),('069025'),('244001'),('244001'),('244001'),('244001'),('244001'),('244001'),('244001'),('244001'),('244001'),('244001'),('244001'),('244002'),('244002'),('244002'),('244002'),('244002'),('244002'),('244002'),('244002'),('244002'),('244002'),('244002'),('244009'),('244009'),('244009'),('244009'),('244009'),('244009'),('244009'),('244009'),('244009'),('244009'),('244009'),('244008'),('244008'),('244008'),('244008'),('244008'),('244008'),('244008'),('244008'),('244008'),('244008'),('244008'),('244007'),('244007'),('244007'),('244007'),('244007'),('244007'),('244007'),('244007'),('244007'),('244007'),('244007'),('244006'),('244006'),('244006'),('244006'),('244006'),('244006'),('244006'),('244006'),('244006'),('244006'),('244006'),('244004'),('244004'),('244004'),('244004'),('244004'),('244004'),('244004'),('244004'),('244004'),('244004'),('244004'),('244003'),('244003'),('244003'),('244003'),('244003'),('244003'),('244003'),('244003'),('244003'),('244003'),('244003'),('244014'),('244014'),('244014'),('244014'),('244014'),('244014'),('244014'),('244014'),('244013'),('244013'),('244013'),('244013'),('244013'),('244013'),('244013'),('244013'),('244012'),('244012'),('244012'),('244012'),('244012'),('244012'),('244012'),('244012'),('244011'),('244011'),('244011'),('244011'),('244011'),('244011'),('244011'),('244011'),('244016'),('244016'),('244016'),('244016'),('244016'),('244016'),('244016'),('244016'),('244016'),('244016'),('244016'),('244017'),('244017'),('244017'),('244017'),('244017'),('244017'),('244017'),('244017'),('244017'),('240040'),('240037'),('405009'),('405009'),('405009'),('405010'),('405010'),('240043'),('240043'),('504028'),('504040'),('800001'),('410019'),('410019'),('410020'),('410020'),('410020'),('410021'),('410021'),('244018'),('244018'),('244018'),('244018'),('244018'),('244018'),('244018'),('244018'),('244018'),('244018'),('244018'),('244019'),('244019'),('244019'),('244019'),('244019'),('244019'),('244019'),('244019'),('244019'),('244019'),('244019'),('244020'),('244020'),('244020'),('244020'),('244020'),('244020'),('244020'),('244020'),('413001'),('344007'),('082045'),('082045'),('082045'),('082045'),('082045'),('010031'),('010031'),('010031'),('010031'),('010032'),('010032'),('010032'),('010032'),('010033'),('010033'),('010033'),('010033'),('010033'),('010034'),('010034'),('010034'),('010034'),('010035'),('010035'),('010035'),('010035'),('504044'),('515016'),('515016'),('515016'),('515016'),('801002'),('801003'),('801004'),('801005'),('802001'),('801001'),('414001'),('141029'),('803001'),('803002'),('803004'),('803005'),('803006'),('803007'),('803008'),('803009'),('803013'),('803014'),('803015'),('803016'),('803017'),('410022'),('410023'),('410023'),('803019'),('415002'),('415001'),('244021'),('244021'),('244021'),('244021'),('244021'),('244021'),('244021'),('011020'),('011020'),('011020'),('011020'),('011023'),('011023'),('011023'),('011023'),('011022'),('011022'),('011022'),('011022'),('011022'),('011022'),('011021'),('011021'),('011021'),('011021'),('025065'),('025065'),('025065'),('025065'),('165037'),('165037'),('165038'),('165038'),('165038'),('165039'),('416001'),('416001'),('416001'),('416001'),('416001'),('416002'),('416003'),('417001'),('418001'),('504045'),('504045'),('504045'),('803022'),('240022'),('240022'),('240022'),('240022'),('420001'),('420001'),('420001'),('420001'),('804010'),('804005'),('804002'),('804018'),('804013'),('511019'),('511016'),('511015'),('511032'),('511031'),('511030'),('511027'),('511026'),('511025'),('511033'),('511023'),('133034'),('133034'),('133034'),('133033'),('169011'),('169011'),('169011'),('169011'),('169011'),('344008'),('244022'),('244022'),('244022'),('244022'),('244022'),('244022'),('244022'),('244026'),('244026'),('244026'),('244026'),('244026'),('244026'),('244025'),('244025'),('244025'),('244025'),('244025'),('244025'),('244025'),('244025'),('244030'),('244030'),('244030'),('244030'),('244030'),('244030'),('244030'),('244030'),('244023'),('244023'),('244023'),('244023'),('244023'),('244023'),('244024'),('244024'),('244024'),('244024'),('244024'),('244024'),('244024'),('244024'),('244027'),('244027'),('244027'),('244027'),('244027'),('244027'),('244027'),('244027'),('244028'),('244028'),('244028'),('244028'),('244028'),('244028'),('244028'),('244028'),('244029'),('244029'),('244029'),('244029'),('244029'),('244029'),('244029'),('244029'),('244031'),('244031'),('244031'),('244031'),('244031'),('244031'),('244031'),('244031'),('082046'),('082046'),('082046'),('082046'),('082047'),('082047'),('082048'),('082048'),('126015'),('126015'),('126016'),('126016'),('126016'),('126016'),('126016'),('416005'),('421001'),('421001'),('421002'),('016037'),('016037'),('016037'),('016037'),('016036'),('016036'),('016036'),('016036'),('115124'),('115124'),('115126'),('240049'),('240049'),('240048'),('240048'),('240047'),('240047'),('240046'),('240046'),('240045'),('240044'),('244032'),('244033'),('422002'),('422004'),('422004'),('422004'),('422005'),('422005'),('184013'),('184013'),('184013'),('805001'),('805002'),('805003'),('805004'),('805005'),('056024'),('056024'),('056024'),('423001'),('344010'),('235009'),('235009'),('235009'),('235009'),('212014'),('212014'),('056025'),('056025'),('056025'),('056026'),('056026'),('056026'),('056026'),('056026'),('056026'),('244034'),('244034'),('244034'),('244034'),('244034'),('244034'),('244035'),('244035'),('244035'),('244035'),('244035'),('244035'),('244035'),('244036'),('244036'),('244036'),('244036'),('244036'),('244036'),('244036'),('244037'),('244037'),('244037'),('244037'),('244037'),('244037'),('244037'),('244038'),('244038'),('244038'),('244038'),('244038'),('244038'),('244038'),('244039'),('244039'),('244039'),('244039'),('244039'),('244039'),('244039'),('203015'),('245002'),('245002'),('245001'),('245001'),('056029'),('056030'),('056032'),('424001'),('056034'),('056034'),('056034'),('056034'),('056033'),('056033'),('056033'),('805006'),('805007'),('805008'),('805009'),('805010'),('422008'),('422008'),('422007'),('422007'),('422006'),('422006'),('422010'),('422009'),('422009'),('422011'),('422011'),('209004'),('209004'),('150022'),('100002'),('056035'),('056035'),('056035'),('023036'),('023036'),('185005'),('246001'),('246001'),('247001'),('247001'),('247001'),('247001'),('247001'),('247001'),('247001'),('247002'),('247002'),('425001'),('416006'),('416006'),('165042'),('165041'),('165040'),('165043'),('010040'),('010039'),('010038'),('010036'),('248001'),('248002'),('248003'),('248004'),('248005'),('249001'),('249003'),('249004'),('249005'),('250007'),('250001'),('250002'),('250003'),('250004'),('250005'),('250006'),('250008'),('250009'),('250010'),('250011'),('250012'),('250013'),('251001'),('251002'),('806001'),('806002'),('235010'),('243009'),('249007'),('249008'),('249009'),('011024'),('011025'),('429001'),('429001'),('429002'),('429002'),('429003'),('429003'); +select field from t1 group by field; field 001001 001010 @@ -1614,3 +1621,4 @@ field 429001 429002 429003 +drop table t1; diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result index 30a2f884557..4dbfa1b9f66 100644 --- a/mysql-test/r/type_float.result +++ b/mysql-test/r/type_float.result @@ -1,12 +1,21 @@ +SELECT 10,10.0,10.,.1e+2,100.0e-1; 10 10.0 10. .1e+2 100.0e-1 10 10.0 10 10 10 +SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000; 6e-05 -6e-05 --6e-05 -6e-05+1.000000 6e-05 -6e-05 6e-05 0.99994 +SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1; 1e1 1.e1 1.0e1 1e+1 1.e+1 1.0e+1 1e-1 1.e-1 1.0e-1 10 10 10 10 10 10 0.1 0.1 0.1 +drop table if exists t1; +create table t1 (f1 float(24),f2 float(52)); +show full columns from t1; Field Type Null Key Default Extra Privileges f1 float YES NULL select,insert,update,references f2 double YES NULL select,insert,update,references +insert into t1 values(10,10),(1e+5,1e+5),(1234567890,1234567890),(1e+10,1e+10),(1e+15,1e+15),(1e+20,1e+20),(1e+50,1e+50),(1e+150,1e+150); +insert into t1 values(-10,-10),(1e-5,1e-5),(1e-10,1e-10),(1e-15,1e-15),(1e-20,1e-20),(1e-50,1e-50),(1e-150,1e-150); +select * from t1; f1 f2 10 10 100000 100000 @@ -23,28 +32,43 @@ f1 f2 1e-20 1e-20 0 1e-50 0 1e-150 +drop table t1; +create table t1 (datum double); +insert into t1 values (0.5),(1.0),(1.5),(2.0),(2.5); +select * from t1; datum 0.5 1 1.5 2 2.5 +select * from t1 where datum < 1.5; datum 0.5 1 +select * from t1 where datum > 1.5; datum 2 2.5 +select * from t1 where datum = 1.5; datum 1.5 +drop table t1; +create table t1 (a decimal(7,3) not null, key (a)); +insert into t1 values ("0"),("-0.00"),("-0.01"),("-0.002"),("1"); +select a from t1 order by a; a -0.010 -0.002 -0.000 0.000 1.000 +select min(a) from t1; min(a) -0.010 +drop table t1; +create table t1 (f float, f2 float(24), f3 float(6,2), d double, d2 float(53), d3 double(10,3), de decimal, de2 decimal(6), de3 decimal(5,2), n numeric, n2 numeric(8), n3 numeric(5,6)); +show full columns from t1; Field Type Null Key Default Extra Privileges f float YES NULL select,insert,update,references f2 float YES NULL select,insert,update,references @@ -58,11 +82,20 @@ de3 decimal(5,2) YES NULL select,insert,update,references n decimal(10,0) YES NULL select,insert,update,references n2 decimal(8,0) YES NULL select,insert,update,references n3 decimal(8,6) YES NULL select,insert,update,references +drop table t1; +create table t1 (a decimal(7,3) not null, key (a)); +insert into t1 values ("0"),("-0.00"),("-0.01"),("-0.002"),("1"); +select a from t1 order by a; a -0.010 -0.002 -0.000 0.000 1.000 +select min(a) from t1; min(a) -0.010 +drop table t1; +create table t1 (f float(54)); +Incorrect column specifier for column 'f' +drop table if exists t1; diff --git a/mysql-test/r/type_ranges.result b/mysql-test/r/type_ranges.result index abb8ef8cb09..22b4292fa39 100644 --- a/mysql-test/r/type_ranges.result +++ b/mysql-test/r/type_ranges.result @@ -1,3 +1,43 @@ +drop table if exists t1,t2,t3; +CREATE TABLE t1 ( +auto int(5) unsigned DEFAULT 0 NOT NULL auto_increment, +string char(10) default "hello", +tiny tinyint(4) DEFAULT '0' NOT NULL , +short smallint(6) DEFAULT '1' NOT NULL , +medium mediumint(8) DEFAULT '0' NOT NULL, +long_int int(11) DEFAULT '0' NOT NULL, +longlong bigint(13) DEFAULT '0' NOT NULL, +real_float float(13,1) DEFAULT 0.0 NOT NULL, +real_double double(16,4), +utiny tinyint(3) unsigned DEFAULT '0' NOT NULL, +ushort smallint(5) unsigned zerofill DEFAULT '00000' NOT NULL, +umedium mediumint(8) unsigned DEFAULT '0' NOT NULL, +ulong int(11) unsigned DEFAULT '0' NOT NULL, +ulonglong bigint(13) unsigned DEFAULT '0' NOT NULL, +time_stamp timestamp, +date_field date, +time_field time, +date_time datetime, +blob_col blob, +tinyblob_col tinyblob, +mediumblob_col mediumblob not null, +longblob_col longblob not null, +options enum('one','two','tree') not null, +flags set('one','two','tree') not null, +PRIMARY KEY (auto), +KEY (utiny), +KEY (tiny), +KEY (short), +KEY any_name (medium), +KEY (longlong), +KEY (real_float), +KEY (ushort), +KEY (umedium), +KEY (ulong), +KEY (ulonglong,ulong), +KEY (options,flags) +); +show full fields from t1; Field Type Null Key Default Extra Privileges auto int(5) unsigned PRI NULL auto_increment select,insert,update,references string varchar(10) YES hello select,insert,update,references @@ -23,6 +63,7 @@ mediumblob_col mediumblob select,insert,update,references longblob_col longblob select,insert,update,references options enum('one','two','tree') MUL one select,insert,update,references flags set('one','two','tree') select,insert,update,references +show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment t1 0 PRIMARY 1 auto A 0 NULL NULL t1 1 utiny 1 utiny A NULL NULL NULL @@ -38,6 +79,18 @@ t1 1 ulonglong 1 ulonglong A NULL NULL NULL t1 1 ulonglong 2 ulong A NULL NULL NULL t1 1 options 1 options A NULL NULL NULL t1 1 options 2 flags A NULL NULL NULL +CREATE UNIQUE INDEX test on t1 ( auto ) ; +CREATE INDEX test2 on t1 ( ulonglong,ulong) ; +CREATE INDEX test3 on t1 ( medium ) ; +DROP INDEX test ON t1; +insert into t1 values (10, 1,1,1,1,1,1,1,1,1,1,1,1,1,NULL,0,0,0,1,1,1,1,'one','one'); +insert into t1 values (NULL,2,2,2,2,2,2,2,2,2,2,2,2,2,NULL,NULL,NULL,NULL,NULL,NULL,2,2,'two','two,one'); +insert into t1 values (0,1/3,3,3,3,3,3,3,3,3,3,3,3,3,NULL,'19970303','10:10:10','19970303 101010','','','','3',3,3); +insert into t1 values (0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,NULL,19970807,080706,19970403090807,-1,-1,-1,'-1',-1,-1); +insert into t1 values (0,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,-4294967295,NULL,0,0,0,-4294967295,-4294967295,-4294967295,'-4294967295',0,"one,two,tree"); +insert into t1 values (0,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,4294967295,NULL,0,0,0,4294967295,4294967295,4294967295,'4294967295',0,0); +insert into t1 (tiny) values (1); +select auto,string,tiny,short,medium,long_int,longlong,real_float,real_double,utiny,ushort,umedium,ulong,ulonglong,mod(floor(time_stamp/1000000),1000000)-mod(curdate(),1000000),date_field,time_field,date_time,blob_col,tinyblob_col,mediumblob_col,longblob_col from t1; auto string tiny short medium long_int longlong real_float real_double utiny ushort umedium ulong ulonglong mod(floor(time_stamp/1000000),1000000)-mod(curdate(),1000000) date_field time_field date_time blob_col tinyblob_col mediumblob_col longblob_col 10 1 1 1 1 1 1 1.0 1.0000 1 00001 1 1 1 0 0000-00-00 00:00:00 0000-00-00 00:00:00 1 1 1 1 11 2 2 2 2 2 2 2.0 2.0000 2 00002 2 2 2 0 NULL NULL NULL NULL NULL 2 2 @@ -46,6 +99,27 @@ auto string tiny short medium long_int longlong real_float real_double utiny ush 14 -429496729 -128 -32768 -8388608 -2147483648 -4294967295 -4294967296.0 -4294967295.0000 0 00000 0 0 18446744069414584321 0 0000-00-00 00:00:00 0000-00-00 00:00:00 -4294967295 -4294967295 -4294967295 -4294967295 15 4294967295 127 32767 8388607 2147483647 4294967295 4294967296.0 4294967295.0000 255 65535 16777215 4294967295 4294967295 0 0000-00-00 00:00:00 0000-00-00 00:00:00 4294967295 4294967295 4294967295 4294967295 16 hello 1 1 0 0 0 0.0 NULL 0 00000 0 0 0 0 NULL NULL NULL NULL NULL +ALTER TABLE t1 +add new_field char(10) default "new" not null, +change blob_col new_blob_col varchar(20), +change date_field date_field char(10), +alter column string set default "new default", +alter short drop default, +DROP INDEX utiny, +DROP INDEX ushort, +DROP PRIMARY KEY, +DROP FOREIGN KEY any_name, +ADD INDEX (auto); +LOCK TABLES t1 WRITE; +ALTER TABLE t1 +RENAME as t2, +DROP longblob_col; +UNLOCK TABLES; +ALTER TABLE t2 rename as t3; +LOCK TABLES t3 WRITE ; +ALTER TABLE t3 rename as t1; +UNLOCK TABLES; +select auto,new_field,new_blob_col,date_field from t1 ; auto new_field new_blob_col date_field 10 new 1 0000-00-00 11 new NULL NULL @@ -54,6 +128,15 @@ auto new_field new_blob_col date_field 14 new -4294967295 0000-00-00 15 new 4294967295 0000-00-00 16 new NULL NULL +CREATE TABLE t2 ( +auto int(5) unsigned NOT NULL DEFAULT 0 auto_increment, +string char(20), +mediumblob_col mediumblob not null, +new_field char(2), +PRIMARY KEY (auto) +); +INSERT INTO t2 (string,mediumblob_col,new_field) SELECT string,mediumblob_col,new_field from t1 where auto > 10; +select * from t2; auto string mediumblob_col new_field 1 2 2 ne 2 0.33 ne @@ -61,21 +144,30 @@ auto string mediumblob_col new_field 4 -429496729 -4294967295 ne 5 4294967295 4294967295 ne 6 hello ne +select distinct flags from t1; flags one,two,tree one one,two +select flags from t1 where find_in_set("two",flags)>0; flags one,two,tree one,two,tree one,two one,two +select flags from t1 where find_in_set("unknown",flags)>0; flags +select options,flags from t1 where options="ONE" and flags="ONE"; options flags one one +select options,flags from t1 where options="one" and flags="one"; options flags one one +drop table t2; +create table t2 select * from t1; +update t2 set string="changed" where auto=16; +show full columns from t1; Field Type Null Key Default Extra Privileges auto int(5) unsigned MUL NULL auto_increment select,insert,update,references string varchar(10) YES new defaul select,insert,update,references @@ -101,6 +193,7 @@ mediumblob_col mediumblob select,insert,update,references options enum('one','two','tree') MUL one select,insert,update,references flags set('one','two','tree') select,insert,update,references new_field varchar(10) new select,insert,update,references +show full columns from t2; Field Type Null Key Default Extra Privileges auto int(5) unsigned 0 select,insert,update,references string varchar(10) YES new defaul select,insert,update,references @@ -126,16 +219,22 @@ mediumblob_col mediumblob select,insert,update,references options enum('one','two','tree') one select,insert,update,references flags set('one','two','tree') select,insert,update,references new_field varchar(10) new select,insert,update,references +select t1.auto,t2.auto from t1,t2 where t1.auto=t2.auto and ((t1.string<>t2.string and (t1.string is not null or t2.string is not null)) or (t1.tiny<>t2.tiny and (t1.tiny is not null or t2.tiny is not null)) or (t1.short<>t2.short and (t1.short is not null or t2.short is not null)) or (t1.medium<>t2.medium and (t1.medium is not null or t2.medium is not null)) or (t1.long_int<>t2.long_int and (t1.long_int is not null or t2.long_int is not null)) or (t1.longlong<>t2.longlong and (t1.longlong is not null or t2.longlong is not null)) or (t1.real_float<>t2.real_float and (t1.real_float is not null or t2.real_float is not null)) or (t1.real_double<>t2.real_double and (t1.real_double is not null or t2.real_double is not null)) or (t1.utiny<>t2.utiny and (t1.utiny is not null or t2.utiny is not null)) or (t1.ushort<>t2.ushort and (t1.ushort is not null or t2.ushort is not null)) or (t1.umedium<>t2.umedium and (t1.umedium is not null or t2.umedium is not null)) or (t1.ulong<>t2.ulong and (t1.ulong is not null or t2.ulong is not null)) or (t1.ulonglong<>t2.ulonglong and (t1.ulonglong is not null or t2.ulonglong is not null)) or (t1.time_stamp<>t2.time_stamp and (t1.time_stamp is not null or t2.time_stamp is not null)) or (t1.date_field<>t2.date_field and (t1.date_field is not null or t2.date_field is not null)) or (t1.time_field<>t2.time_field and (t1.time_field is not null or t2.time_field is not null)) or (t1.date_time<>t2.date_time and (t1.date_time is not null or t2.date_time is not null)) or (t1.new_blob_col<>t2.new_blob_col and (t1.new_blob_col is not null or t2.new_blob_col is not null)) or (t1.tinyblob_col<>t2.tinyblob_col and (t1.tinyblob_col is not null or t2.tinyblob_col is not null)) or (t1.mediumblob_col<>t2.mediumblob_col and (t1.mediumblob_col is not null or t2.mediumblob_col is not null)) or (t1.options<>t2.options and (t1.options is not null or t2.options is not null)) or (t1.flags<>t2.flags and (t1.flags is not null or t2.flags is not null)) or (t1.new_field<>t2.new_field and (t1.new_field is not null or t2.new_field is not null))); auto auto 16 16 +select t1.auto,t2.auto from t1,t2 where t1.auto=t2.auto and not (t1.string<=>t2.string and t1.tiny<=>t2.tiny and t1.short<=>t2.short and t1.medium<=>t2.medium and t1.long_int<=>t2.long_int and t1.longlong<=>t2.longlong and t1.real_float<=>t2.real_float and t1.real_double<=>t2.real_double and t1.utiny<=>t2.utiny and t1.ushort<=>t2.ushort and t1.umedium<=>t2.umedium and t1.ulong<=>t2.ulong and t1.ulonglong<=>t2.ulonglong and t1.time_stamp<=>t2.time_stamp and t1.date_field<=>t2.date_field and t1.time_field<=>t2.time_field and t1.date_time<=>t2.date_time and t1.new_blob_col<=>t2.new_blob_col and t1.tinyblob_col<=>t2.tinyblob_col and t1.mediumblob_col<=>t2.mediumblob_col and t1.options<=>t2.options and t1.flags<=>t2.flags and t1.new_field<=>t2.new_field); auto auto 16 16 +drop table t2; +create table t2 (primary key (auto)) select auto+1 as auto,1 as t1, "a" as t2, repeat("a",256) as t3, binary repeat("b",256) as t4 from t1; +show full columns from t2; Field Type Null Key Default Extra Privileges -auto bigint(17) PRI 0 select,insert,update,references +auto bigint(17) unsigned PRI 0 select,insert,update,references t1 bigint(1) 0 select,insert,update,references t2 char(1) select,insert,update,references t3 mediumtext select,insert,update,references t4 mediumblob select,insert,update,references +select * from t2; auto t1 t2 t3 t4 11 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 12 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb @@ -144,16 +243,39 @@ auto t1 t2 t3 t4 15 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 16 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 17 1 a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb +drop table t1,t2; +create table t1 (c int); +insert into t1 values(1),(2); +create table t2 select * from t1; +create table t3 select * from t1, t2; +Duplicate column name 'c' +create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2; +show full columns from t3; Field Type Null Key Default Extra Privileges c1 int(11) YES NULL select,insert,update,references c2 int(11) YES NULL select,insert,update,references const bigint(1) 0 select,insert,update,references +drop table t1,t2,t3; +create table t1 ( myfield INT NOT NULL, UNIQUE INDEX (myfield), unique (myfield), index(myfield)); +drop table t1; +create table t1 ( id integer unsigned not null primary key ); +create table t2 ( id integer unsigned not null primary key ); +insert into t1 values (1), (2); +insert into t2 values (1); +select t1.id as id_A, t2.id as id_B from t1 left join t2 using ( id ); id_A id_B 1 1 2 NULL +create table t3 (id_A integer unsigned not null, id_B integer unsigned null ); +insert into t3 select t1.id as id_A, t2.id as id_B from t1 left join t2 using ( id ); +select * from t3; id_A id_B 1 1 2 NULL +drop table t3; +create table t3 select t1.id as id_A, t2.id as id_B from t1 left join t2 using ( id ); +select * from t3; id_A id_B 1 1 2 NULL +drop table t1,t2,t3; diff --git a/mysql-test/r/type_time.result b/mysql-test/r/type_time.result index 1a137a89b1e..ff700f456ef 100644 --- a/mysql-test/r/type_time.result +++ b/mysql-test/r/type_time.result @@ -1,3 +1,7 @@ +create table t1 (t time); +insert into t1 values("10:22:33"),("12:34:56.78"),(10),(1234),(123456.78),(1234559.99),("1"),("1:23"),("1:23:45"), ("10.22"), ("-10 1:22:33.45"),("20 10:22:33"),("1999-02-03 20:33:34"); +insert t1 values (30),(1230),("1230"),("12:30"),("12:30:35"),("1 12:30:31.32"); +select * from t1; t 10:22:33 12:34:56 @@ -18,6 +22,8 @@ t 12:30:00 12:30:35 36:30:31 +insert into t1 values("10.22.22"),(1234567),(123456789),(123456789.10),("10 22:22"),("12.45a"); +select * from t1; t 10:22:33 12:34:56 @@ -44,6 +50,10 @@ t 838:59:59 262:22:00 00:00:12 +drop table t1; +create table t1 (t time); +insert into t1 values ('09:00:00'),('13:00:00'),('19:38:34'), ('13:00:00'),('09:00:00'),('09:00:00'),('13:00:00'),('13:00:00'),('13:00:00'),('09:00:00'); +select t, time_to_sec(t),sec_to_time(time_to_sec(t)) from t1; t time_to_sec(t) sec_to_time(time_to_sec(t)) 09:00:00 32400 09:00:00 13:00:00 46800 13:00:00 @@ -55,6 +65,7 @@ t time_to_sec(t) sec_to_time(time_to_sec(t)) 13:00:00 46800 13:00:00 13:00:00 46800 13:00:00 09:00:00 32400 09:00:00 +select sec_to_time(time_to_sec(t)) from t1; sec_to_time(time_to_sec(t)) 09:00:00 13:00:00 @@ -66,3 +77,4 @@ sec_to_time(time_to_sec(t)) 13:00:00 13:00:00 09:00:00 +drop table t1; diff --git a/mysql-test/r/type_timestamp.result b/mysql-test/r/type_timestamp.result index 8996ca59f7f..ab53d27e8f3 100644 --- a/mysql-test/r/type_timestamp.result +++ b/mysql-test/r/type_timestamp.result @@ -1,11 +1,29 @@ +CREATE TABLE t1 ( t timestamp); +SET TIMESTAMP=1234; +insert into t1 values(NULL); +select * from t1; t 19700101032034 +drop table t1; +CREATE TABLE t1 (value TEXT NOT NULL, id VARCHAR(32) NOT NULL, stamp timestamp, PRIMARY KEY (id)); +INSERT INTO t1 VALUES ("my value", "myKey","1999-04-02 00:00:00"); +SELECT stamp FROM t1 WHERE id="myKey"; stamp 19990402000000 +UPDATE t1 SET value="my value" WHERE id="myKey"; +SELECT stamp FROM t1 WHERE id="myKey"; stamp 19990402000000 +drop table t1; +create table t1 (a timestamp); +insert into t1 values (now()); +select date_format(a,"%Y %y"),year(a),year(now()) from t1; date_format(a,"%Y %y") year(a) year(now()) 1970 70 1970 1970 +drop table t1; +create table t1 (ix timestamp); +insert into t1 values (19991101000000),(19990102030405),(19990630232922),(19990601000000),(19990930232922),(19990531232922),(19990501000000),(19991101000000),(19990501000000); +select * from t1; ix 19991101000000 19990102030405 @@ -16,6 +34,21 @@ ix 19990501000000 19991101000000 19990501000000 +drop table t1; +CREATE TABLE t1 (date date, date_time datetime, time_stamp timestamp); +INSERT INTO t1 VALUES ("1998-12-31","1998-12-31 23:59:59",19981231235959); +INSERT INTO t1 VALUES ("1999-01-01","1999-01-01 00:00:00",19990101000000); +INSERT INTO t1 VALUES ("1999-09-09","1999-09-09 23:59:59",19990909235959); +INSERT INTO t1 VALUES ("2000-01-01","2000-01-01 00:00:00",20000101000000); +INSERT INTO t1 VALUES ("2000-02-28","2000-02-28 00:00:00",20000228000000); +INSERT INTO t1 VALUES ("2000-02-29","2000-02-29 00:00:00",20000229000000); +INSERT INTO t1 VALUES ("2000-03-01","2000-03-01 00:00:00",20000301000000); +INSERT INTO t1 VALUES ("2000-12-31","2000-12-31 23:59:59",20001231235959); +INSERT INTO t1 VALUES ("2001-01-01","2001-01-01 00:00:00",20010101000000); +INSERT INTO t1 VALUES ("2004-12-31","2004-12-31 23:59:59",20041231235959); +INSERT INTO t1 VALUES ("2005-01-01","2005-01-01 00:00:00",20050101000000); +INSERT INTO t1 VALUES ("2030-01-01","2030-01-01 00:00:00",20300101000000); +SELECT * FROM t1; date date_time time_stamp 1998-12-31 1998-12-31 23:59:59 19981231235959 1999-01-01 1999-01-01 00:00:00 19990101000000 @@ -29,3 +62,4 @@ date date_time time_stamp 2004-12-31 2004-12-31 23:59:59 20041231235959 2005-01-01 2005-01-01 00:00:00 20050101000000 2030-01-01 2030-01-01 00:00:00 20300101000000 +drop table t1; diff --git a/mysql-test/r/type_uint.result b/mysql-test/r/type_uint.result index 54fa717e0f8..1acfc700d3a 100644 --- a/mysql-test/r/type_uint.result +++ b/mysql-test/r/type_uint.result @@ -1,3 +1,9 @@ +drop table if exists t1; +create table t1 (this int unsigned); +insert into t1 values (1); +insert into t1 values (-1); +select * from t1; this 1 0 +drop table t1; diff --git a/mysql-test/r/type_year.result b/mysql-test/r/type_year.result index 7dc15a4dd1b..c892d575ca0 100644 --- a/mysql-test/r/type_year.result +++ b/mysql-test/r/type_year.result @@ -1,3 +1,6 @@ +create table t1 (y year,y2 year(2)); +insert into t1 values (0,0),(1999,1999),(2000,2000),(2001,2001),(70,70),(69,69); +select * from t1; y y2 0000 00 1999 99 @@ -5,6 +8,7 @@ y y2 2001 01 1970 70 2069 69 +select * from t1 order by y; y y2 0000 00 1970 70 @@ -12,6 +16,7 @@ y y2 2000 00 2001 01 2069 69 +select * from t1 order by y2; y y2 1970 70 1999 99 @@ -19,3 +24,4 @@ y y2 2000 00 2001 01 2069 69 +drop table t1; diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 0598bfb9ca0..3d4b79ea78d 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -1,3 +1,9 @@ +drop table if exists t1,t2,t3; +CREATE TABLE t1 (a int not null, b char (10) not null); +insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c'); +CREATE TABLE t2 (a int not null, b char (10) not null); +insert into t2 values (3,'c'),(4,'d'),(5,'f'),(6,'e'); +select a,b from t1 union select a,b from t2; a b 1 a 2 b @@ -5,6 +11,7 @@ a b 4 d 5 f 6 e +select a,b from t1 union all select a,b from t2; a b 1 a 2 b @@ -14,6 +21,7 @@ a b 4 d 5 f 6 e +select a,b from t1 union all select a,b from t2 order by b; a b 1 a 2 b @@ -23,6 +31,7 @@ a b 4 d 6 e 5 f +select a,b from t1 union all select a,b from t2 union select 7,'g'; a b 1 a 2 b @@ -33,6 +42,7 @@ a b 5 f 6 e 7 g +select 0,'#' union select a,b from t1 union all select a,b from t2 union select 7,'gg'; 0 # 0 # 1 a @@ -44,10 +54,12 @@ a b 5 f 6 e 7 g +select a,b from t1 union select a,b from t1; a b 1 a 2 b 3 c +select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 group by b; t1 b count(*) t1 a 1 t1 b 1 @@ -56,17 +68,63 @@ t2 c 1 t2 d 1 t2 e 1 t2 f 1 +explain select a,b from t1 union all select a,b from t2; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 4 t2 ALL NULL NULL NULL NULL 4 +select a,b from t1 into outfile 'skr' union select a,b from t2; +Wrong usage of UNION and INTO +select a,b from t1 order by a union select a,b from t2; +Wrong usage of UNION and ORDER BY +insert into t3 select a from t1 order by a union select a from t2; +Wrong usage of UNION and ORDER BY +create table t3 select a,b from t1 union select a from t2; +The used SELECT statements have a different number of columns +select a,b from t1 union select a from t2; +The used SELECT statements have a different number of columns +select * from t1 union select a from t2; +The used SELECT statements have a different number of columns +select a from t1 union select * from t2; +The used SELECT statements have a different number of columns +create table t3 select a,b from t1 union all select a,b from t2; +insert into t3 select a,b from t1 union all select a,b from t2; +replace into t3 select a,b as c from t1 union all select a,b from t2; +drop table t1,t2,t3; +CREATE TABLE t1 ( +`pseudo` char(35) NOT NULL default '', +`pseudo1` char(35) NOT NULL default '', +`same` tinyint(1) unsigned NOT NULL default '1', +PRIMARY KEY (`pseudo1`), +KEY `pseudo` (`pseudo`) +) TYPE=MyISAM; +INSERT INTO t1 (pseudo,pseudo1,same) VALUES ('joce', 'testtt', 1),('joce', 'tsestset', 1),('dekad', 'joce', 1); +SELECT pseudo FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo FROM t1 WHERE pseudo='joce'; pseudo dekad joce +SELECT pseudo1 FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo1 FROM t1 WHERE pseudo='joce'; pseudo1 joce testtt tsestset +SELECT * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce' order by pseudo desc,pseudo1 desc; pseudo pseudo1 same joce tsestset 1 joce testtt 1 dekad joce 1 +SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT pseudo FROM t1 WHERE pseudo1='joce'; +pseudo1 +testtt +tsestset +dekad +SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION ALL SELECT pseudo FROM t1 WHERE pseudo1='joce'; +pseudo1 +testtt +tsestset +dekad +SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT 1; +pseudo1 +testtt +tsestset +1 +drop table t1; diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result index bd34700e5ec..4fa1f3513b2 100644 --- a/mysql-test/r/update.result +++ b/mysql-test/r/update.result @@ -1,3 +1,16 @@ +drop table if exists t1; +create table t1 (a int auto_increment , primary key (a)); +insert into t1 values (NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL),(NULL); +update t1 set a=a+10 where a > 34; +update t1 set a=a+100 where a > 0; +update t1 set a=a+100 where a=1 and a=2; +update t1 set a=b+100 where a=1 and a=2; +Unknown column 'b' in 'field list' +update t1 set a=b+100 where c=1 and a=2; +Unknown column 'c' in 'where clause' +update t1 set d=a+100 where a=1; +Unknown column 'd' in 'field list' +select * from t1; a 101 102 @@ -35,7 +48,57 @@ a 134 145 146 +drop table t1; +CREATE TABLE t1 +( +place_id int (10) unsigned NOT NULL, +shows int(10) unsigned DEFAULT '0' NOT NULL, +ishows int(10) unsigned DEFAULT '0' NOT NULL, +ushows int(10) unsigned DEFAULT '0' NOT NULL, +clicks int(10) unsigned DEFAULT '0' NOT NULL, +iclicks int(10) unsigned DEFAULT '0' NOT NULL, +uclicks int(10) unsigned DEFAULT '0' NOT NULL, +ts timestamp(14), +PRIMARY KEY (place_id,ts) +); +INSERT INTO t1 (place_id,shows,ishows,ushows,clicks,iclicks,uclicks,ts) +VALUES (1,0,0,0,0,0,0,20000928174434); +UPDATE t1 SET shows=shows+1,ishows=ishows+1,ushows=ushows+1,clicks=clicks+1,iclicks=iclicks+1,uclicks=uclicks+1 WHERE place_id=1 AND ts>="2000-09-28 00:00:00"; +select place_id,shows from t1; place_id shows 1 1 +drop table t1; +CREATE TABLE t1 ( +lfdnr int(10) unsigned NOT NULL default '0', +ticket int(10) unsigned NOT NULL default '0', +client varchar(255) NOT NULL default '', +replyto varchar(255) NOT NULL default '', +subject varchar(100) NOT NULL default '', +timestamp int(10) unsigned NOT NULL default '0', +tstamp timestamp(14) NOT NULL, +status int(3) NOT NULL default '0', +type varchar(15) NOT NULL default '', +assignment int(10) unsigned NOT NULL default '0', +fupcount int(4) unsigned NOT NULL default '0', +parent int(10) unsigned NOT NULL default '0', +activity int(10) unsigned NOT NULL default '0', +priority tinyint(1) unsigned NOT NULL default '1', +cc varchar(255) NOT NULL default '', +bcc varchar(255) NOT NULL default '', +body text NOT NULL, +comment text, +header text, +PRIMARY KEY (lfdnr), +KEY k1 (timestamp), +KEY k2 (type), +KEY k3 (parent), +KEY k4 (assignment), +KEY ticket (ticket) +) TYPE=MyISAM; +INSERT INTO t1 VALUES (773,773,'','','',980257344,20010318180652,0,'Open',10,0,0,0,1,'','','','',''); +alter table t1 change lfdnr lfdnr int(10) unsigned default 0 not null auto_increment; +update t1 set status=1 where type='Open'; +select status from t1; status 1 +drop table t1; diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index e06a113bd29..5c8b4581c5c 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -1,16 +1,32 @@ +set @a := foo; +You may only use constant expressions with SET +set @a := connection_id() + 3; +select @a - connection_id(); @a - connection_id() 3 +drop table if exists t1,t2; +CREATE TABLE t1 ( i int not null, v int not null,index (i)); +insert into t1 values (1,1),(1,3),(2,1); +create table t2 (i int not null, unique (i)); +insert into t2 select distinct i from t1; +select * from t2; i 1 2 +select distinct t2.i,@vv1:=if(sv1.i,1,0),@vv2:=if(sv2.i,1,0),@vv3:=if(sv3.i,1,0), @vv1+@vv2+@vv3 from t2 left join t1 as sv1 on sv1.i=t2.i and sv1.v=1 left join t1 as sv2 on sv2.i=t2.i and sv2.v=2 left join t1 as sv3 on sv3.i=t2.i and sv3.v=3; i @vv1:=if(sv1.i,1,0) @vv2:=if(sv2.i,1,0) @vv3:=if(sv3.i,1,0) @vv1+@vv2+@vv3 1 1 0 1 2 2 1 0 0 1 +explain select * from t1 where i=@vv1; table type possible_keys key key_len ref rows Extra t1 ref i i 4 const 1 where used +explain select * from t1 where @vv1:=@vv1+1 and i=@vv1; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 3 where used +explain select @vv1:=i from t1 where i=@vv1; table type possible_keys key key_len ref rows Extra t1 index NULL i 4 NULL 3 where used; Using index +explain select * from t1 where i=@vv1; table type possible_keys key key_len ref rows Extra t1 ref i i 4 const 1 where used +drop table t1,t2; diff --git a/mysql-test/r/varbinary.result b/mysql-test/r/varbinary.result index bb4aaefe057..1596ad15810 100644 --- a/mysql-test/r/varbinary.result +++ b/mysql-test/r/varbinary.result @@ -1,10 +1,25 @@ +select 0x41,0x41+0,0x41 | 0x7fffffffffffffff | 0,0xffffffffffffffff | 0 ; 0x41 0x41+0 0x41 | 0x7fffffffffffffff | 0 0xffffffffffffffff | 0 A 65 9223372036854775807 -1 +select 0x31+1,concat(0x31)+1,-0xf; 0x31+1 concat(0x31)+1 -0xf 50 2 -15 +select x'31',X'ffff'+0; x'31' X'ffff'+0 1 65535 +create table t1 (ID int(8) unsigned zerofill not null auto_increment,UNIQ bigint(21) unsigned zerofill not null,primary key (ID),unique (UNIQ) ); +insert into t1 set UNIQ=0x38afba1d73e6a18a; +insert into t1 set UNIQ=123; +explain select * from t1 where UNIQ=0x38afba1d73e6a18a; table type possible_keys key key_len ref rows Extra t1 const UNIQ UNIQ 8 const 1 +drop table t1; +select x'hello'; +You have an error in your SQL syntax near 'x'hello'' at line 1 +select 0xfg; +Unknown column '0xfg' in 'field list' +create table t1 select 1 as x, 2 as xx; +select x,xx from t1; x xx 1 2 +drop table t1; diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index f852378e6a1..ca67bdeb857 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -1,14 +1,26 @@ +set @`test`=1,@TEST=3,@select=2,@t5=1.23456; +select @test,@`select`,@TEST,@not_used; @test @`select` @TEST @not_used 1 2 3 NULL +set @test_int=10,@test_double=1e-10,@test_string="abcdeghi",@test_string2="abcdefghij",@select=NULL; +select @test_int,@test_double,@test_string,@test_string2,@select; @test_int @test_double @test_string @test_string2 @select 10 1e-10 abcdeghi abcdefghij NULL +set @test_int="hello",@test_double="hello",@test_string="hello",@test_string2="hello"; +select @test_int,@test_double,@test_string,@test_string2; @test_int @test_double @test_string @test_string2 hello hello hello hello +set @test_int="hellohello",@test_double="hellohello",@test_string="hellohello",@test_string2="hellohello"; +select @test_int,@test_double,@test_string,@test_string2; @test_int @test_double @test_string @test_string2 hellohello hellohello hellohello hellohello +set @test_int=null,@test_double=null,@test_string=null,@test_string2=null; +select @test_int,@test_double,@test_string,@test_string2; @test_int @test_double @test_string @test_string2 NULL NULL NULL NULL +select @t1:=(@t2:=1)+@t3:=4,@t1,@t2,@t3; @t1:=(@t2:=1)+@t3:=4 @t1 @t2 @t3 5 5 1 4 +select @t5; @t5 1.23456 diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result new file mode 100644 index 00000000000..d77e98cc635 --- /dev/null +++ b/mysql-test/r/warnings.result @@ -0,0 +1,9 @@ +create table t1 (a int); +insert into t1 values (1); +insert into t1 values ("hej"); +insert into t1 values ("hej"),("då"); +set SQL_WARNINGS=1; +insert into t1 values ("hej"); +insert into t1 values ("hej"),("då"); +drop table t1; +set SQL_WARNINGS=0; diff --git a/mysql-test/t/auto_increment.test b/mysql-test/t/auto_increment.test index b9b8c244699..d86466572d8 100644 --- a/mysql-test/t/auto_increment.test +++ b/mysql-test/t/auto_increment.test @@ -2,6 +2,7 @@ # Test of auto_increment; The test for BDB tables is in bdb.test # +drop table if exists t1; create table t1 (a int not null auto_increment,b int, primary key (a)) type=myisam auto_increment=3; insert into t1 values (1,1),(NULL,3),(NULL,4); delete from t1 where a=4; @@ -18,20 +19,6 @@ insert into t1 values (NULL,9,9); select * from t1; drop table t1; -create table t1 (a int not null auto_increment,b int, primary key (a)) type=isam; -insert into t1 values (1,1),(NULL,2),(3,3),(NULL,4); -delete from t1 where a=4 or a=2; -insert into t1 values (NULL,4),(NULL,5),(6,6); -select * from t1; -delete from t1 where a=6; -#show table status like "t1"; -replace t1 values (3,1); -replace t1 values (3,3); -ALTER TABLE t1 add c int; -insert into t1 values (NULL,6,6); -select * from t1; -drop table t1; - create table t1 ( skey tinyint unsigned NOT NULL auto_increment PRIMARY KEY, sval char(20) diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test index 43ea6fd19ad..c622522c870 100644 --- a/mysql-test/t/backup.test +++ b/mysql-test/t/backup.test @@ -39,9 +39,3 @@ reap; unlock tables; connection con1; reap; - - - - - - diff --git a/mysql-test/t/bench_count_distinct.test b/mysql-test/t/bench_count_distinct.test index 62d456a3cf8..9059428bea4 100644 --- a/mysql-test/t/bench_count_distinct.test +++ b/mysql-test/t/bench_count_distinct.test @@ -1,12 +1,13 @@ drop table if exists t1; create table t1(n int not null, key(n)) delay_key_write = 1; let $1=100; +disable_query_log; while ($1) { eval insert into t1 values($1); eval insert into t1 values($1); dec $1; } - +enable_query_log; select count(distinct n) from t1; drop table t1; diff --git a/mysql-test/t/bigint.test b/mysql-test/t/bigint.test index 6470b6f6a30..52ae9ad35db 100644 --- a/mysql-test/t/bigint.test +++ b/mysql-test/t/bigint.test @@ -14,3 +14,18 @@ select * from t1 where a='18446744073709551615'; delete from t1 where a=18446744073709551615; select * from t1; drop table t1; + +create table t1 ( a int not null default 1, big bigint ); +insert into t1 (big) values (-1),(12345678901234567),(9223372036854775807),(18446744073709551615); +select min(big),max(big),max(big)-1 from t1; +select min(big),max(big),max(big)-1 from t1 group by a; +alter table t1 modify big bigint unsigned not null; +select min(big),max(big),max(big)-1 from t1; +select min(big),max(big),max(big)-1 from t1 group by a; +alter table t1 add key (big); +select min(big),max(big),max(big)-1 from t1; +select min(big),max(big),max(big)-1 from t1 group by a; +alter table t1 modify big bigint not null; +select min(big),max(big),max(big)-1 from t1; +select min(big),max(big),max(big)-1 from t1 group by a; +drop table t1; diff --git a/mysql-test/t/check.test b/mysql-test/t/check.test index 6296b31d65d..421c98d79e0 100644 --- a/mysql-test/t/check.test +++ b/mysql-test/t/check.test @@ -5,11 +5,13 @@ drop table if exists t1; #add a lot of keys to slow down check create table t1(n int not null, key(n), key(n), key(n), key(n)); let $1=10000; +disable_query_log; while ($1) { eval insert into t1 values ($1); dec $1; } +enable_query_log; send check table t1 type=extended; connection con2; insert into t1 values (200000); diff --git a/mysql-test/t/count_distinct2-master.opt b/mysql-test/t/count_distinct2-master.opt index 8f1be6dce3a..d81cc55090d 100644 --- a/mysql-test/t/count_distinct2-master.opt +++ b/mysql-test/t/count_distinct2-master.opt @@ -1 +1 @@ --O max_heap_table_size=16384 +--set-variable=max_heap_table_size=16384 diff --git a/mysql-test/t/count_distinct2.test b/mysql-test/t/count_distinct2.test index 33d4cf54278..d1bea7614c8 100644 --- a/mysql-test/t/count_distinct2.test +++ b/mysql-test/t/count_distinct2.test @@ -1,3 +1,5 @@ +drop table if exists t1; + create table t1(n1 int, n2 int, s char(20), vs varchar(20), t text); insert into t1 values (1,11, 'one','eleven', 'eleven'), (1,11, 'one','eleven', 'eleven'), @@ -44,14 +46,16 @@ select count(distinct n1), count(distinct n2) from t1; select count(distinct n2), n1 from t1 group by n1; drop table t1; -# test the converstion from tree to MyISAM +# test the conversion from tree to MyISAM create table t1 (n int default NULL); let $1=5000; +disable_query_log; while ($1) { eval insert into t1 values($1); dec $1; } +enable_query_log; flush status; select count(distinct n) from t1; @@ -61,12 +65,13 @@ drop table t1; #test conversion from heap to MyISAM create table t1 (s text); let $1=5000; +disable_query_log; while ($1) { eval insert into t1 values('$1'); dec $1; } - +enable_query_log; flush status; select count(distinct s) from t1; show status like 'Created_tmp_disk_tables'; diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index d45d013c9fb..3eb4f35bdc2 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -25,14 +25,10 @@ drop table if exists t1,t2; !$1164 create table t1 (a int not null auto_increment,primary key (a)) type=heap; !$1163 create table t1 (a int not null,b text) type=heap; !$1171 create table t1 (a int ,primary key(a)) type=heap; -!$1121 create table t1 (a int,b text, index(a)) type=isam; -!$1073 create table t1 (a int,b text, index(b)) type=isam; drop table if exists t1; -!$1075 create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ord,ordid)) type=isam; !$1164 create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ord,ordid)) type=heap; !$1171 create table t1 (ordid int(8), primary key (ordid)); -!$1121 create table t1 (ordid int(8), unique (ordid)) type=isam; -- error 1044,1 create table not_existing_database.test (a int); diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test index 4491de1f82b..fe219471041 100644 --- a/mysql-test/t/flush.test +++ b/mysql-test/t/flush.test @@ -1,3 +1,11 @@ +# This test doesn't work with the embedded version as this code +# assumes that one query is running while we are doing queries on +# a second connection. +# This would work if mysqltest run would be threaded and handle each +# connection in a separate thread. +# +-- source include/not_embedded.inc + connect (con1,localhost,root,,); connect (con2,localhost,root,,); connection con1; @@ -7,6 +15,7 @@ drop table if exists t2; create table t2(n int); insert into t2 values(3); let $1=100; +disable_query_log; while ($1) { connection con1; @@ -19,7 +28,7 @@ while ($1) reap; dec $1; } - +enable_query_log; connection con1; select * from t1; connection con2; diff --git a/mysql-test/t/func_system.test b/mysql-test/t/func_system.test index b0bdbe472dd..052e0530cf6 100644 --- a/mysql-test/t/func_system.test +++ b/mysql-test/t/func_system.test @@ -2,5 +2,5 @@ # system functions # -select database(),user(); +select database(),user() like "%@%"; select version()>="3.23.29"; diff --git a/mysql-test/t/isam.test b/mysql-test/t/isam.test index 1cf068b42ba..5b3ab7647c7 100644 --- a/mysql-test/t/isam.test +++ b/mysql-test/t/isam.test @@ -1,3 +1,7 @@ +-- source include/have_isam.inc + +drop table if exists t1,t2; + # # Test possible problem with rows that are about 65535 bytes long # @@ -5,11 +9,13 @@ create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a)); let $1=100; +disable_query_log; while ($1) { eval insert into t1 (b) values(repeat(char(65+$1),65540-$1)); dec $1; } +enable_query_log; check table t1; repair table t1; delete from t1 where (a & 1); @@ -17,3 +23,48 @@ check table t1; repair table t1; check table t1; drop table t1; + +# +# Test of auto_increment; The test for BDB tables is in bdb.test +# + +create table t1 (a int not null auto_increment,b int, primary key (a)) type=isam; +insert into t1 values (1,1),(NULL,2),(3,3),(NULL,4); +delete from t1 where a=4 or a=2; +insert into t1 values (NULL,4),(NULL,5),(6,6); +select * from t1; +delete from t1 where a=6; +#show table status like "t1"; +replace t1 values (3,1); +replace t1 values (3,3); +ALTER TABLE t1 add c int; +insert into t1 values (NULL,6,6); +select * from t1; +drop table t1; + +# +# Test of some CREATE TABLE's that should fail +# +!$1121 create table t1 (a int,b text, index(a)) type=isam; +!$1073 create table t1 (a int,b text, index(b)) type=isam; +!$1075 create table t1 (ordid int(8) not null auto_increment, ord varchar(50) not null, primary key (ord,ordid)) type=isam; +!$1121 create table t1 (ordid int(8), unique (ordid)) type=isam; +drop table if exists t1; + +# +# Test of some show commands +# + +create table t1 (a int not null primary key, b int not null,c int not null, key(b,c)); +insert into t1 values (1,2,2),(2,2,3),(3,2,4),(4,2,4); +create table t2 type=isam select * from t1; +optimize table t1; +check table t1,t2; +repair table t1,t2; +check table t2,t1; +lock tables t1 write; +check table t2,t1; +show columns from t1; +show full columns from t1; +show index from t1; +drop table t1,t2; diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test index 6fff628ccb9..224db1dd8f0 100644 --- a/mysql-test/t/join.test +++ b/mysql-test/t/join.test @@ -89,3 +89,26 @@ select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using --error 1116 select t1.a from t1 as t1 left join t1 as t2 using (a) left join t1 as t3 using (a) left join t1 as t4 using (a) left join t1 as t5 using (a) left join t1 as t6 using (a) left join t1 as t7 using (a) left join t1 as t8 using (a) left join t1 as t9 using (a) left join t1 as t10 using (a) left join t1 as t11 using (a) left join t1 as t12 using (a) left join t1 as t13 using (a) left join t1 as t14 using (a) left join t1 as t15 using (a) left join t1 as t16 using (a) left join t1 as t17 using (a) left join t1 as t18 using (a) left join t1 as t19 using (a) left join t1 as t20 using (a) left join t1 as t21 using (a) left join t1 as t22 using (a) left join t1 as t23 using (a) left join t1 as t24 using (a) left join t1 as t25 using (a) left join t1 as t26 using (a) left join t1 as t27 using (a) left join t1 as t28 using (a) left join t1 as t29 using (a) left join t1 as t30 using (a) left join t1 as t31 using (a) left join t1 as t32 using (a) left join t1 as t33 using (a) left join t1 as t34 using (a) left join t1 as t35 using (a) left join t1 as t36 using (a) left join t1 as t37 using (a) left join t1 as t38 using (a) left join t1 as t39 using (a) left join t1 as t40 using (a) left join t1 as t41 using (a) left join t1 as t42 using (a) left join t1 as t43 using (a) left join t1 as t44 using (a) left join t1 as t45 using (a) left join t1 as t46 using (a) left join t1 as t47 using (a) left join t1 as t48 using (a) left join t1 as t49 using (a) left join t1 as t50 using (a) left join t1 as t51 using (a) left join t1 as t52 using (a) left join t1 as t53 using (a) left join t1 as t54 using (a) left join t1 as t55 using (a) left join t1 as t56 using (a) left join t1 as t57 using (a) left join t1 as t58 using (a) left join t1 as t59 using (a) left join t1 as t60 using (a) left join t1 as t61 using (a) left join t1 as t62 using (a) left join t1 as t63 using (a) left join t1 as t64 using (a) left join t1 as t65 using (a); drop table t1; + +# +# Simple join test. This failed in 3.23.42, there should have been +# no matches, still three matches were found. +# + +CREATE TABLE t1 ( + a int(11) NOT NULL, + b int(11) NOT NULL, + PRIMARY KEY (a,b) +) TYPE=MyISAM; + +INSERT INTO t1 VALUES (1,1),(1,2),(1,3),(1,4),(1,5),(1,6),(1,7),(2,3); + +CREATE TABLE t2 ( + a int(11) default NULL +) TYPE=MyISAM; + +INSERT INTO t2 VALUES (2),(3); + +SELECT t1.a,t2.a,b FROM t1,t2 WHERE t1.a=t2.a AND (t1.a=1 OR t1.a=2) AND b>=1 AND b<=3; + +DROP TABLE t1, t2; diff --git a/mysql-test/t/kill.test b/mysql-test/t/kill.test index be6860a3cc3..6bcc43ac916 100644 --- a/mysql-test/t/kill.test +++ b/mysql-test/t/kill.test @@ -1,3 +1,11 @@ +# This test doesn't work with the embedded version as this code +# assumes that one query is running while we are doing queries on +# a second connection. +# This would work if mysqltest run would be threaded and handle each +# connection in a separate thread. +# +-- source include/not_embedded.inc + connect (con1, localhost, root,,); connect (con2, localhost, root,,); diff --git a/mysql-test/t/lock.test b/mysql-test/t/lock.test index 77354e63252..385713174d2 100644 --- a/mysql-test/t/lock.test +++ b/mysql-test/t/lock.test @@ -53,45 +53,3 @@ lock tables t1 write; check table t2; unlock tables; drop table t1,t2; - -#test to see if select will get the lock ahead of low priority update -connect (locker,localhost,root,,); -connect (reader,localhost,root,,); -connect (writer,localhost,root,,); - -connection locker; -create table t1(n int); -insert into t1 values (1); -lock tables t1 write; -connection writer; -send update low_priority t1 set n = 4; -connection reader; ---sleep 2 -send select n from t1; -connection locker; ---sleep 2 -unlock tables; -connection writer; -reap; -connection reader; -reap; -drop table t1; - -connection locker; -create table t1(n int); -insert into t1 values (1); -lock tables t1 read; -connection writer; -send update low_priority t1 set n = 4; -connection reader; ---sleep 2 -send select n from t1; -connection locker; ---sleep 2 -unlock tables; -connection writer; -reap; -connection reader; -reap; -drop table t1; - diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test new file mode 100644 index 00000000000..53e9fd3393c --- /dev/null +++ b/mysql-test/t/lock_multi.test @@ -0,0 +1,49 @@ +# This test doesn't work with the embedded version as this code +# assumes that one query is running while we are doing queries on +# a second connection. +# This would work if mysqltest run would be threaded and handle each +# connection in a separate thread. +# +-- source include/not_embedded.inc + +#test to see if select will get the lock ahead of low priority update + +connect (locker,localhost,root,,); +connect (reader,localhost,root,,); +connect (writer,localhost,root,,); + +connection locker; +create table t1(n int); +insert into t1 values (1); +lock tables t1 write; +connection writer; +send update low_priority t1 set n = 4; +connection reader; +--sleep 2 +send select n from t1; +connection locker; +--sleep 2 +unlock tables; +connection writer; +reap; +connection reader; +reap; +drop table t1; + +connection locker; +create table t1(n int); +insert into t1 values (1); +lock tables t1 read; +connection writer; +send update low_priority t1 set n = 4; +connection reader; +--sleep 2 +send select n from t1; +connection locker; +--sleep 2 +unlock tables; +connection writer; +reap; +connection reader; +reap; +drop table t1; diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 188f699cd64..5bd78769a05 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -2,7 +2,7 @@ # test of MERGE TABLES # -drop table if exists t1,t2,t3; +drop table if exists t1,t2,t3,t4,t5,t6; create table t1 (a int not null primary key auto_increment, message char(20)); create table t2 (a int not null primary key auto_increment, message char(20)); INSERT INTO t1 (message) VALUES ("Testing"),("table"),("t1"); @@ -31,6 +31,14 @@ select * from t3 where a > 10 and a < 20; explain select a from t3 order by a desc limit 10; select a from t3 order by a desc limit 10; select a from t3 order by a desc limit 300,10; +delete from t3 where a=3; +select * from t3 where a < 10; +delete from t3 where a >= 6 and a <= 8; +select * from t3 where a < 10; +update t3 set a=3 where a=9; +select * from t3 where a < 10; +update t3 set a=6 where a=7; +select * from t3 where a < 10; show create table t3; # The following should give errors @@ -114,3 +122,49 @@ insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6); flush tables; select * from t3 where a=1 order by b limit 2; drop table t3,t1,t2; + +# +# [phi] testing INSERT_METHOD stuff +# + +drop table if exists t6, t5, t4, t3, t2, t1; +# first testing of common stuff with new parameters +create table t1 (a int not null, b int not null, key(a,b)); +create table t2 (a int not null, b int not null, key(a,b)); +create table t3 (a int not null, b int not null, key(a,b)) UNION=(t1,t2) INSERT_METHOD=NO; +create table t4 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2) INSERT_METHOD=NO; +create table t5 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2) INSERT_METHOD=FIRST; +create table t6 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2) INSERT_METHOD=LAST; +show create table t3; +show create table t4; +show create table t5; +show create table t6; +insert into t1 values (1,1),(1,2),(1,3),(1,4); +insert into t2 values (2,1),(2,2),(2,3),(2,4); +select * from t3 order by b,a limit 3; +select * from t4 order by b,a limit 3; +select * from t5 order by b,a limit 3,3; +select * from t6 order by b,a limit 6,3; +# now testing inserts and where the data gets written +insert into t5 values (5,1),(5,2); +insert into t6 values (6,1),(6,2); +select * from t1 order by a,b; +select * from t2 order by a,b; +select * from t4 order by a,b; +# preperation for next test +insert into t3 values (3,1),(3,2),(3,3),(3,4); +select * from t3 order by a,b; +# now testing whether options are kept by alter table +alter table t4 UNION=(t1,t2,t3); +show create table t4; +select * from t4 order by a,b; +# testing switching off insert method and inserts again +alter table t4 INSERT_METHOD=FIRST; +show create table t4; +insert into t4 values (4,1),(4,2); +select * from t1 order by a,b; +select * from t2 order by a,b; +select * from t3 order by a,b; +select * from t4 order by a,b; +select * from t5 order by a,b; +drop table if exists t6, t5, t4, t3, t2, t1; diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index 7959b67ee9c..0fc4d923469 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -9,6 +9,7 @@ drop table if exists t1,t2,t3; create table t1(id1 int not null auto_increment primary key, t char(12)); create table t2(id2 int not null, t char(12)); create table t3(id3 int not null, t char(12), index(id3)); +disable_query_log; let $1 = 10000; while ($1) { @@ -27,7 +28,7 @@ while ($1) } dec $1; } - +enable_query_log; delete t1.*, t2.*, t3.* from t1,t2,t3 where t1.id1 = t2.id2 and t2.id2 = t3.id3 and t1.id1 > 9500; check table t1, t2, t3; diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 0dc7f84efc5..48a8b5d6c65 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -24,11 +24,13 @@ drop table t1; create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a)); let $1=100; +disable_query_log; while ($1) { eval insert into t1 (b) values(repeat(char(65+$1),65550-$1)); dec $1; } +enable_query_log; check table t1; repair table t1; delete from t1 where (a & 1); diff --git a/mysql-test/t/order_fill_sortbuf-master.opt b/mysql-test/t/order_fill_sortbuf-master.opt index af4e7d33143..116494d4588 100644 --- a/mysql-test/t/order_fill_sortbuf-master.opt +++ b/mysql-test/t/order_fill_sortbuf-master.opt @@ -1 +1 @@ --O sort_buffer=0 +--set-variable=sort_buffer=0 diff --git a/mysql-test/t/order_fill_sortbuf.test b/mysql-test/t/order_fill_sortbuf.test index a64ffce08e3..6419f2a93df 100644 --- a/mysql-test/t/order_fill_sortbuf.test +++ b/mysql-test/t/order_fill_sortbuf.test @@ -9,12 +9,13 @@ CREATE TABLE `t1` ( `id2` int(11) NOT NULL default '0', `id3` int(11) NOT NULL default '0'); let $1=4000; +disable_query_log; while ($1) { eval insert into t1 (id,id2,id3) values ($1,$1,$1); dec $1; } - +enable_query_log; create table t2 select id2 from t1 order by id3; select count(*) from t2; drop table t1,t2; diff --git a/mysql-test/t/rename.test b/mysql-test/t/rename.test index 2a9cf113a47..ce4651d8de3 100644 --- a/mysql-test/t/rename.test +++ b/mysql-test/t/rename.test @@ -12,13 +12,19 @@ select * from t1; rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1; rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1; select * from t1; + # The following should give errors -!$1050 rename table t1 to t2; -!$1050 rename table t1 to t1; -!$1050 rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2; +--error 1050,1050 +rename table t1 to t2; +--error 1050,1050 +rename table t1 to t1; +--error 1050,1050 +rename table t3 to t4, t2 to t3, t1 to t2, t4 to t2; show tables like "t_"; -!$1050 rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1; -!$1017 rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1; +--error 1050,1050 +rename table t3 to t1, t2 to t3, t1 to t2, t4 to t1; +--error 1017,1017 +rename table t3 to t4, t5 to t3, t1 to t2, t4 to t1; select * from t1; select * from t2; diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test index 54882d7bd43..113a9637dac 100644 --- a/mysql-test/t/rpl000001.test +++ b/mysql-test/t/rpl000001.test @@ -42,10 +42,10 @@ save_master_pos; connection master1; #avoid generating result create temporary table t1_temp(n int); -insert into t1_temp select get_lock('crash_lock', 1) from t2; +insert into t1_temp select get_lock('crash_lock%20C', 1) from t2; connection master; -send update t1 set n = n + get_lock('crash_lock', 2); +send update t1 set n = n + get_lock('crash_lock%20C', 2); connection master1; sleep 2; select (@id := id) - id from t2; diff --git a/mysql-test/t/rpl000002.test b/mysql-test/t/rpl000002.test index 865aa5e5bab..420ae27a337 100644 --- a/mysql-test/t/rpl000002.test +++ b/mysql-test/t/rpl000002.test @@ -1,4 +1,5 @@ source include/master-slave.inc; +eval_result; connection master; use test; drop table if exists t1; diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test index 73a10bed7b3..3b29049f1d7 100644 --- a/mysql-test/t/rpl000015.test +++ b/mysql-test/t/rpl000015.test @@ -1,5 +1,6 @@ -connect (master,localhost,root,,test,0,mysql-master.sock); -connect (slave,localhost,root,,test,0, mysql-slave.sock); +connect (master,localhost,root,,test,0,master.sock); +connect (slave,localhost,root,,test,0, slave.sock); +eval_result; connection master; reset master; show master status; @@ -31,4 +32,3 @@ drop table t1; save_master_pos; connection slave; sync_with_master; - diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test index 7b46bc75498..964419f5172 100644 --- a/mysql-test/t/rpl000016.test +++ b/mysql-test/t/rpl000016.test @@ -1,5 +1,6 @@ -connect (master,localhost,root,,test,0,mysql-master.sock); -connect (slave,localhost,root,,test,0,mysql-slave.sock); +connect (master,localhost,root,,test,0,master.sock); +connect (slave,localhost,root,,test,0,slave.sock); +eval_result; system cat /dev/null > var/slave-data/master.info; system chmod 000 var/slave-data/master.info; connection slave; @@ -75,12 +76,14 @@ connection master; let $1=100; drop table if exists t3; create table t3 (n int); +disable_query_log; while ($1) { #eval means expand $ expressions eval insert into t3 values($1 + 4); dec $1; } +enable_query_log; show master logs; show master status; save_master_pos; diff --git a/mysql-test/t/rpl000017-slave.sh b/mysql-test/t/rpl000017-slave.sh index 23117597ca5..c717500ae4a 100755 --- a/mysql-test/t/rpl000017-slave.sh +++ b/mysql-test/t/rpl000017-slave.sh @@ -3,8 +3,8 @@ master-bin.001 4 127.0.0.1 replicate -aaaaaaaaaaaaaaab -9306 +aaaaaaaaaaaaaaabthispartofthepasswordisnotused +$MASTER_MYPORT 1 0 EOF diff --git a/mysql-test/t/rpl000017.test b/mysql-test/t/rpl000017.test index 04a2bc9c78a..011b6507e49 100644 --- a/mysql-test/t/rpl000017.test +++ b/mysql-test/t/rpl000017.test @@ -1,8 +1,9 @@ -connect (master,localhost,root,,test,0,mysql-master.sock); -connect (slave,localhost,root,,test,0,mysql-slave.sock); +connect (master,localhost,root,,test,0,master.sock); +connect (slave,localhost,root,,test,0,slave.sock); connection master; reset master; grant file on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab'; +grant file on *.* to replicate@127.0.0.1 identified by 'aaaaaaaaaaaaaaab'; connection slave; slave start; connection master; diff --git a/mysql-test/t/rpl000018-master.sh b/mysql-test/t/rpl000018-master.sh deleted file mode 100755 index e570f106ec6..00000000000 --- a/mysql-test/t/rpl000018-master.sh +++ /dev/null @@ -1,3 +0,0 @@ -rm -f $MYSQL_TEST_DIR/var/master-data/master-bin.* -cp $MYSQL_TEST_DIR/std_data/master-bin.001 $MYSQL_TEST_DIR/var/master-data/ -echo ./master-bin.001 > $MYSQL_TEST_DIR/var/master-data/master-bin.index diff --git a/mysql-test/t/rpl000018.test b/mysql-test/t/rpl000018.test index 44236323d1d..621147b7c3e 100644 --- a/mysql-test/t/rpl000018.test +++ b/mysql-test/t/rpl000018.test @@ -1,5 +1,7 @@ -connect (master,localhost,root,,test,0,mysql-master.sock); -connect (slave,localhost,root,,test,0,mysql-slave.sock); +connect (master,localhost,root,,test,0,master.sock); +connect (slave,localhost,root,,test,0,slave.sock); +server_stop master; +server_start master; connection slave; reset slave; slave start; diff --git a/mysql-test/t/rpl_failsafe.test b/mysql-test/t/rpl_failsafe.test new file mode 100644 index 00000000000..b8ef5b3f365 --- /dev/null +++ b/mysql-test/t/rpl_failsafe.test @@ -0,0 +1,5 @@ +source include/master-slave.inc; +connection master; +show variables like 'rpl_recovery_rank'; +connection slave; +show variables like 'rpl_recovery_rank'; diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test index 426553b4bdc..841524d57e6 100644 --- a/mysql-test/t/rpl_log.test +++ b/mysql-test/t/rpl_log.test @@ -46,3 +46,4 @@ show new master for slave with master_log_file='master-bin.002' and master_log_pos=4 and master_log_seq=1 and master_server_id=1; show new master for slave with master_log_file='master-bin.002' and master_log_pos=137 and master_log_seq=3 and master_server_id=1; + diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 0e0d79e7d16..56370b9ca85 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -1,21 +1,8 @@ # # Test of some show commands # -drop table if exists t1,t2; -create table t1 (a int not null primary key, b int not null,c int not null, key(b,c)); -insert into t1 values (1,2,2),(2,2,3),(3,2,4),(4,2,4); -create table t2 type=isam select * from t1; -optimize table t1; -check table t1,t2; -repair table t1,t2; -check table t2,t1; -lock tables t1 write; -check table t2,t1; -show columns from t1; -show full columns from t1; -show index from t1; -drop table t1,t2; +drop table if exists t1,t2; create table t1 (a int not null primary key, b int not null,c int not null, key(b,c)); insert into t1 values (1,2,2),(2,2,3),(3,2,4),(4,2,4); check table t1 type=fast; @@ -79,3 +66,11 @@ create table t1(n int); insert into t1 values (1); show open tables; drop table t1; + +create table t1 (a int not null, b VARCHAR(10), INDEX (b) ) AVG_ROW_LENGTH=10 CHECKSUM=1 COMMENT="test" TYPE=MYISAM MIN_ROWS=10 MAX_ROWS=100 PACK_KEYS=1 DELAY_KEY_WRITE=1 ROW_FORMAT=fixed; +show create table t1; +alter table t1 MAX_ROWS=200 ROW_FORMAT=dynamic PACK_KEYS=0; +show create table t1; +ALTER TABLE t1 AVG_ROW_LENGTH=0 CHECKSUM=0 COMMENT="" MIN_ROWS=0 MAX_ROWS=0 PACK_KEYS=DEFAULT DELAY_KEY_WRITE=0 ROW_FORMAT=default; +show create table t1; +drop table t1; diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index bdfeb26073f..cffca437cf1 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -1,3 +1,11 @@ +# This test doesn't work with the embedded version as this code +# assumes that one query is running while we are doing queries on +# a second connection. +# This would work if mysqltest run would be threaded and handle each +# connection in a separate thread. +# +-- source include/not_embedded.inc + connect (con1,localhost,root,,); connect (con2,localhost,root,,); diff --git a/mysql-test/t/tablelock.test b/mysql-test/t/tablelock.test index c32a3f7cd35..fa8c4f03675 100644 --- a/mysql-test/t/tablelock.test +++ b/mysql-test/t/tablelock.test @@ -2,6 +2,7 @@ # Test of lock tables # +drop table if exists t1,t2; create table t1 ( n int auto_increment primary key); lock tables t1 write; insert into t1 values(NULL); @@ -36,12 +37,10 @@ drop table t1; CREATE TABLE t1 (a int); CREATE TABLE t2 (a int); lock tables t1 write,t1 as b write, t2 write, t2 as c read; -drop table t1; -drop table t2; +drop table t1,t2; CREATE TABLE t1 (a int); CREATE TABLE t2 (a int); lock tables t1 write,t1 as b write, t2 write, t2 as c read; -drop table t2; -drop table t1; +drop table t2,t1; unlock tables; diff --git a/mysql-test/t/type_enum.test b/mysql-test/t/type_enum.test index 0278f53c642..62d83388a67 100644 --- a/mysql-test/t/type_enum.test +++ b/mysql-test/t/type_enum.test @@ -2,6 +2,7 @@ # Problem with many enums # +DROP TABLE if exists t1; CREATE TABLE t1 ( field enum('001001','001004','001010','001018','001019','001020','001021','001027','001028','001029','001030','001031','001100','002003','002004','002005','002007','002008','002009','002012','002013','002014','003002','003003','003004','003005','003006','003007','003008','003009','003010','003011','003012','003013','003014','003015','003016','003017','003018','003019','004002','004003','004005','004006','004007','004008','004010','004012','004014','004016','004017','004020','004021','004022','004023','004024','004025','004026','006002','006004','006006','006010','006011','006012','006013','006014','007001','007002','007003','007004','007005','007006','007007','007008','007009','007010','007011','007012','007013','007014','007015','007016','007017','007018','007019','007020','007021','007022','007023','007024','007025','007026','007027','007028','007029','007030','007031','007032','007033','007034','007035','007036','007037','007038','007039','007040','007043','007044','009001','009002','009004','009005','009006','009007','009008','009009','009010','009011','009012','009013','010002','010003','010004','010005','010006','010007','010008','010009','010010','010011','010012','010013','010015','010016','010017','010018','010019','010020','010021','010022','010023','010024','010025','010026','010027','010028','011001','011002','011003','011004','011006','011012','011013','011014','011015','011016','012017','012018','012019','012023','012027','012028','012029','012030','012031','012032','012033','012034','012035','012036','012037','012038','012039','014001','016002','016003','016004','016007','016010','016011','016016','016019','016020','016021','016022','016023','016024','016026','016027','016028','016029','016030','016031','016032','016033','016034','017002','018001','019002','019004','020001','020003','020004','020005','020006','020007','020008','020009','022001','022002','022003','023001','023002','023003','023004','023005','023006','023007','023008','023010','023011','023012','023017','023019','023020','023021','023025','023026','023027','023028','023029','023030','023031','023032','023033','023034','023035','025001','025003','025004','025005','025006','025007','025008','025009','025010','025011','025012','025013','025014','025015','025016','025017','025018','025019','025020','025021','025022','025023','025024','025025','025026','025027','025028','025029','025030','025031','025032','025033','025034','025035','025036','025037','025038','025039','025040','025041','025042','025043','025044','025045','025046','025047','025048','025049','025050','025051','025052','025053','025054','025055','025056','025057','025058','025059','025060','025061','025062','025063','027001','027002','027011','035008','035012','036001','037001','037003','037004','037005','037006','037007','037008','037009','038004','038005','038006','038007','038009','039001','039002','039003','039004','039005','039006','046001','046002','046003','046004','046005','046007','046008','046009','046010','046011','046012','046013','046014','047001','047002','048001','051001','051002','051003','051004','052001','052002','052005','053015','053016','053019','053020','053023','053024','053026','053028','053029','053033','053034','053036','053037','053038','053039','053041','053042','053043','053045','053046','053047','053048','053051','053052','053054','053055','053056','053057','053068','053069','053070','053073','053074','053075','053086','053094','053095','053096','053097','053098','053099','053100','053101','053102','053103','053104','053105','053107','053122','053123','053124','053125','053127','053128','054001','054002','054003','054004','054005','054006','054007','054009','054010','056001','056002','056003','056004','056005','056006','056009','056010','056011','056016','056017','056018','056019','056020','056021','056022','057001','057002','057003','057004','058002','058003','058004','058005','060001','060003','060004','060005','060006','060007','061002','061003','061004','061005','061006','069006','069007','069010','069011','069012','069013','069014','069015','069016','069017','069018','069020','069021','069022','069023','069024','071002','071003','071004','071005','071006','071008','071011','071013','071020','071021','071022','072001','073001','073002','073003','073004','074001','074002','074003','074004','074005','074006','074007','074008','074009','074010','074011','074012','075001','075007','076101','076102','076103','077001','077002','077003','077004','077006','077007','077008','077009','078005','079002','079003','079004','079005','079006','079007','081001','082006','082007','082011','082013','082014','082015','082016','082017','082021','082022','082023','082024','082025','082026','082027','082028','082029','082030','082031','082032','082033','082034','082035','082036','082037','082038','082039','082040','082041','082042','082043','082044','084001','084002','084003','084004','084005','084007','084008','084009','084011','084013','084014','084016','084017','084027','084031','084032','084033','084035','084036','084037','084038','084039','084040','084041','084042','084043','084044','084045','084046','084047','084048','084049','084050','084051','085001','085002','085003','085004','085005','085006','085007','085009','085011','085012','085013','085014','085015','085016','085017','085018','085019','085020','085021','085022','085023','085028','085029','085030','085031','085033','085034','085035','085036','085037','085038','085040','085041','085042','085043','085044','085045','085046','085047','085048','085063','085064','085065','085068','085070','085071','085073','085082','085083','085086','085088','085089','085090','085091','085092','085093','085094','085095','085096','085097','085098','085099','085100','085101','085102','085103','085104','085105','085106','085107','085108','085109','085110','085111','085112','085113','085115','085119','085120','085121','085122','085123','085124','085125','085126','085127','085128','085129','085130','085132','085133','085134','085135','085136','085137','086001','086002','086003','086004','086005','088001','088003','088005','088006','088007','088008','088009','089001','090001','090002','090003','090004','090005','090006','090007','090008','090009','090010','090013','090015','090016','090017','090018','090019','090022','090027','090028','091001','091002','091005','091008','091009','091010','091011','091012','091013','091014','091015','091016','091017','091018','093001','093003','093098','093100','093102','093104','093141','093142','093146','093151','093153','093167','093168','093176','094001','094002','094004','094005','095004','099001','099002','100001','101001','102002','102003','105001','105002','106001','113001','113002','113003','113004','113005','113006','113007','113008','113009','113010','113011','113012','113013','113014','113015','113016','113017','113018','113019','113020','113021','113022','113023','113024','113025','113026','113027','113028','114001','115001','115002','115003','115004','115005','115006','115007','115008','115009','115010','115011','115012','115013','115014','115015','115016','115017','115018','115020','115021','115022','115023','115025','115026','115027','115028','115029','115030','115031','115032','115033','115034','115035','115036','115039','115040','115041','115042','115043','115044','115045','115046','115047','115048','115049','115050','115051','115052','115053','115054','115055','115056','115057','115059','115060','115061','115062','115063','115064','115065','115066','115067','115068','115069','115070','115071','115072','115073','115075','115076','115081','115082','115085','115086','115087','115088','115095','115096','115097','115098','115099','115101','115102','115103','115104','115105','115106','115108','115109','115110','115111','115112','115113','115114','115115','115116','115117','115118','115119','115120','115121','115122','116001','116002','116003','116004','116005','116006','116007','116008','116009','116010','116011','116012','117001','117002','117003','123001','124010','124014','124015','124019','124024','124025','124026','124027','124028','124029','124030','124031','124032','124033','124035','124036','124037','124038','124039','124040','124041','124042','124043','124044','124045','124046','124047','124048','124049','124050','124051','124052','124053','124054','124055','124056','124057','124058','124059','124060','124061','124062','124063','124064','124065','126001','126002','126003','126004','126005','126006','126007','126008','126009','126010','126011','126012','130001','132001','132002','132003','133001','133008','133009','133010','133011','133012','133013','133014','133015','133016','133017','133018','133019','133020','133021','133022','133023','133024','133025','133027','133028','133029','133030','133031','134001','135001','135002','135003','135004','135005','135006','135007','135008','135009','135010','136001','137009','137010','137011','137012','137013','137014','137015','137016','137017','137018','137019','138001','138002','138003','138004','139001','139003','140001','141001','141002','141003','141006','141007','141008','141009','141011','141012','141014','141015','141016','141017','141018','141019','141020','141021','141022','141023','141024','141025','141026','141027','141028','142001','142002','142003','142004','142005','142006','142007','142008','142010','142011','142012','144001','145001','145002','145003','145004','145005','145006','145007','145008','145009','145010','145011','145012','145013','145014','145015','145016','147001','150003','150005','150009','150013','150014','150015','150016','150017','150020','150021','152001','152002','152003','152004','152005','152006','152007','154001','154002','154003','155001','155002','155003','155004','155005','155006','159001','159002','159003','159004','160001','160002','160003','161001','162001','162002','162003','162004','162007','162010','162011','162012','163001','163002','163003','163005','163010','163011','163014','163015','163016','165001','165002','165003','165004','165005','165006','165007','165008','165009','165010','165011','165012','165013','165014','165015','165016','165017','165018','165019','165020','165021','165022','165023','165024','165025','165026','165027','165028','165029','165030','165031','165032','165033','165034','165035','165036','167001','168001','168002','168003','168004','168005','168007','168008','168009','168010','168011','168012','168013','168014','169001','169002','169003','169007','169008','169009','169010','170001','171001','171002','171003','171004','171005','171006','171007','171008','171009','172001','174001','174002','174003','176001','176002','176003','177001','177002','179001','179002','179003','179004','179005','179006','179007','179008','179009','179010','179011','179012','179013','179014','179015','179016','179017','179018','179019','179020','179021','179022','179023','179024','179025','179026','179027','179028','179029','179030','179031','179032','179033','179034','179035','179036','179037','179038','179039','179040','179041','179042','179043','179044','179045','179046','179047','180001','180010','180012','180013','180014','180015','180016','180017','180018','180019','180020','180021','180022','180023','180024','180025','180026','180027','180028','180030','180031','180032','180033','180034','180035','180036','180037','180038','180039','180041','180042','180043','180044','180045','180046','180047','180048','180049','180050','180051','180052','180053','180054','180055','180056','180057','180058','180059','180060','180061','180062','180063','180064','180065','180066','180067','180068','180069','180070','180071','182001','184001','184002','184005','184006','184007','184008','184009','184010','184011','185001','185003','187001','188001','188002','188003','188004','188005','188006','188007','188008','188009','188010','188011','191001','191002','192002','194001','194002','194003','194004','194005','194006','194007','195001','195002','195003','195004','195005','195006','195007','196001','196002','197001','197002','197003','197004','197005','197006','198001','198003','198004','198005','198006','198007','198008','198009','198010','198011','198012','198013','198014','198015','198016','198017','201001','201002','201005','202001','203001','203002','203003','203017','203018','203019','204001','204002','204003','205001','208001','208002','208003','208004','208005','209001','209002','209003','210001','210002','210003','210004','210005','210006','210007','210008','210009','210010','210011','210012','210013','211017','212001','212002','212003','212004','212005','212006','212007','212008','212009','212010','212011','212012','212013','218001','218003','218004','218006','218007','218008','218009','218011','218015','218016','218017','218018','218019','218020','218021','218022','218023','218024','218025','218026','218027','218028','218029','218030','218031','218032','218033','218034','218035','218036','221001','221002','221003','221004','221005','221006','221007','221008','221009','221010','221011','221012','221013','223001','223002','223003','224001','224002','224003','224006','224007','224008','225001','225002','225003','225004','225005','225006','225007','225008','225009','225010','225011','225012','225013','226001','226002','226003','226004','226005','226006','226007','226008','226009','227001','227002','227003','227004','227005','227006','227007','227008','227009','227010','227011','227012','227013','227014','227015','227016','227017','227018','227019','227020','227021','227022','227023','227024','227025','227026','227027','227028','227029','227030','227031','227032','227033','227034','227035','227036','227037','227038','227039','227040','227041','227042','227043','227044','227045','227046','227047','227048','227049','227050','227051','227052','227053','227054','227055','227056','227057','227058','227059','227060','227061','227062','227063','227064','227065','227066','227067','227068','227069','227070','227071','227072','227073','227074','227075','227076','227077','227078','227079','227080','227081','227082','227083','227084','227085','227086','227087','227088','227089','227090','227091','227092','227093','227094','227095','227096','227097','227098','227099','227100','227101','227102','227103','227104','227105','227106','227107','227108','227109','227110','227111','227112','227113','227114','227115','227116','227117','227118','227119','227120','227122','227123','227124','227125','227126','227127','227128','227129','227130','227131','227132','227133','227134','227135','227136','227137','227138','227139','227140','227141','227142','227143','227144','227145','227146','227147','227148','227149','227150','227151','227152','228001','229001','229002','229003','229004','229005','230001','230002','232001','233001','233002','233003','233004','233005','233006','233007','233008','234001','234002','234003','234004','234005','234006','234007','234008','234009','234010','234011','234012','234013','234014','234015','234016','234017','234018','234019','234020','234021','234022','234023','234024','234025','234026','234027','234028','234029','234030','235001','235002','235003','235004','235005','236001','236002','236003','237001','238002','238003','238004','238005','238006','238007','238008','333013','333014','333015','333016','333017','333018','333019','333020','333021','333022','333023','333024','333025','333030','333031','333032','333033','333034','333035','334001','334002','334003','334004','334005','334006','334007','336004','337001','337002','337003','337004','339001','339002','343001','344001','344002','344003','344004','344005','345001','345002','345003','347001','347002','348001','348002','348003','348004','348005','349001','349002','349003','350001','353001','353002','353003','353004','355001','355002','355003','355004','355005','355006','356001','358001','359001','359002','360001','360002','360003','360004','360005','366001','366002','366003','366004','369001','373001','373002','373003','373004','373005','373006','373007','373008','373009','373010','373011','373012','373013','373014','373015','373016','373017','373018','373019','373020','373021','374001','374002','374003','374004','374005','374006','374007','374008','374009','374010','374011','374012','374013','374014','374015','374016','376001','376002','376003','376004','376005','376006','376007','376008','376009','376010','376011','376012','376013','376016','376017','376018','376019','376020','376021','379003','382001','382002','383001','384001','384002','385001','385002','386001','386002','386003','386004','386005','386006','386007','386008','386009','386010','386011','386012','386013','386014','387001','389001','389002','389003','389004','392001','393001','393002','393003','393004','395001','396001','397001','397002','399001','399002','399003','400001','400002','401001','401002','401003','402001','402002','402003','402004','402005','403001','403002','403003','504001','504002','504004','504005','504006','504007','504008','504009','504010','504011','504012','504013','504014','504017','504018','504019','504021','504022','504023','504024','504025','506001','506002','508001','508002','511001','511002','511003','511004','511005','511006','511007','511008','511009','511010','511011','511012','511013','511014','511017','511018','511020','511021','511022','511024','511028','511029','513001','513002','513003','513004','514001','515001','515002','515003','515007','515008','515009','515010','515011','515012','515013','515014','515015','518001','518002','518003','520001','520002','521001','521002','521003','521004','521005','521006','521007','521008','521009','521010','521011','521012','521013','521014','521015','521016','523001','523002','523003','523004','523005','523006','523007','524001','700001','701001','701002','701003','702001','702002','702003','702004','702005','702006','702007','702008','703001','703002','703003','704001','704002','704003','704004','705001','706001','706002','707001','707002','707003','708001','709001','709002','710001','710002','711001','711002','712001','713001','713002','714001','714002','715001','716001','718001','718002','719001','719002','991001','991002','991003','991004','991005','991006','991007','991008','992001','995001','996001','996002','996003','998001','998002','998003','998004','998005','998006','998007','999001','999002','011017','011018','034001','034002','071010','208006','239001','519001','519003','126013','184012','053071','374017','374018','374019','374020','374021','404001','405002','405001','405003','405007','405006','405005','405004','240011','240010','240009','240008','240007','240006','240005','240004','240003','240002','240001','240012','240013','240014','240015','240016','240017','357001','235006','235007','712002','355008','355007','056023','999999','046015','019005','126014','241003','241002','241001','240018','240020','240019','242001','242002','242003','242004','242005','242006','089002','406001','406002','406003','406004','406005','406006','243001','243002','243003','243004','243005','243006','243007','243008','010030','010029','407001','407006','407005','407004','407003','407002','408001','366005','133032','016035','077010','996004','025064','011019','407007','407008','407009','409001','115123','504026','039007','039009','039008','039010','039011','039012','180072','240021','240023','408002','405008','235008','525001','525002','525003','525004','410001','410002','410003','410004','410005','410006','410007','410008','410009','410010','410011','410012','410013','410014','410015','410016','344006','240031','240030','240029','240028','240027','240026','240025','240024','240034','240033','240032','410017','410018','411001','411002','411003','411004','411005','411006','411007','411008','203020','203021','203022','412001','412002','412003','412004','069025','244001','244002','244009','244008','244007','244006','244005','244004','244003','244015','244014','244013','244012','244011','244010','244016','244017','240042','240041','240040','240039','240038','240037','240036','240035','405009','405010','240043','504034','504033','504032','504031','504030','504029','504028','504027','504042','504041','504040','504039','504038','504037','504036','504035','800001','410019','410020','410021','244018','244019','244020','399004','413001','504043','198018','198019','344007','082045','010031','010032','010033','010034','010035','504044','515016','801002','801003','801004','801005','802001','801001','414001','414002','414003','141029','141030','803001','803002','803003','803004','803005','803006','803007','803008','803009','803010','803011','803012','803013','803014','803015','803016','803017','410022','410023','803018','803019','803020','415002','415001','244021','011020','011023','011022','011021','025065','165037','165038','165039','416001','416002','416003','417001','418001','504045','803022','803021','240022','419001','420001','804010','804009','804008','804007','804006','804005','804004','804003','804002','804001','804020','804019','804018','804017','804016','804015','804014','804013','804012','804011','804024','804021','804023','804022','511019','511016','511015','511032','511031','511030','511027','511026','511025','511033','511023','133034','133033','169011','344008','344009','244022','244026','244025','244030','244023','244024','244027','244028','244029','244031','082046','082047','082048','126015','126016','416004','416005','421001','421002','016037','016036','115124','115125','115126','240049','240048','240047','240046','240045','240044','244032','244033','422001','422002','422003','422004','422005','184013','239002','805001','805002','805003','805004','805005','056024','423001','344010','235009','212014','056025','056026','802002','244034','244035','244036','244037','244038','244039','515017','504046','203015','245002','245001','071023','056027','056028','056029','056030','056031','056032','424001','056034','056033','805006','805007','805008','805009','805010','422008','422007','422006','422010','422009','422011','209004','150022','150023','100002','056035','023036','185004','185005','246001','247001','247002','425001','416006','165042','165041','165040','165043','010040','010039','010038','010037','010036','422012','422013','422014','422015','426000','248001','248002','248003','248004','248005','249001','249002','249003','249004','249005','249006','250007','250001','250002','250003','250004','250005','250006','250008','250009','250010','250011','250012','250013','251001','251002','422016','422017','422018','806001','806002','116013','235010','235011','091026','091027','091028','091029','091019','091020','091021','091022','091023','091024','091025','252001','243009','249007','249008','249009','011024','011025','427001','428002','428001','169012','429001','429002','429003') DEFAULT '001001' NOT NULL, KEY field (field) diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index a4a29c76e65..5c4a62d5c41 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -61,5 +61,8 @@ CREATE TABLE t1 ( INSERT INTO t1 (pseudo,pseudo1,same) VALUES ('joce', 'testtt', 1),('joce', 'tsestset', 1),('dekad', 'joce', 1); SELECT pseudo FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo FROM t1 WHERE pseudo='joce'; SELECT pseudo1 FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo1 FROM t1 WHERE pseudo='joce'; -SELECT * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce' order by pseudo desc; +SELECT * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce' order by pseudo desc,pseudo1 desc; +SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT pseudo FROM t1 WHERE pseudo1='joce'; +SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION ALL SELECT pseudo FROM t1 WHERE pseudo1='joce'; +SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT 1; drop table t1; diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 9a44d569e45..1797d306254 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -34,7 +34,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ my_error.c errors.c my_div.c my_messnc.c \ mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \ my_symlink.c my_symlink2.c \ - mf_pack.c mf_pack2.c mf_unixpath.c mf_stripp.c \ + mf_pack.c mf_unixpath.c mf_stripp.c \ mf_casecnv.c mf_soundex.c mf_wcomp.c mf_wfile.c \ mf_qsort.c mf_qsort2.c mf_sort.c \ ptr_cmp.c mf_radix.c queues.c \ @@ -45,7 +45,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ my_quick.c my_lockmem.c my_static.c \ getopt.c getopt1.c getvar.c my_mkdir.c \ default.c my_compress.c checksum.c raid.cc my_net.c \ - my_vsnprintf.c charset.c my_bitmap.c + my_vsnprintf.c charset.c my_bitmap.c my_bit.c md5.c EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ thr_mutex.c thr_rwlock.c libmysys_a_LIBADD = @THREAD_LOBJECTS@ diff --git a/mysys/charset.c b/mysys/charset.c index f778afb4144..47eaf3587d5 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -44,13 +44,6 @@ struct simpleconfig_buf_st { char *p; }; -/* Defined in strings/ctype.c */ - -CHARSET_INFO *find_compiled_charset(uint cs_number); -uint compiled_charset_number(const char *name); -const char *compiled_charset_name(uint charset_number); - - static uint num_from_csname(CS_ID **cs, const char *name) { CS_ID **c; @@ -110,7 +103,7 @@ char *get_charsets_dir(char *buf) strxmov(buf, DEFAULT_CHARSET_HOME, "/", sharedir, "/", CHARSET_DIR, NullS); } - convert_dirname(buf); + convert_dirname(buf,buf,NullS); DBUG_PRINT("info",("charsets dir='%s'", buf)); DBUG_RETURN(strend(buf)); } @@ -264,22 +257,22 @@ static my_bool read_charset_file(uint cs_number, CHARSET_INFO *set, uint get_charset_number(const char *charset_name) { - my_bool error; - error = init_available_charsets(MYF(0)); /* If it isn't initialized */ - if (error) - return compiled_charset_number(charset_name); - else - return num_from_csname(available_charsets, charset_name); + uint number=compiled_charset_number(charset_name); + if (number) + return number; + if (init_available_charsets(MYF(0))) /* If it isn't initialized */ + return 0; + return num_from_csname(available_charsets, charset_name); } const char *get_charset_name(uint charset_number) { - my_bool error; - error = init_available_charsets(MYF(0)); /* If it isn't initialized */ - if (error) - return compiled_charset_name(charset_number); - else - return name_from_csnum(available_charsets, charset_number); + const char *name=compiled_charset_name(charset_number); + if (*name != '?') + return name; + if (init_available_charsets(MYF(0))) /* If it isn't initialized */ + return "?"; + return name_from_csnum(available_charsets, charset_number); } @@ -293,8 +286,8 @@ static CHARSET_INFO *find_charset(CHARSET_INFO **table, uint cs_number, return NULL; } -static CHARSET_INFO *find_charset_by_name(CHARSET_INFO **table, const char *name, - size_t tablesz) +static CHARSET_INFO *find_charset_by_name(CHARSET_INFO **table, + const char *name, size_t tablesz) { uint i; for (i = 0; i < tablesz; ++i) diff --git a/mysys/default.c b/mysys/default.c index e2e80f36a68..920a3a5e70b 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -231,11 +231,10 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, return 0; /* Ignore wrong paths */ if (dir) { - strmov(name,dir); - convert_dirname(name); + end=convert_dirname(name, dir, NullS); if (dir[0] == FN_HOMELIB) /* Add . to filenames in home */ - strcat(name,"."); - strxmov(strend(name),config_file,ext,NullS); + *end++='.'; + strxmov(end,config_file,ext,NullS); } else { @@ -369,16 +368,18 @@ void print_defaults(const char *conf_file, const char **groups) #endif for (dirs=default_directories ; *dirs; dirs++) { + const char *pos; + char *end; if (**dirs) - strmov(name,*dirs); + pos= *dirs; else if (defaults_extra_file) - strmov(name,defaults_extra_file); + pos= defaults_extra_file; else continue; - convert_dirname(name); + end=convert_dirname(name, pos, NullS); if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ - strcat(name,"."); - strxmov(strend(name),conf_file,default_ext," ",NullS); + *end++='.'; + strxmov(end,conf_file,default_ext," ",NullS); fputs(name,stdout); } puts(""); diff --git a/sql/md5.c b/mysys/md5.c index a4ff75d469a..a4ff75d469a 100644 --- a/sql/md5.c +++ b/mysys/md5.c diff --git a/mysys/mf_casecnv.c b/mysys/mf_casecnv.c index 125f54b2594..2e0f5db83ff 100644 --- a/mysys/mf_casecnv.c +++ b/mysys/mf_casecnv.c @@ -35,7 +35,7 @@ void caseup_str(my_string str) if (use_mb(default_charset_info)) { register uint32 l; - register char *end=str+(uint) strlen(str); + register char *end=str+strlen(str); while (*str) { if ((l=my_ismbchar(default_charset_info, str,end))) str+=l; @@ -56,7 +56,7 @@ void casedn_str(my_string str) if (use_mb(default_charset_info)) { register uint32 l; - register char *end=str+(uint) strlen(str); + register char *end=str+strlen(str); while (*str) { if ((l=my_ismbchar(default_charset_info, str,end))) str+=l; @@ -155,7 +155,7 @@ int my_strcasecmp(const char *s, const char *t) if (use_mb(default_charset_info)) { register uint32 l; - register const char *end=s+(uint) strlen(s); + register const char *end=s+strlen(s); while (s<end) { if ((l=my_ismbchar(default_charset_info, s,end))) diff --git a/mysys/mf_dirname.c b/mysys/mf_dirname.c index 399082a238b..a9d91963480 100644 --- a/mysys/mf_dirname.c +++ b/mysys/mf_dirname.c @@ -50,57 +50,70 @@ uint dirname_part(my_string to, const char *name) DBUG_PRINT("enter",("'%s'",name)); length=dirname_length(name); - (void) strmake(to,(char*) name,min(length,FN_REFLEN-2)); - convert_dirname(to); /* Convert chars */ + convert_dirname(to, name, name+length); DBUG_RETURN(length); } /* dirname */ - /* convert dirname to use under this system */ - /* If MSDOS converts '/' to '\' */ - /* If VMS converts '<' to '[' and '>' to ']' */ - /* Adds a '/' to end if there isn't one and the last isn't a dev_char */ - /* ARGSUSED */ + /* + Convert directory name to use under this system + If MSDOS converts '/' to '\' + If VMS converts '<' to '[' and '>' to ']' + Adds a FN_LIBCHAR to end if the result string if there isn't one + and the last isn't dev_char. + Copies data from 'from' until ASCII(0) for until from == from_end + If you want to use the whole 'from' string, just send NullS as the + last argument. + If the result string is larger than FN_REFLEN -1, then it's cut. + + Returns pointer to end \0 + */ #ifndef FN_DEVCHAR #define FN_DEVCHAR '\0' /* For easier code */ #endif -char *convert_dirname(my_string to) +char *convert_dirname(char *to, const char *from, const char *from_end) { - reg1 char *pos; -#ifdef FN_UPPER_CASE - caseup_str(to); -#endif -#ifdef FN_LOWER_CASE - casedn_str(to); -#endif -#if FN_LIBCHAR != '/' - { - pos=to-1; /* Change from '/' */ - while ((pos=strchr(pos+1,'/')) != 0) - *pos=FN_LIBCHAR; - } -#endif -#ifdef FN_C_BEFORE_DIR_2 + char *to_org=to; + + /* We use -2 here, becasue we need place for the last FN_LIBCHAR */ + if (!from_end || (from_end - from) > FN_REFLEN-2) + from_end=from+FN_REFLEN -2; + +#if FN_LIBCHAR != '/' || defined(FN_C_BEFORE_DIR_2) { - for (pos=to ; *pos ; pos++) + for (; *from && from != from_end; from++) { - if (*pos == FN_C_BEFORE_DIR_2) - *pos=FN_C_BEFORE_DIR; - if (*pos == FN_C_AFTER_DIR_2) - *pos=FN_C_AFTER_DIR; + if (*from == '/') + *to++= FN_LIBCHAR; +#ifdef FN_C_BEFORE_DIR_2 + else if (*from == FN_C_BEFORE_DIR_2) + *to++= FN_C_BEFORE_DIR; + else if (*from == FN_C_AFTER_DIR_2) + *to++= FN_C_AFTER_DIR; +#endif + else + *to++= *from; } + *to=0; } #else - { /* Append FN_LIBCHAR if not there */ - pos=strend(to); - if (pos != to && (pos[-1] != FN_LIBCHAR && pos[-1] != FN_DEVCHAR)) - { - *pos++=FN_LIBCHAR; - *pos=0; - } + /* This is ok even if to == from, becasue we need to cut the string */ + to= strmake(to, from, (uint) (from_end-from)); +#endif + + /* Add FN_LIBCHAR to the end of directory path */ + if (to != to_org && (to[-1] != FN_LIBCHAR && to[-1] != FN_DEVCHAR)) + { + *to++=FN_LIBCHAR; + *to=0; } +#ifdef FN_UPPER_CASE + caseup_str(to_org); +#endif +#ifdef FN_LOWER_CASE + casedn_str(to_org); #endif - return pos; /* Pointer to end of dir */ + return to; /* Pointer to end of dir */ } /* convert_dirname */ diff --git a/mysys/mf_format.c b/mysys/mf_format.c index 5063d6ca831..d7d2af608e8 100644 --- a/mysys/mf_format.c +++ b/mysys/mf_format.c @@ -18,64 +18,68 @@ #include "mysys_priv.h" #include <m_string.h> - /* format a filename with replace of library and extension */ - /* params to and name may be identicall */ - /* function doesn't change name if name != to */ - /* Flag may be: 1 replace filenames library with 'dsk' */ - /* 2 replace extension with 'form' */ - /* 4 Unpack filename (replace ~ with home) */ - /* 8 Pack filename as short as possibly */ - /* 16 Resolve symbolic links for filename */ - /* 32 Resolve filename to full path */ - /* 64 Return NULL if too long path */ + /* + Formats a filename with possible replace of directory of extension + Function can handle the case where 'to' == 'name' + For a description of the flag values, consult my_sys.h + The arguments should be in unix format. + */ -my_string fn_format(my_string to, const char *name, const char *dsk, - const char *form, int flag) +my_string fn_format(my_string to, const char *name, const char *dir, + const char *extension, uint flag) { reg1 uint length; char dev[FN_REFLEN], buff[FN_REFLEN], *pos, *startpos; const char *ext; DBUG_ENTER("fn_format"); - DBUG_PRINT("enter",("name: %s dsk: %s form: %s flag: %d", - name,dsk,form,flag)); + DBUG_PRINT("enter",("name: %s dir: %s extension: %s flag: %d", + name,dir,extension,flag)); - /* Kopiera & skippa enheten */ + /* Copy and skip directory */ name+=(length=dirname_part(dev,(startpos=(my_string) name))); - if (length == 0 || flag & 1) + if (length == 0 || (flag & MY_REPLACE_DIR)) + { + /* Use given directory */ + convert_dirname(dev,dir,NullS); /* Fix to this OS */ + } + else if ((flag & MY_RELATIVE_PATH) && !test_if_hard_path(name)) { - (void) strmake(dev,dsk, sizeof(dev) - 2); - /* Use given directory */ - convert_dirname(dev); /* Fix to this OS */ + /* Put 'dir' before the given path */ + strmake(buff,dev,sizeof(buff)-1); + pos=convert_dirname(dev,dir,NullS); + strmake(pos,buff,sizeof(buff)-1- (int) (pos-dev)); } - if (flag & 8) + + if (flag & MY_PACK_FILENAME) pack_dirname(dev,dev); /* Put in ./.. and ~/.. */ - if (flag & 4) + if (flag & MY_UNPACK_FILENAME) (void) unpack_dirname(dev,dev); /* Replace ~/.. with dir */ - if ((pos=(char*)strchr(name,FN_EXTCHAR)) != NullS) + if ((pos= (char*) strchr(name,FN_EXTCHAR)) != NullS) { - if ((flag & 2) == 0) /* Skall vi byta extension ? */ + if ((flag & MY_REPLACE_EXT) == 0) /* If we should keep old ext */ { - length=strlength(name); /* Old extension */ + length=strlength(name); /* Use old extension */ ext = ""; } else { length=(uint) (pos-(char*) name); /* Change extension */ - ext= form; + ext= extension; } } else { - length=strlength(name); /* Har ingen ext- tag nya */ - ext=form; + length=strlength(name); /* No ext, use the now one */ + ext=extension; } if (strlen(dev)+length+strlen(ext) >= FN_REFLEN || length >= FN_LEN ) - { /* To long path, return original */ + { + /* To long path, return original or NULL */ uint tmp_length; - if (flag & 64) - return 0; + if (flag & MY_SAFE_PATH) + return NullS; tmp_length=strlength(startpos); DBUG_PRINT("error",("dev: '%s' ext: '%s' length: %d",dev,ext,length)); (void) strmake(to,startpos,min(tmp_length,FN_REFLEN-1)); @@ -96,9 +100,14 @@ my_string fn_format(my_string to, const char *name, const char *dsk, #endif (void) strmov(pos,ext); /* Don't convert extension */ } - if (flag & 32) - (void) my_realpath(to, to, MYF(flag & 32 ? 0 : MY_RESOLVE_LINK)); - else if (flag & 16) + /* + If MY_RETURN_REAL_PATH and MY_RESOLVE_SYMLINK is given, only do + realpath if the file is a symbolic link + */ + if (flag & MY_RETURN_REAL_PATH) + (void) my_realpath(to, to, MYF(flag & MY_RESOLVE_SYMLINKS ? + MY_RESOLVE_LINK: 0)); + else if (flag & MY_RESOLVE_SYMLINKS) { strmov(buff,to); (void) my_readlink(to, buff, MYF(0)); diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index 1397c14515b..76b8055bb45 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -96,6 +96,7 @@ uint my_b_fill(IO_CACHE *info) ** Read a string ended by '\n' into a buffer of 'max_length' size. ** Returns number of characters read, 0 on error. ** last byte is set to '\0' +** If buffer is full then to[max_length-1] will be set to \0. */ uint my_b_gets(IO_CACHE *info, char *to, uint max_length) diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 5b8ec96b4d1..d223a4779a0 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -53,7 +53,6 @@ typedef struct sec_link { } SEC_LINK; -static uint find_next_bigger_power(uint value); static SEC_LINK *find_key_block(int file,my_off_t filepos,int *error); /* static variables in this file */ @@ -61,9 +60,11 @@ static SEC_LINK *_my_block_root,**_my_hash_root, *_my_used_first,*_my_used_last; static int _my_disk_blocks; static uint _my_disk_blocks_used, _my_hash_blocks; +static uint key_cache_shift; ulong _my_blocks_used,_my_blocks_changed; ulong _my_cache_w_requests,_my_cache_write,_my_cache_r_requests, _my_cache_read; +uint key_cache_block_size=DEFAULT_KEYCACHE_BLOCK_SIZE; static byte HUGE_PTR *_my_block_mem; static SEC_LINK *changed_blocks[CHANGED_BLOCKS_HASH]; static SEC_LINK *file_blocks[CHANGED_BLOCKS_HASH]; @@ -92,12 +93,16 @@ int init_key_cache(ulong use_mem, { key_cache_inited=TRUE; _my_disk_blocks= -1; + key_cache_shift=my_bit_log2(key_cache_block_size); + DBUG_PRINT("info",("key_cache_block_size: %u key_cache_shift: %u", + key_cache_block_size, key_cache_shift)); #ifndef DBUG_OFF _my_printed=0; #endif } - blocks= (uint) (use_mem/(sizeof(SEC_LINK)+sizeof(SEC_LINK*)*5/4+KEYCACHE_BLOCK_SIZE)); + blocks= (uint) (use_mem/(sizeof(SEC_LINK)+sizeof(SEC_LINK*)*5/4+ + key_cache_block_size)); /* No use to have very few blocks */ if (blocks >= 8 && _my_disk_blocks < 0) { @@ -107,13 +112,15 @@ int init_key_cache(ulong use_mem, #endif for (;;) { - if ((_my_hash_blocks=find_next_bigger_power((uint) blocks)) < blocks*5/4) - _my_hash_blocks<<=1; + /* Set my_hash_blocks to the next bigger 2 power */ + _my_hash_blocks=(uint) 1 << (my_bit_log2(blocks*5/4)+1); while ((length=(uint) blocks*sizeof(SEC_LINK)+ - sizeof(SEC_LINK*)*_my_hash_blocks)+(ulong) blocks*KEYCACHE_BLOCK_SIZE > + sizeof(SEC_LINK*)*_my_hash_blocks)+ + ((ulong) blocks << key_cache_shift) > use_mem) blocks--; - if ((_my_block_mem=my_malloc_lock((ulong) blocks * KEYCACHE_BLOCK_SIZE,MYF(0)))) + if ((_my_block_mem=my_malloc_lock((ulong) blocks << key_cache_shift, + MYF(0)))) { if ((_my_block_root=(SEC_LINK*) my_malloc((uint) length,MYF(0))) != 0) break; @@ -170,17 +177,6 @@ void end_key_cache(void) } /* end_key_cache */ -static uint find_next_bigger_power(uint value) -{ - uint old_value=1; - while (value) - { - old_value=value; - value&= value-1; - } - return (old_value << 1); -} - static inline void link_into_file_blocks(SEC_LINK *next, int file) { reg1 SEC_LINK **ptr= &file_blocks[(uint) file & CHANGED_BLOCKS_MASK]; @@ -243,7 +239,7 @@ static void test_key_cache(const char *where, my_bool lock); /* ** read a key_buffer - ** filepos must point at a even KEYCACHE_BLOCK_SIZE block + ** filepos must point at a even key_cache_block_size block ** if return_buffer is set then the intern buffer is returned if ** it can be used ** Returns adress to where data is read @@ -257,7 +253,7 @@ byte *key_cache_read(File file, my_off_t filepos, byte *buff, uint length, int error=0; #ifndef THREAD - if (block_length > KEYCACHE_BLOCK_SIZE) + if (block_length > key_cache_block_size) return_buffer=0; #endif if (_my_disk_blocks > 0) @@ -268,7 +264,8 @@ byte *key_cache_read(File file, my_off_t filepos, byte *buff, uint length, do { _my_cache_r_requests++; - read_length= length > KEYCACHE_BLOCK_SIZE ? KEYCACHE_BLOCK_SIZE : length; + read_length= (length > key_cache_block_size ? key_cache_block_size : + length); if (!(next=find_key_block(file,filepos,&error))) { pthread_mutex_unlock(&THR_LOCK_keycache); @@ -310,7 +307,7 @@ byte *key_cache_read(File file, my_off_t filepos, byte *buff, uint length, /* write a key_buffer */ /* We don't have to use pwrite because of write locking */ - /* buff must point at a even KEYCACHE_BLOCK_SIZE block */ + /* buff must point at a even key_cache_block_size block */ int key_cache_write(File file, my_off_t filepos, byte *buff, uint length, uint block_length __attribute__((unused)), @@ -336,7 +333,7 @@ int key_cache_write(File file, my_off_t filepos, byte *buff, uint length, _my_cache_w_requests++; do { - read_length= length > KEYCACHE_BLOCK_SIZE ? KEYCACHE_BLOCK_SIZE : length; + read_length= length > key_cache_block_size ? key_cache_block_size : length; if (!(next=find_key_block(file,filepos,&error))) goto end; /* Fatal error */ if (!dont_write) /* If we wrote buff at start */ @@ -385,7 +382,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) #endif *error=0; - next= *(start= &_my_hash_root[((ulong) (filepos/KEYCACHE_BLOCK_SIZE)+(ulong) file) & + next= *(start= &_my_hash_root[((ulong) (filepos >> key_cache_shift)+(ulong) file) & (_my_hash_blocks-1)]); while (next && (next->diskpos != filepos || next->file != file)) next= next->next_hash; @@ -411,7 +408,8 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) { /* There are unused blocks */ next= &_my_block_root[_my_blocks_used++]; /* Link in hash-chain */ next->buffer=ADD_TO_PTR(_my_block_mem, - (ulong) _my_disk_blocks_used*KEYCACHE_BLOCK_SIZE,byte*); + ((ulong) _my_disk_blocks_used << key_cache_shift), + byte*); /* link first in file_blocks */ next->changed=0; link_into_file_blocks(next,file); @@ -426,7 +424,8 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) next= _my_used_first; if (next->changed) { - if (my_pwrite(next->file,next->buffer,KEYCACHE_BLOCK_SIZE,next->diskpos, + if (my_pwrite(next->file,next->buffer,key_cache_block_size, + next->diskpos, MYF(MY_NABP | MY_WAIT_IF_FULL))) { *error=1; @@ -505,7 +504,8 @@ static int flush_cached_blocks(File file, SEC_LINK **cache, uint count) qsort((byte*) cache, count, sizeof(*cache), (qsort_cmp) cmp_sec_link); for ( ; count-- ; cache++) { - if (my_pwrite(file,(*cache)->buffer,KEYCACHE_BLOCK_SIZE,(*cache)->diskpos, + if (my_pwrite(file,(*cache)->buffer,key_cache_block_size, + (*cache)->diskpos, MYF(MY_NABP | MY_WAIT_IF_FULL))) { if (!last_errno) @@ -646,7 +646,7 @@ static void test_key_cache(const char *where, my_bool lock) i,(ulong) pos,(ulong) prev,(ulong) pos->prev_hash)); } - if (((pos->diskpos/KEYCACHE_BLOCK_SIZE)+pos->file) % _my_hash_blocks != i) + if (((pos->diskpos >> key_cache_shift)+pos->file) % _my_hash_blocks != i) { DBUG_PRINT("error",("hash: %d pos: %lx : Wrong disk_buffer %ld", i,(ulong) pos,(ulong) pos->diskpos)); diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c index 62394050261..c8b01ce700c 100644 --- a/mysys/mf_pack.c +++ b/mysys/mf_pack.c @@ -459,8 +459,7 @@ my_string intern_filename(my_string to, const char *from) my_string pos,from_pos,to_pos,end_pos; char buff[FN_REFLEN]; - (void) strmov(buff,from); - convert_dirname(buff); /* change '<>' to '[]' */ + convert_dirname(buff,from,NullS); /* change '<>' to '[]' */ from_pos=buff; if ((pos=strrchr(from_pos,FN_DEVCHAR))) /* Skipp device part */ { diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c index 2cdd720edbd..d8a67990a52 100644 --- a/mysys/mf_tempfile.c +++ b/mysys/mf_tempfile.c @@ -90,9 +90,10 @@ File create_temp_file(char *to, const char *dir, const char *prefix, uint pfx_len; File org_file; - pfx_len=(strmov(strnmov(prefix_buff, - prefix ? prefix : "tmp.", - sizeof(prefix_buff)-7),"XXXXXX") - prefix_buff); + pfx_len= (uint) (strmov(strnmov(prefix_buff, + prefix ? prefix : "tmp.", + sizeof(prefix_buff)-7),"XXXXXX") - + prefix_buff); if (!dir && ! (dir =getenv("TMPDIR"))) dir=P_tmpdir; if (strlen(dir)+ pfx_len > FN_REFLEN-2) @@ -100,8 +101,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, errno=my_errno= ENAMETOOLONG; return 1; } - strmov(to,dir); - strmov(convert_dirname(to),prefix_buff); + strmov(convert_dirname(to,dir,NullS),prefix_buff); org_file=mkstemp(to); file=my_register_filename(org_file, to, FILE_BY_MKSTEMP, EE_CANTCREATEFILE, MyFlags); diff --git a/mysys/mf_pack2.c b/mysys/my_bit.c index 1cda7797457..19ffb74a5c5 100644 --- a/mysys/mf_pack2.c +++ b/mysys/my_bit.c @@ -15,39 +15,18 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include "mysys_priv.h" -#include <m_string.h> +/* Some useful bit functions */ - /* Pack a filename for output on screen */ - /* Changes long paths to .../ */ - /* Removes pathname and extension */ - /* If not possibly to pack returns '?' in to and returns 1*/ +#include "mysys_priv.h" -int pack_filename(my_string to, const char *name, size_s max_length) - /* to may be name */ +/* + Find smallest X in 2^X >= value + This can be used to divide a number with value by doing a shift instead +*/ +uint my_bit_log2(ulong value) { - int i; - char buff[FN_REFLEN]; - - if (strlen(fn_format(to,name,"","",0)) <= max_length) - return 0; - if (strlen(fn_format(to,name,"","",8)) <= max_length) - return 0; - if (strlen(fn_format(buff,name,".../","",1)) <= max_length) - { - VOID(strmov(to,buff)); - return 0; - } - for (i= 0 ; i < 3 ; i++) - { - if (strlen(fn_format(buff,to,"","", i == 0 ? 2 : i == 1 ? 1 : 3 )) - <= max_length) - { - VOID(strmov(to,buff)); - return 0; - } - } - to[0]='?'; to[1]=0; /* Can't pack filename */ - return 1; -} /* pack_filename */ + uint bit; + for (bit=0 ; value > 1 ; value>>=1, bit++) ; + return bit; +} diff --git a/mysys/my_init.c b/mysys/my_init.c index c3b9cecf86e..f39b3f0ed6d 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -45,9 +45,8 @@ static my_bool win32_init_tcp_ip(); #else #define my_win_init() #endif -static my_bool my_init_done=0; - +my_bool my_init_done=0; static ulong atoi_octal(const char *str) { diff --git a/mysys/my_open.c b/mysys/my_open.c index 2ed1af1eca1..748113528a1 100644 --- a/mysys/my_open.c +++ b/mysys/my_open.c @@ -75,8 +75,8 @@ int my_close(File fd, myf MyFlags) pthread_mutex_destroy(&my_file_info[fd].mutex); #endif my_file_info[fd].type = UNOPEN; - my_file_opened--; } + my_file_opened--; pthread_mutex_unlock(&THR_LOCK_open); DBUG_RETURN(err); } /* my_close */ @@ -96,9 +96,8 @@ File my_register_filename(File fd, const char *FileName, enum file_type my_error(EE_OUT_OF_FILERESOURCES, MYF(ME_BELL+ME_WAITTANG), FileName, my_errno); return(-1); -#else - thread_safe_increment(my_file_opened,&THR_LOCK_open); #endif + thread_safe_increment(my_file_opened,&THR_LOCK_open); return(fd); /* safeguard */ } pthread_mutex_lock(&THR_LOCK_open); diff --git a/mysys/my_read.c b/mysys/my_read.c index b317630f4bd..9a6c7f4d9dc 100644 --- a/mysys/my_read.c +++ b/mysys/my_read.c @@ -28,10 +28,11 @@ uint my_read(File Filedes, byte *Buffer, uint Count, myf MyFlags) /* Max number of bytes returnd */ /* Flags on what to do on error */ { - uint readbytes; + uint readbytes,save_count; DBUG_ENTER("my_read"); DBUG_PRINT("my",("Fd: %d Buffer: %lx Count: %u MyFlags: %d", Filedes, Buffer, Count, MyFlags)); + save_count=Count; for (;;) { @@ -54,12 +55,21 @@ uint my_read(File Filedes, byte *Buffer, uint Count, myf MyFlags) my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG), my_filename(Filedes),my_errno); } - if ((int) readbytes == -1 || (MyFlags & (MY_FNABP | MY_NABP))) + if ((int) readbytes == -1 || + ((MyFlags & (MY_FNABP | MY_NABP)) && !(MyFlags & MY_FULL_IO))) DBUG_RETURN(MY_FILE_ERROR); /* Return with error */ + if (readbytes > 0 && (MyFlags & MY_FULL_IO)) + { + Buffer+=readbytes; + Count-=readbytes; + continue; + } } if (MyFlags & (MY_NABP | MY_FNABP)) readbytes=0; /* Ok on read */ + else if (MyFlags & MY_FULL_IO) + readbytes=save_count; break; } DBUG_RETURN(readbytes); diff --git a/mysys/typelib.c b/mysys/typelib.c index b18959442ae..f4b638e047e 100644 --- a/mysys/typelib.c +++ b/mysys/typelib.c @@ -84,7 +84,8 @@ int find_type(my_string x, TYPELIB *typelib, uint full_name) /* Get name of type nr 'nr' */ /* Warning first type is 1, 0 = empty field */ -void make_type(register my_string to, register uint nr, register TYPELIB *typelib) +void make_type(register my_string to, register uint nr, + register TYPELIB *typelib) { DBUG_ENTER("make_type"); if (!nr) diff --git a/readline/rlstdc.h b/readline/rlstdc.h index d2c5f874d7a..f79cf89fe76 100644 --- a/readline/rlstdc.h +++ b/readline/rlstdc.h @@ -76,4 +76,8 @@ #endif /* !__STDC__ */ +#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__) || __GNUC__ == 2 && __GNUC_MINOR__ < 8) +#define __attribute__(A) +#endif + #endif /* !_RL_STDC_H_ */ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d2cca98ce63..c83a7e2315f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -28,6 +28,7 @@ bin_SCRIPTS = @server_scripts@ \ mysql_find_rows \ mysqlhotcopy \ mysqldumpslow \ + mysql_explain_log \ mysqld_multi EXTRA_SCRIPTS = make_binary_distribution.sh \ @@ -43,6 +44,7 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \ mysql_find_rows.sh \ mysqlhotcopy.sh \ mysqldumpslow.sh \ + mysql_explain_log.sh \ mysqld_multi.sh \ mysqld_safe.sh @@ -95,6 +97,8 @@ SUFFIXES = .sh -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\ -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\ -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \ + -e 's!@''LIBS''@!@LIBS@!' \ + -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \ -e 's!@''VERSION''@!@VERSION@!' \ -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \ -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \ diff --git a/scripts/explain_log.sh b/scripts/explain_log.sh new file mode 100644 index 00000000000..c4a4ef21568 --- /dev/null +++ b/scripts/explain_log.sh @@ -0,0 +1,383 @@ +#!@PERL@ -w +use strict; +use DBI; + +use Getopt::Long; +$Getopt::Long::ignorecase=0; + +print "explain_log provided by http://www.mobile.de\n"; +print "=========== ================================\n"; + +my $Param={}; + +$Param->{host}=''; +$Param->{user}=''; +$Param->{password}=''; +$Param->{PrintError}=0; + +if (!GetOptions ('date|d:i' => \$Param->{ViewDate}, + 'host|h:s' => \$Param->{host}, + 'user|u:s' => \$Param->{user}, + 'password|p:s' => \$Param->{password}, + 'printerror|e:s' => \$Param->{PrintError}, + )) { + ShowOptions(); +} +else { + $Param->{UpdateCount} = 0; + $Param->{SelectCount} = 0; + $Param->{IdxUseCount} = 0; + $Param->{LineCount} = 0; + + $Param->{Init} = 0; + $Param->{Field} = 0; + $Param->{Refresh} = 0; + $Param->{QueryCount} = 0; + $Param->{Statistics} =0; + + $Param->{Query} = undef; + $Param->{ALL} = undef ; + $Param->{Comment} = undef ; + + @{$Param->{Rows}} = (qw|possible_keys key type|); + + if ($Param->{ViewDate}) { + $Param->{View} = 0; + } + else { + $Param->{View} = 1; + } + + #print "Date=$Param->{ViewDate}, host=$Param->{host}, user=$Param->{user}, password=$Param->{password}\n"; + + $Param->{dbh}=DBI->connect("DBI:mysql:host=$Param->{host}",$Param->{user},$Param->{password},{PrintError=>0}); + if (DBI::err()) { + print "Error: " . DBI::errstr() . "\n"; + } + else { + $Param->{Start} = time; + while(<STDIN>) { + $Param->{LineCount} ++ ; + + if ($Param->{ViewDate} ) { + if (m/^(\d{6})\s+\d{1,2}:\d\d:\d\d\s.*$/) { # get date + #print "# $1 #\n"; + if ($1 == $Param->{ViewDate}) { + $Param->{View} = 1; + } + else { + $Param->{View} = 0; + } + } + } + if ($Param->{View} ) { + #print "->>>$_"; + + if (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Connect.+\s+on\s+(.*)$/i) { # get connection ID($2) and database($3) + #print "C-$1--$2--$3------\n"; + RunQuery($Param); + if (defined $3) { + $Param->{CID}->{$2} = $3 ; + #print "DB:$Param->{CID}->{$2} .. $2 .. $3 \n"; + } + } + + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Connect.+$/i) { # get connection ID($2) and database($3) + #print "\n <<<<<<<<<<<<<<<<<<----------------------------<<<<<<<<<<<<<<<< \n"; + #print "Connect \n"; + RunQuery($Param); + } + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Change user .*\s+on\s+(.*)$/i) { # get connection ID($2) and database($3) + #print "C-$1--$2--$3------\n"; + RunQuery($Param); + if (defined $3) { + $Param->{CID}->{$2} = $3 ; + #print "DB:$Param->{CID}->{$2} .. $2 .. $3 \n"; + } + } + + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Quit\s+$/i) { # remove connection ID($2) and querystring + #print "Q-$1--$2--------\n"; + RunQuery($Param); + delete $Param->{CID}->{$2} ; + } + + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(select.+)$/i) { # get connection ID($2) and querystring + #print "S1-$1--$2--$3------\n"; + RunQuery($Param); + unless ($Param->{CID}->{$2}) { + #print "Error: No Database for Handle: $2 found\n"; + } + else { + $Param->{DB}=$Param->{CID}->{$2}; + + my $s = "$3"; + $s =~ s/from\s/from $Param->{DB}./i; + $Param->{Query}="EXPLAIN $s"; + + #$s =~ m/from\s+(\w+[.]\w+)/i; + #$Param->{tab} =$1; + #print "-- $Param->{tab} -- $s --\n"; + } + } + + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(update.+)$/i) { # get connection ID($2) and querystring + #print "S2--$1--$2--$3------\n"; + RunQuery($Param); + unless ($Param->{CID}->{$2}) { + #print "Error: No Database for Handle: $2 found\n"; + } + else { + $Param->{DB}=$Param->{CID}->{$2}; + + my $ud = $3; + $ud =~ m/^update\s+(\w+).+(where.+)$/i; + $Param->{Query} ="EXPLAIN SELECT * FROM $1 $2"; + $Param->{Query} =~ s/from\s/from $Param->{DB}./i; + + #$Param->{Query} =~ m/from\s+(\w+[.]\w+)/i; + #$Param->{tab} =$1; + } + } + + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Statistics\s+(.*)$/i) { # get connection ID($2) and info? + $Param->{Statistics} ++; + #print "Statistics--$1--$2--$3------\n"; + RunQuery($Param); + } + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(.+)$/i) { # get connection ID($2) + $Param->{QueryCount} ++; + #print "Query-NULL $3\n"; + RunQuery($Param); + } + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Refresh\s+(.+)$/i) { # get connection ID($2) + $Param->{Refresh} ++; + #print "Refresh\n"; + RunQuery($Param); + } + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Init\s+(.+)$/i) { # get connection ID($2) + $Param->{Init} ++; + #print "Init $3\n"; + RunQuery($Param); + } + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Field\s+(.+)$/i) { # get connection ID($2) + $Param->{Field} ++; + #print "Field $3\n"; + RunQuery($Param); + } + + elsif (m/^\s+(.+)$/ ) { # command could be some lines ... + #print "multi-lined ($1)\n"; + my ($A)=$1; + chomp $A; + $Param->{Query} .= " $1"; + #print "multi-lined ($1)<<$Param->{Query}>>\n"; + } + + + } + + } + + $Param->{dbh}->disconnect(); + + if (1 == 0) { + print "\nunclosed handles----------------------------------------\n"; + my $count=0; + foreach (sort keys %{$Param->{CID}}) { + print "$count | $_ : $Param->{CID}->{$_} \n"; + $count ++; + } + } + + print "\nIndex usage ------------------------------------\n"; + foreach my $t (sort keys %{$Param->{Data}}) { + print "\nTable\t$t: ---\n"; + foreach my $k (sort keys %{$Param->{Data}->{$t}}) { + print " count\t$k:\n"; + my %h = %{$Param->{Data}->{$t}->{$k}}; + foreach (sort {$h{$a} <=> $h{$b}} keys %h) { + print " $Param->{Data}->{$t}->{$k}->{$_}\t$_\n"; + } + } + } + + $Param->{AllCount}=0; + print "\nQueries causing table scans -------------------\n\n"; + foreach (@{$Param->{ALL}}) { + $Param->{AllCount} ++; + print "$_\n"; + } + print "Sum: $Param->{AllCount} table scans\n"; + + print "\nSummary ---------------------------------------\n\n"; + print "Select: \t$Param->{SelectCount} queries\n"; + print "Update: \t$Param->{UpdateCount} queries\n"; + print "\n"; + + print "Init: \t$Param->{Init} times\n"; + print "Field: \t$Param->{Field} times\n"; + print "Refresh: \t$Param->{Refresh} times\n"; + print "Query: \t$Param->{QueryCount} times\n"; + print "Statistics:\t$Param->{Statistics} times\n"; + print "\n"; + + print "Logfile: \t$Param->{LineCount} lines\n"; + print "Started: \t".localtime($Param->{Start})."\n"; + print "Finished: \t".localtime(time)."\n"; + + } +} + + +########################################################################### +# +# +# +sub RunQuery { + my $Param = shift ; + + if (defined $Param->{Query}) { + if (defined $Param->{DB} ) { + + $Param->{Query} =~ m/from\s+(\w+[.]\w+|\w+)/i; + $Param->{tab} =$1; + #print "||$Param->{tab} -- $Param->{Query}\n"; + + my $sth=$Param->{dbh}->prepare("USE $Param->{DB}"); + if (DBI::err()) { + if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";} + } + else { + $sth->execute(); + if (DBI::err()) { + if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";} + } + else { + $sth->finish(); + + $sth=$Param->{dbh}->prepare($Param->{Query}); + if (DBI::err()) { + if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";} + } + else { + #print "$Param->{Query}\n"; + $sth->execute(); + if (DBI::err()) { + if ($Param->{PrintError}) {print "[$Param->{LineCount}]<<$Param->{Query}>>\n";} + if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";} + } + else { + my $row = undef; + while ($row = $sth->fetchrow_hashref()) { + $Param->{SelectCount} ++; + + if (defined $row->{Comment}) { + push (@{$Param->{Comment}}, "$row->{Comment}; $_; $Param->{DB}; $Param->{Query}"); + } + foreach (@{$Param->{Rows}}) { + if (defined $row->{$_}) { + #if (($_ eq 'type' ) and ($row->{$_} eq 'ALL')) { + if ($row->{type} eq 'ALL') { + push (@{$Param->{ALL}}, "$Param->{Query}"); + #print ">> $row->{$_} $_ $Param->{DB} $Param->{Query}\n"; + } + $Param->{IdxUseCount} ++; + $Param->{Data}->{$Param->{tab}}->{$_}->{$row->{$_}} ++; + } + } + } + } + } + } + } + $sth->finish(); + } + $Param->{Query} = undef ; + } +} + +########################################################################### +# +# +# +sub ShowOptions { + print <<EOF; +Usage: $0 [OPTIONS] < LOGFILE + +--date=YYMMDD select only entrys of date +-d=YYMMDD +--host=HOSTNAME db-host to ask +-h=HOSTNAME +--user=USERNAME db-user +-u=USERNAME +--password=PASSWORD password of db-user +-p=PASSWORD + +Read logfile from STDIN an try to EXPLAIN all SELECT statements. All UPDATE statements are rewritten to an EXPLAIN SELECT statement. The results of the EXPLAIN statement are collected and counted. All results with type=ALL are collected in an separete list. Results are printed to STDOUT. + +EOF +} + +1; + +__END__ + +=pod + +=head1 NAME + +explain_log.pl + +Feed a mysqld general logfile (created with mysqld --log) back into mysql +and collect statistics about index usage with EXPLAIN. + +=head1 DISCUSSION + +To optimize your indices, you have to know which ones are actually +used and what kind of queries are causing table scans. Especially +if you are generating your queries dynamically and you have a huge +amount of queries going on, this isn't easy. + +Use this tool to take a look at the effects of your real life queries. +Then add indices to avoid table scans and remove those which aren't used. + +=head1 USAGE + +explain_log.pl [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw] < logfile + +--date=YYMMDD select only entrys of date + +-d=YYMMDD + +--host=HOSTNAME db-host to ask + +-h=HOSTNAME + +--user=USERNAME db-user + +-u=USERNAME + +--password=PASSWORD password of db-user + +-p=PASSWORD + +=head1 EXAMPLE + +explain_log.pl --host=localhost --user=foo --password=bar < /var/lib/mysql/mobile.log + +=head1 AUTHOR + + Stefan Nitz + Jan Willamowius <jan@mobile.de>, http://www.mobile.de + +=head1 RECRUITING + +If you are looking for a MySQL or Perl job, take a look at http://www.mobile.de +and send me an email with your resume (you must be speaking German!). + +=head1 SEE ALSO + +mysql documentation + +=cut diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index b97d8f204db..35be819cd2e 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -88,7 +88,7 @@ do fi done -for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a $BASE/lib +for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a libmysqld/.libs/libmysqld.a libmysqld/.libs/libmysqld.so* libmysqld/libmysqld.a libmysqld/libmysqld.a do if [ -f $i ] then diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index ed344f4b1e3..b2a09173760 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -31,16 +31,18 @@ client_libs='@CLIENT_LIBS@' libs="$ldflags -L'$pkglibdir' -lmysqlclient $client_libs" cflags="-I'$pkgincludedir'" +embedded_libs="$ldflags -L'$pkglibdir' -lmysqld @LIBS@ @innodb_system_libs@" usage () { cat <<EOF Usage: $0 [OPTIONS] Options: - --cflags [$cflags] - --libs [$libs] - --socket [$socket] - --port [$port] - --version [$version] + --cflags [$cflags] + --libs [$libs] + --socket [$socket] + --port [$port] + --version [$version] + --libmysqld-libs [$embedded_libs] EOF exit 1 } @@ -54,6 +56,7 @@ while test $# -gt 0; do --socket) echo "$socket" ;; --port) echo "$port" ;; --version) echo "$version" ;; + --embedded-libs | --embedded | libmysqld-libs) echo "$embedded_libs" ;; *) usage ;; esac diff --git a/scripts/mysql_explain_log.sh b/scripts/mysql_explain_log.sh new file mode 100644 index 00000000000..d7f6bb97b40 --- /dev/null +++ b/scripts/mysql_explain_log.sh @@ -0,0 +1,383 @@ +#!@PERL@ -w +use strict; +use DBI; + +use Getopt::Long; +$Getopt::Long::ignorecase=0; + +print "explain_log provided by http://www.mobile.de\n"; +print "=========== ================================\n"; + +my $Param={}; + +$Param->{host}=''; +$Param->{user}=''; +$Param->{password}=''; +$Param->{PrintError}=0; + +if (!GetOptions ('date|d:i' => \$Param->{ViewDate}, + 'host|h:s' => \$Param->{host}, + 'user|u:s' => \$Param->{user}, + 'password|p:s' => \$Param->{password}, + 'printerror|e:s' => \$Param->{PrintError}, + )) { + ShowOptions(); +} +else { + $Param->{UpdateCount} = 0; + $Param->{SelectCount} = 0; + $Param->{IdxUseCount} = 0; + $Param->{LineCount} = 0; + + $Param->{Init} = 0; + $Param->{Field} = 0; + $Param->{Refresh} = 0; + $Param->{QueryCount} = 0; + $Param->{Statistics} =0; + + $Param->{Query} = undef; + $Param->{ALL} = undef ; + $Param->{Comment} = undef ; + + @{$Param->{Rows}} = (qw|possible_keys key type|); + + if ($Param->{ViewDate}) { + $Param->{View} = 0; + } + else { + $Param->{View} = 1; + } + + #print "Date=$Param->{ViewDate}, host=$Param->{host}, user=$Param->{user}, password=$Param->{password}\n"; + + $Param->{dbh}=DBI->connect("DBI:mysql:host=$Param->{host}",$Param->{user},$Param->{password},{PrintError=>0}); + if (DBI::err()) { + print "Error: " . DBI::errstr() . "\n"; + } + else { + $Param->{Start} = time; + while(<STDIN>) { + $Param->{LineCount} ++ ; + + if ($Param->{ViewDate} ) { + if (m/^(\d{6})\s+\d{1,2}:\d\d:\d\d\s.*$/) { # get date + #print "# $1 #\n"; + if ($1 == $Param->{ViewDate}) { + $Param->{View} = 1; + } + else { + $Param->{View} = 0; + } + } + } + if ($Param->{View} ) { + #print "->>>$_"; + + if (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Connect.+\s+on\s+(.*)$/i) { # get connection ID($2) and database($3) + #print "C-$1--$2--$3------\n"; + RunQuery($Param); + if (defined $3) { + $Param->{CID}->{$2} = $3 ; + #print "DB:$Param->{CID}->{$2} .. $2 .. $3 \n"; + } + } + + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Connect.+$/i) { # get connection ID($2) and database($3) + #print "\n <<<<<<<<<<<<<<<<<<----------------------------<<<<<<<<<<<<<<<< \n"; + #print "Connect \n"; + RunQuery($Param); + } + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Change user .*\s+on\s+(.*)$/i) { # get connection ID($2) and database($3) + #print "C-$1--$2--$3------\n"; + RunQuery($Param); + if (defined $3) { + $Param->{CID}->{$2} = $3 ; + #print "DB:$Param->{CID}->{$2} .. $2 .. $3 \n"; + } + } + + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Quit\s+$/i) { # remove connection ID($2) and querystring + #print "Q-$1--$2--------\n"; + RunQuery($Param); + delete $Param->{CID}->{$2} ; + } + + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(select.+)$/i) { # get connection ID($2) and querystring + #print "S1-$1--$2--$3------\n"; + RunQuery($Param); + unless ($Param->{CID}->{$2}) { + #print "Error: No Database for Handle: $2 found\n"; + } + else { + $Param->{DB}=$Param->{CID}->{$2}; + + my $s = "$3"; + $s =~ s/from\s/from $Param->{DB}./i; + $Param->{Query}="EXPLAIN $s"; + + #$s =~ m/from\s+(\w+[.]\w+)/i; + #$Param->{tab} =$1; + #print "-- $Param->{tab} -- $s --\n"; + } + } + + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(update.+)$/i) { # get connection ID($2) and querystring + #print "S2--$1--$2--$3------\n"; + RunQuery($Param); + unless ($Param->{CID}->{$2}) { + #print "Error: No Database for Handle: $2 found\n"; + } + else { + $Param->{DB}=$Param->{CID}->{$2}; + + my $ud = $3; + $ud =~ m/^update\s+(\w+).+(where.+)$/i; + $Param->{Query} ="EXPLAIN SELECT * FROM $1 $2"; + $Param->{Query} =~ s/from\s/from $Param->{DB}./i; + + #$Param->{Query} =~ m/from\s+(\w+[.]\w+)/i; + #$Param->{tab} =$1; + } + } + + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Statistics\s+(.*)$/i) { # get connection ID($2) and info? + $Param->{Statistics} ++; + #print "Statistics--$1--$2--$3------\n"; + RunQuery($Param); + } + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(.+)$/i) { # get connection ID($2) + $Param->{QueryCount} ++; + #print "Query-NULL $3\n"; + RunQuery($Param); + } + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Refresh\s+(.+)$/i) { # get connection ID($2) + $Param->{Refresh} ++; + #print "Refresh\n"; + RunQuery($Param); + } + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Init\s+(.+)$/i) { # get connection ID($2) + $Param->{Init} ++; + #print "Init $3\n"; + RunQuery($Param); + } + elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Field\s+(.+)$/i) { # get connection ID($2) + $Param->{Field} ++; + #print "Field $3\n"; + RunQuery($Param); + } + + elsif (m/^\s+(.+)$/ ) { # command could be some lines ... + #print "multi-lined ($1)\n"; + my ($A)=$1; + chomp $A; + $Param->{Query} .= " $1"; + #print "multi-lined ($1)<<$Param->{Query}>>\n"; + } + + + } + + } + + $Param->{dbh}->disconnect(); + + if (1 == 0) { + print "\nunclosed handles----------------------------------------\n"; + my $count=0; + foreach (sort keys %{$Param->{CID}}) { + print "$count | $_ : $Param->{CID}->{$_} \n"; + $count ++; + } + } + + print "\nIndex usage ------------------------------------\n"; + foreach my $t (sort keys %{$Param->{Data}}) { + print "\nTable\t$t: ---\n"; + foreach my $k (sort keys %{$Param->{Data}->{$t}}) { + print " count\t$k:\n"; + my %h = %{$Param->{Data}->{$t}->{$k}}; + foreach (sort {$h{$a} <=> $h{$b}} keys %h) { + print " $Param->{Data}->{$t}->{$k}->{$_}\t$_\n"; + } + } + } + + $Param->{AllCount}=0; + print "\nQueries causing table scans -------------------\n\n"; + foreach (@{$Param->{ALL}}) { + $Param->{AllCount} ++; + print "$_\n"; + } + print "Sum: $Param->{AllCount} table scans\n"; + + print "\nSummary ---------------------------------------\n\n"; + print "Select: \t$Param->{SelectCount} queries\n"; + print "Update: \t$Param->{UpdateCount} queries\n"; + print "\n"; + + print "Init: \t$Param->{Init} times\n"; + print "Field: \t$Param->{Field} times\n"; + print "Refresh: \t$Param->{Refresh} times\n"; + print "Query: \t$Param->{QueryCount} times\n"; + print "Statistics:\t$Param->{Statistics} times\n"; + print "\n"; + + print "Logfile: \t$Param->{LineCount} lines\n"; + print "Started: \t".localtime($Param->{Start})."\n"; + print "Finished: \t".localtime(time)."\n"; + + } +} + + +########################################################################### +# +# +# +sub RunQuery { + my $Param = shift ; + + if (defined $Param->{Query}) { + if (defined $Param->{DB} ) { + + $Param->{Query} =~ m/from\s+(\w+[.]\w+|\w+)/i; + $Param->{tab} =$1; + #print "||$Param->{tab} -- $Param->{Query}\n"; + + my $sth=$Param->{dbh}->prepare("USE $Param->{DB}"); + if (DBI::err()) { + if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";} + } + else { + $sth->execute(); + if (DBI::err()) { + if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";} + } + else { + $sth->finish(); + + $sth=$Param->{dbh}->prepare($Param->{Query}); + if (DBI::err()) { + if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";} + } + else { + #print "$Param->{Query}\n"; + $sth->execute(); + if (DBI::err()) { + if ($Param->{PrintError}) {print "[$Param->{LineCount}]<<$Param->{Query}>>\n";} + if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";} + } + else { + my $row = undef; + while ($row = $sth->fetchrow_hashref()) { + $Param->{SelectCount} ++; + + if (defined $row->{Comment}) { + push (@{$Param->{Comment}}, "$row->{Comment}; $_; $Param->{DB}; $Param->{Query}"); + } + foreach (@{$Param->{Rows}}) { + if (defined $row->{$_}) { + #if (($_ eq 'type' ) and ($row->{$_} eq 'ALL')) { + if ($row->{type} eq 'ALL') { + push (@{$Param->{ALL}}, "$row->{$_} $_ $Param->{DB} $Param->{Query}"); + #print ">> $row->{$_} $_ $Param->{DB} $Param->{Query}\n"; + } + $Param->{IdxUseCount} ++; + $Param->{Data}->{$Param->{tab}}->{$_}->{$row->{$_}} ++; + } + } + } + } + } + } + } + $sth->finish(); + } + $Param->{Query} = undef ; + } +} + +########################################################################### +# +# +# +sub ShowOptions { + print <<EOF; +Usage: $0 [OPTIONS] < LOGFILE + +--date=YYMMDD select only entrys of date +-d=YYMMDD +--host=HOSTNAME db-host to ask +-h=HOSTNAME +--user=USERNAME db-user +-u=USERNAME +--password=PASSWORD password of db-user +-p=PASSWORD + +Read logfile from STDIN an try to EXPLAIN all SELECT statements. All UPDATE statements are rewritten to an EXPLAIN SELECT statement. The results of the EXPLAIN statement are collected and counted. All results with type=ALL are collected in an separete list. Results are printed to STDOUT. + +EOF +} + +1; + +__END__ + +=pod + +=head1 NAME + +explain_log.pl + +Feed a mysqld general logfile (created with mysqld --log) back into mysql +and collect statistics about index usage with EXPLAIN. + +=head1 DISCUSSION + +To optimize your indices, you have to know which ones are actually +used and what kind of queries are causing table scans. Especially +if you are generating your queries dynamically and you have a huge +amount of queries going on, this isn't easy. + +Use this tool to take a look at the effects of your real life queries. +Then add indices to avoid table scans and remove those which aren't used. + +=head1 USAGE + +explain_log.pl [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw] < logfile + +--date=YYMMDD select only entrys of date + +-d=YYMMDD + +--host=HOSTNAME db-host to ask + +-h=HOSTNAME + +--user=USERNAME db-user + +-u=USERNAME + +--password=PASSWORD password of db-user + +-p=PASSWORD + +=head1 EXAMPLE + +explain_log.pl --host=localhost --user=foo --password=bar < /var/lib/mysql/mobile.log + +=head1 AUTHOR + + Stefan Nitz + Jan Willamowius <jan@mobile.de>, http://www.mobile.de + +=head1 RECRUITING + +If you are looking for a MySQL or Perl job, take a look at http://www.mobile.de +and send me an email with your resume (you must be speaking German!). + +=head1 SEE ALSO + +mysql documentation + +=cut diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh index 8e9ef509d66..7226840b475 100644 --- a/scripts/mysql_fix_privilege_tables.sh +++ b/scripts/mysql_fix_privilege_tables.sh @@ -3,8 +3,8 @@ echo "This scripts updates the mysql.user, mysql.db, mysql.host and the" echo "mysql.func table to MySQL 3.22.14 and above." echo "" -echo "This is needed if you want to use the new GRANT functions or" -echo "want to use the more secure passwords." +echo "This is needed if you want to use the new GRANT functions," +echo "CREATE AGGREAGATE FUNCTION or want to use the more secure passwords in 3.23" echo "" echo "If you get Access denied errors, you should run this script again" echo "and give the MySQL root user password as a argument!" @@ -15,13 +15,12 @@ host="localhost" # Fix old password format, add File_priv and func table echo "" echo "If your tables are already up to date or partially up to date you will" -echo "get some warnings about 'Duplicated column name' or" -echo "'Table 'func' already exists'. You can safely ignore these!" +echo "get some warnings about 'Duplicated column name'. You can safely ignore these!" @bindir@/mysql -f --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA alter table user change password password char(16) NOT NULL; alter table user add File_priv enum('N','Y') NOT NULL; -CREATE TABLE func ( +CREATE TABLE if not exists func ( name char(64) DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, @@ -57,6 +56,13 @@ END_OF_DATA echo "" fi +echo "Adding columns needed by GRANT .. REQUIRE (openssl)" +echo "You can ignore any Duplicate column errors" +@bindir@/mysql --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA +ALTER TABLE user ADD ssl_type enum('NONE','ANY','X509', 'SPECIFIED') DEFAULT 'NONE' NOT NULL, ADD ssl_cipher BLOB NOT NULL, ADD x509_issuer BLOB NOT NULL, ADD x509_subject BLOB NOT NULL +END_OF_DATA +echo "" + # # Create tables_priv and columns_priv if they don't exists # @@ -64,7 +70,7 @@ fi echo "Creating the new table and column privilege tables" @bindir@/mysql -f --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA -CREATE TABLE tables_priv ( +CREATE TABLE IF NOT EXISTS tables_priv ( Host char(60) DEFAULT '' NOT NULL, Db char(60) DEFAULT '' NOT NULL, User char(16) DEFAULT '' NOT NULL, @@ -75,7 +81,7 @@ CREATE TABLE tables_priv ( Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name) ); -CREATE TABLE columns_priv ( +CREATE TABLE IF NOT EXISTS columns_priv ( Host char(60) DEFAULT '' NOT NULL, Db char(60) DEFAULT '' NOT NULL, User char(16) DEFAULT '' NOT NULL, @@ -97,6 +103,7 @@ echo "You can ignore any errors from this" @bindir@/mysql -f --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA ALTER TABLE columns_priv change Type Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL; END_OF_DATA +echo "" # # Add the new 'type' column to the func table. @@ -108,3 +115,14 @@ echo "You can ignore any Duplicate column errors" @bindir@/mysql --user=root --password=$root_password mysql <<EOF alter table func add type enum ('function','aggregate') NOT NULL; EOF +echo "" + +echo "Converting all privilege tables to MyISAM format" +@bindir@/mysql -f --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA +ALTER TABLE user type=MyISAM; +ALTER TABLE db type=MyISAM; +ALTER TABLE host type=MyISAM; +ALTER TABLE func type=MyISAM; +ALTER TABLE columns_priv type=MyISAM; +ALTER TABLE tables_priv type=MyISAM; +END_OF_DATA diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 7e232692ba1..c99126cdf53 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -224,18 +224,22 @@ then c_u="$c_u References_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u Index_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u ssl_type enum('NONE','ANY','X509', 'SPECIFIED') DEFAULT 'NONE' NOT NULL," + c_u="$c_u ssl_cipher BLOB NOT NULL," + c_u="$c_u x509_issuer BLOB NOT NULL," + c_u="$c_u x509_subject BLOB NOT NULL," c_u="$c_u PRIMARY KEY Host (Host,User)" c_u="$c_u )" c_u="$c_u comment='Users and global privileges';" - i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','',''); + INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','',''); - REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + REPLACE INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','',''); + REPLACE INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','NONE','','',''); - INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N'); - INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');" + INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','NONE','','',''); + INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','NONE','','','');" fi if test ! -f $mdata/func.frm diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index 8c290a634f7..86d62cea54e 100644 --- a/sql-bench/server-cfg.sh +++ b/sql-bench/server-cfg.sh @@ -73,7 +73,7 @@ sub get_server { $server= new db_interbase($host,$database); } else { - die "Unknown sql server name used: $name\nUse one of: Access, Adabas, AdabasD, Empress, FrontBase, Oracle, Informix, DB2, mSQL, Mimer, MS-SQL, MySQL, Pg, Solid or Sybase.\nIf the connection is done trough ODBC the name must end with _ODBC\n"; + die "Unknown sql server name used: $name\nUse one of: Access, Adabas, AdabasD, Empress, FrontBase, Oracle, Informix, InterBase, DB2, mSQL, Mimer, MS-SQL, MySQL, Pg, Solid or Sybase.\nIf the connection is done trough ODBC the name must end with _ODBC\n"; } if ($name =~ /_ODBC$/i || defined($odbc) && $odbc) { @@ -200,6 +200,7 @@ sub new $main::opt_create_options =~ /type=gemini/i) { $limits{'working_blobs'} = 0; # Blobs not implemented yet + $limits{'max_tables'} = 500; } return $self; @@ -2961,7 +2962,7 @@ sub new bless $self; $self->{'cmp_name'} = "interbase"; - $self->{'data_source'} = "DBI:InterBase:database=$database"; + $self->{'data_source'} = "DBI:InterBase:database=$database:ib_dialect=3"; $self->{'limits'} = \%limits; $self->{'smds'} = \%smds; $self->{'blob'} = "blob"; diff --git a/sql/Makefile.am b/sql/Makefile.am index abde8b3a738..a11b1d0c252 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -24,12 +24,12 @@ INCLUDES = @MT_INCLUDES@ \ @bdb_includes@ @innodb_includes@ @gemini_includes@ \ -I$(srcdir)/../include \ -I$(srcdir)/../regex \ - -I$(srcdir) -I../include $(openssl_includes) + -I$(srcdir) -I../include -I. $(openssl_includes) WRAPLIBS= @WRAPLIBS@ SUBDIRS = share libexec_PROGRAMS = mysqld noinst_PROGRAMS = gen_lex_hash -gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ +gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ LDADD = ../isam/libnisam.a \ ../merge/libmerge.a \ ../myisam/libmyisam.a \ @@ -43,7 +43,7 @@ LDADD = ../isam/libnisam.a \ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @bdb_libs@ @innodb_libs@ @pstack_libs@ \ - @gemini_libs@ \ + @gemini_libs@ @innodb_system_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ @@ -55,7 +55,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ ha_heap.h ha_myisam.h ha_berkeley.h ha_innobase.h \ ha_gemini.h opt_range.h opt_ft.h \ sql_select.h structs.h table.h sql_udf.h hash_filo.h\ - lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \ + lex.h lex_symbol.h sql_acl.h sql_crypt.h \ log_event.h mini_client.h sql_repl.h slave.h \ stacktrace.h sql_sort.h mysqld_SOURCES = sql_lex.cc sql_handler.cc \ @@ -82,7 +82,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \ slave.cc sql_repl.cc sql_union.cc \ mini_client.cc mini_client_errors.c \ - md5.c stacktrace.c + stacktrace.c gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) diff --git a/sql/derror.cc b/sql/derror.cc index 62971fde394..bda0690ae7d 100644 --- a/sql/derror.cc +++ b/sql/derror.cc @@ -51,6 +51,7 @@ static void read_texts(const char *file_name,const char ***point, uchar head[32],*pos; DBUG_ENTER("read_texts"); + *point=0; // If something goes wrong LINT_INIT(buff); funktpos=0; if ((file=my_open(fn_format(name,file_name,language,"",4), @@ -72,8 +73,7 @@ static void read_texts(const char *file_name,const char ***point, Check that the above file is the right version for this program!\n\n", my_progname,name,ant,error_messages); VOID(my_close(file,MYF(MY_WME))); - clean_up(0); /* Clean_up frees everything */ - exit(1); /* We can't continue */ + unireg_abort(1); } x_free((gptr) *point); /* Free old language */ @@ -115,8 +115,7 @@ err: if (file != FERR) VOID(my_close(file,MYF(MY_WME))); fprintf(stderr,buff,my_progname,name); - clean_up(0); /* Clean_up frees everything */ - exit(1); /* We can't continue */ + unireg_abort(1); } /* read_texts */ diff --git a/sql/field.cc b/sql/field.cc index 01178efbdb1..b34f58439db 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4122,7 +4122,7 @@ ulonglong Field_blob::get_id(const char *from) ulonglong id = 0; ulong length=get_length(from); if (length) - uint8korr(id, from+packlength); + id=uint8korr(from+packlength); return id; } diff --git a/sql/field.h b/sql/field.h index b9d8e1957c9..8f60b7e008b 100644 --- a/sql/field.h +++ b/sql/field.h @@ -415,10 +415,11 @@ public: unireg_check_arg, field_name_arg, table_arg, 0, zero_arg,unsigned_arg) {} - Field_longlong(uint32 len_arg,bool maybe_null_arg, const char *field_name_arg, - struct st_table *table_arg) + Field_longlong(uint32 len_arg,bool maybe_null_arg, + const char *field_name_arg, + struct st_table *table_arg, bool unsigned_arg) :Field_num((char*) 0, len_arg, maybe_null_arg ? (uchar*) "": 0,0, - NONE, field_name_arg, table_arg,0,0,0) + NONE, field_name_arg, table_arg,0,0,unsigned_arg) {} enum Item_result result_type () const { return INT_RESULT; } enum_field_types type() const { return FIELD_TYPE_LONGLONG;} diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc index 722f5226980..2358dde7b6d 100644 --- a/sql/gen_lex_hash.cc +++ b/sql/gen_lex_hash.cc @@ -26,7 +26,8 @@ #include "mysql_version.h" #include "lex.h" -bool opt_search=0,opt_verbose=0; +bool opt_search=0; +int opt_verbose=0; ulong opt_count=100000; #define max_allowed_array 8000 // Don't generate bigger arrays than this @@ -216,7 +217,7 @@ you have to change 'main' to print out the new function\n"); return(1); } - if (opt_verbose) + if (opt_verbose > 1) fprintf (stderr,"Info: Possible add values: %d\n",found-type_count); for (prime=primes; (function_mod=*prime) ; prime++) @@ -376,7 +377,7 @@ static int get_options(int argc, char **argv) opt_search=1; break; case 'v': - opt_verbose=1; + opt_verbose++; break; case 'V': usage(1); exit(0); case 'I': @@ -473,7 +474,7 @@ int main(int argc,char **argv) MY_INIT(argv[0]); - start_value=2250933L; best_t1=2721579L; best_t2=4627039L; best_type=3; /* mode=4567 add=4 type: 0 */ + start_value=1109118L; best_t1=6657025L; best_t2=6114496L; best_type=1; /* mode=4903 add=3 type: 0 */ if (get_options(argc,(char **) argv)) exit(1); @@ -493,7 +494,7 @@ int main(int argc,char **argv) printf("start_value=%ldL; best_t1=%ldL; best_t2=%ldL; best_type=%d; /* mode=%d add=%d type: %d */\n", start_value, best_t1,best_t2,best_type,best_mod,best_add, best_functype); - + best_start_value=start_value; for (uint i=1 ; i <= opt_count ; i++) { if (i % 10 == 0) @@ -516,6 +517,10 @@ int main(int argc,char **argv) best_start_value,best_t1,best_t2,best_type,best_mod,best_add, best_functype); } + if (opt_verbose && (i % 20000) == 0) + printf("\nstart_value=%ldL; best_t1=%ldL; best_t2=%ldL; best_type=%d; /* mode=%d add=%d type: %d */\n", + best_start_value,best_t1,best_t2,best_type,best_mod,best_add, + best_functype); } } diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index e9cd3f57122..b10939227ff 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -90,7 +90,7 @@ const char *berkeley_lock_names[] = { "DEFAULT", "OLDEST","RANDOM","YOUNGEST",0 }; u_int32_t berkeley_lock_types[]= { DB_LOCK_DEFAULT, DB_LOCK_OLDEST, DB_LOCK_RANDOM }; -TYPELIB berkeley_lock_typelib= {array_elements(berkeley_lock_names),"", +TYPELIB berkeley_lock_typelib= {array_elements(berkeley_lock_names)-1,"", berkeley_lock_names}; static void berkeley_print_error(const char *db_errpfx, char *buffer); diff --git a/sql/ha_gemini.cc b/sql/ha_gemini.cc index e8130c55fc7..a60841c3fe6 100644 --- a/sql/ha_gemini.cc +++ b/sql/ha_gemini.cc @@ -68,7 +68,7 @@ ulong gemini_recovery_options = GEMINI_RECOVERY_FULL; /* bits in gemini_recovery_options */ const char *gemini_recovery_names[] = { "FULL", "NONE", "FORCE" }; -TYPELIB gemini_recovery_typelib= {array_elements(gemini_recovery_names),"", +TYPELIB gemini_recovery_typelib= {array_elements(gemini_recovery_names)-1,"", gemini_recovery_names}; const int start_of_name = 2; /* Name passed as ./<db>/<table-name> diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index cb76c034749..e7d98dbe406 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -85,7 +85,7 @@ char *innobase_data_home_dir; char *innobase_log_group_home_dir, *innobase_log_arch_dir; char *innobase_unix_file_flush_method; bool innobase_flush_log_at_trx_commit, innobase_log_archive, - innobase_use_native_aio; + innobase_use_native_aio; /* Set default InnoDB size to 64M, to let users use InnoDB without having @@ -524,7 +524,6 @@ innobase_init(void) /*===============*/ /* out: TRUE if error */ { - static char current_dir[3]; int err; bool ret; @@ -537,11 +536,6 @@ innobase_init(void) srv_query_thread_priority = QUERY_PRIOR; } - /* Use current_dir if no paths are set */ - current_dir[0]=FN_CURLIB; - current_dir[1]=FN_LIBCHAR; - current_dir[2]=0; - /* Set InnoDB initialization parameters according to the values read from MySQL .cnf file */ @@ -550,10 +544,10 @@ innobase_init(void) MYF(MY_WME)); srv_data_home = (innobase_data_home_dir ? innobase_data_home_dir : - current_dir); + mysql_real_data_home); srv_logs_home = (char*) ""; srv_arch_dir = (innobase_log_arch_dir ? innobase_log_arch_dir : - current_dir); + mysql_real_data_home); ret = innobase_parse_data_file_paths_and_sizes(); @@ -563,7 +557,7 @@ innobase_init(void) } if (!innobase_log_group_home_dir) - innobase_log_group_home_dir= current_dir; + innobase_log_group_home_dir= mysql_real_data_home; ret = innobase_parse_log_group_home_dirs(); if (ret == FALSE) { @@ -591,6 +585,8 @@ innobase_init(void) srv_lock_wait_timeout = (ulint) innobase_lock_wait_timeout; + srv_print_verbose_log = mysql_embedded ? 0 : 1; + err = innobase_start_or_create_for_mysql(); if (err != DB_SUCCESS) { diff --git a/sql/ha_isam.cc b/sql/ha_isam.cc index 746fdd2f585..2451b8bdaec 100644 --- a/sql/ha_isam.cc +++ b/sql/ha_isam.cc @@ -20,6 +20,7 @@ #endif #include "mysql_priv.h" +#ifdef HAVE_ISAM #include <m_ctype.h> #include <myisampack.h> #include "ha_isam.h" @@ -388,3 +389,4 @@ ha_rows ha_isam::records_in_range(int inx, end_key,end_key_len, end_search_flag); } +#endif /* HAVE_ISAM */ diff --git a/sql/ha_isammrg.cc b/sql/ha_isammrg.cc index dd2e4e2f723..41fb99fe867 100644 --- a/sql/ha_isammrg.cc +++ b/sql/ha_isammrg.cc @@ -20,11 +20,12 @@ #endif #include "mysql_priv.h" +#ifdef HAVE_ISAM #include <m_ctype.h> #ifndef MASTER -#include "../srclib/merge/mrgdef.h" +#include "../srclib/merge/mrg_def.h" #else -#include "../merge/mrgdef.h" +#include "../merge/mrg_def.h" #endif #include "ha_isammrg.h" @@ -208,3 +209,4 @@ int ha_isammrg::create(const char *name, register TABLE *form, char buff[FN_REFLEN]; return mrg_create(fn_format(buff,name,"","",2+4+16),0); } +#endif /* HAVE_ISAM */ diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 94481057743..63a39465cfa 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -36,7 +36,7 @@ ulong myisam_recover_options= HA_RECOVER_NONE; /* bits in myisam_recover_options */ const char *myisam_recover_names[] = { "DEFAULT", "BACKUP", "FORCE", "QUICK", NullS}; -TYPELIB myisam_recover_typelib= {array_elements(myisam_recover_names),"", +TYPELIB myisam_recover_typelib= {array_elements(myisam_recover_names)-1,"", myisam_recover_names}; @@ -374,14 +374,14 @@ int ha_myisam::restore(THD* thd, HA_CHECK_OPT *check_opt) char* backup_dir = thd->lex.backup_dir; char src_path[FN_REFLEN], dst_path[FN_REFLEN]; char* table_name = table->real_name; + int error; + const char* errmsg; DBUG_ENTER("restore"); - if (!fn_format(src_path, table_name, backup_dir, MI_NAME_DEXT, 4 + 64)) + if (fn_format_relative_to_data_home(src_path, table_name, backup_dir, + MI_NAME_DEXT)) DBUG_RETURN(HA_ADMIN_INVALID); - int error = 0; - const char* errmsg = ""; - if (my_copy(src_path, fn_format(dst_path, table->path, "", MI_NAME_DEXT, 4), MYF(MY_WME))) { @@ -404,7 +404,7 @@ int ha_myisam::restore(THD* thd, HA_CHECK_OPT *check_opt) param.db_name = table->table_cache_key; param.table_name = table->table_name; param.testflag = 0; - mi_check_print_error(¶m,errmsg, errno ); + mi_check_print_error(¶m,errmsg, my_errno); DBUG_RETURN(error); } } @@ -415,41 +415,47 @@ int ha_myisam::backup(THD* thd, HA_CHECK_OPT *check_opt) char* backup_dir = thd->lex.backup_dir; char src_path[FN_REFLEN], dst_path[FN_REFLEN]; char* table_name = table->real_name; - int error = 0; - const char* errmsg = ""; - - if (!fn_format(dst_path, table_name, backup_dir, reg_ext, 4 + 64)) - { - errmsg = "Failed in fn_format() for .frm file: errno = %d"; - error = HA_ADMIN_INVALID; - goto err; - } + int error; + const char *errmsg; + DBUG_ENTER("ha_myisam::backup"); + + if (fn_format_relative_to_data_home(dst_path, table_name, backup_dir, + reg_ext)) + { + errmsg = "Failed in fn_format() for .frm file: errno = %d"; + error = HA_ADMIN_INVALID; + goto err; + } - if (my_copy(fn_format(src_path, table->path,"", reg_ext, 4), - dst_path, - MYF(MY_WME | MY_HOLD_ORIGINAL_MODES ))) + if (my_copy(fn_format(src_path, table->path,"", reg_ext, MY_UNPACK_FILENAME), + dst_path, + MYF(MY_WME | MY_HOLD_ORIGINAL_MODES))) { error = HA_ADMIN_FAILED; errmsg = "Failed copying .frm file: errno = %d"; goto err; } - if (!fn_format(dst_path, table_name, backup_dir, MI_NAME_DEXT, 4 + 64)) - { - errmsg = "Failed in fn_format() for .MYD file: errno = %d"; - error = HA_ADMIN_INVALID; - goto err; - } + /* Change extension */ + if (!fn_format(dst_path, dst_path, "", MI_NAME_DEXT, + MY_REPLACE_EXT | MY_UNPACK_FILENAME | MY_SAFE_PATH)) + { + errmsg = "Failed in fn_format() for .MYD file: errno = %d"; + error = HA_ADMIN_INVALID; + goto err; + } - if (my_copy(fn_format(src_path, table->path,"", MI_NAME_DEXT, 4), + if (my_copy(fn_format(src_path, table->path,"", MI_NAME_DEXT, + MY_UNPACK_FILENAME), dst_path, - MYF(MY_WME | MY_HOLD_ORIGINAL_MODES )) ) - { - errmsg = "Failed copying .MYD file: errno = %d"; - error= HA_ADMIN_FAILED; - goto err; - } - return HA_ADMIN_OK; + MYF(MY_WME | MY_HOLD_ORIGINAL_MODES))) + { + errmsg = "Failed copying .MYD file: errno = %d"; + error= HA_ADMIN_FAILED; + goto err; + } + DBUG_RETURN(HA_ADMIN_OK); + err: { MI_CHECK param; @@ -459,8 +465,8 @@ int ha_myisam::backup(THD* thd, HA_CHECK_OPT *check_opt) param.db_name = table->table_cache_key; param.table_name = table->table_name; param.testflag = 0; - mi_check_print_error(¶m,errmsg, errno ); - return error; + mi_check_print_error(¶m,errmsg, my_errno); + DBUG_RETURN(error); } } diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index abcf81806ad..0a2ef534ad1 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -23,9 +23,9 @@ #include <m_ctype.h> #include "ha_myisammrg.h" #ifndef MASTER -#include "../srclib/myisammrg/mymrgdef.h" +#include "../srclib/myisammrg/myrg_def.h" #else -#include "../myisammrg/mymrgdef.h" +#include "../myisammrg/myrg_def.h" #endif /***************************************************************************** @@ -66,7 +66,13 @@ int ha_myisammrg::close(void) int ha_myisammrg::write_row(byte * buf) { - return (my_errno=HA_ERR_WRONG_COMMAND); + statistic_increment(ha_write_count,&LOCK_status); + if (table->time_stamp) + update_timestamp(buf+table->time_stamp-1); + if (table->next_number_field && buf == table->record[0]) + return (my_errno=HA_ERR_WRONG_COMMAND); + // update_auto_increment(); - [phi] have to check this before allowing it + return myrg_write(file,buf); } int ha_myisammrg::update_row(const byte * old_data, byte * new_data) @@ -181,6 +187,11 @@ void ha_myisammrg::info(uint flag) int ha_myisammrg::extra(enum ha_extra_function operation) { + /* As this is just a mapping, we don't have to force the underlying + tables to be closed */ + if (operation == HA_EXTRA_FORCE_REOPEN || + operation == HA_EXTRA_PREPARE_FOR_DELETE) + return 0; return myrg_extra(file,operation); } @@ -217,6 +228,7 @@ THR_LOCK_DATA **ha_myisammrg::store_lock(THD *thd, void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info) { + // [phi] auto_increment stuff is missing (but currently not needed) DBUG_ENTER("ha_myisammrg::update_create_info"); if (!(create_info->used_fields & HA_CREATE_USED_UNION)) { @@ -241,6 +253,10 @@ void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info) } *create_info->merge_list.next=0; } + if (!(create_info->used_fields & HA_CREATE_USED_INSERT_METHOD)) + { + create_info->merge_insert_method = file->merge_insert_method; + } DBUG_VOID_RETURN; err: @@ -263,12 +279,19 @@ int ha_myisammrg::create(const char *name, register TABLE *form, *pos++= tables->real_name; *pos=0; DBUG_RETURN(myrg_create(fn_format(buff,name,"","",2+4+16), - (const char **) table_names, (my_bool) 0)); + (const char **) table_names, + create_info->merge_insert_method, + (my_bool) 0)); } void ha_myisammrg::append_create_info(String *packet) { char buff[FN_REFLEN]; + if (file->merge_insert_method != MERGE_INSERT_DISABLED) + { + packet->append(" INSERT_METHOD=",15); + packet->append(get_type(&merge_insert_method,file->merge_insert_method-1)); + } packet->append(" UNION=(",8); MYRG_TABLE *table,*first; diff --git a/sql/handler.cc b/sql/handler.cc index 8b7b7fe6799..5a41498aff1 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -25,7 +25,7 @@ #include "ha_heap.h" #include "ha_myisam.h" #include "ha_myisammrg.h" -#ifndef NO_ISAM +#ifdef HAVE_ISAM #include "ha_isam.h" #include "ha_isammrg.h" #endif @@ -88,11 +88,9 @@ enum db_type ha_checktype(enum db_type database_type) #ifndef NO_HASH case DB_TYPE_HASH: #endif -#ifndef NO_MERGE - case DB_TYPE_MRG_ISAM: -#endif -#ifndef NO_ISAM +#ifdef HAVE_ISAM case DB_TYPE_ISAM: + case DB_TYPE_MRG_ISAM: #endif case DB_TYPE_HEAP: case DB_TYPE_MYISAM: @@ -111,11 +109,9 @@ handler *get_new_handler(TABLE *table, enum db_type db_type) #ifndef NO_HASH return new ha_hash(table); #endif -#ifndef NO_MERGE +#ifdef HAVE_ISAM case DB_TYPE_MRG_ISAM: return new ha_isammrg(table); -#endif -#ifndef NO_ISAM case DB_TYPE_ISAM: return new ha_isam(table); #endif @@ -186,14 +182,14 @@ int ha_init() int ha_panic(enum ha_panic_function flag) { int error=0; -#ifndef NO_MERGE - error|=mrg_panic(flag); -#endif #ifndef NO_HASH error|=h_panic(flag); /* fix hash */ #endif - error|=heap_panic(flag); +#ifdef HAVE_ISAM + error|=mrg_panic(flag); error|=nisam_panic(flag); +#endif + error|=heap_panic(flag); error|=mi_panic(flag); error|=myrg_panic(flag); #ifdef HAVE_BERKELEY_DB diff --git a/sql/handler.h b/sql/handler.h index 530c94a8b43..72e4f292871 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -116,15 +116,20 @@ enum db_type { DB_TYPE_UNKNOWN=0,DB_TYPE_DIAB_ISAM=1, DB_TYPE_BERKELEY_DB, DB_TYPE_INNODB, DB_TYPE_GEMINI, DB_TYPE_DEFAULT }; -enum row_type { ROW_TYPE_DEFAULT, ROW_TYPE_FIXED, ROW_TYPE_DYNAMIC, - ROW_TYPE_COMPRESSED }; +enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED, + ROW_TYPE_DYNAMIC, ROW_TYPE_COMPRESSED}; /* struct to hold information about the table that should be created */ /* Bits in used_fields */ -#define HA_CREATE_USED_AUTO 1 -#define HA_CREATE_USED_RAID 2 -#define HA_CREATE_USED_UNION 4 +#define HA_CREATE_USED_AUTO 1 +#define HA_CREATE_USED_RAID 2 +#define HA_CREATE_USED_UNION 4 +#define HA_CREATE_USED_INSERT_METHOD 8 +#define HA_CREATE_USED_MIN_ROWS 16 +#define HA_CREATE_USED_MAX_ROWS 32 +#define HA_CREATE_USED_AVG_ROW_LENGTH 64 +#define HA_CREATE_USED_PACK_KEYS 128 typedef struct st_thd_trans { void *bdb_tid; @@ -152,6 +157,7 @@ typedef struct st_ha_create_information bool if_not_exists; ulong used_fields; SQL_LIST merge_list; + uint merge_insert_method; } HA_CREATE_INFO; diff --git a/sql/item.cc b/sql/item.cc index d5961fe1733..5eae3a9b542 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -37,7 +37,7 @@ void item_init(void) Item::Item() { marker=0; - binary=maybe_null=null_value=with_sum_func=0; + binary=maybe_null=null_value=with_sum_func=unsigned_flag=0; name=0; decimals=0; max_length=0; next=current_thd->free_list; // Put in free list @@ -116,6 +116,7 @@ void Item_field::set_field(Field *field_par) table_name=field_par->table_name; field_name=field_par->field_name; binary=field_par->binary(); + unsigned_flag=test(field_par->flags & UNSIGNED_FLAG); } const char *Item_ident::full_name() const @@ -298,13 +299,21 @@ bool Item::fix_fields(THD *thd, bool Item_field::fix_fields(THD *thd,TABLE_LIST *tables) { - if (!field) + if (!field) // If field is not checked { Field *tmp; if (!(tmp=find_field_in_tables(thd,this,tables))) return 1; set_field(tmp); } + else if (thd && thd->set_query_id && field->query_id != thd->query_id) + { + /* We only come here in unions */ + TABLE *table=field->table; + field->query_id=thd->query_id; + table->used_fields++; + table->used_keys&=field->part_of_key; + } return 0; } @@ -318,6 +327,8 @@ void Item::init_make_field(Send_field *tmp_field, tmp_field->type=field_type; tmp_field->length=max_length; tmp_field->decimals=decimals; + if (unsigned_flag) + tmp_field->flags |= UNSIGNED_FLAG; } /* ARGSUSED */ @@ -337,6 +348,7 @@ void Item_uint::make_field(Send_field *tmp_field) { init_make_field(tmp_field,FIELD_TYPE_LONGLONG); tmp_field->flags|= UNSIGNED_FLAG; + unsigned_flag=1; } void Item_real::make_field(Send_field *tmp_field) diff --git a/sql/item.h b/sql/item.h index 98abdc834d9..27611a3cce5 100644 --- a/sql/item.h +++ b/sql/item.h @@ -43,6 +43,7 @@ public: my_bool maybe_null; /* If item may be null */ my_bool null_value; /* if item is null */ my_bool binary; + my_bool unsigned_flag; my_bool with_sum_func; @@ -80,6 +81,7 @@ public: virtual void split_sum_func(List<Item> &fields) {} virtual bool get_date(TIME *ltime,bool fuzzydate); virtual bool get_time(TIME *ltime); + virtual bool is_null() { return 0; } }; @@ -129,6 +131,7 @@ public: Field *tmp_table_field() { return result_field; } bool get_date(TIME *ltime,bool fuzzydate); bool get_time(TIME *ltime); + bool is_null() { return field->is_null(); } }; @@ -149,6 +152,7 @@ public: bool send(String *str); bool basic_const_item() const { return 1; } Item *new_item() { return new Item_null(name); } + bool is_null() { return 1; } }; @@ -382,6 +386,7 @@ public: void copy(); table_map used_tables() const { return (table_map) 1L; } bool const_item() const { return 0; } + bool is_null() { return null_value; } }; diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index db1d6911119..f825b4960c5 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1197,14 +1197,12 @@ longlong Item_cond_or::val_int() longlong Item_func_isnull::val_int() { - (void) args[0]->val(); - return (args[0]->null_value) ? 1 : 0; + return args[0]->is_null() ? 1: 0; } longlong Item_func_isnotnull::val_int() { - (void) args[0]->val(); - return !(args[0]->null_value) ? 1 : 0; + return args[0]->is_null() ? 0 : 1; } diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 5ee0687c064..9ed3e86d6e8 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -46,6 +46,7 @@ public: virtual enum Functype rev_functype() const { return UNKNOWN_FUNC; } bool have_rev_func() const { return rev_functype() != UNKNOWN_FUNC; } void print(String *str) { Item_func::print_op(str); } + bool is_null() { return test(args[0]->is_null() || args[1]->is_null()); } }; @@ -459,7 +460,10 @@ public: Item_func_isnotnull(Item *a) :Item_bool_func(a) {} longlong val_int(); enum Functype functype() const { return ISNOTNULL_FUNC; } - void fix_length_and_dec() { decimals=0; max_length=1; maybe_null=0; } + void fix_length_and_dec() + { + decimals=0; max_length=1; maybe_null=0; + } const char *func_name() const { return "isnotnull"; } optimize_type select_optimize() const { return OPTIMIZE_NULL; } }; diff --git a/sql/item_func.cc b/sql/item_func.cc index 960cadf71e9..bbe5e5fced9 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -184,8 +184,10 @@ String *Item_num_func::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; /* purecov: inspected */ - else + else if (!unsigned_flag) str->set(nr); + else + str->set((ulonglong) nr); } else { @@ -207,24 +209,31 @@ void Item_func::fix_num_length_and_dec() max_length=float_length(decimals); } - String *Item_int_func::val_str(String *str) { longlong nr=val_int(); if (null_value) return 0; - else + else if (!unsigned_flag) str->set(nr); + else + str->set((ulonglong) nr); return str; } -/* Change from REAL_RESULT (default) to INT_RESULT if both arguments are integers */ +/* + Change from REAL_RESULT (default) to INT_RESULT if both arguments are + integers +*/ void Item_num_op::find_num_type(void) { if (args[0]->result_type() == INT_RESULT && args[1]->result_type() == INT_RESULT) + { hybrid_type=INT_RESULT; + unsigned_flag=args[0]->unsigned_flag | args[1]->unsigned_flag; + } } String *Item_num_op::val_str(String *str) @@ -234,8 +243,10 @@ String *Item_num_op::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; /* purecov: inspected */ - else + else if (!unsigned_flag) str->set(nr); + else + str->set((ulonglong) nr); } else { @@ -667,8 +678,10 @@ String *Item_func_min_max::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; - else + else if (!unsigned_flag) str->set(nr); + else + str->set((ulonglong) nr); return str; } case REAL_RESULT: @@ -1050,7 +1063,8 @@ udf_handler::~udf_handler() } free_udf(u_d); } - delete [] buffers; + if (buffers) // Because of bug in ecc + delete [] buffers; } @@ -1306,8 +1320,10 @@ String *Item_func_udf_int::val_str(String *str) longlong nr=val_int(); if (null_value) return 0; - else + else if (!unsigned_flag) str->set(nr); + else + str->set((ulonglong) nr); return str; } @@ -1402,19 +1418,16 @@ void item_user_lock_release(ULL *ull) if (mysql_bin_log.is_open()) { THD *thd = current_thd; - int save_errno; char buf[256]; String tmp(buf,sizeof(buf)); tmp.length(0); tmp.append("SELECT release_lock(\""); tmp.append(ull->key,ull->key_length); tmp.append("\")"); - save_errno=thd->net.last_errno; - thd->net.last_errno=0; thd->query_length=tmp.length(); Query_log_event qev(thd,tmp.ptr()); + qev.error_code=0; // this query is always safe to run on slave mysql_bin_log.write(&qev); - thd->net.last_errno=save_errno; } if (--ull->count) pthread_cond_signal(&ull->cond); @@ -1448,6 +1461,80 @@ longlong Item_master_pos_wait::val_int() return event_count; } +#ifdef EXTRA_DEBUG +void debug_sync_point(const char* lock_name, uint lock_timeout) +{ + THD* thd=current_thd; + ULL* ull; + struct timespec abstime; + int lock_name_len,error=0; + lock_name_len=strlen(lock_name); + pthread_mutex_lock(&LOCK_user_locks); + + if (thd->ull) + { + item_user_lock_release(thd->ull); + thd->ull=0; + } + + /* if the lock has not been aquired by some client, we do not want to + create an entry for it, since we immediately release the lock. In + this case, we will not be waiting, but rather, just waste CPU and + memory on the whole deal + */ + if (!(ull= ((ULL*) hash_search(&hash_user_locks,lock_name, + lock_name_len)))) + { + pthread_mutex_unlock(&LOCK_user_locks); + return; + } + ull->count++; + + /* structure is now initialized. Try to get the lock */ + /* Set up control struct to allow others to abort locks */ + thd->proc_info="User lock"; + thd->mysys_var->current_mutex= &LOCK_user_locks; + thd->mysys_var->current_cond= &ull->cond; + +#ifdef HAVE_TIMESPEC_TS_SEC + abstime.ts_sec=time((time_t*) 0)+(time_t) lock_timeout; + abstime.ts_nsec=0; +#else + abstime.tv_sec=time((time_t*) 0)+(time_t) lock_timeout; + abstime.tv_nsec=0; +#endif + + while (!thd->killed && + (error=pthread_cond_timedwait(&ull->cond,&LOCK_user_locks,&abstime)) + != ETIME && error != ETIMEDOUT && ull->locked) ; + if (ull->locked) + { + if (!--ull->count) + delete ull; // Should never happen + } + else + { + ull->locked=1; + ull->thread=thd->real_id; + thd->ull=ull; + } + pthread_mutex_unlock(&LOCK_user_locks); + pthread_mutex_lock(&thd->mysys_var->mutex); + thd->proc_info=0; + thd->mysys_var->current_mutex= 0; + thd->mysys_var->current_cond= 0; + pthread_mutex_unlock(&thd->mysys_var->mutex); + pthread_mutex_lock(&LOCK_user_locks); + if (thd->ull) + { + item_user_lock_release(thd->ull); + thd->ull=0; + } + pthread_mutex_unlock(&LOCK_user_locks); +} + +#endif + /* Get a user level lock. If the thread has an old lock this is first released. Returns 1: Got lock diff --git a/sql/item_func.h b/sql/item_func.h index 1926fd025f4..ccc71d7f5fe 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -119,6 +119,7 @@ public: { return (null_value=args[0]->get_time(ltime)); } + bool is_null() { (void) val_int(); return null_value; } friend class udf_handler; }; @@ -147,6 +148,7 @@ public: longlong val_int() { return (longlong) val(); } enum Item_result result_type () const { return hybrid_type; } void fix_length_and_dec() { fix_num_length_and_dec(); } + bool is_null() { (void) val(); return null_value; } }; @@ -161,6 +163,7 @@ class Item_num_op :public Item_func enum Item_result result_type () const { return hybrid_type; } void fix_length_and_dec() { fix_num_length_and_dec(); find_num_type(); } void find_num_type(void); + bool is_null() { (void) val(); return null_value; } }; diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 12561fe4326..355f28d5432 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -17,7 +17,7 @@ /* This file defines all string functions ** Warning: Some string functions doesn't always put and end-null on a String -** (This shouldn't be neaded) +** (This shouldn't be needed) */ #ifdef __GNUC__ @@ -384,7 +384,7 @@ void Item_func_reverse::fix_length_and_dec() /* ** Replace all occurences of string2 in string1 with string3. -** Don't reallocate val_str() if not neaded +** Don't reallocate val_str() if not needed */ /* TODO: Fix that this works with binary strings when using USE_MB */ diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 812fc636fef..431d8b56e6a 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -52,6 +52,8 @@ void Item_sum::make_field(Send_field *tmp_field) tmp_field->flags=0; if (!maybe_null) tmp_field->flags|= NOT_NULL_FLAG; + if (unsigned_flag) + tmp_field->flags |= UNSIGNED_FLAG; tmp_field->length=max_length; tmp_field->decimals=decimals; tmp_field->type=(result_type() == INT_RESULT ? FIELD_TYPE_LONG : @@ -150,7 +152,7 @@ Item_sum_hybrid::fix_fields(THD *thd,TABLE_LIST *tables) return 1; hybrid_type=item->result_type(); if (hybrid_type == INT_RESULT) - max_length=21; + max_length=20; else if (hybrid_type == REAL_RESULT) max_length=float_length(decimals); else @@ -158,6 +160,7 @@ Item_sum_hybrid::fix_fields(THD *thd,TABLE_LIST *tables) decimals=item->decimals; maybe_null=item->maybe_null; binary=item->binary; + unsigned_flag=item->unsigned_flag; result_field=0; null_value=1; fix_length_and_dec(); @@ -323,12 +326,27 @@ double Item_sum_hybrid::val() { if (null_value) return 0.0; - if (hybrid_type == STRING_RESULT) - { + switch (hybrid_type) { + case STRING_RESULT: String *res; res=val_str(&str_value); return res ? atof(res->c_ptr()) : 0.0; + case INT_RESULT: + if (unsigned_flag) + return ulonglong2double(sum_int); + return (double) sum_int; + case REAL_RESULT: + return sum; } - return sum; + return 0; // Keep compiler happy +} + +longlong Item_sum_hybrid::val_int() +{ + if (null_value) + return 0; + if (hybrid_type == INT_RESULT) + return sum_int; + return (longlong) Item_sum_hybrid::val(); } @@ -337,25 +355,26 @@ Item_sum_hybrid::val_str(String *str) { if (null_value) return 0; - if (hybrid_type == STRING_RESULT) + switch (hybrid_type) { + case STRING_RESULT: return &value; - str->set(sum,decimals); - return str; + case REAL_RESULT: + str->set(sum,decimals); + break; + case INT_RESULT: + if (unsigned_flag) + str->set((ulonglong) sum_int); + else + str->set((longlong) sum_int); + break; + } + return str; // Keep compiler happy } - bool Item_sum_min::add() { - if (hybrid_type != STRING_RESULT) - { - double nr=args[0]->val(); - if (!args[0]->null_value && (null_value || nr < sum)) - { - sum=nr; - null_value=0; - } - } - else + switch (hybrid_type) { + case STRING_RESULT: { String *result=args[0]->val_str(&tmp_value); if (!args[0]->null_value && @@ -366,22 +385,39 @@ bool Item_sum_min::add() null_value=0; } } - return 0; -} - - -bool Item_sum_max::add() -{ - if (hybrid_type != STRING_RESULT) + break; + case INT_RESULT: + { + longlong nr=args[0]->val_int(); + if (!args[0]->null_value && (null_value || + (unsigned_flag && + (ulonglong) nr < (ulonglong) sum_int) || + (!unsigned_flag && nr < sum_int))) + { + sum_int=nr; + null_value=0; + } + } + break; + case REAL_RESULT: { double nr=args[0]->val(); - if (!args[0]->null_value && (null_value || nr > sum)) + if (!args[0]->null_value && (null_value || nr < sum)) { sum=nr; null_value=0; } } - else + break; + } + return 0; +} + + +bool Item_sum_max::add() +{ + switch (hybrid_type) { + case STRING_RESULT: { String *result=args[0]->val_str(&tmp_value); if (!args[0]->null_value && @@ -392,6 +428,31 @@ bool Item_sum_max::add() null_value=0; } } + break; + case INT_RESULT: + { + longlong nr=args[0]->val_int(); + if (!args[0]->null_value && (null_value || + (unsigned_flag && + (ulonglong) nr > (ulonglong) sum_int) || + (!unsigned_flag && nr > sum_int))) + { + sum_int=nr; + null_value=0; + } + } + break; + case REAL_RESULT: + { + double nr=args[0]->val(); + if (!args[0]->null_value && (null_value || nr > sum)) + { + sum=nr; + null_value=0; + } + } + break; + } return 0; } @@ -676,9 +737,17 @@ Item_sum_hybrid::min_max_update_int_field(int offset) nr=args[0]->val_int(); if (!args[0]->null_value) { - if (result_field->is_null(offset) || - (cmp_sign > 0 ? old_nr > nr : old_nr < nr)) + if (result_field->is_null(offset)) old_nr=nr; + else + { + bool res=(unsigned_flag ? + (ulonglong) old_nr > (ulonglong) nr : + old_nr > nr); + /* (cmp_sign > 0 && res) || (!(cmp_sign > 0) && !res) */ + if ((cmp_sign > 0) ^ (!res)) + old_nr=nr; + } result_field->set_notnull(); } else if (result_field->is_null(offset)) @@ -1079,7 +1148,7 @@ void Item_udf_sum::reset() bool Item_udf_sum::add() { - DBUG_ENTER("Item_udf_sum::reset"); + DBUG_ENTER("Item_udf_sum::add"); udf.add(&null_value); DBUG_RETURN(0); } diff --git a/sql/item_sum.h b/sql/item_sum.h index 7356eeda28c..18b0c3ff577 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -271,6 +271,7 @@ class Item_sum_hybrid :public Item_sum protected: String value,tmp_value; double sum; + longlong sum_int; Item_result hybrid_type; int cmp_sign; table_map used_table_cache; @@ -286,12 +287,13 @@ class Item_sum_hybrid :public Item_sum void reset() { sum=0.0; + sum_int=0; value.length(0); null_value=1; add(); } double val(); - longlong val_int() { return (longlong) val(); } /* Real as default */ + longlong val_int(); void reset_field(); String *val_str(String *); void make_const() { used_table_cache=0; } diff --git a/sql/lex.h b/sql/lex.h index 21639fe4b70..99ca58cf47b 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -84,6 +84,7 @@ static SYMBOL symbols[] = { { "CHANGED", SYM(CHANGED),0,0}, { "CHECK", SYM(CHECK_SYM),0,0}, { "CHECKSUM", SYM(CHECKSUM_SYM),0,0}, + { "CIPHER", SYM(CIPHER_SYM),0,0}, { "CLOSE", SYM(CLOSE_SYM),0,0}, { "COLUMN", SYM(COLUMN_SYM),0,0}, { "COLUMNS", SYM(COLUMNS),0,0}, @@ -178,6 +179,7 @@ static SYMBOL symbols[] = { { "INNODB", SYM(INNOBASE_SYM),0,0}, { "INSERT", SYM(INSERT),0,0}, { "INSERT_ID", SYM(INSERT_ID),0,0}, + { "INSERT_METHOD", SYM(INSERT_METHOD),0,0}, { "INT", SYM(INT_SYM),0,0}, { "INTEGER", SYM(INT_SYM),0,0}, { "INTERVAL", SYM(INTERVAL_SYM),0,0}, @@ -191,6 +193,7 @@ static SYMBOL symbols[] = { { "IS", SYM(IS),0,0}, { "ISOLATION", SYM(ISOLATION),0,0}, { "ISAM", SYM(ISAM_SYM),0,0}, + { "ISSUER", SYM(ISSUER_SYM),0,0}, { "JOIN", SYM(JOIN_SYM),0,0}, { "KEY", SYM(KEY_SYM),0,0}, { "KEYS", SYM(KEYS),0,0}, @@ -278,6 +281,7 @@ static SYMBOL symbols[] = { { "REPAIR", SYM(REPAIR),0,0}, { "REPLACE", SYM(REPLACE),0,0}, { "REPEATABLE", SYM(REPEATABLE_SYM),0,0}, + { "REQUIRE", SYM(REQUIRE_SYM),0,0}, { "RESET", SYM(RESET_SYM),0,0}, { "RESTORE", SYM(RESTORE_SYM),0,0}, { "RESTRICT", SYM(RESTRICT),0,0}, @@ -316,6 +320,7 @@ static SYMBOL symbols[] = { { "SQL_SLAVE_SKIP_COUNTER", SYM(SQL_SLAVE_SKIP_COUNTER),0,0}, { "SQL_SMALL_RESULT", SYM(SQL_SMALL_RESULT),0,0}, { "SQL_WARNINGS", SYM(SQL_WARNINGS),0,0}, + { "SSL", SYM(SSL_SYM),0,0}, { "STRAIGHT_JOIN", SYM(STRAIGHT_JOIN),0,0}, { "START", SYM(START_SYM),0,0}, { "STARTING", SYM(STARTING),0,0}, @@ -323,6 +328,7 @@ static SYMBOL symbols[] = { { "STRING", SYM(STRING_SYM),0,0}, { "STOP", SYM(STOP_SYM),0,0}, { "STRIPED", SYM(RAID_STRIPED_SYM),0,0}, + { "SUBJECT", SYM(SUBJECT_SYM),0,0}, { "TABLE", SYM(TABLE_SYM),0,0}, { "TABLES", SYM(TABLES),0,0}, { "TEMPORARY", SYM(TEMPORARY),0,0}, @@ -358,6 +364,7 @@ static SYMBOL symbols[] = { { "WRITE", SYM(WRITE_SYM),0,0}, { "WHEN", SYM(WHEN_SYM),0,0}, { "WHERE", SYM(WHERE),0,0}, + { "X509", SYM(X509_SYM),0,0}, { "YEAR", SYM(YEAR_SYM),0,0}, { "YEAR_MONTH", SYM(YEAR_MONTH_SYM),0,0}, { "ZEROFILL", SYM(ZEROFILL),0,0}, diff --git a/sql/log_event.cc b/sql/log_event.cc index 83fac4a7706..5bd386c7b29 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -21,6 +21,7 @@ #endif #include "mysql_priv.h" #include "slave.h" +#include <my_dir.h> #endif /* MYSQL_CLIENT */ #ifdef MYSQL_CLIENT @@ -127,6 +128,25 @@ Log_event::Log_event(THD* thd_arg, uint16 flags_arg): when = time(NULL); } } + +static void cleanup_load_tmpdir() +{ + MY_DIR *dirp; + FILEINFO *file; + uint i; + if (!(dirp=my_dir(slave_load_tmpdir,MYF(MY_WME)))) + return; + + for (i=0;i<(uint)dirp->number_off_files;i++) + { + file=dirp->dir_entry+i; + if (!memcmp(file->name,"SQL_LOAD-",9)) + my_delete(file->name,MYF(MY_WME)); + } + + my_dirend(dirp); +} + #endif Log_event::Log_event(const char* buf):cached_event_len(0),temp_buf(0) @@ -469,7 +489,7 @@ Log_event* Log_event::read_log_event(IO_CACHE* file) error = "read error"; goto err; } - if((res = read_log_event(buf, data_len))) + if ((res = read_log_event(buf, data_len, &error))) res->register_temp_buf(buf); err: UNLOCK_MUTEX; @@ -481,10 +501,11 @@ err: return res; } -Log_event* Log_event::read_log_event(const char* buf, int event_len) +Log_event* Log_event::read_log_event(const char* buf, int event_len, + const char **error) { - if(event_len < EVENT_LEN_OFFSET || - (uint)event_len != uint4korr(buf+EVENT_LEN_OFFSET)) + if (event_len < EVENT_LEN_OFFSET || + (uint)event_len != uint4korr(buf+EVENT_LEN_OFFSET)) return NULL; // general sanity check - will fail on a partial read Log_event* ev = NULL; @@ -531,6 +552,7 @@ Log_event* Log_event::read_log_event(const char* buf, int event_len) if (!ev) return 0; if (!ev->is_valid()) { + *error= "Found invalid event in binary log"; delete ev; return 0; } @@ -812,80 +834,92 @@ int Load_log_event::write_data_body(IO_CACHE* file) if (sql_ex.write_data(file)) return 1; if (num_fields && fields && field_lens) { - if(my_b_write(file, (byte*)field_lens, num_fields) || - my_b_write(file, (byte*)fields, field_block_len)) + if (my_b_write(file, (byte*)field_lens, num_fields) || + my_b_write(file, (byte*)fields, field_block_len)) return 1; } - return my_b_write(file, (byte*)table_name, table_name_len + 1) || - my_b_write(file, (byte*)db, db_len + 1) || - my_b_write(file, (byte*)fname, fname_len); + return (my_b_write(file, (byte*)table_name, table_name_len + 1) || + my_b_write(file, (byte*)db, db_len + 1) || + my_b_write(file, (byte*)fname, fname_len)); } -#define WRITE_STR(name) my_b_write(file,(byte*)&name ## _len, 1) || \ - my_b_write(file,(byte*)name,name ## _len) -#define OLD_EX_INIT(name) old_ex.##name = *name + +static bool write_str(IO_CACHE *file, char *str, byte length) +{ + return (my_b_write(file, &length, 1) || + my_b_write(file, (byte*) str, (int) length)); +} int sql_ex_info::write_data(IO_CACHE* file) { if (new_format()) { - return WRITE_STR(field_term) || WRITE_STR(enclosed) || - WRITE_STR(line_term) || WRITE_STR(line_start) || - WRITE_STR(escaped) || my_b_write(file,(byte*)&opt_flags,1); + return (write_str(file, field_term, field_term_len) || + write_str(file, enclosed, enclosed_len) || + write_str(file, line_term, line_term_len) || + write_str(file, line_start, line_start_len) || + write_str(file, escaped, escaped_len) || + my_b_write(file,(byte*) &opt_flags,1)); } else { old_sql_ex old_ex; - OLD_EX_INIT(field_term); - OLD_EX_INIT(enclosed); - OLD_EX_INIT(line_term); - OLD_EX_INIT(line_start); - OLD_EX_INIT(escaped); - old_ex.opt_flags = opt_flags; - old_ex.empty_flags = empty_flags; - return my_b_write(file,(byte*)&old_ex,sizeof(old_ex)); + old_ex.field_term= *field_term; + old_ex.enclosed= *enclosed; + old_ex.line_term= *line_term; + old_ex.line_start= *line_start; + old_ex.escaped= *escaped; + old_ex.opt_flags= opt_flags; + old_ex.empty_flags=empty_flags; + return my_b_write(file, (byte*) &old_ex, sizeof(old_ex)); } } -#define READ_STR(name) name ## _len = *buf++;\ - if (buf >= buf_end) return 0;\ - name = buf; \ - buf += name ## _len; \ - if (buf >= buf_end) return 0; - -#define READ_OLD_STR(name) name ## _len = 1; \ - name = buf++; \ - if (buf >= buf_end) return 0; - -#define FIX_OLD_LEN(name,NAME) if (empty_flags & NAME ## _EMPTY) \ - name ## _len = 0 +static inline int read_str(char * &buf, char *buf_end, char * &str, + uint8 &len) +{ + if (buf + (uint) (uchar) *buf >= buf_end) + return 1; + len = (uint8) *buf; + str= buf+1; + buf+= (uint) len+1; + return 0; +} char* sql_ex_info::init(char* buf,char* buf_end,bool use_new_format) { cached_new_format = use_new_format; if (use_new_format) { - READ_STR(field_term); - READ_STR(enclosed); - READ_STR(line_term); - READ_STR(line_start); - READ_STR(escaped); + empty_flags=0; + if (read_str(buf, buf_end, field_term, field_term_len) || + read_str(buf, buf_end, enclosed, enclosed_len) || + read_str(buf, buf_end, line_term, line_term_len) || + read_str(buf, buf_end, line_start, line_start_len) || + read_str(buf, buf_end, escaped, escaped_len)) + return 0; opt_flags = *buf++; } else { - READ_OLD_STR(field_term); - READ_OLD_STR(enclosed); - READ_OLD_STR(line_term); - READ_OLD_STR(line_start); - READ_OLD_STR(escaped); + field_term_len= enclosed_len= line_term_len= line_start_len= escaped_len=1; + *field_term=*buf++; + *enclosed= *buf++; + *line_term= *buf++; + *line_start=*buf++; + *escaped= *buf++; opt_flags = *buf++; - empty_flags = *buf++; - FIX_OLD_LEN(field_term,FIELD_TERM); - FIX_OLD_LEN(enclosed,ENCLOSED); - FIX_OLD_LEN(line_term,LINE_TERM); - FIX_OLD_LEN(line_start,LINE_START); - FIX_OLD_LEN(escaped,ESCAPED); + empty_flags=*buf++; + if (empty_flags & FIELD_TERM_EMPTY) + field_term_len=0; + if (empty_flags & ENCLOSED_EMPTY) + enclosed_len=0; + if (empty_flags & LINE_TERM_EMPTY) + line_term_len=0; + if (empty_flags & LINE_START_EMPTY) + line_start_len=0; + if (empty_flags & ESCAPED_EMPTY) + escaped_len=0; } return buf; } @@ -1271,6 +1305,8 @@ Create_file_log_event::Create_file_log_event(const char* buf, int len): block = (char*)buf + block_offset; block_len = len - block_offset; } + + #ifdef MYSQL_CLIENT void Create_file_log_event::print(FILE* file, bool short_form, char* last_db) @@ -1477,10 +1513,10 @@ int Query_log_event::exec_event(struct st_master_info* mi) (actual_error = thd->net.last_errno) && expected_error) { const char* errmsg = "Slave: did not get the expected error\ - running query from master - expected: '%s'(%d), got '%s'(%d)"; + running query from master - expected: '%s' (%d), got '%s' (%d)"; sql_print_error(errmsg, ER_SAFE(expected_error), expected_error, - actual_error ? thd->net.last_error:"no error", + actual_error ? thd->net.last_error: "no error", actual_error); thd->query_error = 1; } @@ -1553,20 +1589,16 @@ int Load_log_event::exec_event(NET* net, struct st_master_info* mi) handle_dup = DUP_REPLACE; sql_exchange ex((char*)fname, sql_ex.opt_flags && DUMPFILE_FLAG ); - -#define SET_EX(name) String name(sql_ex.name,sql_ex.name ## _len);\ - ex.name = &name; - - SET_EX(field_term); - SET_EX(enclosed); - SET_EX(line_term); - SET_EX(line_start); - SET_EX(escaped); + String field_term(sql_ex.field_term,sql_ex.field_term_len); + String enclosed(sql_ex.enclosed,sql_ex.enclosed_len); + String line_term(sql_ex.line_term,sql_ex.line_term_len); + String line_start(sql_ex.line_start,sql_ex.line_start_len); + String escaped(sql_ex.escaped,sql_ex.escaped_len); ex.opt_enclosed = (sql_ex.opt_flags & OPT_ENCLOSED_FLAG); - if(sql_ex.empty_flags & FIELD_TERM_EMPTY) + if (sql_ex.empty_flags & FIELD_TERM_EMPTY) ex.field_term->length(0); - + ex.skip_lines = skip_lines; List<Item> fields; set_fields(fields); @@ -1626,6 +1658,7 @@ int Load_log_event::exec_event(NET* net, struct st_master_info* mi) int Start_log_event::exec_event(struct st_master_info* mi) { close_temporary_tables(thd); + cleanup_load_tmpdir(); return Log_event::exec_event(mi); } @@ -1634,6 +1667,7 @@ int Stop_log_event::exec_event(struct st_master_info* mi) if(mi->pos > 4) // stop event should be ignored after rotate event { close_temporary_tables(thd); + cleanup_load_tmpdir(); mi->inc_pos(get_event_len(), log_seq); flush_master_info(mi); } @@ -1862,10 +1896,3 @@ err: #endif - - - - - - - diff --git a/sql/log_event.h b/sql/log_event.h index d938bced742..71f0f2a8575 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -272,7 +272,8 @@ public: #else // avoid having to link mysqlbinlog against libpthread static Log_event* read_log_event(IO_CACHE* file); #endif - static Log_event* read_log_event(const char* buf, int event_len); + static Log_event* read_log_event(const char* buf, int event_len, + const char **error); const char* get_type_str(); #ifndef MYSQL_CLIENT @@ -567,9 +568,10 @@ public: uint file_id; #ifndef MYSQL_CLIENT Create_file_log_event(THD* thd, sql_exchange* ex, const char* db_arg, - const char* table_name_arg, - List<Item>& fields_arg, enum enum_duplicates handle_dup, - char* block_arg, uint block_len_arg); + const char* table_name_arg, + List<Item>& fields_arg, + enum enum_duplicates handle_dup, + char* block_arg, uint block_len_arg); #endif Create_file_log_event(const char* buf, int event_len); diff --git a/sql/mf_iocache.cc b/sql/mf_iocache.cc index 24af439961e..40b98983291 100644 --- a/sql/mf_iocache.cc +++ b/sql/mf_iocache.cc @@ -81,7 +81,7 @@ int init_io_cache(IO_CACHE *info, File file, uint cachesize, if ((my_off_t) cachesize > end_of_file-seek_offset+IO_SIZE*2-1) { cachesize=(uint) (end_of_file-seek_offset)+IO_SIZE*2-1; - use_async_io=0; /* No nead to use async */ + use_async_io=0; /* No need to use async */ } } } diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 1afe4c97b8e..266a292fe1d 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -22,7 +22,6 @@ in case we decide to make them external at some point */ -#define DONT_USE_RAID #if defined(__WIN__) #include <winsock.h> #include <odbcinst.h> @@ -41,6 +40,7 @@ inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __a #endif #include <my_global.h> +#include <mysql_embed.h> #include <mysql_com.h> #include <violite.h> #include <my_sys.h> @@ -803,7 +803,7 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user, /* Do the SSL layering. */ DBUG_PRINT("info", ("IO layer change in progress...")); DBUG_PRINT("info", ("IO context %p",((struct st_VioSSLConnectorFd*)mysql->connector_fd)->ssl_context_)); - sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),mysql->net.vio); + sslconnect((struct st_VioSSLConnectorFd*)(mysql->connector_fd),mysql->net.vio,60L); DBUG_PRINT("info", ("IO layer change done!")); } #endif /* HAVE_OPENSSL */ diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 7151f43904f..bd7c2f3cfd1 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -18,9 +18,10 @@ #define _MYSQL_PRIV_H #include <my_global.h> +#include "mysql_embed.h" #include <my_sys.h> #include <m_string.h> -#include "mysql_version.h" +#include <mysql_version.h> #include <hash.h> #include <signal.h> #include <thr_lock.h> @@ -70,7 +71,6 @@ char* query_table_status(THD *thd,const char *db,const char *table_name); #define HASH_PASSWORD_LENGTH 16 #define HOST_CACHE_SIZE 128 #define MAX_ACCEPT_RETRY 10 // Test accept this many times -#define MAX_BLOB_WIDTH 8192 // Default width for blob #define MAX_FIELDS_BEFORE_HASH 32 #define USER_VARS_HASH_SIZE 16 #define STACK_MIN_SIZE 8192 // Abort if less stack during eval. @@ -189,6 +189,19 @@ char* query_table_status(THD *thd,const char *db,const char *table_name); #define RAID_BLOCK_SIZE 1024 +// Sync points allow us to force the server to reach a certain line of code +// and block there until the client tells the server it is ok to go on. +// The client tells the server to block with SELECT GET_LOCK() +// and unblocks it with SELECT RELEASE_LOCK(). Used for debugging difficult +// concurrency problems +#ifdef EXTRA_DEBUG +#define DBUG_SYNC_POINT(lock_name,lock_timeout) \ + debug_sync_point(lock_name,lock_timeout) +void debug_sync_point(const char* lock_name, uint lock_timeout); +#else +#define DBUG_SYNC_POINT(lock_name,lock_timeout) +#endif + /* BINLOG_DUMP options */ #define BINLOG_DUMP_NON_BLOCK 1 @@ -504,11 +517,13 @@ void init_errmessage(void); void sql_perror(const char *message); void sql_print_error(const char *format,...) __attribute__ ((format (printf, 1, 2))); +bool fn_format_relative_to_data_home(my_string to, const char *name, + const char *dir, const char *extension); extern uint32 server_id; -extern char mysql_data_home[2],server_version[SERVER_VERSION_LENGTH], +extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH], max_sort_char, mysql_real_data_home[]; -extern my_string mysql_unix_port,mysql_tmpdir; +extern my_string mysql_tmpdir; extern const char *first_keyword, *localhost, *delayed_user; extern ulong refresh_version,flush_version, thread_id,query_id,opened_tables, created_tmp_tables, created_tmp_disk_tables, @@ -522,7 +537,7 @@ extern ulong filesort_merge_passes; extern ulong select_range_check_count, select_range_count, select_scan_count; extern ulong select_full_range_join_count,select_full_join_count, slave_open_temp_tables; -extern uint test_flags,select_errors,mysql_port,ha_open_options; +extern uint test_flags,select_errors,ha_open_options; extern ulong thd_startup_options, slow_launch_threads, slow_launch_time; extern time_t start_time; extern const char *command_name[]; @@ -540,7 +555,7 @@ extern pthread_cond_t COND_refresh,COND_thread_count, COND_binlog_update, COND_slave_stopped, COND_slave_start; extern pthread_attr_t connection_attrib; extern bool opt_endinfo, using_udf_functions, locked_in_memory, - opt_using_transactions, use_temp_pool; + opt_using_transactions, use_temp_pool, mysql_embedded; extern char f_fyllchar; extern ulong ha_read_count, ha_write_count, ha_delete_count, ha_update_count, ha_read_key_count, ha_read_next_count, ha_read_prev_count, diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 87d42da976b..7b0c97c4b79 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -193,7 +193,7 @@ SHOW_COMP_OPTION have_innodb=SHOW_OPTION_YES; #else SHOW_COMP_OPTION have_innodb=SHOW_OPTION_NO; #endif -#ifndef NO_ISAM +#ifdef HAVE_ISAM SHOW_COMP_OPTION have_isam=SHOW_OPTION_YES; #else SHOW_COMP_OPTION have_isam=SHOW_OPTION_NO; @@ -214,8 +214,9 @@ SHOW_COMP_OPTION have_symlink=SHOW_OPTION_YES; static bool opt_skip_slave_start = 0; // if set, slave is not autostarted static bool opt_do_pstack = 0; static ulong opt_specialflag=SPECIAL_ENGLISH; -static my_socket unix_sock= INVALID_SOCKET,ip_sock= INVALID_SOCKET; static ulong back_log,connect_timeout,concurrency; +static ulong opt_myisam_block_size; +static my_socket unix_sock= INVALID_SOCKET,ip_sock= INVALID_SOCKET; static my_string opt_logname=0,opt_update_logname=0, opt_binlog_index_name = 0,opt_slow_logname=0; static char mysql_home[FN_REFLEN],pidfile_name[FN_REFLEN]; @@ -242,16 +243,11 @@ static char **defaults_argv,time_zone[30]; static const char *default_table_type_name; static char glob_hostname[FN_REFLEN]; +#include "sslopt-vars.h" #ifdef HAVE_OPENSSL -static bool opt_use_ssl = FALSE; -static char *opt_ssl_key = 0; -static char *opt_ssl_cert = 0; -static char *opt_ssl_ca = 0; -static char *opt_ssl_capath = 0; struct st_VioSSLAcceptorFd * ssl_acceptor_fd = 0; #endif /* HAVE_OPENSSL */ - I_List <i_string_pair> replicate_rewrite_db; I_List<i_string> replicate_do_db, replicate_ignore_db; // allow the user to tell us which db to replicate and which to ignore @@ -290,7 +286,7 @@ uint master_port = MYSQL_PORT, master_connect_retry = 60; uint report_port = MYSQL_PORT; bool master_ssl = 0; -ulong max_tmp_tables,max_heap_table_size; +ulong max_tmp_tables,max_heap_table_size,master_retry_count=0; ulong bytes_sent = 0L, bytes_received = 0L; bool opt_endinfo,using_udf_functions,low_priority_updates, locked_in_memory; @@ -315,10 +311,18 @@ ulong slow_launch_threads = 0; ulong myisam_max_sort_file_size, myisam_max_extra_sort_file_size; char mysql_real_data_home[FN_REFLEN], - mysql_data_home[2],language[LIBLEN],reg_ext[FN_EXTLEN], + language[LIBLEN],reg_ext[FN_EXTLEN], default_charset[LIBLEN],mysql_charsets_dir[FN_REFLEN], *charsets_list, blob_newline,f_fyllchar,max_sort_char,*mysqld_user,*mysqld_chroot, *opt_init_file; +#ifndef EMBEDDED_LIBRARY +char mysql_data_home_buff[2], *mysql_data_home=mysql_data_home_buff; +bool mysql_embedded=0; +#else +char *mysql_data_home=mysql_real_data_home; +bool mysql_embedded=1; +#endif + char *opt_bin_logname = 0; // this one needs to be seen in sql_parse.cc char server_version[SERVER_VERSION_LENGTH]=MYSQL_SERVER_VERSION; const char *first_keyword="first"; @@ -328,10 +332,12 @@ const char *sql_mode_str="OFF"; const char *default_tx_isolation_name; enum_tx_isolation default_tx_isolation=ISO_READ_COMMITTED; +uint rpl_recovery_rank=0; + #ifdef HAVE_GEMINI_DB const char *gemini_recovery_options_str="FULL"; #endif -my_string mysql_unix_port=NULL,mysql_tmpdir=NULL; +my_string mysql_unix_port=NULL, mysql_tmpdir=NULL, allocated_mysql_tmpdir=NULL; ulong my_bind_addr; /* the address we bind to */ DATE_FORMAT dayord; double log_10[32]; /* 10 potences */ @@ -342,7 +348,7 @@ ulong opt_sql_mode = 0L; const char *sql_mode_names[] = { "REAL_AS_FLOAT", "PIPES_AS_CONCAT", "ANSI_QUOTES", "IGNORE_SPACE", "SERIALIZE","ONLY_FULL_GROUP_BY", NullS }; -TYPELIB sql_mode_typelib= {array_elements(sql_mode_names),"", +TYPELIB sql_mode_typelib= {array_elements(sql_mode_names)-1,"", sql_mode_names}; MY_BITMAP temp_pool; @@ -682,11 +688,8 @@ static sig_handler print_signal_warning(int sig) void unireg_end(int signal_number __attribute__((unused))) { clean_up(); -#if defined(EMBEDDED_LIBRARY) - exit(0); // XXX QQ: this is a temporary hack (I hope) -#else + my_thread_end(); pthread_exit(0); // Exit is in main thread -#endif } @@ -695,6 +698,7 @@ void unireg_abort(int exit_code) if (exit_code) sql_print_error("Aborting\n"); clean_up(); /* purecov: inspected */ + my_thread_end(); exit(exit_code); /* purecov: inspected */ } @@ -725,25 +729,25 @@ void clean_up(bool print_message) my_free(opt_ssl_cert,MYF(MY_ALLOW_ZERO_PTR)); my_free(opt_ssl_ca,MYF(MY_ALLOW_ZERO_PTR)); my_free(opt_ssl_capath,MYF(MY_ALLOW_ZERO_PTR)); + my_free(opt_ssl_cipher,MYF(MY_ALLOW_ZERO_PTR)); opt_ssl_key=opt_ssl_cert=opt_ssl_ca=opt_ssl_capath=0; #endif /* HAVE_OPENSSL */ free_defaults(defaults_argv); my_free(charsets_list, MYF(MY_ALLOW_ZERO_PTR)); - my_free(mysql_tmpdir,MYF(0)); - my_free(slave_load_tmpdir,MYF(0)); + my_free(allocated_mysql_tmpdir,MYF(MY_ALLOW_ZERO_PTR)); + my_free(slave_load_tmpdir,MYF(MY_ALLOW_ZERO_PTR)); x_free(opt_bin_logname); bitmap_free(&temp_pool); free_max_user_conn(); end_slave_list(); -#ifndef __WIN__ +#if !defined(__WIN__) && !defined(EMBEDDED_LIBRARY) if (!opt_bootstrap) (void) my_delete(pidfile_name,MYF(0)); // This may not always exist #endif - if (print_message) + if (print_message && errmesg) sql_print_error(ER(ER_SHUTDOWN_COMPLETE),my_progname); x_free((gptr) my_errmsg[ERRMAPP]); /* Free messages */ - my_thread_end(); /* Tell main we are ready */ (void) pthread_mutex_lock(&LOCK_thread_count); @@ -1202,13 +1206,13 @@ static sig_handler handle_segfault(int sig) fprintf(stderr,"\ mysqld got signal %d;\n\ This could be because you hit a bug. It is also possible that this binary\n\ -or one of the libraries it was linked agaist is corrupt, improperly built,\n\ +or one of the libraries it was linked against is corrupt, improperly built,\n\ or misconfigured. This error can also be caused by malfunctioning hardware.\n", sig); fprintf(stderr, "\ We will try our best to scrape up some info that will hopefully help diagnose\n\ the problem, but since we have already crashed, something is definitely wrong\n\ -and this may fail\n\n"); +and this may fail.\n\n"); fprintf(stderr, "key_buffer_size=%ld\n", keybuff_size); fprintf(stderr, "record_buffer=%ld\n", my_default_record_cache_size); fprintf(stderr, "sort_buffer=%ld\n", sortbuff_size); @@ -1219,15 +1223,15 @@ and this may fail\n\n"); key_buffer_size + (record_buffer + sort_buffer)*max_connections = %ld K\n\ bytes of memory\n", (keybuff_size + (my_default_record_cache_size + sortbuff_size) * max_connections)/ 1024); - fprintf(stderr, "Hope that's ok, if not, decrease some variables in the equation\n\n"); + fprintf(stderr, "Hope that's ok; if not, decrease some variables in the equation.\n\n"); #if defined(HAVE_LINUXTHREADS) if (sizeof(char*) == 4 && thread_count > UNSAFE_DEFAULT_LINUX_THREADS) { fprintf(stderr, "\ You seem to be running 32-bit Linux and have %d concurrent connections.\n\ -If you have not changed STACK_SIZE in LinuxThreads and build the binary \n\ -yourself, LinuxThreads is quite likely to steal a part of global heap for\n\ +If you have not changed STACK_SIZE in LinuxThreads and built the binary \n\ +yourself, LinuxThreads is quite likely to steal a part of the global heap for\n\ the thread stack. Please read http://www.mysql.com/doc/L/i/Linux.html\n\n", thread_count); } @@ -1251,12 +1255,12 @@ Some pointers may be invalid and cause the dump to abort...\n"); fprintf(stderr, "\n Successfully dumped variables, if you ran with --log, take a look at the\n\ details of what thread %ld did to cause the crash. In some cases of really\n\ -bad corruption, the values shown above may be invalid\n\n", +bad corruption, the values shown above may be invalid.\n\n", thd->thread_id); } fprintf(stderr, "\ The manual page at http://www.mysql.com/doc/C/r/Crashing.html contains\n\ -information that should help you find out what is causing the crash\n"); +information that should help you find out what is causing the crash.\n"); fflush(stderr); #endif /* HAVE_STACKTRACE */ @@ -1712,7 +1716,7 @@ int main(int argc, char **argv) if (opt_use_ssl) { ssl_acceptor_fd = new_VioSSLAcceptorFd(opt_ssl_key, opt_ssl_cert, - opt_ssl_ca, opt_ssl_capath); + opt_ssl_ca, opt_ssl_capath, opt_ssl_cipher); DBUG_PRINT("info",("ssl_acceptor_fd: %p",ssl_acceptor_fd)); if (!ssl_acceptor_fd) opt_use_ssl=0; @@ -1738,7 +1742,7 @@ int main(int argc, char **argv) pthread_attr_setscope(&connection_attrib, PTHREAD_SCOPE_SYSTEM); #if defined( SET_RLIMIT_NOFILE) || defined( OS2) - /* connections and databases neads lots of files */ + /* connections and databases needs lots of files */ { uint wanted_files=10+(uint) max(max_connections*5, max_connections+table_cache_size*2); @@ -1788,10 +1792,6 @@ int main(int argc, char **argv) init_thr_lock(); init_slave_list(); - /* Fix varibles that are base 1024*1024 */ - myisam_max_temp_length= (my_off_t) min(((ulonglong) myisam_max_sort_file_size)*1024*1024, (ulonglong) MAX_FILE_SIZE); - myisam_max_extra_temp_length= (my_off_t) min(((ulonglong) myisam_max_extra_sort_file_size)*1024*1024, (ulonglong) MAX_FILE_SIZE); - /* Setup log files */ if (opt_log) open_log(&mysql_log, glob_hostname, opt_logname, ".log", LOG_NORMAL); @@ -1802,17 +1802,18 @@ int main(int argc, char **argv) using_update_log=1; } - //make sure slave thread gets started - // if server_id is set, valid master.info is present, and master_host has - // not been specified - if(server_id && !master_host) - { - char fname[FN_REFLEN+128]; - MY_STAT stat_area; - fn_format(fname, master_info_file, mysql_data_home, "", 4+16+32); - if(my_stat(fname, &stat_area, MYF(0)) && !init_master_info(&glob_mi)) - master_host = glob_mi.host; - } + /* + make sure slave thread gets started if server_id is set, + valid master.info is present, and master_host has not been specified + */ + if (server_id && !master_host) + { + char fname[FN_REFLEN+128]; + MY_STAT stat_area; + fn_format(fname, master_info_file, mysql_data_home, "", 4+16+32); + if (my_stat(fname, &stat_area, MYF(0)) && !init_master_info(&glob_mi)) + master_host = glob_mi.host; + } if (opt_bin_log && !server_id) { @@ -1906,7 +1907,7 @@ The server will not act as a slave."); (void) pthread_kill(signal_thread,MYSQL_KILL_SIGNAL); #ifndef __WIN__ if (!opt_bootstrap) - (void) my_delete(pidfile_name,MYF(MY_WME)); // Not neaded anymore + (void) my_delete(pidfile_name,MYF(MY_WME)); // Not needed anymore #endif exit(1); } @@ -2046,7 +2047,7 @@ The server will not act as a slave."); { if(start_mode) { - if (WaitForSingleObject(hEventShutdown,INFINITE)==WAIT_OBJECT_0) + if (WaitForSingleObject(hEventShutdown,1000)==WAIT_TIMEOUT) Service.Stop(); } else @@ -2062,7 +2063,7 @@ The server will not act as a slave."); } #endif #ifdef HAVE_OPENSSL - my_free((gptr)ssl_acceptor_fd,MYF(0)); + my_free((gptr)ssl_acceptor_fd,MYF(MY_ALLOW_ZERO_PTR)); #endif /* HAVE_OPENSSL */ /* Wait until cleanup is done */ (void) pthread_mutex_lock(&LOCK_thread_count); @@ -2576,10 +2577,9 @@ enum options { OPT_MASTER_HOST, OPT_MASTER_USER, OPT_MASTER_PASSWORD, OPT_MASTER_PORT, OPT_MASTER_INFO_FILE, OPT_MASTER_CONNECT_RETRY, -#ifdef HAVE_OPENSSL + OPT_MASTER_RETRY_COUNT, OPT_MASTER_SSL, OPT_MASTER_SSL_KEY, OPT_MASTER_SSL_CERT, -#endif /* HAVE_OPESSSL*/ OPT_SQL_BIN_UPDATE_SAME, OPT_REPLICATE_DO_DB, OPT_REPLICATE_IGNORE_DB, OPT_LOG_SLAVE_UPDATES, OPT_BINLOG_DO_DB, OPT_BINLOG_IGNORE_DB, @@ -2610,7 +2610,8 @@ enum options { OPT_DO_PSTACK, OPT_REPORT_HOST, OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT, OPT_SHOW_SLAVE_AUTH_INFO, OPT_OLD_RPL_COMPAT, - OPT_SLAVE_LOAD_TMPDIR, OPT_NO_MIX_TYPE + OPT_SLAVE_LOAD_TMPDIR, OPT_NO_MIX_TYPE, + OPT_RPL_RECOVERY_RANK }; static struct option long_options[] = { @@ -2642,9 +2643,8 @@ static struct option long_options[] = { {"default-table-type", required_argument, 0, (int) OPT_TABLE_TYPE}, {"delay-key-write-for-all-tables", no_argument, 0, (int) OPT_DELAY_KEY_WRITE}, - {"do-pstack", - no_argument, 0, (int) OPT_DO_PSTACK}, {"enable-locking", no_argument, 0, (int) OPT_ENABLE_LOCK}, + {"enable-pstack", no_argument, 0, (int) OPT_DO_PSTACK}, {"exit-info", optional_argument, 0, 'T'}, {"flush", no_argument, 0, (int) OPT_FLUSH}, #ifdef HAVE_GEMINI_DB @@ -2687,12 +2687,11 @@ static struct option long_options[] = { {"master-password", required_argument, 0, (int) OPT_MASTER_PASSWORD}, {"master-port", required_argument, 0, (int) OPT_MASTER_PORT}, {"master-connect-retry", required_argument, 0, (int) OPT_MASTER_CONNECT_RETRY}, + {"master-retry-count", required_argument, 0, (int) OPT_MASTER_RETRY_COUNT}, {"master-info-file", required_argument, 0, (int) OPT_MASTER_INFO_FILE}, -#ifdef HAVE_OPENSSL {"master-ssl", optional_argument, 0, (int) OPT_MASTER_SSL}, {"master-ssl-key", optional_argument, 0, (int) OPT_MASTER_SSL_KEY}, {"master-ssl-cert", optional_argument, 0, (int) OPT_MASTER_SSL_CERT}, -#endif {"myisam-recover", optional_argument, 0, (int) OPT_MYISAM_RECOVER}, {"memlock", no_argument, 0, (int) OPT_MEMLOCK}, // needs to be available for the test case to pass in non-debugging mode @@ -2737,6 +2736,7 @@ static struct option long_options[] = { {"report-user", required_argument, 0, (int) OPT_REPORT_USER}, {"report-password", required_argument, 0, (int) OPT_REPORT_PASSWORD}, {"report-port", required_argument, 0, (int) OPT_REPORT_PORT}, + {"rpl-recovery-rank", required_argument, 0, (int) OPT_RPL_RECOVERY_RANK}, {"safe-mode", no_argument, 0, (int) OPT_SAFE}, {"safe-show-database", no_argument, 0, (int) OPT_SAFE_SHOW_DB}, {"safe-user-create", no_argument, 0, (int) OPT_SAFE_USER_CREATE}, @@ -2889,6 +2889,9 @@ CHANGEABLE_VAR changeable_vars[] = { ~0L, 1, ~0L, 0, 1 }, { "myisam_bulk_insert_tree_size", (long*) &myisam_bulk_insert_tree_size, 8192*1024, 4, ~0L, 0, 1 }, + { "myisam_block_size", (long*) &opt_myisam_block_size, + MI_KEY_BLOCK_LENGTH, MI_MIN_KEY_BLOCK_LENGTH, MI_MAX_KEY_BLOCK_LENGTH, + 0, MI_MIN_KEY_BLOCK_LENGTH }, { "myisam_max_extra_sort_file_size", (long*) &myisam_max_extra_sort_file_size, (long) (MI_MAX_TEMP_LENGTH/(1024L*1024L)), 0, ~0L, 0, 1 }, @@ -3033,6 +3036,7 @@ struct show_var_st init_vars[]= { {"protocol_version", (char*) &protocol_version, SHOW_INT}, {"record_buffer", (char*) &my_default_record_cache_size,SHOW_LONG}, {"record_rnd_buffer", (char*) &record_rnd_cache_size, SHOW_LONG}, + {"rpl_recovery_rank", (char*) &rpl_recovery_rank, SHOW_LONG}, {"query_buffer_size", (char*) &query_buff_size, SHOW_LONG}, {"safe_show_database", (char*) &opt_safe_show_db, SHOW_BOOL}, {"server_id", (char*) &server_id, SHOW_LONG}, @@ -3111,21 +3115,29 @@ struct show_var_st status_vars[]= { {"Sort_rows", (char*) &filesort_rows, SHOW_LONG}, {"Sort_scan", (char*) &filesort_scan_count, SHOW_LONG}, #ifdef HAVE_OPENSSL - {"SSL_CTX_sess_accept", (char*) 0, SHOW_SSL_CTX_SESS_ACCEPT}, - {"SSL_CTX_sess_accept_good", (char*) 0, SHOW_SSL_CTX_SESS_ACCEPT_GOOD}, - {"SSL_CTX_sess_accept_renegotiate", (char*) 0, SHOW_SSL_CTX_SESS_ACCEPT_RENEGOTIATE}, - {"SSL_CTX_sess_cb_hits", (char*) 0, SHOW_SSL_CTX_SESS_CB_HITS}, - {"SSL_CTX_sess_number", (char*) 0, SHOW_SSL_CTX_SESS_NUMBER}, - {"SSL_CTX_get_session_cache_mode", (char*) 0, SHOW_SSL_CTX_GET_SESSION_CACHE_MODE}, - {"SSL_CTX_sess_get_cache_size", (char*) 0, SHOW_SSL_CTX_SESS_GET_CACHE_SIZE}, - {"SSL_CTX_get_verify_mode", (char*) 0, SHOW_SSL_CTX_GET_VERIFY_MODE}, - {"SSL_CTX_get_verify_depth", (char*) 0, SHOW_SSL_CTX_GET_VERIFY_DEPTH}, - {"SSL_get_verify_mode", (char*) 0, SHOW_SSL_GET_VERIFY_MODE}, - {"SSL_get_verify_depth", (char*) 0, SHOW_SSL_GET_VERIFY_DEPTH}, - {"SSL_session_reused", (char*) 0, SHOW_SSL_SESSION_REUSED}, - {"SSL_get_version", (char*) 0, SHOW_SSL_GET_VERSION}, - {"SSL_get_cipher", (char*) 0, SHOW_SSL_GET_CIPHER}, - {"SSL_get_default_timeout", (char*) 0, SHOW_SSL_GET_DEFAULT_TIMEOUT}, + {"ssl_accepts", (char*) 0, SHOW_SSL_CTX_SESS_ACCEPT}, + {"ssl_finished_accepts", (char*) 0, SHOW_SSL_CTX_SESS_ACCEPT_GOOD}, + {"ssl_finished_connects", (char*) 0, SHOW_SSL_CTX_SESS_CONNECT_GOOD}, + {"ssl_accept_renegotiates", (char*) 0, SHOW_SSL_CTX_SESS_ACCEPT_RENEGOTIATE}, + {"ssl_connect_renegotiates", (char*) 0, SHOW_SSL_CTX_SESS_CONNECT_RENEGOTIATE}, + {"ssl_callback_cache_hits", (char*) 0, SHOW_SSL_CTX_SESS_CB_HITS}, + {"ssl_session_cache_hits", (char*) 0, SHOW_SSL_CTX_SESS_HITS}, + {"ssl_session_cache_misses", (char*) 0, SHOW_SSL_CTX_SESS_MISSES}, + {"ssl_session_cache_timeouts", (char*) 0, SHOW_SSL_CTX_SESS_TIMEOUTS}, + {"ssl_used_session_cache_entries",(char*) 0, SHOW_SSL_CTX_SESS_NUMBER}, + {"ssl_client_connects", (char*) 0, SHOW_SSL_CTX_SESS_CONNECT}, + {"ssl_session_cache_overflows", (char*) 0, SHOW_SSL_CTX_SESS_CACHE_FULL}, + {"ssl_session_cache_size", (char*) 0, SHOW_SSL_CTX_SESS_GET_CACHE_SIZE}, + {"ssl_session_cache_mode", (char*) 0, SHOW_SSL_CTX_GET_SESSION_CACHE_MODE}, + {"ssl_sessions_reused", (char*) 0, SHOW_SSL_SESSION_REUSED}, + {"ssl_ctx_verify_mode", (char*) 0, SHOW_SSL_CTX_GET_VERIFY_MODE}, + {"ssl_ctx_verify_depth", (char*) 0, SHOW_SSL_CTX_GET_VERIFY_DEPTH}, + {"ssl_verify_mode", (char*) 0, SHOW_SSL_GET_VERIFY_MODE}, + {"ssl_verify_depth", (char*) 0, SHOW_SSL_GET_VERIFY_DEPTH}, + {"ssl_version", (char*) 0, SHOW_SSL_GET_VERSION}, + {"ssl_cipher", (char*) 0, SHOW_SSL_GET_CIPHER}, + {"ssl_cipher_list", (char*) 0, SHOW_SSL_GET_CIPHER_LIST}, + {"ssl_default_timeout", (char*) 0, SHOW_SSL_GET_DEFAULT_TIMEOUT}, #endif /* HAVE_OPENSSL */ {"Table_locks_immediate", (char*) &locks_immediate, SHOW_LONG}, {"Table_locks_waited", (char*) &locks_waited, SHOW_LONG}, @@ -3188,6 +3200,7 @@ static void usage(void) Don't flush key buffers between writes for any MyISAM\n\ table\n\ --enable-locking Enable system locking\n\ + --enable-pstack Print a symbolic stack trace on failure\n\ -T, --exit-info Used for debugging; Use at your own risk!\n\ --flush Flush tables to disk between SQL commands\n\ -?, --help Display this help and exit\n\ @@ -3444,6 +3457,9 @@ static void get_options(int argc,char **argv) safemalloc_mem_limit = atoi(optarg); #endif break; + case OPT_RPL_RECOVERY_RANK: + rpl_recovery_rank=atoi(optarg); + break; case OPT_SLAVE_LOAD_TMPDIR: slave_load_tmpdir = my_strdup(optarg, MYF(MY_FAE)); break; @@ -3682,7 +3698,7 @@ static void get_options(int argc,char **argv) opt_specialflag|= SPECIAL_NO_HOST_CACHE; break; case (int) OPT_ENABLE_LOCK: - my_disable_locking=0; + my_disable_locking=myisam_single_user=0; break; case (int) OPT_USE_LOCKING: my_disable_locking=0; @@ -3764,7 +3780,10 @@ static void get_options(int argc,char **argv) break; #endif case (int) OPT_FLUSH: - nisam_flush=myisam_flush=1; +#ifdef HAVE_ISAM + nisam_flush=1; +#endif + myisam_flush=1; flush_time=0; // No auto flush break; case OPT_LOW_PRIORITY_UPDATES: @@ -3964,7 +3983,6 @@ static void get_options(int argc,char **argv) case OPT_MASTER_PORT: master_port= atoi(optarg); break; -#ifdef HAVE_OPENSSL case OPT_MASTER_SSL: master_ssl=atoi(optarg); break; @@ -3974,7 +3992,6 @@ static void get_options(int argc,char **argv) case OPT_MASTER_SSL_CERT: master_ssl_cert=optarg; break; -#endif /* HAVE_OPENSSL */ case OPT_REPORT_HOST: report_host=optarg; break; @@ -3990,6 +4007,9 @@ static void get_options(int argc,char **argv) case OPT_MASTER_CONNECT_RETRY: master_connect_retry= atoi(optarg); break; + case OPT_MASTER_RETRY_COUNT: + master_retry_count= atoi(optarg); + break; case OPT_SAFE_SHOW_DB: opt_safe_show_db=1; break; @@ -4023,6 +4043,12 @@ static void get_options(int argc,char **argv) /* To be deleted in MySQL 4.0 */ if (!record_rnd_cache_size) record_rnd_cache_size=my_default_record_cache_size; + + /* Fix variables that are base 1024*1024 */ + myisam_max_temp_length= (my_off_t) min(((ulonglong) myisam_max_sort_file_size)*1024*1024, (ulonglong) MAX_FILE_SIZE); + myisam_max_extra_temp_length= (my_off_t) min(((ulonglong) myisam_max_extra_sort_file_size)*1024*1024, (ulonglong) MAX_FILE_SIZE); + + myisam_block_size=(uint) 1 << my_bit_log2(opt_myisam_block_size); } @@ -4282,7 +4308,10 @@ static int get_service_parameters() else if ( lstrcmp(szKeyValueName, TEXT("FlushTables")) == 0 ) { CHECK_KEY_TYPE( REG_DWORD, szKeyValueName ); - nisam_flush = myisam_flush= *lpdwValue ? 1 : 0; +#ifdef HAVE_NISAM + nisam_flush = 1; +#endif + myisam_flush= *lpdwValue ? 1 : 0; } else if ( lstrcmp(szKeyValueName, TEXT("BackLog")) == 0 ) { @@ -4516,12 +4545,34 @@ static char *get_relative_path(const char *path) } +/* + Fix filename and replace extension where 'dir' is relative to + mysql_real_data_home. + Return 1 if len(path) > FN_REFLEN +*/ + +bool +fn_format_relative_to_data_home(my_string to, const char *name, + const char *dir, const char *extension) +{ + char tmp_path[FN_REFLEN]; + if (!test_if_hard_path(dir)) + { + strxnmov(tmp_path,sizeof(tmp_path)-1, mysql_real_data_home, + dir, NullS); + dir=tmp_path; + } + return !fn_format(to, name, dir, extension, + MY_REPLACE_EXT | MY_UNPACK_FILENAME | MY_SAFE_PATH); +} + + static void fix_paths(void) { (void) fn_format(mysql_home,mysql_home,"","",16); // Remove symlinks - convert_dirname(mysql_home); - convert_dirname(mysql_real_data_home); - convert_dirname(language); + convert_dirname(mysql_home,mysql_home,NullS); + convert_dirname(mysql_real_data_home,mysql_real_data_home,NullS); + convert_dirname(language,language,NullS); (void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir (void) my_load_path(mysql_real_data_home,mysql_real_data_home,mysql_home); (void) my_load_path(pidfile_name,pidfile_name,mysql_real_data_home); @@ -4531,7 +4582,7 @@ static void fix_paths(void) strmov(buff,sharedir); /* purecov: tested */ else strxmov(buff,mysql_home,sharedir,NullS); - convert_dirname(buff); + convert_dirname(buff,buff,NullS); (void) my_load_path(language,language,buff); /* If --character-sets-dir isn't given, use shared library dir */ @@ -4545,19 +4596,16 @@ static void fix_paths(void) char *tmp= (char*) my_malloc(FN_REFLEN,MYF(MY_FAE)); if (tmp) { - strmov(tmp,mysql_tmpdir); - mysql_tmpdir=tmp; - convert_dirname(mysql_tmpdir); - mysql_tmpdir=(char*) my_realloc(mysql_tmpdir,(uint) strlen(mysql_tmpdir)+1, + char *end=convert_dirname(tmp, mysql_tmpdir, NullS); + + mysql_tmpdir=(char*) my_realloc(tmp,(uint) (end-tmp)+1, MYF(MY_HOLD_ON_ERROR)); + allocated_mysql_tmpdir=mysql_tmpdir; } if (!slave_load_tmpdir) { - int copy_len; - slave_load_tmpdir = (char*) my_malloc((copy_len=strlen(mysql_tmpdir) + 1) - , MYF(MY_FAE)); // no need to check return value, if we fail, my_malloc() never returns - memcpy(slave_load_tmpdir, mysql_tmpdir, copy_len); + slave_load_tmpdir = (char*) my_strdup(mysql_tmpdir, MYF(MY_FAE)); } } diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 43650f365bb..5e002a0f63e 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -31,16 +31,16 @@ #include <winsock.h> #endif #include <my_global.h> +#include <mysql.h> +#include <mysql_embed.h> #include <mysql_com.h> -#include <violite.h> +#include <mysqld_error.h> #include <my_sys.h> #include <m_string.h> -#include "mysql.h" -#include "mysqld_error.h" +#include <my_net.h> +#include <violite.h> #include <signal.h> #include <errno.h> -#include <sys/types.h> -#include <assert.h> #ifdef MYSQL_SERVER ulong max_allowed_packet=65536; @@ -60,20 +60,9 @@ ulong net_write_timeout= NET_WRITE_TIMEOUT; #endif ulong net_buffer_length=8192; /* Default length. Enlarged if necessary */ -#if !defined(__WIN__) && !defined(MSDOS) -#include <sys/socket.h> -#else +#if defined(__WIN__) || defined(MSDOS) #undef MYSQL_SERVER /* Win32 can't handle interrupts */ #endif -#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) -#include <netinet/in_systm.h> -#include <netinet/in.h> -#include <netinet/ip.h> -#if !defined(alpha_linux_port) -#include <netinet/tcp.h> -#endif -#endif -#include "mysqld_error.h" #ifdef MYSQL_SERVER #include "my_pthread.h" #include "thr_alarm.h" @@ -90,7 +79,7 @@ extern ulong mysqld_net_retry_count; typedef my_bool thr_alarm_t; typedef my_bool ALARM; #define thr_alarm_init(A) (*(A))=0 -#define thr_alarm_in_use(A) (*(A)) +#define thr_alarm_in_use(A) (*(A) != 0) #define thr_end_alarm(A) #define thr_alarm(A,B,C) local_thr_alarm((A),(B),(C)) inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __attribute__((unused))) @@ -130,7 +119,7 @@ int my_net_init(NET *net, Vio* vio) net->no_send_ok = 0; net->error=0; net->return_errno=0; net->return_status=0; net->timeout=(uint) net_read_timeout; /* Timeout for read */ - net->pkt_nr=0; + net->pkt_nr=net->compress_pkt_nr=0; net->write_pos=net->read_pos = net->buff; net->last_error[0]=0; net->compress=0; net->reading_or_writing=0; @@ -191,7 +180,7 @@ static my_bool net_realloc(NET *net, ulong length) void net_clear(NET *net) { #ifndef EXTRA_DEBUG - int count; // One may get 'unused' warning + int count; /* One may get 'unused' warn */ bool is_blocking=vio_is_blocking(net->vio); if (is_blocking) vio_blocking(net->vio, FALSE); @@ -205,7 +194,7 @@ void net_clear(NET *net) vio_blocking(net->vio, TRUE); } #endif /* EXTRA_DEBUG */ - net->pkt_nr=0; /* Ready for new command */ + net->pkt_nr=net->compress_pkt_nr=0; /* Ready for new command */ net->write_pos=net->buff; } @@ -218,9 +207,12 @@ int net_flush(NET *net) if (net->buff != net->write_pos) { error=net_real_write(net,(char*) net->buff, - (uint) (net->write_pos - net->buff)); + (ulong) (net->write_pos - net->buff)); net->write_pos=net->buff; } + /* Sync packet number if using compression */ + if (net->compress) + net->pkt_nr=net->compress_pkt_nr; DBUG_RETURN(error); } @@ -249,7 +241,7 @@ my_net_write(NET *net,const char *packet,ulong len) { const ulong z_size = MAX_THREE_BYTES; int3store(buff, z_size); - buff[3]= (net->compress) ? 0 : (uchar) (net->pkt_nr++); + buff[3]= net->pkt_nr++; if (net_write_buff(net, (char*) buff, NET_HEADER_SIZE) || net_write_buff(net, packet, z_size)) return 1; @@ -258,7 +250,7 @@ my_net_write(NET *net,const char *packet,ulong len) } /* Write last packet */ int3store(buff,len); - buff[3]= (net->compress) ? 0 : (uchar) (net->pkt_nr++); + buff[3]= net->pkt_nr++; if (net_write_buff(net,(char*) buff,NET_HEADER_SIZE)) return 1; return net_write_buff(net,packet,len); @@ -276,7 +268,7 @@ my_net_write(NET *net,const char *packet,ulong len) int net_write_command(NET *net,uchar command,const char *packet,ulong len) { - uint length=len+1; /* 1 extra byte for command */ + ulong length=len+1; /* 1 extra byte for command */ uchar buff[NET_HEADER_SIZE+1]; uint header_size=NET_HEADER_SIZE+1; buff[4]=command; /* For first packet */ @@ -288,7 +280,7 @@ net_write_command(NET *net,uchar command,const char *packet,ulong len) do { int3store(buff, MAX_THREE_BYTES); - buff[3]= (net->compress) ? 0 : (uchar) (net->pkt_nr++); + buff[3]= net->pkt_nr++; if (net_write_buff(net,(char*) buff, header_size) || net_write_buff(net,packet,len)) return 1; @@ -300,7 +292,7 @@ net_write_command(NET *net,uchar command,const char *packet,ulong len) len=length; /* Data left to be written */ } int3store(buff,length); - buff[3]= (net->compress) ? 0 : (uchar) (net->pkt_nr++); + buff[3]= net->pkt_nr++; return test(net_write_buff(net,(char*) buff,header_size) || net_write_buff(net,packet,len) || net_flush(net)); } @@ -313,7 +305,7 @@ net_write_command(NET *net,uchar command,const char *packet,ulong len) static int net_write_buff(NET *net,const char *packet,ulong len) { - uint left_length=(uint) (net->buff_end - net->write_pos); + ulong left_length=(ulong) (net->buff_end - net->write_pos); while (len > left_length) { @@ -339,10 +331,10 @@ net_write_buff(NET *net,const char *packet,ulong len) int net_real_write(NET *net,const char *packet,ulong len) { - int length; + long int length; char *pos,*end; thr_alarm_t alarmed; -#if !defined(__WIN__) +#if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2) ALARM alarm_buff; #endif uint retry_count=0; @@ -379,7 +371,7 @@ net_real_write(NET *net,const char *packet,ulong len) } int3store(&b[NET_HEADER_SIZE],complen); int3store(b,len); - b[3]=(uchar) (net->pkt_nr++); + b[3]=(uchar) (net->compress_pkt_nr++); len+= header_length; packet= (char*) b; } @@ -397,7 +389,7 @@ net_real_write(NET *net,const char *packet,ulong len) pos=(char*) packet; end=pos+len; while (pos != end) { - if ((int) (length=vio_write(net->vio,pos,(int) (end-pos))) <= 0) + if ((long) (length=vio_write(net->vio,pos,(ulong) (end-pos))) <= 0) { my_bool interrupted = vio_should_retry(net->vio); #if (!defined(__WIN__) && !defined(__EMX__) && !defined(OS2)) @@ -498,7 +490,7 @@ static void my_net_skip_rest(NET *net, ulong remain, thr_alarm_t *alarmed) { my_bool interrupted = vio_should_retry(net->vio); if (!thr_got_alarm(&alarmed) && interrupted) - { /* Probably in MIT threads */ + { /* Probably in MIT threads */ if (retry_count++ < RETRY_COUNT) continue; } @@ -517,7 +509,7 @@ static void my_net_skip_rest(NET *net, ulong remain, thr_alarm_t *alarmed) This function reallocates the net->buff buffer if necessary. */ -static uint +static ulong my_real_read(NET *net, ulong *complen) { uchar *pos; @@ -628,9 +620,9 @@ my_real_read(NET *net, ulong *complen) if (net->buff[net->where_b] != (uchar) 255) { DBUG_PRINT("error", - ("Packets out of order (Found: %d, expected %d)", + ("Packets out of order (Found: %d, expected %u)", (int) net->buff[net->where_b + 3], - (uint) (uchar) net->pkt_nr)); + net->pkt_nr)); #ifdef EXTRA_DEBUG fprintf(stderr,"Packets out of order (Found: %d, expected %d)\n", (int) net->buff[net->where_b + 3], @@ -643,7 +635,7 @@ my_real_read(NET *net, ulong *complen) #endif goto end; } - net->pkt_nr++; + net->compress_pkt_nr= ++net->pkt_nr; #ifdef HAVE_COMPRESS if (net->compress) { @@ -711,7 +703,7 @@ my_net_read(NET *net) if (len == MAX_THREE_BYTES) { /* First packet of a multi-packet. Concatenate the packets */ - int save_pos = net->where_b; + ulong save_pos = net->where_b; ulong total_length=0; do { @@ -821,8 +813,8 @@ my_net_read(NET *net) net->read_pos= net->buff+ first_packet_offset + NET_HEADER_SIZE; net->buf_length= buf_length; - net->remain_in_buf= buf_length - start_of_packet; - len = ((uint) (start_of_packet - first_packet_offset) - NET_HEADER_SIZE - + net->remain_in_buf= (ulong) (buf_length - start_of_packet); + len = ((ulong) (start_of_packet - first_packet_offset) - NET_HEADER_SIZE - multi_byte_packet); net->save_char= net->read_pos[len]; /* Must be saved */ net->read_pos[len]=0; /* Safeguard for mysql_use_result */ diff --git a/sql/nt_servc.cc b/sql/nt_servc.cc index 5884300fe95..3a36f5740a9 100644 --- a/sql/nt_servc.cc +++ b/sql/nt_servc.cc @@ -246,7 +246,8 @@ void NTService::ServiceMain(DWORD argc, LPTSTR *argv) WaitForSingleObject (pService->hExitEvent, INFINITE); // wait for thread to exit - WaitForSingleObject (pService->hThreadHandle, 30000); + if (WaitForSingleObject (pService->hThreadHandle, 1000)==WAIT_TIMEOUT) + CloseHandle(pService->hThreadHandle); pService->Exit(0); } diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 0831634a9a6..cc659623f1d 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -607,7 +607,7 @@ int SQL_SELECT::test_quick_select(key_map keys_to_use, table_map prev_tables, if (limit < records) read_time=(double) records+scan_time+1; // Force to use index else if (read_time <= 2.0 && !force_quick_range) - DBUG_RETURN(0); /* No nead for quick select */ + DBUG_RETURN(0); /* No need for quick select */ DBUG_PRINT("info",("Time to scan table: %ld",(long) read_time)); diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index c16c0d919d4..182fb6cf362 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -305,7 +305,7 @@ static bool find_range_key(TABLE_REF *ref, Field* field, COND *cond) key>>=1; ref->key_length=0; ref->key=idx; - if (field->part_of_key & ((table_map) 1 << idx)) + if (field->part_of_key & ((key_map) 1 << idx)) { table->key_read=1; table->file->extra(HA_EXTRA_KEYREAD); @@ -350,7 +350,7 @@ static bool find_range_key(TABLE_REF *ref, Field* field, COND *cond) { ref->key_length= (uint) (key_ptr-ref->key_buff); ref->key=idx; - if (field->part_of_key & ((table_map) 1 << idx)) + if (field->part_of_key & ((key_map) 1 << idx)) { table->key_read=1; table->file->extra(HA_EXTRA_KEYREAD); diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index b92297abbf8..8d9fda437a5 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -231,3 +231,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt index 9adc2f5fb73..81d44de6a87 100644 --- a/sql/share/danish/errmsg.txt +++ b/sql/share/danish/errmsg.txt @@ -225,3 +225,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt index 61db11f39f8..68e20deb257 100644 --- a/sql/share/dutch/errmsg.txt +++ b/sql/share/dutch/errmsg.txt @@ -228,3 +228,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index bd328dbb6e4..5d057c30a0e 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -222,3 +222,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index 166637c43e1..3f9d15c2e4d 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -226,3 +226,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index 0db8b69622e..7d9c6202c5f 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -222,3 +222,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt index a9ba1f41c42..14bd0f8a042 100644 --- a/sql/share/german/errmsg.txt +++ b/sql/share/german/errmsg.txt @@ -225,3 +225,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt index aa8d659b263..ab1103a56b4 100644 --- a/sql/share/greek/errmsg.txt +++ b/sql/share/greek/errmsg.txt @@ -222,3 +222,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt index 5cc5ac663b1..33d51cb0e60 100644 --- a/sql/share/hungarian/errmsg.txt +++ b/sql/share/hungarian/errmsg.txt @@ -224,3 +224,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index 7c44e0bf4c7..127a33bbb28 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -222,3 +222,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt index 5d6f0158ea2..e345f462f2a 100644 --- a/sql/share/japanese/errmsg.txt +++ b/sql/share/japanese/errmsg.txt @@ -224,3 +224,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt index 6288ac535d4..dd1d92adf64 100644 --- a/sql/share/korean/errmsg.txt +++ b/sql/share/korean/errmsg.txt @@ -222,3 +222,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt index de783f93d1a..bbdf23e4056 100644 --- a/sql/share/norwegian-ny/errmsg.txt +++ b/sql/share/norwegian-ny/errmsg.txt @@ -224,3 +224,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt index 3cbc5b6138d..6139b1bb700 100644 --- a/sql/share/norwegian/errmsg.txt +++ b/sql/share/norwegian/errmsg.txt @@ -224,3 +224,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt index c144dda47ae..39ff72acba1 100644 --- a/sql/share/polish/errmsg.txt +++ b/sql/share/polish/errmsg.txt @@ -226,3 +226,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index c11adc3af70..a522e792750 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -222,3 +222,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt index 32b6eddfeeb..0177ff942a0 100644 --- a/sql/share/romanian/errmsg.txt +++ b/sql/share/romanian/errmsg.txt @@ -226,3 +226,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt index fbff74993fb..c6b5c324cad 100644 --- a/sql/share/russian/errmsg.txt +++ b/sql/share/russian/errmsg.txt @@ -225,3 +225,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index d60dbf0956c..26ca2881212 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -230,3 +230,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index 9234de04786..8bbf04c9a3d 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -223,3 +223,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt index 25309cd0598..b4303de8619 100644 --- a/sql/share/swedish/errmsg.txt +++ b/sql/share/swedish/errmsg.txt @@ -222,3 +222,4 @@ "SELECT kommandona har olika antal kolumner" "Kan inte utföra kommandot emedan du har ett READ lås", "Blandning av transaktionella och icke-transaktionella tabeller är inaktiverat", +"Option '%s' användes två gånger", diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt index 49ab4399664..80c2bcc06fb 100644 --- a/sql/share/ukrainian/errmsg.txt +++ b/sql/share/ukrainian/errmsg.txt @@ -227,3 +227,4 @@ "The used SELECT statements have a different number of columns", "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", +"Option '%s' used twice in statement", diff --git a/sql/slave.cc b/sql/slave.cc index 1a6a0910f54..d2e038bef88 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -307,7 +307,7 @@ static int init_strvar_from_file(char* var, int max_size, IO_CACHE* f, } else if (default_val) { - strmake(var, default_val, max_size); + strmake(var, default_val, max_size-1); return 0; } return 1; @@ -522,7 +522,7 @@ int init_master_info(MASTER_INFO* mi) if (master_user) strmake(mi->user, master_user, sizeof(mi->user) - 1); if (master_password) - strmake(mi->password, master_password, sizeof(mi->password) - 1); + strmake(mi->password, master_password, HASH_PASSWORD_LENGTH); mi->port = master_port; mi->connect_retry = master_connect_retry; } @@ -548,20 +548,20 @@ int init_master_info(MASTER_INFO* mi) } mi->log_file_name[length-1]= 0; // kill \n - char buf[FN_REFLEN]; - if(!my_b_gets(&mi->file, buf, sizeof(buf))) + /* Reuse fname buffer */ + if(!my_b_gets(&mi->file, fname, sizeof(fname))) { msg="Error reading log file position from master info file"; goto error; } + mi->pos = strtoull(fname,(char**) 0, 10); - mi->pos = strtoull(buf,(char**) 0, 10); mi->fd = fd; if(init_strvar_from_file(mi->host, sizeof(mi->host), &mi->file, master_host) || init_strvar_from_file(mi->user, sizeof(mi->user), &mi->file, master_user) || - init_strvar_from_file(mi->password, sizeof(mi->password), &mi->file, + init_strvar_from_file(mi->password, HASH_PASSWORD_LENGTH+1, &mi->file, master_password) || init_intvar_from_file((int*)&mi->port, &mi->file, master_port) || init_intvar_from_file((int*)&mi->connect_retry, &mi->file, @@ -925,7 +925,7 @@ point. If you are sure that your master is ok, run this query manually on the\ slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1;\ SLAVE START;", thd->query); last_slave_errno = expected_error; - sql_print_error(last_slave_error); + sql_print_error("%s",last_slave_error); return 1; default: return 0; @@ -934,8 +934,9 @@ point. If you are sure that your master is ok, run this query manually on the\ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) { + const char *error_msg; Log_event * ev = Log_event::read_log_event((const char*)net->read_pos + 1, - event_len); + event_len, &error_msg); if (ev) { int type_code = ev->get_type_code(); @@ -1249,7 +1250,7 @@ static int safe_connect(THD* thd, MYSQL* mysql, MASTER_INFO* mi) !mc_mysql_connect(mysql, mi->host, mi->user, mi->password, 0, mi->port, 0, 0)) { - sql_print_error("Slave thread: error connecting to master:%s(%d),\ + sql_print_error("Slave thread: error connecting to master: %s (%d),\ retry in %d sec", mc_mysql_error(mysql), errno, mi->connect_retry); safe_sleep(thd, mi->connect_retry); } @@ -1266,38 +1267,55 @@ static int safe_connect(THD* thd, MYSQL* mysql, MASTER_INFO* mi) return slave_was_killed; } -/* try to connect until successful or slave killed */ +/* + Try to connect until successful or slave killed or we have retried + master_retry_count times +*/ static int safe_reconnect(THD* thd, MYSQL* mysql, MASTER_INFO* mi) { int slave_was_killed; + int last_errno= -2; // impossible error + ulong err_count=0; char llbuff[22]; - // if we lost connection after reading a state set event - // we will be re-reading it, so pending needs to be cleared + /* + If we lost connection after reading a state set event + we will be re-reading it, so pending needs to be cleared + */ mi->pending = 0; #ifndef DBUG_OFF events_till_disconnect = disconnect_slave_event_count; #endif - while(!(slave_was_killed = slave_killed(thd)) && mc_mysql_reconnect(mysql)) + while (!(slave_was_killed = slave_killed(thd)) && mc_mysql_reconnect(mysql)) { - sql_print_error("Slave thread: error re-connecting to master:\ + /* Don't repeat last error */ + if (mc_mysql_errno(mysql) != last_errno) + { + sql_print_error("Slave thread: error re-connecting to master: \ %s, last_errno=%d, retry in %d sec", - mc_mysql_error(mysql), errno, mi->connect_retry); - safe_sleep(thd, mi->connect_retry); + mc_mysql_error(mysql), last_errno=mc_mysql_errno(mysql), + mi->connect_retry); + safe_sleep(thd, mi->connect_retry); + } + if (err_count++ == master_retry_count) + { + slave_was_killed=1; + break; + } } - if(!slave_was_killed) - { - sql_print_error("Slave: reconnected to master '%s@%s:%d',\ + if (!slave_was_killed) + { + sql_print_error("Slave: reconnected to master '%s@%s:%d',\ replication resumed in log '%s' at position %s", glob_mi.user, glob_mi.host, glob_mi.port, RPL_LOG_NAME, llstr(glob_mi.pos,llbuff)); #ifdef SIGNAL_WITH_VIO_CLOSE - thd->set_active_vio(mysql->net.vio); + thd->set_active_vio(mysql->net.vio); #endif - } + } return slave_was_killed; } diff --git a/sql/slave.h b/sql/slave.h index 5850b57d3b3..5c6772147b6 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -4,7 +4,7 @@ #include "mysql.h" #define SLAVE_NET_TIMEOUT 3600 -extern ulong slave_net_timeout; +extern ulong slave_net_timeout, master_retry_count; extern char* slave_load_tmpdir; typedef struct st_master_info diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 4c128a882c6..888ccf7b482 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -62,8 +62,9 @@ public: char *user,*password; ulong salt[2]; #ifdef HAVE_OPENSSL - char *ssl_type, *ssl_cipher, *x509_issuer, *x509_subject; -#endif + enum SSL_type ssl_type; + const char *ssl_cipher, *x509_issuer, *x509_subject; +#endif /* HAVE_OPENSSL */ }; class ACL_DB :public ACL_ACCESS @@ -204,13 +205,22 @@ int acl_init(bool dont_read_acl_tables) user.password=get_field(&mem, table,2); #ifdef HAVE_OPENSSL DBUG_PRINT("info",("table->fields=%d",table->fields)); - if (table->fields >= 21) { - user.ssl_type=get_field(&mem, table,17); - user.ssl_cipher=get_field(&mem, table,18); - user.x509_issuer=get_field(&mem, table,19); - user.x509_subject=get_field(&mem, table,20); + if (table->fields >= 21) /* From 4.0.0 we have more fields */ + { + char *ssl_type=get_field(&mem, table,17); + if (!strcmp(ssl_type, "ANY")) + user.ssl_type=SSL_TYPE_ANY; + else if (!strcmp(ssl_type, "X509")) + user.ssl_type=SSL_TYPE_X509; + else if (!strcmp(ssl_type, "SPECIFIED")) + user.ssl_type=SSL_TYPE_SPECIFIED; + else + user.ssl_type=SSL_TYPE_NONE; + user.ssl_cipher=get_field(&mem, table, 18); + user.x509_issuer=get_field(&mem, table, 19); + user.x509_subject=get_field(&mem, table, 20); } -#endif +#endif /* HAVE_OPENSSL */ if (user.password && (length=(uint) strlen(user.password)) == 8 && protocol_version == PROTOCOL_VERSION) { @@ -410,15 +420,14 @@ static int acl_compare(ACL_ACCESS *a,ACL_ACCESS *b) } -/* Get master privilges for user (priviliges for all tables) */ - - -uint acl_getroot(const char *host, const char *ip, const char *user, +/* Get master privilges for user (priviliges for all tables). Required to connect */ +uint acl_getroot(THD *thd, const char *host, const char *ip, const char *user, const char *password,const char *message,char **priv_user, bool old_ver) { uint user_access=NO_ACCESS; *priv_user=(char*) user; + char *ptr=0; if (!initialized) return (uint) ~NO_ACCESS; // If no data allow anything /* purecov: tested */ @@ -440,7 +449,93 @@ uint acl_getroot(const char *host, const char *ip, const char *user, !check_scramble(password,message,acl_user->salt, (my_bool) old_ver))) { +#ifdef HAVE_OPENSSL + Vio *vio=thd->net.vio; + /* + In this point we know that user is allowed to connect + from given host by given username/password pair. Now + we check if SSL is required, if user is using SSL and + if X509 certificate attributes are OK + */ + switch(acl_user->ssl_type) { + case SSL_TYPE_NONE: /* SSL is not required to connect */ + user_access=acl_user->access; + break; + case SSL_TYPE_ANY: /* Any kind of SSL is good enough */ + if (vio_type(vio) == VIO_TYPE_SSL) + user_access=acl_user->access; + break; + case SSL_TYPE_X509: /* Client should have any valid certificate. */ + /* + Connections with non-valid certificates are dropped already + in sslaccept() anyway, so we do not check validity here. + */ + if (SSL_get_peer_certificate(vio->ssl_)) + user_access=acl_user->access; + break; + case SSL_TYPE_SPECIFIED: /* Client should have specified attrib */ + /* + We do not check for absence of SSL because without SSL it does + not pass all checks here anyway. + If cipher name is specified, we compare it to actual cipher in + use. + */ + if (acl_user->ssl_cipher) + DBUG_PRINT("info",("comparing ciphers: '%s' and '%s'", + acl_user->ssl_cipher, + SSL_get_cipher(vio->ssl_))); + if (!strcmp(acl_user->ssl_cipher,SSL_get_cipher(vio->ssl_))) + user_access=acl_user->access; + else + { + user_access=NO_ACCESS; + break; + } + /* Prepare certificate (if exists) */ + DBUG_PRINT("info",("checkpoint 1")); + X509* cert=SSL_get_peer_certificate(vio->ssl_); + DBUG_PRINT("info",("checkpoint 2")); + /* If X509 issuer is speified, we check it... */ + if (acl_user->x509_issuer) + { + DBUG_PRINT("info",("checkpoint 3")); + ptr = X509_NAME_oneline(X509_get_issuer_name(cert), 0, 0); + DBUG_PRINT("info",("comparing issuers: '%s' and '%s'", + acl_user->x509_issuer, ptr)); + if (!strcmp(acl_user->x509_issuer,ptr)) + user_access=acl_user->access; + else + { + user_access=NO_ACCESS; + free(ptr); + break; + } + free(ptr); + } + DBUG_PRINT("info",("checkpoint 4")); + /* X509 subject is specified, we check it .. */ + if (acl_user->x509_subject) + { + ptr = X509_NAME_oneline(X509_get_subject_name(cert), 0, 0); + DBUG_PRINT("info",("comparing subjects: '%s' and '%s'", + acl_user->x509_subject, ptr)); + if (!strcmp(acl_user->x509_subject,ptr)) + user_access=acl_user->access; + else + { + user_access=NO_ACCESS; + free(ptr); + break; + } + free(ptr); + } + DBUG_PRINT("info",("checkpoint 5")); + break; + } + DBUG_PRINT("info",("checkpoint 6")); +#else /* HAVE_OPENSSL */ user_access=acl_user->access; +#endif /* HAVE_OPENSSL */ if (!acl_user->user) *priv_user=(char*) ""; // Change to anonymous user /* purecov: inspected */ break; @@ -469,7 +564,12 @@ static byte* check_get_key(ACL_USER *buff,uint *length, } static void acl_update_user(const char *user, const char *host, - const char *password, uint privileges) + const char *password, + enum SSL_type ssl_type, + const char *ssl_cipher, + const char *x509_issuer, + const char *x509_subject, + uint privileges) { for (uint i=0 ; i < acl_users.elements ; i++) { @@ -482,6 +582,12 @@ static void acl_update_user(const char *user, const char *host, acl_user->host.hostname && !strcmp(host,acl_user->host.hostname)) { acl_user->access=privileges; +#ifdef HAVE_OPENSSL + acl_user->ssl_type=ssl_type; + acl_user->ssl_cipher=ssl_cipher; + acl_user->x509_issuer=x509_issuer; + acl_user->x509_subject=x509_subject; +#endif /* HAVE_OPENSSL */ if (password) { if (!password[0]) @@ -500,7 +606,11 @@ static void acl_update_user(const char *user, const char *host, static void acl_insert_user(const char *user, const char *host, - const char *password, + const char *password, + enum SSL_type ssl_type, + const char *ssl_cipher, + const char *x509_issuer, + const char *x509_subject, uint privileges) { ACL_USER acl_user; @@ -510,6 +620,12 @@ static void acl_insert_user(const char *user, const char *host, acl_user.access=privileges; acl_user.sort=get_sort(2,acl_user.host.hostname,acl_user.user); acl_user.hostname_length=(uint) strlen(acl_user.host.hostname); +#ifdef HAVE_OPENSSL + acl_user.ssl_type=ssl_type; + acl_user.ssl_cipher=ssl_cipher; + acl_user.x509_issuer=x509_issuer; + acl_user.x509_subject=x509_subject; +#endif /* HAVE_OPENSSL */ if (password) { acl_user.password=(char*) ""; // Just point at something @@ -984,7 +1100,7 @@ static bool test_if_create_new_users(THD *thd) ** Handle GRANT commands ****************************************************************************/ -static int replace_user_table(TABLE *table, const LEX_USER &combo, +static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo, uint rights, char what, bool create_user) { int error = -1; @@ -1044,7 +1160,38 @@ static int replace_user_table(TABLE *table, const LEX_USER &combo, table->field[i]->store(&what,1); } rights=get_access(table,3); - +#ifdef HAVE_OPENSSL + /* We write down SSL related ACL stuff */ + DBUG_PRINT("info",("table->fields=%d",table->fields)); + if (table->fields >= 21) /* From 4.0.0 we have more fields */ + { + table->field[18]->store("",0); + table->field[19]->store("",0); + table->field[20]->store("",0); + switch (thd->lex.ssl_type) { + case SSL_TYPE_ANY: + table->field[17]->store("ANY",3); + break; + case SSL_TYPE_X509: + table->field[17]->store("X509",4); + break; + case SSL_TYPE_SPECIFIED: + table->field[17]->store("SPECIFIED",9); + if (thd->lex.ssl_cipher) + table->field[18]->store(thd->lex.ssl_cipher, + strlen(thd->lex.ssl_cipher)); + if (thd->lex.x509_issuer) + table->field[19]->store(thd->lex.x509_issuer, + strlen(thd->lex.x509_issuer)); + if (thd->lex.x509_subject) + table->field[20]->store(thd->lex.x509_subject, + strlen(thd->lex.x509_subject)); + break; + default: + table->field[17]->store("NONE",4); + } + } +#endif /* HAVE_OPENSSL */ if (old_row_exists) { /* @@ -1071,16 +1218,26 @@ static int replace_user_table(TABLE *table, const LEX_USER &combo, } error=0; // Privileges granted / revoked - end: +end: if (!error) { acl_cache->clear(1); // Clear privilege cache if (!combo.password.str) password=0; // No password given on command if (old_row_exists) - acl_update_user(combo.user.str,combo.host.str,password,rights); + acl_update_user(combo.user.str,combo.host.str,password, + thd->lex.ssl_type, + thd->lex.ssl_cipher, + thd->lex.x509_issuer, + thd->lex.x509_subject, + rights); else - acl_insert_user(combo.user.str,combo.host.str,password,rights); + acl_insert_user(combo.user.str,combo.host.str,password, + thd->lex.ssl_type, + thd->lex.ssl_cipher, + thd->lex.x509_issuer, + thd->lex.x509_subject, + rights); } table->file->index_end(); DBUG_RETURN(error); @@ -1626,6 +1783,9 @@ int mysql_table_grant (THD *thd, TABLE_LIST *table_list, TABLE_LIST tables[3]; bool create_new_users=0; DBUG_ENTER("mysql_table_grant"); + DBUG_PRINT("info",("ssl_cipher=%s",thd->lex.ssl_cipher)); + DBUG_PRINT("info",("x509_issuer=%s",thd->lex.x509_issuer)); + DBUG_PRINT("info",("x509_subject=%s",thd->lex.x509_subject)); if (!initialized) { @@ -1715,9 +1875,10 @@ int mysql_table_grant (THD *thd, TABLE_LIST *table_list, continue; } /* Create user if needed */ - if (replace_user_table(tables[0].table, - *Str, - 0, + if (replace_user_table(thd, + tables[0].table, + *Str, + 0, revoke_grant ? 'N' : 'Y', create_new_users)) { @@ -1810,7 +1971,7 @@ int mysql_table_grant (THD *thd, TABLE_LIST *table_list, pthread_mutex_unlock(&LOCK_grant); if (!result) send_ok(&thd->net); - /* Tables are automaticly closed */ + /* Tables are automatically closed */ DBUG_RETURN(result); } @@ -1871,7 +2032,8 @@ int mysql_grant (THD *thd, const char *db, List <LEX_USER> &list, uint rights, result= -1; continue; } - if ((replace_user_table(tables[0].table, + if ((replace_user_table(thd, + tables[0].table, *Str, (!db ? rights : 0), what, create_new_users))) result= -1; @@ -2332,6 +2494,7 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user) { uint counter, want_access,index; int error = 0; + int ssl_options = 0; ACL_USER *acl_user; ACL_DB *acl_db; char buff[1024]; DBUG_ENTER("mysql_show_grants"); @@ -2426,30 +2589,40 @@ int mysql_show_grants(THD *thd,LEX_USER *lex_user) global.append('\''); } #ifdef HAVE_OPENSSL -/* SSL grant stuff */ - DBUG_PRINT("info",("acl_user->ssl_type=%s",acl_user->ssl_type)); - DBUG_PRINT("info",("acl_user->ssl_cipher=%s",acl_user->ssl_cipher)); - DBUG_PRINT("info",("acl_user->x509_subject=%s",acl_user->x509_subject)); - DBUG_PRINT("info",("acl_user->x509_issuer=%s",acl_user->x509_issuer)); - if(acl_user->ssl_type) { - if(!strcmp(acl_user->ssl_type,"ssl")) - global.append(" REQUIRE SSL",12); - else if(!strcmp(acl_user->ssl_type,"x509")) - { - global.append(" REQUIRE X509 ",14); - if(acl_user->x509_issuer) { - global.append("SUBJECT \"",9); - global.append(acl_user->x509_issuer,strlen(acl_user->x509_issuer)); - global.append("\"",1); - } - if(acl_user->x509_subject) { - global.append("ISSUER \"",8); - global.append(acl_user->x509_subject,strlen(acl_user->x509_subject)); - global.append("\"",1); - } - } + /* "show grants" SSL related stuff */ + if (acl_user->ssl_type == SSL_TYPE_ANY) + global.append(" REQUIRE SSL",12); + else if (acl_user->ssl_type==SSL_TYPE_X509) + global.append(" REQUIRE X509",13); + else if (acl_user->ssl_type==SSL_TYPE_SPECIFIED) + { + global.append(" REQUIRE ",9); + if (acl_user->x509_issuer) + { + if (ssl_options++) + global.append(" AND ",5); + global.append("ISSUER \"",8); + global.append(acl_user->x509_issuer,strlen(acl_user->x509_issuer)); + global.append("\"",1); + } + if (acl_user->x509_subject) + { + if (ssl_options++) + global.append(" AND ",5); + global.append("SUBJECT \"",9); + global.append(acl_user->x509_subject,strlen(acl_user->x509_subject)); + global.append("\"",1); + } + if (acl_user->ssl_cipher) + { + if (ssl_options++) + global.append(" AND ",5); + global.append("CIPHER \"",8); + global.append(acl_user->ssl_cipher,strlen(acl_user->ssl_cipher)); + global.append("\"",1); } -#endif + } +#endif /* HAVE_OPENSSL */ if (want_access & GRANT_ACL) global.append(" WITH GRANT OPTION",18); thd->packet.length(0); diff --git a/sql/sql_acl.h b/sql/sql_acl.h index cf9696d51e7..e6a39f1b269 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -59,7 +59,7 @@ void acl_reload(void); void acl_free(bool end=0); uint acl_get(const char *host, const char *ip, const char *bin_ip, const char *user, const char *db); -uint acl_getroot(const char *host, const char *ip, const char *user, +uint acl_getroot(THD *thd, const char *host, const char *ip, const char *user, const char *password,const char *scramble,char **priv_user, bool old_ver); bool acl_check_host(const char *host, const char *ip); diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 41093452984..595bee99908 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -15,7 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* Basic functions neaded by many modules */ +/* Basic functions needed by many modules */ #include "mysql_priv.h" #include "sql_acl.h" @@ -160,17 +160,19 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild) if (table) continue; if (!(*start_list = (OPEN_TABLE_LIST *) - sql_alloc(sizeof(OPEN_TABLE_LIST)+entry->key_length))) + sql_alloc(sizeof(*start_list)+entry->key_length))) { open_list=0; // Out of memory break; } - (*start_list)->table=(strmov((*start_list)->db=(char*) ((*start_list)+1), - entry->table_cache_key)+1, - entry->real_name); + strmov((*start_list)->table= + strmov(((*start_list)->db= (char*) ((*start_list)+1)), + entry->table_cache_key)+1, + entry->real_name); (*start_list)->in_use= entry->in_use ? 1 : 0; (*start_list)->locked= entry->locked_by_name ? 1 : 0; start_list= &(*start_list)->next; + *start_list=0; } VOID(pthread_mutex_unlock(&LOCK_open)); DBUG_RETURN(open_list); @@ -1579,13 +1581,7 @@ Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length, { field->query_id=thd->query_id; table->used_fields++; - if (field->part_of_key) - { - if (!(field->part_of_key & table->ref_primary_key)) - table->used_keys&=field->part_of_key; - } - else - table->used_keys=0; + table->used_keys&=field->part_of_key; } else thd->dupp_field=field; @@ -1655,7 +1651,8 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables) for (; tables ; tables=tables->next) { Field *field=find_field_in_table(thd,tables->table,name,length, - grant_option && !thd->master_access, allow_rowid); + grant_option && + !thd->master_access, allow_rowid); if (field) { if (field == WRONG_GRANT) @@ -1879,14 +1876,7 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name, if (field->query_id == thd->query_id) thd->dupp_field=field; field->query_id=thd->query_id; - - if (field->part_of_key) - { - if (!(field->part_of_key & table->ref_primary_key)) - table->used_keys&=field->part_of_key; - } - else - table->used_keys=0; + table->used_keys&=field->part_of_key; } /* All fields are used */ table->used_fields=table->fields; @@ -1954,7 +1944,6 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) // TODO: This could be optimized to use hashed names if t2 had a hash for (j=0 ; j < t2->fields ; j++) { - key_map tmp_map; if (!my_strcasecmp(t1->field[i]->field_name, t2->field[j]->field_name)) { @@ -1967,20 +1956,8 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) /* Mark field used for table cache */ t1->field[i]->query_id=t2->field[j]->query_id=thd->query_id; cond_and->list.push_back(tmp); - if ((tmp_map=t1->field[i]->part_of_key)) - { - if (!(tmp_map & t1->ref_primary_key)) - t1->used_keys&=tmp_map; - } - else - t1->used_keys=0; - if ((tmp_map=t2->field[j]->part_of_key)) - { - if (!(tmp_map & t2->ref_primary_key)) - t2->used_keys&=tmp_map; - } - else - t2->used_keys=0; + t1->used_keys&= t1->field[i]->part_of_key; + t2->used_keys&= t2->field[j]->part_of_key; break; } } diff --git a/sql/sql_class.h b/sql/sql_class.h index 0104a251f2c..b34b97b29a0 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -51,6 +51,7 @@ typedef struct st_log_info ~st_log_info() { pthread_mutex_destroy(&lock);} } LOG_INFO; +class Log_event; class MYSQL_LOG { private: diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 00ebef89fa5..8ba293c82f9 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -274,6 +274,8 @@ multi_delete::initialize_tables(JOIN *join) /* We are going to delete from this table */ walk->table=tab->table; walk=walk->next; + if (tab == join->join_tab) + tab->table->no_keyread=1; } } } @@ -309,7 +311,6 @@ bool multi_delete::send_data(List<Item> &values) continue; table->file->position(table->record[0]); - int rl = table->file->ref_length; if (secure_counter < 0) { @@ -354,6 +355,10 @@ void multi_delete::send_error(uint errcode,const char *err) { /* First send error what ever it is ... */ ::send_error(&thd->net,errcode,err); + + /* reset used flags */ + delete_tables->table->no_keyread=0; + /* If nothing deleted return */ if (!deleted) return; @@ -397,7 +402,6 @@ int multi_delete::do_deletes (bool from_send_error) table_being_deleted=table_being_deleted->next, counter++) { TABLE *table = table_being_deleted->table; - int rl = table->file->ref_length; if (tempfiles[counter]->get(table)) { error=1; @@ -453,6 +457,9 @@ bool multi_delete::send_eof() thd->proc_info="deleting from reference tables"; int error = do_deletes(false); + /* reset used flags */ + delete_tables->table->no_keyread=0; + thd->proc_info="end"; if (error && error != -1) { diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 1d2805d8e90..7a89a3d38dd 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -391,7 +391,7 @@ int write_record(TABLE *table,COPY_INFO *info) } else { - if (table->file->extra(HA_EXTRA_FLUSH_CACHE)) /* Not neaded with NISAM */ + if (table->file->extra(HA_EXTRA_FLUSH_CACHE)) /* Not needed with NISAM */ { error=my_errno; goto err; @@ -534,7 +534,7 @@ public: } ~delayed_insert() { - /* The following is not really neaded, but just for safety */ + /* The following is not really needed, but just for safety */ delayed_row *row; while ((row=rows.get())) delete row; @@ -868,6 +868,7 @@ void kill_delayed_threads(void) delayed_insert *tmp; while ((tmp=it++)) { + /* Ensure that the thread doesn't kill itself while we are looking at it */ pthread_mutex_lock(&tmp->mutex); tmp->thd.killed=1; if (tmp->thd.mysys_var) @@ -875,9 +876,15 @@ void kill_delayed_threads(void) pthread_mutex_lock(&tmp->thd.mysys_var->mutex); if (tmp->thd.mysys_var->current_cond) { - pthread_mutex_lock(tmp->thd.mysys_var->current_mutex); + /* + We need the following test because the main mutex may be locked + in handle_delayed_insert() + */ + if (&tmp->mutex != tmp->thd.mysys_var->current_mutex) + pthread_mutex_lock(tmp->thd.mysys_var->current_mutex); pthread_cond_broadcast(tmp->thd.mysys_var->current_cond); - pthread_mutex_unlock(tmp->thd.mysys_var->current_mutex); + if (&tmp->mutex != tmp->thd.mysys_var->current_mutex) + pthread_mutex_unlock(tmp->thd.mysys_var->current_mutex); } pthread_mutex_unlock(&tmp->thd.mysys_var->mutex); } diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 4d2441da246..6ccb0a6b059 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -22,7 +22,7 @@ class Table_ident; class sql_exchange; class LEX_COLUMN; -// The following hack is neaded because mysql_yacc.cc does not define +// The following hack is needed because mysql_yacc.cc does not define // YYSTYPE before including this file #ifdef MYSQL_YACC @@ -56,7 +56,7 @@ enum enum_sql_command { SQLCOM_SHOW_OPEN_TABLES, SQLCOM_LOAD_MASTER_DATA, SQLCOM_HA_OPEN, SQLCOM_HA_CLOSE, SQLCOM_HA_READ, SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_MULTI_DELETE, - SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER, + SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER }; enum lex_states { STATE_START, STATE_CHAR, STATE_IDENT, @@ -145,6 +145,8 @@ typedef struct st_lex { char *length,*dec,*change,*name; char *backup_dir; /* For RESTORE/BACKUP */ char* to_log; /* For PURGE MASTER LOGS TO */ + char* x509_subject,*x509_issuer,*ssl_cipher; + enum SSL_type ssl_type; /* defined in violite.h */ String *wild; sql_exchange *exchange; diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index c6e23eb927a..cdf6cb8e7f1 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -115,7 +115,7 @@ static bool check_user(THD *thd,enum_server_command command, const char *user, send_error(net,ER_OUT_OF_RESOURCES); return 1; } - thd->master_access=acl_getroot(thd->host, thd->ip, thd->user, + thd->master_access=acl_getroot(thd, thd->host, thd->ip, thd->user, passwd, thd->scramble, &thd->priv_user, protocol_version == 9 || !(thd->client_capabilities & @@ -433,7 +433,7 @@ check_connections(THD *thd) DBUG_PRINT("info", ("Agreed to change IO layer to SSL") ); /* Do the SSL layering. */ DBUG_PRINT("info", ("IO layer change in progress...")); - sslaccept(ssl_acceptor_fd, net->vio); + sslaccept(ssl_acceptor_fd, net->vio, (long)60L); DBUG_PRINT("info", ("Reading user information over SSL layer")); if ((pkt_len=my_net_read(net)) == packet_error || pkt_len < NORMAL_HANDSHAKE_SIZE) @@ -633,6 +633,7 @@ pthread_handler_decl(handle_bootstrap,arg) length--; buff[length]=0; thd->current_tablenr=0; + thd->query_length=length; thd->query= thd->memdup(buff,length+1); thd->query_id=query_id++; mysql_parse(thd,thd->query,length); @@ -692,19 +693,18 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd) thd->free_list = 0; thd->query = tbl_name; - if((error = mysqld_dump_create_info(thd, table, -1))) - { - my_error(ER_GET_ERRNO, MYF(0)); - goto err; - } + thd->query_length=strlen(tbl_name); + if ((error = mysqld_dump_create_info(thd, table, -1))) + { + my_error(ER_GET_ERRNO, MYF(0)); + goto err; + } net_flush(&thd->net); if ((error = table->file->dump(thd,fd))) my_error(ER_GET_ERRNO, MYF(0)); err: - close_thread_tables(thd); - DBUG_RETURN(error); } @@ -855,7 +855,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, DBUG_PRINT("info",("query ready")); break; } - case COM_FIELD_LIST: // This isn't actually neaded + case COM_FIELD_LIST: // This isn't actually needed #ifdef DONT_ALLOW_SHOW_COMMANDS send_error(&thd->net,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */ break; @@ -872,6 +872,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, thd->free_list=0; table_list.name=table_list.real_name=thd->strdup(packet); thd->query=fields=thd->strdup(strend(packet)+1); + thd->query_length=strlen(thd->query); mysql_log.write(thd,command,"%s %s",table_list.real_name,fields); remove_escape(table_list.real_name); // This can't have wildcards @@ -2052,9 +2053,9 @@ mysql_execute_command(void) goto error; res = mysql_table_grant(thd,tables,lex->users_list, lex->columns, lex->grant, lex->sql_command == SQLCOM_REVOKE); - if(!res) + if (!res) { - mysql_update_log.write(thd, thd->query,thd->query_length); + mysql_update_log.write(thd, thd->query, thd->query_length); if (mysql_bin_log.is_open()) { Query_log_event qinfo(thd, thd->query); @@ -2074,7 +2075,7 @@ mysql_execute_command(void) lex->sql_command == SQLCOM_REVOKE); if (!res) { - mysql_update_log.write(thd, thd->query,thd->query_length); + mysql_update_log.write(thd, thd->query, thd->query_length); if (mysql_bin_log.is_open()) { Query_log_event qinfo(thd, thd->query); @@ -2390,7 +2391,7 @@ bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, int *yystacksize) /**************************************************************************** - Initialize global thd variables neaded for query + Initialize global thd variables needed for query ****************************************************************************/ static void @@ -3051,7 +3052,7 @@ static void refresh_status(void) static bool append_file_to_dir(char **filename_ptr, char *table_name) { - char buff[FN_REFLEN],*ptr; + char buff[FN_REFLEN],*ptr, *end; if (!*filename_ptr) return 0; // nothing to do @@ -3064,8 +3065,8 @@ static bool append_file_to_dir(char **filename_ptr, char *table_name) } /* Fix is using unix filename format on dos */ strmov(buff,*filename_ptr); - convert_dirname(buff); - if (!(ptr=sql_alloc(strlen(buff)+strlen(table_name)+1))) + end=convert_dirname(buff, *filename_ptr, NullS); + if (!(ptr=sql_alloc((uint) (end-buff)+strlen(table_name)+1))) return 1; // End of memory *filename_ptr=ptr; strxmov(ptr,buff,table_name,NullS); diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index f274d1ff91e..6123ecfea91 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1623,6 +1623,7 @@ int log_loaded_block(IO_CACHE* file) block_len); mysql_bin_log.write(&c); lf_info->wrote_create_file = 1; + DBUG_SYNC_POINT("debug_lock.created_file_event",10); } return 0; } diff --git a/sql/sql_select.cc b/sql/sql_select.cc index cc77f6bcd04..e31b5c029e4 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -107,7 +107,6 @@ static uint find_shortest_key(TABLE *table, key_map usable_keys); static bool test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order, ha_rows select_limit, bool no_changes); static int create_sort_index(JOIN_TAB *tab,ORDER *order,ha_rows select_limit); -static bool fix_having(JOIN *join, Item **having); static int remove_duplicates(JOIN *join,TABLE *entry,List<Item> &fields, Item *having); static int remove_dup_with_compare(THD *thd, TABLE *entry, Field **field, @@ -2332,7 +2331,20 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) { JOIN_TAB *tab=join->join_tab+i; table_map current_map= tab->table->map; + bool use_quick_range=0; used_tables|=current_map; + + if (tab->type == JT_REF && tab->quick && + tab->ref.key_length < tab->quick->max_used_key_length) + { + /* Range uses longer key; Use this instead of ref on key */ + tab->type=JT_ALL; + use_quick_range=1; + tab->use_quick=1; + tab->ref.key_parts=0; // Don't use ref key. + join->best_positions[i].records_read=tab->quick->records; + } + COND *tmp=make_cond_for_table(cond,used_tables,current_map); if (!tmp && tab->quick) { // Outer join @@ -2375,7 +2387,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) if (tab->const_keys && tab->table->reginfo.impossible_range) DBUG_RETURN(1); } - else if (tab->type == JT_ALL) + else if (tab->type == JT_ALL && ! use_quick_range) { if (tab->const_keys && tab->table->reginfo.impossible_range) @@ -2434,15 +2446,6 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) } } } - if (tab->type == JT_REF && sel->quick && - tab->ref.key_length < sel->quick->max_used_key_length) - { - /* Range uses longer key; Use this instead of ref on key */ - tab->type=JT_ALL; - tab->use_quick=1; - tab->ref.key_parts=0; // Don't use ref key. - join->best_positions[i].records_read=sel->quick->records; - } } } } @@ -2486,7 +2489,8 @@ make_join_readinfo(JOIN *join,uint options) table->file->index_init(tab->ref.key); tab->read_first_record= join_read_key; tab->read_record.read_record= join_no_more_records; - if (table->used_keys & ((key_map) 1 << tab->ref.key)) + if (table->used_keys & ((key_map) 1 << tab->ref.key) && + !table->no_keyread) { table->key_read=1; table->file->extra(HA_EXTRA_KEYREAD); @@ -2504,7 +2508,8 @@ make_join_readinfo(JOIN *join,uint options) table->file->index_init(tab->ref.key); tab->read_first_record= join_read_always_key; tab->read_record.read_record= join_read_next; - if (table->used_keys & ((key_map) 1 << tab->ref.key)) + if (table->used_keys & ((key_map) 1 << tab->ref.key) && + !table->no_keyread) { table->key_read=1; table->file->extra(HA_EXTRA_KEYREAD); @@ -2565,18 +2570,21 @@ make_join_readinfo(JOIN *join,uint options) statistic_increment(select_full_join_count, &LOCK_status); } } - if (tab->select && tab->select->quick && - table->used_keys & ((key_map) 1 << tab->select->quick->index)) + if (!table->no_keyread) { - table->key_read=1; - table->file->extra(HA_EXTRA_KEYREAD); - } - else if (table->used_keys && ! (tab->select && tab->select->quick)) - { // Only read index tree - tab->index=find_shortest_key(table, table->used_keys); - tab->table->file->index_init(tab->index); - tab->read_first_record= join_init_read_first_with_key; - tab->type=JT_NEXT; // Read with index_first / index_next + if (tab->select && tab->select->quick && + table->used_keys & ((key_map) 1 << tab->select->quick->index)) + { + table->key_read=1; + table->file->extra(HA_EXTRA_KEYREAD); + } + else if (table->used_keys && ! (tab->select && tab->select->quick)) + { // Only read index tree + tab->index=find_shortest_key(table, table->used_keys); + tab->table->file->index_init(tab->index); + tab->read_first_record= join_init_read_first_with_key; + tab->type=JT_NEXT; // Read with index_first / index_next + } } } break; @@ -2637,7 +2645,8 @@ join_free(JOIN *join) } join->group_fields.delete_elements(); join->tmp_table_param.copy_funcs.delete_elements(); - delete [] join->tmp_table_param.copy_field; + if (join->tmp_table_param.copy_field) // Because of bug in ecc + delete [] join->tmp_table_param.copy_field; join->tmp_table_param.copy_field=0; DBUG_VOID_RETURN; } @@ -3306,7 +3315,7 @@ Field *create_tmp_field(TABLE *table,Item *item, Item::Type type, item->name,table,item_sum->decimals); case INT_RESULT: return new Field_longlong(item_sum->max_length,maybe_null, - item->name,table); + item->name,table,item->unsigned_flag); case STRING_RESULT: if (item_sum->max_length > 255) return new Field_blob(item_sum->max_length,maybe_null, @@ -3357,7 +3366,7 @@ Field *create_tmp_field(TABLE *table,Item *item, Item::Type type, break; case INT_RESULT: new_field=new Field_longlong(item->max_length,maybe_null, - item->name,table); + item->name,table, item->unsigned_flag); break; case STRING_RESULT: if (item->max_length > 255) @@ -4553,7 +4562,8 @@ join_init_read_first_with_key(JOIN_TAB *tab) { int error; TABLE *table=tab->table; - if (!table->key_read && (table->used_keys & ((key_map) 1 << tab->index))) + if (!table->key_read && (table->used_keys & ((key_map) 1 << tab->index)) && + !table->no_keyread) { table->key_read=1; table->file->extra(HA_EXTRA_KEYREAD); @@ -5439,39 +5449,6 @@ err: DBUG_RETURN(-1); } - -/* -** Add the HAVING criteria to table->select -*/ - -static bool fix_having(JOIN *join, Item **having) -{ - (*having)->update_used_tables(); // Some tables may have been const - JOIN_TAB *table=&join->join_tab[join->const_tables]; - table_map used_tables= join->const_table_map | table->table->map; - - Item* sort_table_cond=make_cond_for_table(*having,used_tables,used_tables); - if (sort_table_cond) - { - if (!table->select) - if (!(table->select=new SQL_SELECT)) - return 1; - if (!table->select->cond) - table->select->cond=sort_table_cond; - else // This should never happen - if (!(table->select->cond=new Item_cond_and(table->select->cond, - sort_table_cond))) - return 1; - table->select_cond=table->select->cond; - DBUG_EXECUTE("where",print_where(table->select_cond, - "select and having");); - *having=make_cond_for_table(*having,~ (table_map) 0,~used_tables); - DBUG_EXECUTE("where",print_where(*having,"having after make_cond");); - } - return 0; -} - - /***************************************************************************** ** Remove duplicates from tmp table ** This should be recoded to add a uniuqe index to the table and remove @@ -6419,7 +6396,7 @@ setup_copy_fields(TMP_TABLE_PARAM *param,List<Item> &fields) DBUG_ENTER("setup_copy_fields"); if (!(copy=param->copy_field= new Copy_field[param->field_count])) - goto err; + goto err2; param->copy_funcs.empty(); while ((pos=li++)) @@ -6468,8 +6445,9 @@ setup_copy_fields(TMP_TABLE_PARAM *param,List<Item> &fields) DBUG_RETURN(0); err: - delete [] param->copy_field; + delete [] param->copy_field; // This is never 0 param->copy_field=0; +err2: DBUG_RETURN(TRUE); } diff --git a/sql/sql_show.cc b/sql/sql_show.cc index b51e9ab5a73..5a9777e24a4 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -17,7 +17,6 @@ /* Function with list databases, tables or fields */ -#include "my_global.h" #include "mysql_priv.h" #include "sql_select.h" // For select_describe #include "sql_acl.h" @@ -391,7 +390,7 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild) if (table->db_create_options & HA_OPTION_DELAY_KEY_WRITE) ptr=strmov(ptr," delay_key_write=1"); if (table->row_type != ROW_TYPE_DEFAULT) - ptr=strxmov(ptr, " format=", ha_row_type[(uint) table->row_type], + ptr=strxmov(ptr, " row_format=", ha_row_type[(uint) table->row_type], NullS); if (file->raid_type) { @@ -760,17 +759,16 @@ mysqld_dump_create_info(THD *thd, TABLE *table, int fd) convert->convert((char*) packet->ptr(), packet->length()); if (fd < 0) { - if(my_net_write(&thd->net, (char*)packet->ptr(), packet->length())) + if (my_net_write(&thd->net, (char*)packet->ptr(), packet->length())) DBUG_RETURN(-1); VOID(net_flush(&thd->net)); } else { - if(my_write(fd, (const byte*) packet->ptr(), packet->length(), - MYF(MY_WME))) + if (my_write(fd, (const byte*) packet->ptr(), packet->length(), + MYF(MY_WME))) DBUG_RETURN(-1); } - DBUG_RETURN(0); } @@ -920,6 +918,12 @@ store_create_info(THD *thd, TABLE *table, String *packet) p = longlong10_to_str(table->max_rows, buff, 10); packet->append(buff, (uint) (p - buff)); } + if (table->avg_row_length) + { + packet->append(" AVG_ROW_LENGTH="); + p=longlong10_to_str(table->avg_row_length, buff,10); + packet->append(buff, (uint) (p - buff)); + } if (table->db_create_options & HA_OPTION_PACK_KEYS) packet->append(" PACK_KEYS=1", 12); @@ -929,6 +933,11 @@ store_create_info(THD *thd, TABLE *table, String *packet) packet->append(" CHECKSUM=1", 11); if (table->db_create_options & HA_OPTION_DELAY_KEY_WRITE) packet->append(" DELAY_KEY_WRITE=1",18); + if (table->row_type != ROW_TYPE_DEFAULT) + { + packet->append(" ROW_FORMAT=",12); + packet->append(ha_row_type[(uint) table->row_type]); + } table->file->append_create_info(packet); if (table->comment && table->comment[0]) { @@ -1174,18 +1183,46 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables) net_store_data(&packet2,(uint32) SSL_CTX_sess_accept_good(ssl_acceptor_fd->ssl_context_)); break; + case SHOW_SSL_CTX_SESS_CONNECT_GOOD: + net_store_data(&packet2,(uint32) + SSL_CTX_sess_connect_good(ssl_acceptor_fd->ssl_context_)); + break; case SHOW_SSL_CTX_SESS_ACCEPT_RENEGOTIATE: net_store_data(&packet2,(uint32) SSL_CTX_sess_accept_renegotiate(ssl_acceptor_fd->ssl_context_)); break; + case SHOW_SSL_CTX_SESS_CONNECT_RENEGOTIATE: + net_store_data(&packet2,(uint32) + SSL_CTX_sess_connect_renegotiate(ssl_acceptor_fd->ssl_context_)); + break; case SHOW_SSL_CTX_SESS_CB_HITS: net_store_data(&packet2,(uint32) SSL_CTX_sess_cb_hits(ssl_acceptor_fd->ssl_context_)); break; + case SHOW_SSL_CTX_SESS_HITS: + net_store_data(&packet2,(uint32) + SSL_CTX_sess_hits(ssl_acceptor_fd->ssl_context_)); + break; + case SHOW_SSL_CTX_SESS_CACHE_FULL: + net_store_data(&packet2,(uint32) + SSL_CTX_sess_cache_full(ssl_acceptor_fd->ssl_context_)); + break; + case SHOW_SSL_CTX_SESS_MISSES: + net_store_data(&packet2,(uint32) + SSL_CTX_sess_misses(ssl_acceptor_fd->ssl_context_)); + break; + case SHOW_SSL_CTX_SESS_TIMEOUTS: + net_store_data(&packet2,(uint32) + SSL_CTX_sess_timeouts(ssl_acceptor_fd->ssl_context_)); + break; case SHOW_SSL_CTX_SESS_NUMBER: net_store_data(&packet2,(uint32) SSL_CTX_sess_number(ssl_acceptor_fd->ssl_context_)); break; + case SHOW_SSL_CTX_SESS_CONNECT: + net_store_data(&packet2,(uint32) + SSL_CTX_sess_connect(ssl_acceptor_fd->ssl_context_)); + break; case SHOW_SSL_CTX_SESS_GET_CACHE_SIZE: net_store_data(&packet2,(uint32) SSL_CTX_sess_get_cache_size(ssl_acceptor_fd->ssl_context_)); @@ -1247,6 +1284,23 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables) break; case SHOW_SSL_GET_CIPHER: net_store_data(&packet2, thd->net.vio->ssl_ ? SSL_get_cipher(thd->net.vio->ssl_) : ""); + case SHOW_SSL_GET_CIPHER_LIST: + if(thd->net.vio->ssl_) + { + char buf[1024]=""; + for (int i=0; ; i++) + { + const char *p=SSL_get_cipher_list(thd->net.vio->ssl_,i); + if (p == NULL) + break; + if (i != 0) + strcat(buf,":"); + strcat(buf,p); + DBUG_PRINT("info",("cipher to add: %s,%s",p,buf)); + } + net_store_data(&packet2, buf); + } else + net_store_data(&packet2, ""); break; #endif /* HAVE_OPENSSL */ diff --git a/sql/sql_table.cc b/sql/sql_table.cc index ad9bf532268..99c2b837480 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -841,7 +841,8 @@ static int prepare_for_restore(THD* thd, TABLE_LIST* table) char* table_name = table->name; char* db = thd->db ? thd->db : table->db; - if (!fn_format(src_path, table_name, backup_dir, reg_ext, 4 + 64)) + if (fn_format_relative_to_data_home(src_path, table_name, backup_dir, + reg_ext)) DBUG_RETURN(-1); // protect buffer overflow sprintf(dst_path, "%s/%s/%s", mysql_real_data_home, db, table_name); @@ -850,9 +851,8 @@ static int prepare_for_restore(THD* thd, TABLE_LIST* table) DBUG_RETURN(-1); if (my_copy(src_path, - fn_format(dst_path, dst_path,"", - reg_ext, 4), - MYF(MY_WME))) + fn_format(dst_path, dst_path,"", reg_ext, 4), + MYF(MY_WME))) { unlock_table_name(thd, table); DBUG_RETURN(send_check_errmsg(thd, table, "restore", @@ -1110,7 +1110,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, bool use_timestamp=0; ha_rows copied,deleted; ulonglong next_insert_id; - uint save_time_stamp,db_create_options; + uint save_time_stamp,db_create_options, used_fields; enum db_type old_db_type,new_db_type; DBUG_ENTER("mysql_alter_table"); @@ -1119,6 +1119,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, db=table_list->db; if (!new_db) new_db=db; + used_fields=create_info->used_fields; if (!(table=open_ltable(thd,table_list,TL_WRITE_ALLOW_READ))) DBUG_RETURN(-1); @@ -1164,7 +1165,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, if (create_info->db_type == DB_TYPE_DEFAULT) create_info->db_type=old_db_type; new_db_type=create_info->db_type= ha_checktype(create_info->db_type); - if (create_info->row_type == ROW_TYPE_DEFAULT) + if (create_info->row_type == ROW_TYPE_NOT_USED) create_info->row_type=table->row_type; /* In some simple cases we need not to recreate the table */ @@ -1252,7 +1253,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, { /* Reset auto_increment value if it was dropped */ if (MTYP_TYPENR(field->unireg_check) == Field::NEXT_NUMBER && - !(create_info->used_fields & HA_CREATE_USED_AUTO)) + !(used_fields & HA_CREATE_USED_AUTO)) { create_info->auto_increment_value=0; create_info->used_fields|=HA_CREATE_USED_AUTO; @@ -1438,20 +1439,25 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, goto err; } + db_create_options=table->db_create_options & ~(HA_OPTION_PACK_RECORD); (void) sprintf(tmp_name,"%s-%lx_%lx", tmp_file_prefix, current_pid, thd->thread_id); create_info->db_type=new_db_type; - if (!create_info->max_rows) - create_info->max_rows=table->max_rows; - if (!create_info->avg_row_length) - create_info->avg_row_length=table->avg_row_length; - table->file->update_create_info(create_info); if (!create_info->comment) create_info->comment=table->comment; + /* let new create options override the old ones */ - db_create_options=table->db_create_options & ~(HA_OPTION_PACK_RECORD); - if (create_info->table_options & - (HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS)) + if (!(used_fields & HA_CREATE_USED_MIN_ROWS)) + create_info->min_rows=table->min_rows; + if (!(used_fields & HA_CREATE_USED_MAX_ROWS)) + create_info->max_rows=table->max_rows; + if (!(used_fields & HA_CREATE_USED_AVG_ROW_LENGTH)) + create_info->avg_row_length=table->avg_row_length; + + table->file->update_create_info(create_info); + if ((create_info->table_options & + (HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS)) || + (used_fields & HA_CREATE_USED_PACK_KEYS)) db_create_options&= ~(HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS); if (create_info->table_options & (HA_OPTION_CHECKSUM | HA_OPTION_NO_CHECKSUM)) @@ -1808,7 +1814,7 @@ copy_data_between_tables(TABLE *from,TABLE *to, } end_read_record(&info); free_io_cache(from); - delete [] copy; + delete [] copy; // This is never 0 uint tmp_error; if ((tmp_error=to->file->extra(HA_EXTRA_NO_CACHE))) { diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 5dd897ee826..c0ec6c81575 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -31,7 +31,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) ORDER *order; List<Item> item_list; TABLE *table; - TABLE_LIST *first_table, result_table_list; + TABLE_LIST result_table_list; TMP_TABLE_PARAM tmp_table_param; select_union *union_result; int res; @@ -75,9 +75,9 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) { Item *item; List_iterator<Item> it(lex->select_lex.item_list); + TABLE_LIST *first_table= (TABLE_LIST*) lex->select_lex.table_list.first; /* Create a list of items that will be in the result set */ - first_table= (TABLE_LIST*) lex->select_lex.table_list.first; while ((item= it++)) if (item_list.push_back(item)) DBUG_RETURN(-1); diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 3983f3b726c..8960f391f26 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -27,6 +27,7 @@ #include "sql_acl.h" #include "lex_symbol.h" #include <myisam.h> +#include <myisammrg.h> extern void yyerror(const char*); int yylex(void *yylval); @@ -98,7 +99,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token MIN_SYM %token SUM_SYM %token STD_SYM - +%token ABORT_SYM %token ADD %token ALTER %token AFTER_SYM @@ -134,7 +135,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token BINLOG_SYM %token EVENTS_SYM -%token ABORT_SYM %token ACTION %token AGGREGATE_SYM %token ALL @@ -286,6 +286,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token SERIALIZABLE_SYM %token SESSION_SYM %token SHUTDOWN +%token SSL_SYM %token STARTING %token STATUS_SYM %token STRAIGHT_JOIN @@ -317,6 +318,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token WHERE %token WITH %token WRITE_SYM +%token X509_SYM %token COMPRESSED_SYM %token BIGINT @@ -392,6 +394,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token IDENTIFIED_SYM %token IF %token INSERT_ID +%token INSERT_METHOD %token INTERVAL_SYM %token LAST_INSERT_ID %token LEFT @@ -451,6 +454,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token SQL_QUOTE_SHOW_CREATE %token SQL_SLAVE_SKIP_COUNTER +%token ISSUER_SYM +%token SUBJECT_SYM +%token CIPHER_SYM + %left SET_VAR %left OR_OR_CONCAT OR %left AND @@ -488,7 +495,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); table_option opt_if_not_exists %type <ulong_num> - ULONG_NUM raid_types + ULONG_NUM raid_types merge_insert_types %type <ulonglong_number> ulonglong_num @@ -768,13 +775,14 @@ create_table_options: create_table_option: TYPE_SYM EQ table_types { Lex->create_info.db_type= $3; } - | MAX_ROWS EQ ulonglong_num { Lex->create_info.max_rows= $3; } - | MIN_ROWS EQ ulonglong_num { Lex->create_info.min_rows= $3; } - | AVG_ROW_LENGTH EQ ULONG_NUM { Lex->create_info.avg_row_length=$3; } + | MAX_ROWS EQ ulonglong_num { Lex->create_info.max_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;} + | MIN_ROWS EQ ulonglong_num { Lex->create_info.min_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;} + | AVG_ROW_LENGTH EQ ULONG_NUM { Lex->create_info.avg_row_length=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;} | PASSWORD EQ TEXT_STRING { Lex->create_info.password=$3.str; } | COMMENT_SYM EQ TEXT_STRING { Lex->create_info.comment=$3.str; } | AUTO_INC EQ ulonglong_num { Lex->create_info.auto_increment_value=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;} - | PACK_KEYS_SYM EQ ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_PACK_KEYS : HA_OPTION_NO_PACK_KEYS; } + | PACK_KEYS_SYM EQ ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_PACK_KEYS : HA_OPTION_NO_PACK_KEYS; Lex->create_info.used_fields|= HA_CREATE_USED_PACK_KEYS;} + | PACK_KEYS_SYM EQ DEFAULT { Lex->create_info.table_options&= ~(HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS); Lex->create_info.used_fields|= HA_CREATE_USED_PACK_KEYS;} | CHECKSUM_SYM EQ ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM; } | DELAY_KEY_WRITE_SYM EQ ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_DELAY_KEY_WRITE : HA_OPTION_NO_DELAY_KEY_WRITE; } | ROW_FORMAT_SYM EQ row_types { Lex->create_info.row_type= $3; } @@ -794,6 +802,7 @@ create_table_option: table_list->next=0; lex->create_info.used_fields|= HA_CREATE_USED_UNION; } + | INSERT_METHOD EQ merge_insert_types { Lex->create_info.merge_insert_method= $3; Lex->create_info.used_fields|= HA_CREATE_USED_INSERT_METHOD;} | DATA_SYM DIRECTORY_SYM EQ TEXT_STRING { Lex->create_info.data_file_name= $4.str; } | INDEX DIRECTORY_SYM EQ TEXT_STRING { Lex->create_info.index_file_name= $4.str; } @@ -817,6 +826,11 @@ raid_types: | RAID_0_SYM { $$= RAID_TYPE_0; } | ULONG_NUM { $$=$1;} +merge_insert_types: + NO_SYM { $$= MERGE_INSERT_DISABLED; } + | FIRST_SYM { $$= MERGE_INSERT_TO_FIRST; } + | LAST_SYM { $$= MERGE_INSERT_TO_LAST; } + opt_select_from: /* empty */ | select_from select_lock_type @@ -1106,6 +1120,7 @@ alter: lex->select->db=lex->name=0; bzero((char*) &lex->create_info,sizeof(lex->create_info)); lex->create_info.db_type= DB_TYPE_DEFAULT; + lex->create_info.row_type= ROW_TYPE_NOT_USED; lex->alter_keys_onoff=LEAVE_AS_IS; lex->simple_alter=1; } @@ -2825,6 +2840,7 @@ keyword: | CHANGED {} | CHECKSUM_SYM {} | CHECK_SYM {} + | CIPHER_SYM {} | CLOSE_SYM {} | COMMENT_SYM {} | COMMIT_SYM {} @@ -2862,7 +2878,9 @@ keyword: | INDEXES {} | ISOLATION {} | ISAM_SYM {} + | ISSUER_SYM {} | INNOBASE_SYM {} + | INSERT_METHOD {} | LAST_SYM {} | LEVEL_SYM {} | LOCAL_SYM {} @@ -2888,6 +2906,7 @@ keyword: | NATIONAL_SYM {} | NCHAR_SYM {} | NEXT_SYM {} + | NEW_SYM {} | NO_SYM {} | OPEN_SYM {} | PACK_KEYS_SYM {} @@ -2915,10 +2934,12 @@ keyword: | SESSION_SYM {} | SHARE_SYM {} | SHUTDOWN {} + | SLAVE {} | START_SYM {} | STATUS_SYM {} | STOP_SYM {} | STRING_SYM {} + | SUBJECT_SYM {} | TEMPORARY {} | TEXT_SYM {} | TRANSACTION_SYM {} @@ -3135,8 +3156,8 @@ set_isolation: } | SESSION_SYM tx_isolation { - LEX *lex=Lex; - lex->thd->session_tx_isolation= lex->tx_isolation= $2; + LEX *lex=Lex; + lex->thd->session_tx_isolation= lex->tx_isolation= $2; } | tx_isolation { Lex->tx_isolation= $1; } @@ -3257,9 +3278,11 @@ grant: lex->columns.empty(); lex->grant= lex->grant_tot_col=0; lex->select->db=0; + lex->ssl_type=SSL_TYPE_NONE; + lex->ssl_cipher=lex->x509_subject=lex->x509_issuer=0; } grant_privileges ON opt_table TO_SYM user_list - grant_option + require_clause grant_option grant_privileges: grant_privilege_list {} @@ -3293,6 +3316,40 @@ grant_privilege: | FILE_SYM { Lex->grant |= FILE_ACL;} | GRANT OPTION { Lex->grant |= GRANT_ACL;} +require_list: require_list_element AND require_list +| require_list_element + +require_list_element: SUBJECT_SYM TEXT_STRING + { + LEX *lex=Lex; + if (lex->x509_subject) + { + net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "SUBJECT"); + YYABORT; + } + lex->x509_subject=$2.str; + } + | ISSUER_SYM TEXT_STRING + { + LEX *lex=Lex; + if (lex->x509_issuer) + { + net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "ISSUER"); + YYABORT; + } + lex->x509_issuer=$2.str; + } + | CIPHER_SYM TEXT_STRING + { + LEX *lex=Lex; + if (lex->ssl_cipher) + { + net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "CHIPER"); + YYABORT; + } + lex->ssl_cipher=$2.str; + } + opt_table: '*' { @@ -3399,16 +3456,18 @@ column_list_id: require_clause: /* empty */ - | REQUIRE_SYM require_list { /* do magic */} - -require_list: require_list_element AND require_list - { /* do magic */} - | require_list_element {/*do magic*/} - -require_list_element: SUBJECT_SYM TEXT_STRING - | ISSUER TEXT_STRING - | CIPHER TEXT_STRING - + | REQUIRE_SYM require_list + { + Lex->ssl_type=SSL_TYPE_SPECIFIED; + } + | REQUIRE_SYM SSL_SYM + { + Lex->ssl_type=SSL_TYPE_ANY; + } + | REQUIRE_SYM X509_SYM + { + Lex->ssl_type=SSL_TYPE_X509; + } grant_option: /* empty */ {} @@ -3444,7 +3503,7 @@ union_list: if (lex->exchange) { /* Only the last SELECT can have INTO...... */ - net_printf(¤t_thd->net, ER_WRONG_USAGE,"UNION","INTO"); + net_printf(&lex->thd->net, ER_WRONG_USAGE,"UNION","INTO"); YYABORT; } mysql_new_select(lex); diff --git a/sql/structs.h b/sql/structs.h index 12ba5004a2e..2f6f850bc9e 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -134,7 +134,11 @@ enum SHOW_TYPE { SHOW_LONG,SHOW_CHAR,SHOW_INT,SHOW_CHAR_PTR,SHOW_BOOL, ,SHOW_SSL_CTX_SESS_GET_CACHE_SIZE, SHOW_SSL_GET_CIPHER ,SHOW_SSL_GET_DEFAULT_TIMEOUT, SHOW_SSL_GET_VERIFY_MODE ,SHOW_SSL_CTX_GET_VERIFY_MODE, SHOW_SSL_GET_VERIFY_DEPTH - ,SHOW_SSL_CTX_GET_VERIFY_DEPTH + ,SHOW_SSL_CTX_GET_VERIFY_DEPTH, SHOW_SSL_CTX_SESS_CONNECT + ,SHOW_SSL_CTX_SESS_CONNECT_RENEGOTIATE, SHOW_SSL_CTX_SESS_CONNECT_GOOD + ,SHOW_SSL_CTX_SESS_HITS, SHOW_SSL_CTX_SESS_MISSES + ,SHOW_SSL_CTX_SESS_TIMEOUTS, SHOW_SSL_CTX_SESS_CACHE_FULL + ,SHOW_SSL_GET_CIPHER_LIST #endif /* HAVE_OPENSSL */ }; @@ -170,7 +174,7 @@ typedef struct st_lex_user { /* Bits in form->status */ #define STATUS_NO_RECORD (1+2) /* Record isn't usably */ #define STATUS_GARBAGE 1 -#define STATUS_NOT_FOUND 2 /* No record in database when neaded */ +#define STATUS_NOT_FOUND 2 /* No record in database when needed */ #define STATUS_NO_PARENT 4 /* Parent record wasn't found */ #define STATUS_NOT_READ 8 /* Record isn't read */ #define STATUS_UPDATED 16 /* Record is updated by formula */ diff --git a/sql/table.cc b/sql/table.cc index eed4170c14a..1ed856f7854 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -455,8 +455,12 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, if (key == primary_key) { field->flags|= PRI_KEY_FLAG; + /* + If this field is part of the primary key and all keys contains + the primary key, then we can use any key to find this column + */ if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX) - field->part_of_key|= ((key_map) 1 << primary_key); + field->part_of_key= outparam->keys_in_use; } if (field->key_length() != key_part->length) { @@ -480,8 +484,6 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag, (outparam->keys_in_use & ((key_map) 1 << primary_key))) { outparam->primary_key=primary_key; - if (outparam->file->option_flag() & HA_PRIMARY_KEY_IN_READ_INDEX) - outparam->ref_primary_key= (key_map) 1 << primary_key; /* If we are using an integer as the primary key then allow the user to refer to it as '_rowid' @@ -996,6 +998,7 @@ File create_frm(register my_string name, uint reclength, uchar *fileinfo, void update_create_info_from_table(HA_CREATE_INFO *create_info, TABLE *table) { + DBUG_ENTER("update_create_info_from_table"); create_info->max_rows=table->max_rows; create_info->min_rows=table->min_rows; create_info->table_options=table->db_create_options; @@ -1004,6 +1007,7 @@ void update_create_info_from_table(HA_CREATE_INFO *create_info, TABLE *table) create_info->raid_type=table->raid_type; create_info->raid_chunks=table->raid_chunks; create_info->raid_chunksize=table->raid_chunksize; + DBUG_VOID_RETURN; } int diff --git a/sql/table.h b/sql/table.h index 5d50851259d..071c447e660 100644 --- a/sql/table.h +++ b/sql/table.h @@ -97,6 +97,7 @@ struct st_table { my_bool locked_by_name; my_bool crashed; my_bool is_view; + my_bool no_keyread; Field *next_number_field, /* Set if next_number is activated */ *found_next_number_field, /* Set on open */ *rowid_field; @@ -117,7 +118,7 @@ struct st_table { byte *record_pointers; /* If sorted in memory */ ha_rows found_records; /* How many records in sort */ ORDER *group; - key_map quick_keys, used_keys, ref_primary_key; + key_map quick_keys, used_keys; ha_rows quick_rows[MAX_KEY]; uint quick_key_parts[MAX_KEY]; key_part_map const_key_parts[MAX_KEY]; diff --git a/sql/time.cc b/sql/time.cc index d1e0aee0fa4..440cba457f4 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -24,7 +24,7 @@ static ulong const days_at_timestart=719528; /* daynr at 1970.01.01 */ uchar *days_in_month= (uchar*) "\037\034\037\036\037\036\037\037\036\037\036\037"; - /* Init some variabels neaded when using my_local_time */ + /* Init some variabels needed when using my_local_time */ /* Currently only my_time_zone is inited */ static long my_time_zone=0; diff --git a/sql/udf_example.cc b/sql/udf_example.cc index 3a528a9ad3a..44a1d00437a 100644 --- a/sql/udf_example.cc +++ b/sql/udf_example.cc @@ -66,7 +66,7 @@ ** You can easily get all switches right by doing: ** cd sql ; make udf_example.o ** Take the compile line that make writes, remove the '-c' near the end of -** the line and add -o udf_example.so to the end of the compile line. +** the line and add -shared -o udf_example.so to the end of the compile line. ** The resulting library (udf_example.so) should be copied to some dir ** searched by ld. (/usr/lib ?) ** @@ -97,6 +97,13 @@ ** Active function will be reloaded on every restart of server ** (if --skip-grant-tables is not given) ** +** If you ge problems with undefined symbols when loading the shared +** library, you should verify that mysqld is compiled with the -rdynamic +** option. +** +** If you can't get AGGREGATES to work, check that you have the column +** 'type' in the mysql.func table. If not, run 'mysql_fix_privilege_tables'. +** */ #ifdef STANDARD @@ -128,6 +135,11 @@ my_bool sequence_init(UDF_INIT *initid, UDF_ARGS *args, char *message); void sequence_deinit(UDF_INIT *initid); long long sequence(UDF_INIT *initid, UDF_ARGS *args, char *is_null, char *error); +my_bool avgcost_init( UDF_INIT* initid, UDF_ARGS* args, char* message ); +void avgcost_deinit( UDF_INIT* initid ); +void avgcost_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error ); +void avgcost_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error ); +double avgcost( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error ); } @@ -766,6 +778,7 @@ char *reverse_lookup(UDF_INIT *initid, UDF_ARGS *args, char *result, *res_length=(ulong) (strmov(result,hp->h_name) - result); return result; } +#endif // defined(HAVE_GETHOSTBYADDR_R) && defined(HAVE_SOLARIS_STYLE_GETHOST) /* ** Syntax for the new aggregate commands are: @@ -777,13 +790,6 @@ char *reverse_lookup(UDF_INIT *initid, UDF_ARGS *args, char *result, ** (this example is provided by Andreas F. Bobak <bobak@relog.ch>) */ -extern "C" { -my_bool avgcost_init( UDF_INIT* initid, UDF_ARGS* args, char* message ); -void avgcost_deinit( UDF_INIT* initid ); -void avgcost_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error ); -void avgcost_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error ); -double avgcost( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error ); -} struct avgcost_data { @@ -810,7 +816,7 @@ avgcost_init( UDF_INIT* initid, UDF_ARGS* args, char* message ) return 1; } - if ((args->arg_type[0] != INT_RESULT) && (args->arg_type[1] != REAL_RESULT) ) + if ((args->arg_type[0] != INT_RESULT) || (args->arg_type[1] != REAL_RESULT) ) { strcpy( message, @@ -917,5 +923,4 @@ avgcost( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* error ) return data->totalprice/double(data->totalquantity); } -#endif // defined(HAVE_GETHOSTBYADDR_R) && defined(HAVE_SOLARIS_STYLE_GETHOST) #endif /* HAVE_DLOPEN */ diff --git a/sql/uniques.cc b/sql/uniques.cc index bd3ca6db0d0..fcee97dbb1a 100644 --- a/sql/uniques.cc +++ b/sql/uniques.cc @@ -35,6 +35,19 @@ #include "sql_sort.h" +int unique_write_to_file(gptr key, element_count count, Unique *unique) +{ + return my_b_write(&unique->file, (byte*) key, + unique->tree.size_of_element) ? 1 : 0; +} + +int unique_write_to_ptrs(gptr key, element_count count, Unique *unique) +{ + memcpy(unique->record_pointers, key, unique->tree.size_of_element); + unique->record_pointers+=unique->tree.size_of_element; + return 0; +} + Unique::Unique(qsort_cmp2 comp_func, void * comp_func_fixed_arg, uint size, ulong max_in_memory_size_arg) :max_in_memory_size(max_in_memory_size_arg),elements(0) @@ -73,20 +86,6 @@ bool Unique::flush() } -int unique_write_to_file(gptr key, element_count count, Unique *unique) -{ - return my_b_write(&unique->file, (byte*) key, - unique->tree.size_of_element) ? 1 : 0; -} - -int unique_write_to_ptrs(gptr key, element_count count, Unique *unique) -{ - memcpy(unique->record_pointers, key, unique->tree.size_of_element); - unique->record_pointers+=unique->tree.size_of_element; - return 0; -} - - /* Modify the TABLE element so that when one calls init_records() the rows will be read in priority order. diff --git a/sql/unireg.cc b/sql/unireg.cc index c5bfbbbea88..b0dd3471a64 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -20,7 +20,7 @@ struct. In the following functions FIELD * is an ordinary field-structure with the following exeptions: - sc_length,typepos,row,kol,dtype,regnr and field nead not to be set. + sc_length,typepos,row,kol,dtype,regnr and field need not to be set. str is a (long) to record position where 0 is the first position. */ @@ -391,8 +391,8 @@ static bool pack_header(uchar *forminfo, enum db_type table_type, int2store(forminfo+272,int_parts); int2store(forminfo+274,int_length); int2store(forminfo+276,time_stamp_pos); - int2store(forminfo+278,80); /* Columns neaded */ - int2store(forminfo+280,22); /* Rows neaded */ + int2store(forminfo+278,80); /* Columns needed */ + int2store(forminfo+280,22); /* Rows needed */ int2store(forminfo+282,null_fields); DBUG_RETURN(0); } /* pack_header */ diff --git a/strings/Makefile.am b/strings/Makefile.am index 6bf21d630f3..3bce48045b3 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -22,7 +22,7 @@ pkglib_LIBRARIES = libmystrings.a # Exact one of ASSEMBLER_X if ASSEMBLER_x86 ASRCS = strings-x86.s longlong2str-x86.s -CSRCS = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c llstr.c ctype.c strnlen.c +CSRCS = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c ctype.c strnlen.c else if ASSEMBLER_sparc # These file MUST all be on the same line!! Otherwise automake @@ -43,7 +43,7 @@ noinst_PROGRAMS = conf_to_src # Default charset definitions EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c \ ctype-gb2312.c ctype-gbk.c ctype-sjis.c \ - ctype-tis620.c ctype-ujis.c \ + ctype-tis620.c ctype-ujis.c ctype-latin1_de.c \ ctype_autoconf.c \ strto.c strings-x86.s longlong2str-x86.s \ strxmov.c bmove_upp.c strappend.c strcont.c strend.c \ diff --git a/strings/bchange.c b/strings/bchange.c index 68b1434de4f..d65b80e7c2c 100644 --- a/strings/bchange.c +++ b/strings/bchange.c @@ -28,7 +28,8 @@ #include <my_global.h> #include "m_string.h" -void bchange(register char *dst, uint old_length, register const char *src, uint new_length, uint tot_length) +void bchange(register char *dst, uint old_length, register const char *src, + uint new_length, uint tot_length) { uint rest=tot_length-old_length; if (old_length < new_length) diff --git a/strings/strmake.c b/strings/strmake.c index 6f02e4007c8..96f220c2984 100644 --- a/strings/strmake.c +++ b/strings/strmake.c @@ -22,7 +22,8 @@ strmake(dst,src,length) moves length characters, or until end, of src to dst and appends a closing NUL to dst. - strmake() returns pointer to closing null; + Note that is strlen(src) >= length then dst[length] will be set to \0 + strmake() returns pointer to closing null */ #include <my_global.h> diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index ee5a9adaf8b..eed749bf5b2 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -118,7 +118,7 @@ case "$mode" in 'stop') # Stop daemon. We use a signal here to avoid having to know the # root password. - if test -f "$pid_file" + if test -s "$pid_file" then mysqld_pid=`cat $pid_file` echo "Killing mysqld with pid $mysqld_pid" diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index f5ce41a1c70..e62b8e84f9b 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -1,6 +1,6 @@ %define mysql_version @VERSION@ %define shared_lib_version @SHARED_LIB_VERSION@ -%define release 1 +%define release 2 %define mysqld_user mysql %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com @@ -139,6 +139,20 @@ Optional MySQL server binary that supports features like transactional tables. To active this binary, just install this package after the MySQL package. +%package embedded +Release: %{release} +Requires: devel +Summary: MySQL - embedded library +Group: Applications/Databases +Summary(pt_BR): MySQL - Medições de desempenho +Group(pt_BR): Aplicações/Banco_de_Dados +Obsoletes: embedded + +%description devel +This package contains the MySQL server as library. + +%{see_base} + %prep %setup -n mysql-%{mysql_version} @@ -172,6 +186,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \ --infodir=/usr/info \ --includedir=/usr/include \ --mandir=/usr/man \ + --with-embedded-server \ --with-comment=\"Official MySQL RPM\"; # Add this for more debugging support # --with-debug @@ -219,7 +234,7 @@ automake BuildMySQL "--disable-shared" \ "--with-mysqld-ldflags='-all-static'" \ "--with-client-ldflags='-all-static'" \ - "--without-berkeley-db --without-innodb" + "--without-berkeley-db --with-innodb" nm --numeric-sort sql/mysqld > sql/mysqld.sym %install -n mysql-%{mysql_version} @@ -345,6 +360,7 @@ fi %attr(755, root, root) /usr/bin/mysqlbug %attr(755, root, root) /usr/bin/mysqltest %attr(755, root, root) /usr/bin/mysqlhotcopy +%attr(755, root, root) /usr/bin/mysql_explain %attr(755, root, root) /usr/bin/perror %attr(755, root, root) /usr/bin/replace %attr(755, root, root) /usr/bin/resolveip @@ -412,8 +428,15 @@ fi %attr(755, root, root) /usr/sbin/mysqld-max %attr(644, root, root) /usr/lib/mysql/mysqld-max.sym +%files embedded +%attr(755, root, root) /usr/lib/mysql/libmysqld.a + %changelog +* Mon Oct 8 2001 Monty + +- Added embedded server as a separate RPM + * Fri Apr 13 2001 Monty - Added mysqld-max to the distribution diff --git a/tools/Makefile.am b/tools/Makefile.am index 3c786dc9281..e5130865a89 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -6,5 +6,15 @@ mysqlmanager_SOURCES= mysqlmanager.c mysqlmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) DEF= -DUNDEF_THREADS_HACK +OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ + __math.h time.h __time.h unistd.h __unistd.h types.h \ + xtypes.h ac-types.h posix.h string.h __string.h \ + errno.h socket.h inet.h dirent.h netdb.h \ + cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ + prio_queue.h pthread_attr.h pthread_once.h queue.h\ + sleep.h specific.h version.h pwd.h timers.h uio.h \ + cdefs.h machdep.h signal.h __signal.h util.h lex.h \ + wait.h + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/tools/managertest1.nc b/tools/managertest1.nc index 1125e141588..bf1b82ed406 100644 --- a/tools/managertest1.nc +++ b/tools/managertest1.nc @@ -1,12 +1,16 @@ -root secret def_exec server /usr/sbin/mysqld --socket=/tmp/temp.sock --skip-grant --skip-net --datadir=/tmp set_exec_con server root localhost /tmp/temp.sock +set_exec_stdout server /tmp/mysqld.err +set_exec_stderr server /tmp/mysqld.err start_exec server 3 show_exec +query server show variables like '%max_heap%'; stop_exec server 3 +def_exec server /usr/sbin/mysqld --socket=/tmp/temp.sock --skip-grant --skip-net --datadir=/tmp -O max_heap_table_size=5000 show_exec start_exec server 3 +query server show variables like '%max_heap%'; show_exec stop_exec server 3 show_exec -shutdown +quit diff --git a/tools/mysqlmanager-sample.pwd b/tools/mysqlmanager-sample.pwd new file mode 100644 index 00000000000..51c1ade1b77 --- /dev/null +++ b/tools/mysqlmanager-sample.pwd @@ -0,0 +1 @@ +root:5ebe2294ecd0e0f08eab7690d2a6ee69 diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c index 5b32cc9154e..4a3981a890e 100644 --- a/tools/mysqlmanager.c +++ b/tools/mysqlmanager.c @@ -22,25 +22,29 @@ #include <my_global.h> #include <my_sys.h> -#include <my_pthread.h> -#include <m_ctype.h> #include <m_string.h> #include <mysql.h> #include <mysql_version.h> -#include <mysqld_error.h> +#include <m_ctype.h> +#include <my_config.h> #include <my_dir.h> #include <hash.h> +#include <mysqld_error.h> +#include <stdio.h> +#include <stdlib.h> #include <getopt.h> #include <stdarg.h> -#include <violite.h> -#include <signal.h> #include <sys/stat.h> +#include <sys/types.h> #include <sys/wait.h> +#include <unistd.h> #include <errno.h> +#include <violite.h> +#include <my_pthread.h> +#include <md5.h> #define MANAGER_VERSION "1.0" -#define MANAGER_GREETING "MySQL Server Management Daemon v." ## \ - MANAGER_VERSION +#define MANAGER_GREETING "MySQL Server Management Daemon v. 1.0" #define LOG_ERR 1 #define LOG_WARN 2 @@ -113,20 +117,16 @@ uint manager_max_cmd_len = MANAGER_MAX_CMD_LEN; const char* manager_pw_file=MANAGER_PW_FILE; int one_thread = 0; /* for debugging */ +typedef enum {PARAM_STDOUT,PARAM_STDERR} PARAM_TYPE; + /* messages */ #define MAX_CLIENT_MSG_LEN 256 #define NET_BLOCK 2048 -#define MD5_LEN 32 +#define MD5_LEN 16 #define ESCAPE_CHAR '\\' #define EOL_CHAR '\n' -#define MSG_OK 200 -#define MSG_INFO 250 -#define MSG_ACCESS 401 -#define MSG_CLIENT_ERR 450 -#define MSG_INTERNAL_ERR 500 - /* access flags */ #define PRIV_SHUTDOWN 1 @@ -134,7 +134,7 @@ int one_thread = 0; /* for debugging */ struct manager_thd { Vio* vio; - char user[MAX_USER_NAME]; + char user[MAX_USER_NAME+1]; int priv_flags; char* cmd_buf; int fatal,finished; @@ -142,7 +142,7 @@ struct manager_thd struct manager_user { - char user[MAX_USER_NAME]; + char user[MAX_USER_NAME+1]; char md5_pass[MD5_LEN]; int user_len; const char* error; @@ -171,6 +171,9 @@ static byte* get_user_key(const byte* u, uint* len, my_bool __attribute__((unused)) t); static uint tokenize_args(char* arg_start,char** arg_end); static void init_arg_array(char* arg_str,char** args,uint arg_count); +static int hex_val(char c); +static int open_and_dup(int fd,char* path); +static void update_req_len(struct manager_exec* e); typedef int (*manager_cmd_handler)(struct manager_thd*,char*,char*); @@ -212,29 +215,38 @@ struct manager_exec pthread_t th; char con_sock[FN_REFLEN]; char con_host[MAX_HOST]; + char stderr_path[FN_REFLEN]; + char stdout_path[FN_REFLEN]; MYSQL mysql; char* data_buf; int req_len; + int start_wait_timeout; + int stderr_path_size,stdout_path_size,data_buf_size; int num_args; }; -#define HANDLE_DECL(com) static int handle_ ## com (struct manager_thd* thd,\ - char* args_start,char* args_end) +static int set_exec_param(struct manager_thd* thd, char* args_start, + char* args_end, PARAM_TYPE param_type); -#define HANDLE_NOARG_DECL(com) static int handle_ ## com \ +#define HANDLE_DECL(com) static int com (struct manager_thd* thd, char* args_start,char* args_end) +#define HANDLE_NOARG_DECL(com) static int com \ (struct manager_thd* thd, char* __attribute__((unused)) args_start,\ char* __attribute__((unused)) args_end) -HANDLE_NOARG_DECL(ping); -HANDLE_NOARG_DECL(quit); -HANDLE_NOARG_DECL(help); -HANDLE_NOARG_DECL(shutdown); -HANDLE_DECL(def_exec); -HANDLE_DECL(start_exec); -HANDLE_DECL(stop_exec); -HANDLE_DECL(set_exec_con); -HANDLE_NOARG_DECL(show_exec); +HANDLE_NOARG_DECL(handle_ping); +HANDLE_NOARG_DECL(handle_quit); +HANDLE_NOARG_DECL(handle_help); +HANDLE_NOARG_DECL(handle_shutdown); +HANDLE_DECL(handle_def_exec); +HANDLE_DECL(handle_start_exec); +HANDLE_DECL(handle_stop_exec); +HANDLE_DECL(handle_set_exec_con); +HANDLE_DECL(handle_set_exec_stdout); +HANDLE_DECL(handle_set_exec_stderr); +HANDLE_NOARG_DECL(handle_show_exec); +HANDLE_DECL(handle_query); + struct manager_cmd commands[] = { @@ -248,6 +260,11 @@ struct manager_cmd commands[] = handle_stop_exec,9}, {"set_exec_con", "Set connection parameters for executable entry", handle_set_exec_con,12}, + {"set_exec_stdout", "Set stdout path for executable entry", + handle_set_exec_stdout,15}, + {"set_exec_stderr", "Set stderr path for executable entry", + handle_set_exec_stderr,15}, + {"query","Run query against MySQL server",handle_query,5}, {"show_exec","Show defined executable entries",handle_show_exec,9}, {"help", "Print this message", handle_help,4}, {0,0,0,0} @@ -355,7 +372,7 @@ static int exec_line(struct manager_thd* thd,char* buf,char* buf_end) *p=tolower(*p); if (!(cmd=lookup_cmd(buf,(int)(p-buf)))) { - client_msg(thd->vio,MSG_CLIENT_ERR, + client_msg(thd->vio,MANAGER_CLIENT_ERR, "Unrecognized command, type help to see list of supported\ commands"); return 1; @@ -375,35 +392,35 @@ static struct manager_cmd* lookup_cmd(char* s,int len) return 0; } -HANDLE_NOARG_DECL(ping) +HANDLE_NOARG_DECL(handle_ping) { - client_msg(thd->vio,MSG_OK,"Server management daemon is alive"); + client_msg(thd->vio,MANAGER_OK,"Server management daemon is alive"); return 0; } -HANDLE_NOARG_DECL(quit) +HANDLE_NOARG_DECL(handle_quit) { - client_msg(thd->vio,MSG_OK,"Goodbye"); + client_msg(thd->vio,MANAGER_OK,"Goodbye"); thd->finished=1; return 0; } -HANDLE_NOARG_DECL(help) +HANDLE_NOARG_DECL(handle_help) { struct manager_cmd* cmd = commands; Vio* vio = thd->vio; - client_msg_pre(vio,MSG_INFO,"Available commands:"); + client_msg_pre(vio,MANAGER_INFO,"Available commands:"); for (;cmd->name;cmd++) { - client_msg_pre(vio,MSG_INFO,"%s - %s", cmd->name, cmd->help); + client_msg_pre(vio,MANAGER_INFO,"%s - %s", cmd->name, cmd->help); } - client_msg_pre(vio,MSG_INFO,"End of help"); + client_msg_pre(vio,MANAGER_INFO,"End of help"); return 0; } -HANDLE_NOARG_DECL(shutdown) +HANDLE_NOARG_DECL(handle_shutdown) { - client_msg(thd->vio,MSG_OK,"Shutdown started, goodbye"); + client_msg(thd->vio,MANAGER_OK,"Shutdown started, goodbye"); thd->finished=1; shutdown_requested = 1; if (!one_thread) @@ -414,7 +431,7 @@ HANDLE_NOARG_DECL(shutdown) return 0; } -HANDLE_DECL(set_exec_con) +HANDLE_DECL(handle_set_exec_con) { int num_args; const char* error=0; @@ -446,7 +463,7 @@ HANDLE_DECL(set_exec_con) else e->con_sock[0]=0; } - else + else if(num_args > 4) { pthread_mutex_unlock(&lock_exec_hash); error="Too many arguments"; @@ -454,14 +471,76 @@ HANDLE_DECL(set_exec_con) } } pthread_mutex_unlock(&lock_exec_hash); - client_msg(thd->vio,MSG_OK,"Entry updated"); + client_msg(thd->vio,MANAGER_OK,"Entry updated"); return 0; err: - client_msg(thd->vio,MSG_CLIENT_ERR,error); + client_msg(thd->vio,MANAGER_CLIENT_ERR,error); return 1; } -HANDLE_DECL(start_exec) +HANDLE_DECL(handle_set_exec_stdout) +{ + return set_exec_param(thd,args_start,args_end,PARAM_STDOUT); +} + +HANDLE_DECL(handle_set_exec_stderr) +{ + return set_exec_param(thd,args_start,args_end,PARAM_STDERR); +} + +static int set_exec_param(struct manager_thd* thd, char* args_start, + char* args_end, PARAM_TYPE param_type) +{ + int num_args; + const char* error=0; + struct manager_exec* e; + char* arg_p; + char* param; + int param_size; + + if ((num_args=tokenize_args(args_start,&args_end))<2) + { + error="Too few arguments"; + goto err; + } + arg_p=args_start; + pthread_mutex_lock(&lock_exec_hash); + if (!(e=(struct manager_exec*)hash_search(&exec_hash,arg_p, + strlen(arg_p)))) + { + pthread_mutex_unlock(&lock_exec_hash); + error="Exec definition entry does not exist"; + goto err; + } + arg_p+=strlen(arg_p)+1; + param_size=strlen(arg_p)+1; + switch (param_type) + { + case PARAM_STDOUT: + param=e->stdout_path; + e->req_len+=(param_size-e->stdout_path_size); + e->stdout_path_size=param_size; + break; + case PARAM_STDERR: + param=e->stderr_path; + e->req_len+=(param_size-e->stderr_path_size); + e->stderr_path_size=param_size; + break; + default: + error="Internal error"; + goto err; + } + strnmov(param,arg_p,FN_REFLEN); + pthread_mutex_unlock(&lock_exec_hash); + client_msg(thd->vio,MANAGER_OK,"Entry updated"); + return 0; +err: + client_msg(thd->vio,MANAGER_CLIENT_ERR,error); + return 1; +} + + +HANDLE_DECL(handle_start_exec) { int num_args; struct manager_exec* e; @@ -487,9 +566,10 @@ HANDLE_DECL(start_exec) if ((error=e->error)) goto err; pthread_mutex_lock(&e->lock); - t.tv_sec=time(0)+atoi(args_start+ident_len+1); + t.tv_sec=time(0)+(e->start_wait_timeout=atoi(args_start+ident_len+1)); t.tv_nsec=0; - pthread_cond_timedwait(&e->cond,&e->lock,&t); + if (!e->pid) + pthread_cond_timedwait(&e->cond,&e->lock,&t); if (!e->pid) { pthread_mutex_unlock(&e->lock); @@ -502,14 +582,14 @@ HANDLE_DECL(start_exec) pthread_mutex_unlock(&e->lock); if (error) goto err; - client_msg(thd->vio,MSG_OK,"'%s' started",e->ident); + client_msg(thd->vio,MANAGER_OK,"'%s' started",e->ident); return 0; err: - client_msg(thd->vio,MSG_CLIENT_ERR,error); + client_msg(thd->vio,MANAGER_CLIENT_ERR,error); return 1; } -HANDLE_DECL(stop_exec) +HANDLE_DECL(handle_stop_exec) { int num_args; struct timespec abstime; @@ -549,22 +629,106 @@ HANDLE_DECL(stop_exec) error="Could not send shutdown command"; goto err; } - pthread_cond_timedwait(&e->cond,&e->lock,&abstime); + if (e->pid) + pthread_cond_timedwait(&e->cond,&e->lock,&abstime); if (e->pid) error="Process failed to terminate within alotted time"; e->th=0; pthread_mutex_unlock(&e->lock); if (!error) { - client_msg(thd->vio,MSG_OK,"'%s' terminated",e->ident); + client_msg(thd->vio,MANAGER_OK,"'%s' terminated",e->ident); return 0; } err: - client_msg(thd->vio,MSG_CLIENT_ERR,error); + client_msg(thd->vio,MANAGER_CLIENT_ERR,error); + return 1; +} + +HANDLE_DECL(handle_query) +{ + const char* error=0; + struct manager_exec* e; + MYSQL_RES* res=0; + MYSQL_ROW row; + MYSQL_FIELD* fields; + int num_fields,i,ident_len; + char* ident,*query; + query=ident=args_start; + while (!isspace(*query)) + query++; + if (query == ident) + { + error="Missing server identifier"; + goto err; + } + ident_len=(int)(query-ident); + while (query<args_end && isspace(*query)) + query++; + if (query == args_end) + { + error="Missing query"; + goto err; + } + pthread_mutex_lock(&lock_exec_hash); + if (!(e=(struct manager_exec*)hash_search(&exec_hash,ident, + ident_len))) + { + pthread_mutex_unlock(&lock_exec_hash); + error="Exec definition entry does not exist"; + goto err; + } + pthread_mutex_unlock(&lock_exec_hash); + pthread_mutex_lock(&e->lock); + if (!e->pid) + { + error="Process is not running"; + pthread_mutex_unlock(&e->lock); + goto err; + } + + if (mysql_query(&e->mysql,query)) + { + error=mysql_error(&e->mysql); + pthread_mutex_unlock(&e->lock); + goto err; + } + if ((res=mysql_store_result(&e->mysql))) + { + char buf[MAX_CLIENT_MSG_LEN],*p,*buf_end; + fields=mysql_fetch_fields(res); + num_fields=mysql_num_fields(res); + p=buf; + buf_end=buf+sizeof(buf); + for (i=0;i<num_fields && p<buf_end-2;i++) + { + p=arg_strmov(p,fields[i].name,buf_end-p-2); + *p++='\t'; + } + *p=0; + client_msg_pre(thd->vio,MANAGER_OK,buf); + + while ((row=mysql_fetch_row(res))) + { + p=buf; + for (i=0;i<num_fields && p<buf_end-2;i++) + { + p=arg_strmov(p,row[i],buf_end-p-2); + *p++='\t'; + } + *p=0; + client_msg_pre(thd->vio,MANAGER_OK,buf); + } + } + pthread_mutex_unlock(&e->lock); + client_msg(thd->vio,MANAGER_OK,"End"); + return 0; +err: + client_msg(thd->vio,MANAGER_CLIENT_ERR,error); return 1; } -HANDLE_DECL(def_exec) +HANDLE_DECL(handle_def_exec) { struct manager_exec* e=0,*old_e; const char* error=0; @@ -582,26 +746,31 @@ HANDLE_DECL(def_exec) if ((old_e=(struct manager_exec*)hash_search(&exec_hash,(byte*)e->ident, e->ident_len))) { - pthread_mutex_unlock(&lock_exec_hash); - error="Exec definition already exists"; - goto err; + strnmov(e->stdout_path,old_e->stdout_path,sizeof(e->stdout_path)); + strnmov(e->stderr_path,old_e->stderr_path,sizeof(e->stderr_path)); + strnmov(e->con_user,old_e->con_user,sizeof(e->con_user)); + strnmov(e->con_host,old_e->con_host,sizeof(e->con_host)); + strnmov(e->con_sock,old_e->con_sock,sizeof(e->con_sock)); + e->con_port=old_e->con_port; + update_req_len(e); + hash_delete(&exec_hash,(byte*)old_e); } hash_insert(&exec_hash,(byte*)e); pthread_mutex_unlock(&lock_exec_hash); - client_msg(thd->vio,MSG_OK,"Exec definition created"); + client_msg(thd->vio,MANAGER_OK,"Exec definition created"); return 0; err: - client_msg(thd->vio,MSG_CLIENT_ERR,error); + client_msg(thd->vio,MANAGER_CLIENT_ERR,error); if (e) manager_exec_free(e); return 1; } -HANDLE_NOARG_DECL(show_exec) +HANDLE_NOARG_DECL(handle_show_exec) { uint i; - client_msg_pre(thd->vio,MSG_INFO,"Exec_def\tPid\tExit_status\tCon_info\ -\tArguments"); + client_msg_pre(thd->vio,MANAGER_INFO,"Exec_def\tPid\tExit_status\tCon_info\ +\tStdout\tStderr\tArguments"); pthread_mutex_lock(&lock_exec_hash); for (i=0;i<exec_hash.records;i++) { @@ -609,7 +778,7 @@ HANDLE_NOARG_DECL(show_exec) manager_exec_print(thd->vio,e); } pthread_mutex_unlock(&lock_exec_hash); - client_msg(thd->vio,MSG_INFO,"End"); + client_msg(thd->vio,MANAGER_INFO,"End"); return 0; } @@ -634,7 +803,12 @@ static struct manager_exec* manager_exec_by_pid(pid_t pid) static void manager_exec_connect(struct manager_exec* e) { int i; - for (i=0;i<manager_connect_retries;i++) + int connect_retries; + + if (!(connect_retries=e->start_wait_timeout)) + connect_retries=manager_connect_retries; + + for (i=0;i<connect_retries;i++) { if (mysql_real_connect(&e->mysql,e->con_host,e->con_user,e->con_pass,0, e->con_port,e->con_sock,0)) @@ -669,9 +843,16 @@ static int manager_exec_launch(struct manager_exec* e) } else { - if (write(to_launcher_pipe[1],&e->req_len,sizeof(int))!=sizeof(int) || - write(to_launcher_pipe[1],&e->num_args,sizeof(int))!=sizeof(int) || - write(to_launcher_pipe[1],e->data_buf,e->req_len)!=e->req_len) + if (my_write(to_launcher_pipe[1],(byte*)&e->req_len, + sizeof(int),MYF(MY_NABP))|| + my_write(to_launcher_pipe[1],(byte*)&e->num_args, + sizeof(int),MYF(MY_NABP)) || + my_write(to_launcher_pipe[1],e->stdout_path,e->stdout_path_size, + MYF(MY_NABP)) || + my_write(to_launcher_pipe[1],e->stderr_path,e->stderr_path_size, + MYF(MY_NABP)) || + my_write(to_launcher_pipe[1],e->data_buf,e->data_buf_size, + MYF(MY_NABP))) { e->error="Failed write request to launcher"; return 1; @@ -695,7 +876,7 @@ static char* arg_strmov(char* dest, const char* src, int n) static void manager_exec_print(Vio* vio,struct manager_exec* e) { - char buf[MAX_CLIENT_MSG_LEN]; + char buf[MAX_MYSQL_MANAGER_MSG]; char* p=buf,*buf_end=buf+sizeof(buf)-1; char** args=e->args; @@ -725,6 +906,14 @@ static void manager_exec_print(Vio* vio,struct manager_exec* e) p=int10_to_str(e->con_port,p,10); } *p++='\t'; + p=arg_strmov(p,e->stdout_path,(int)(buf_end-p)-1); + if (p==buf_end-1) + goto end; + *p++='\t'; + p=arg_strmov(p,e->stderr_path,(int)(buf_end-p)-1); + if (p==buf_end-1) + goto end; + *p++='\t'; for(;p<buf_end && *args;args++) { @@ -733,17 +922,45 @@ static void manager_exec_print(Vio* vio,struct manager_exec* e) } end: *p=0; - client_msg_pre(vio,MSG_INFO,buf); + client_msg_pre(vio,MANAGER_INFO,buf); return; } static int authenticate(struct manager_thd* thd) { - char* buf_end; - client_msg(thd->vio,MSG_INFO, manager_greeting); + char* buf_end,*buf,*p,*p_end; + my_MD5_CTX context; + uchar digest[MD5_LEN]; + struct manager_user* u; + char c; + + client_msg(thd->vio,MANAGER_INFO, manager_greeting); if (!(buf_end=read_line(thd))) return -1; - client_msg(thd->vio,MSG_OK,"OK"); + for (buf=thd->cmd_buf,p=thd->user,p_end=p+MAX_USER_NAME; + buf<buf_end && (c=*buf) && p<p_end; buf++,p++) + { + if (isspace(c)) + { + *p=0; + break; + } + else + *p=c; + } + if (p==p_end || buf==buf_end) + return 1; + if (!(u=(struct manager_user*)hash_search(&user_hash,thd->user, + (uint)(p-thd->user)))) + return 1; + for (;isspace(*buf) && buf<buf_end;buf++) /* empty */; + + my_MD5Init(&context); + my_MD5Update(&context,buf,(uint)(buf_end-buf)); + my_MD5Final(digest,&context); + if (memcmp(u->md5_pass,digest,MD5_LEN)) + return 1; + client_msg(thd->vio,MANAGER_OK,"OK"); return 0; } @@ -809,21 +1026,21 @@ static void log_msg(const char* fmt, int msg_type, va_list args) pthread_mutex_unlock(&lock_log); } -#define LOG_MSG_FUNC(type,TYPE) inline static void log_ ## type \ +#define LOG_MSG_FUNC(type,TYPE) inline static void type \ (const char* fmt,...) { \ va_list args; \ va_start(args,fmt); \ - log_msg(fmt,LOG_ ## TYPE,args);\ + log_msg(fmt,TYPE,args);\ } -LOG_MSG_FUNC(err,ERR) -LOG_MSG_FUNC(warn,WARN) -LOG_MSG_FUNC(info,INFO) +LOG_MSG_FUNC(log_err,LOG_ERR) +LOG_MSG_FUNC(log_warn,LOG_WARN) +LOG_MSG_FUNC(log_info,LOG_INFO) #ifndef DBUG_OFF -LOG_MSG_FUNC(debug,DEBUG) +LOG_MSG_FUNC(log_debug,LOG_DEBUG) #else -void log_debug(char* __attribute__((unused)) fmt,...) {} +inline void log_debug(char* __attribute__((unused)) fmt,...) {} #endif static pthread_handler_decl(process_launcher_messages, @@ -920,7 +1137,7 @@ static void client_msg_raw(Vio* vio, int err_code, int pre, const char* fmt, *p++='\r'; *p++='\n'; if (vio_write(vio,buf,(uint)(p-buf))<=0) - log_err("Failed writing to client: errno=%d"); + log_err("Failed writing to client: errno=%d",errno); } static void client_msg(Vio* vio, int err_code, const char* fmt, ...) @@ -950,6 +1167,7 @@ static char* read_line(struct manager_thd* thd) if ((len=vio_read(thd->vio,p,read_len))<=0) { log_err("Error reading command from client"); + thd->fatal=1; return 0; } block_end=p+len; @@ -978,7 +1196,7 @@ static char* read_line(struct manager_thd* thd) return p_back; } } - client_msg(thd->vio,MSG_CLIENT_ERR,"Command line too long"); + client_msg(thd->vio,MANAGER_CLIENT_ERR,"Command line too long"); return 0; } @@ -1089,7 +1307,7 @@ static int parse_args(int argc, char **argv) one_thread=1; break; case 'p': - manager_pw_file=MANAGER_PW_FILE; + manager_pw_file=optarg; break; case 'C': manager_connect_retries=atoi(optarg); @@ -1184,7 +1402,7 @@ static int run_server_loop() if (authenticate(thd)) { - client_msg(vio,MSG_ACCESS, "Access denied"); + client_msg(vio,MANAGER_ACCESS, "Access denied"); manager_thd_free(thd); continue; } @@ -1198,7 +1416,7 @@ static int run_server_loop() } else if (pthread_create(&th,0,process_connection,(void*)thd)) { - client_msg(vio,MSG_INTERNAL_ERR,"Could not create thread, errno=%d", + client_msg(vio,MANAGER_INTERNAL_ERR,"Could not create thread, errno=%d", errno); manager_thd_free(thd); continue; @@ -1304,6 +1522,12 @@ static uint tokenize_args(char* arg_start,char** arg_end) return arg_count; } +static void update_req_len(struct manager_exec* e) +{ + e->req_len=e->data_buf_size+ + (e->stdout_path_size=strlen(e->stdout_path)+1)+ + (e->stderr_path_size=strlen(e->stderr_path)+1); + } static struct manager_exec* manager_exec_new(char* arg_start,char* arg_end) { @@ -1313,7 +1537,8 @@ static struct manager_exec* manager_exec_new(char* arg_start,char* arg_end) num_args=tokenize_args(arg_start,&arg_end); arg_len=(uint)(arg_end-arg_start)+1; /* include \0 terminator*/ if (!(tmp=(struct manager_exec*)my_malloc(sizeof(*tmp)+arg_len+ - sizeof(char*)*num_args,MYF(0)))) + sizeof(char*)*num_args, + MYF(MY_ZEROFILL)))) return 0; if (num_args<2) { @@ -1322,7 +1547,7 @@ static struct manager_exec* manager_exec_new(char* arg_start,char* arg_end) } tmp->data_buf=(char*)tmp+sizeof(*tmp); memcpy(tmp->data_buf,arg_start,arg_len); - tmp->req_len=arg_len; + tmp->data_buf_size=arg_len; tmp->args=(char**)(tmp->data_buf+arg_len); tmp->num_args=num_args; tmp->ident=tmp->data_buf; @@ -1330,18 +1555,14 @@ static struct manager_exec* manager_exec_new(char* arg_start,char* arg_end) first_arg=tmp->ident+tmp->ident_len+1; init_arg_array(first_arg,tmp->args,num_args-1); strmov(tmp->con_user,"root"); - tmp->con_pass[0]=0; - tmp->con_sock[0]=0; tmp->con_port=MYSQL_PORT; memcpy(tmp->con_host,"localhost",10); tmp->bin_path=tmp->args[0]; - tmp->pid=0; - tmp->exit_code=0; - tmp->th=0; + tmp->stdout_path_size=tmp->stderr_path_size=1; + tmp->req_len=tmp->data_buf_size+2; pthread_mutex_init(&tmp->lock,0); pthread_cond_init(&tmp->cond,0); mysql_init(&tmp->mysql); - tmp->error=0; return tmp; } @@ -1351,15 +1572,24 @@ static void manager_exec_free(void* e) my_free(e,MYF(0)); } +static int hex_val(char c) +{ + if (isdigit(c)) + return c-'0'; + c=tolower(c); + return c-'a'+10; +} + static struct manager_user* manager_user_new(char* buf) { struct manager_user* tmp; - char* p,*user_end; + char* p,*user_end,*p_end; char c; if (!(tmp=(struct manager_user*)my_malloc(sizeof(*tmp),MYF(0)))) return 0; p=tmp->user; - user_end=p+MAX_USER_NAME-1; + tmp->error=0; + user_end=p+MAX_USER_NAME; for (;(c=*buf) && p<user_end;buf++) { if (c == ':') @@ -1378,13 +1608,18 @@ static struct manager_user* manager_user_new(char* buf) tmp->error="Username too long"; if (tmp->error) return tmp; - if (strlen(buf) < MD5_LEN) + if (strlen(buf) < 2*MD5_LEN) { tmp->error="Invalid MD5 sum, too short"; return tmp; } - memcpy(tmp->md5_pass,buf,MD5_LEN); - tmp->error=0; + p=tmp->md5_pass; + p_end=p+MD5_LEN; + for (; p<p_end;p++,buf+=2) + { + *p=hex_val(*buf)*16+hex_val(buf[1]); + } + return tmp; } @@ -1438,6 +1673,23 @@ static void init_globals() signal(SIGPIPE,handle_sigpipe); } +static int open_and_dup(int fd,char* path) +{ + int old_fd; + if ((old_fd=my_open(path,O_WRONLY|O_APPEND|O_CREAT,MYF(0)))<0) + { + log_err("Could not open '%s' for append, errno=%d",path,errno); + return 1; + } + if (dup2(old_fd,fd)<0) + { + log_err("Failed in dup2(), errno=%d",errno); + return 1; + } + my_close(old_fd,MYF(0)); + return 0; +} + static void run_launcher_loop() { for (;;) @@ -1445,14 +1697,17 @@ static void run_launcher_loop() int req_len,ident_len,num_args; char* request_buf=0; pid_t pid; - char* exec_path,*ident; + char* exec_path,*ident,*stdout_path,*stderr_path; char** args=0; - if (read(to_launcher_pipe[0],&req_len,sizeof(int))!=sizeof(int) || - read(to_launcher_pipe[0],&num_args,sizeof(int))!=sizeof(int) || + if (my_read(to_launcher_pipe[0],(byte*)&req_len, + sizeof(int),MYF(MY_NABP|MY_FULL_IO)) || + my_read(to_launcher_pipe[0],(byte*)&num_args, + sizeof(int),MYF(MY_NABP|MY_FULL_IO)) || !(request_buf=(char*)my_malloc(req_len+sizeof(pid)+2,MYF(0))) || !(args=(char**)my_malloc(num_args*sizeof(char*),MYF(0))) || - read(to_launcher_pipe[0],request_buf+1,req_len)!=req_len) + my_read(to_launcher_pipe[0],request_buf,req_len, + MYF(MY_NABP|MY_FULL_IO))) { log_err("launcher: Error reading request"); my_free((gptr)request_buf,MYF(MY_ALLOW_ZERO_PTR)); @@ -1460,12 +1715,16 @@ static void run_launcher_loop() sleep(1); continue; } + stdout_path=request_buf; + stderr_path=stdout_path+strlen(stdout_path)+1; + request_buf=stderr_path+strlen(stderr_path); /* black magic */ ident=request_buf+1; ident_len=strlen(ident); exec_path=ident+ident_len+1; - log_debug("num_args=%d,req_len=%d,ident=%s,ident_len=%d,exec_path=%s", + log_debug("num_args=%d,req_len=%d,ident=%s,ident_len=%d,exec_path=%s,\ +stdout_path=%s,stderr_path=%s", num_args, - req_len,ident,ident_len,exec_path); + req_len,ident,ident_len,exec_path,stdout_path,stderr_path); init_arg_array(exec_path,args,num_args-1); switch ((pid=fork())) @@ -1475,6 +1734,8 @@ static void run_launcher_loop() sleep(1); break; case 0: + if (open_and_dup(1,stdout_path) || open_and_dup(2,stderr_path)) + exit(1); if (execv(exec_path,args)) log_err("launcher: cannot exec %s",exec_path); exit(1); @@ -1485,7 +1746,7 @@ static void run_launcher_loop() log_err("launcher: error sending launch status report"); break; } - my_free((gptr)request_buf,MYF(0)); + my_free((gptr)(stdout_path),MYF(0)); my_free((gptr)args,MYF(0)); } } diff --git a/vio/test-ssl.c b/vio/test-ssl.c index 0ae90f5001f..61d92bb7b84 100644 --- a/vio/test-ssl.c +++ b/vio/test-ssl.c @@ -41,6 +41,7 @@ main( int argc, char* server_key = 0, *server_cert = 0; char* client_key = 0, *client_cert = 0; char* ca_file = 0, *ca_path = 0; + char* cipher=0; int child_pid,sv[2]; struct st_VioSSLAcceptorFd* ssl_acceptor=0; struct st_VioSSLConnectorFd* ssl_connector=0; @@ -74,17 +75,17 @@ main( int argc, if (socketpair(PF_UNIX, SOCK_STREAM, IPPROTO_IP, sv)==-1) fatal_error("socketpair"); - ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file, ca_path); - ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file, ca_path); + ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file, ca_path, cipher); + ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file, ca_path, cipher); client_vio = (struct st_vio*)my_malloc(sizeof(struct st_vio),MYF(0)); client_vio->sd = sv[0]; client_vio->vioblocking(client_vio,0); - sslconnect(ssl_connector,client_vio); + sslconnect(ssl_connector,client_vio,60L); server_vio = (struct st_vio*)my_malloc(sizeof(struct st_vio),MYF(0)); server_vio->sd = sv[1]; server_vio->vioblocking(client_vio,0); - sslaccept(ssl_acceptor,server_vio); + sslaccept(ssl_acceptor,server_vio,60L); printf("Socketpair: %d , %d\n", client_vio->sd, server_vio->sd); diff --git a/vio/test-sslclient.c b/vio/test-sslclient.c index c19a3589009..b50b0722b17 100644 --- a/vio/test-sslclient.c +++ b/vio/test-sslclient.c @@ -32,7 +32,7 @@ main( int argc __attribute__((unused)), char** argv) { char client_key[] = "../SSL/client-key.pem", client_cert[] = "../SSL/client-cert.pem"; - char ca_file[] = "../SSL/cacert.pem", *ca_path = 0; + char ca_file[] = "../SSL/cacert.pem", *ca_path = 0, *cipher=0; struct st_VioSSLConnectorFd* ssl_connector=0; struct sockaddr_in sa; Vio* client_vio=0; @@ -48,7 +48,7 @@ main( int argc __attribute__((unused)), if (ca_path!=0) printf("CApath : %s\n", ca_path); - ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file, ca_path); + ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file, ca_path, cipher); if(!ssl_connector) { fatal_error("client:new_VioSSLConnectorFd failed"); } @@ -69,7 +69,7 @@ main( int argc __attribute__((unused)), /* ----------------------------------------------- */ /* Now we have TCP conncetion. Start SSL negotiation. */ read(client_vio->sd,xbuf, sizeof(xbuf)); - sslconnect(ssl_connector,client_vio); + sslconnect(ssl_connector,client_vio,60L); err = client_vio->read(client_vio,xbuf, sizeof(xbuf)); if (err<=0) { my_free((gptr)ssl_connector,MYF(0)); diff --git a/vio/test-sslserver.c b/vio/test-sslserver.c index bad141dff17..610a4173875 100644 --- a/vio/test-sslserver.c +++ b/vio/test-sslserver.c @@ -46,7 +46,7 @@ do_ssl_stuff( TH_ARGS* args) /* TCP connection is ready. Do server side SSL. */ err = write(server_vio->sd,(gptr)s, strlen(s)); - sslaccept(args->ssl_acceptor,server_vio); + sslaccept(args->ssl_acceptor,server_vio,60L); err = server_vio->write(server_vio,(gptr)s, strlen(s)); DBUG_VOID_RETURN; } @@ -65,7 +65,8 @@ main( int argc __attribute__((unused)), char server_key[] = "../SSL/server-key.pem", server_cert[] = "../SSL/server-cert.pem"; char ca_file[] = "../SSL/cacert.pem", - *ca_path = 0; + *ca_path = 0, + *cipher = 0; struct st_VioSSLAcceptorFd* ssl_acceptor; pthread_t th; TH_ARGS th_args; @@ -89,7 +90,7 @@ main( int argc __attribute__((unused)), if (ca_path!=0) printf("CApath : %s\n", ca_path); - th_args.ssl_acceptor = ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file, ca_path); + th_args.ssl_acceptor = ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file, ca_path,cipher); /* ----------------------------------------------- */ /* Prepare TCP socket for receiving connections */ diff --git a/vio/vio.c b/vio/vio.c index 15a12bb958d..759f9416ddf 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -25,38 +25,10 @@ #include <my_global.h> #include <mysql_com.h> #include <violite.h> - #include <errno.h> -#include <assert.h> #include <my_sys.h> #include <my_net.h> #include <m_string.h> -#ifdef HAVE_POLL -#include <sys/poll.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif - -#if defined(__EMX__) -#define ioctlsocket ioctl -#endif /* defined(__EMX__) */ - -#if defined(MSDOS) || defined(__WIN__) -#ifdef __WIN__ -#undef errno -#undef EINTR -#undef EAGAIN -#define errno WSAGetLastError() -#define EINTR WSAEINTR -#define EAGAIN WSAEINPROGRESS -#endif /* __WIN__ */ -#define O_NONBLOCK 1 /* For emulation of fcntl() */ -#endif -#ifndef EWOULDBLOCK -#define EWOULDBLOCK EAGAIN -#endif - /* * Helper to fill most of the Vio* with defaults. diff --git a/vio/viosocket.c b/vio/viosocket.c index 667e9b2b118..f6f62924b00 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -27,36 +27,10 @@ #include <mysql_com.h> #include <errno.h> -#include <assert.h> #include <violite.h> #include <my_sys.h> #include <my_net.h> #include <m_string.h> -#ifdef HAVE_POLL -#include <sys/poll.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif - -#if defined(__EMX__) -#define ioctlsocket ioctl -#endif /* defined(__EMX__) */ - -#if defined(MSDOS) || defined(__WIN__) -#ifdef __WIN__ -#undef errno -#undef EINTR -#undef EAGAIN -#define errno WSAGetLastError() -#define EINTR WSAEINTR -#define EAGAIN WSAEINPROGRESS -#endif /* __WIN__ */ -#define O_NONBLOCK 1 /* For emulation of fcntl() */ -#endif -#ifndef EWOULDBLOCK -#define EWOULDBLOCK EAGAIN -#endif #ifndef __WIN__ #define HANDLE void * @@ -76,7 +50,7 @@ void vio_delete(Vio* vio) int vio_errno(Vio *vio __attribute__((unused))) { - return errno; /* On Win32 this mapped to WSAGetLastError() */ + return socket_errno; /* On Win32 this mapped to WSAGetLastError() */ } @@ -129,7 +103,7 @@ int vio_write(Vio * vio, const gptr buf, int size) #ifndef DBUG_OFF if (r < 0) { - DBUG_PRINT("vio_error", ("Got error on write: %d",errno)); + DBUG_PRINT("vio_error", ("Got error on write: %d",socket_errno)); } #endif /* DBUG_OFF */ DBUG_PRINT("exit", ("%d", r)); @@ -137,7 +111,7 @@ int vio_write(Vio * vio, const gptr buf, int size) } -int vio_blocking(Vio * vio, my_bool set_blocking_mode) +int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode) { int r=0; DBUG_ENTER("vio_blocking"); @@ -242,8 +216,9 @@ int vio_keepalive(Vio* vio, my_bool set_keep_alive) my_bool vio_should_retry(Vio * vio __attribute__((unused))) { - int en = errno; - return en == EAGAIN || en == EINTR || en == EWOULDBLOCK; + int en = socket_errno; + return (en == SOCKET_EAGAIN || en == SOCKET_EINTR || + en == SOCKET_EWOULDBLOCK); } @@ -271,7 +246,7 @@ int vio_close(Vio * vio) } if (r) { - DBUG_PRINT("vio_error", ("close() failed, error: %d",errno)); + DBUG_PRINT("vio_error", ("close() failed, error: %d",socket_errno)); /* FIXME: error handling (not critical for MySQL) */ } vio->type= VIO_CLOSED; @@ -310,7 +285,7 @@ my_bool vio_peer_addr(Vio * vio, char *buf) if (getpeername(vio->sd, (struct sockaddr *) (& (vio->remote)), &addrLen) != 0) { - DBUG_PRINT("exit", ("getpeername, error: %d", errno)); + DBUG_PRINT("exit", ("getpeername, error: %d", socket_errno)); DBUG_RETURN(1); } my_inet_ntoa(vio->remote.sin_addr,buf); diff --git a/vio/viossl.c b/vio/viossl.c index c6f70081d18..19fd6e0f0ab 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -34,31 +34,6 @@ #include <my_sys.h> #include <my_net.h> #include <m_string.h> -#ifdef HAVE_POLL -#include <sys/poll.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif - -#if defined(__EMX__) -#define ioctlsocket ioctl -#endif /* defined(__EMX__) */ - -#if defined(MSDOS) || defined(__WIN__) -#ifdef __WIN__ -#undef errno -#undef EINTR -#undef EAGAIN -#define errno WSAGetLastError() -#define EINTR WSAEINTR -#define EAGAIN WSAEINPROGRESS -#endif /* __WIN__ */ -#define O_NONBLOCK 1 /* For emulation of fcntl() */ -#endif -#ifndef EWOULDBLOCK -#define EWOULDBLOCK EAGAIN -#endif #ifndef __WIN__ #define HANDLE void * @@ -83,7 +58,7 @@ report_errors() if (!any_ssl_error) { DBUG_PRINT("info", ("No OpenSSL errors.")); } - DBUG_PRINT("info", ("BTW, errno=%d", errno)); + DBUG_PRINT("info", ("BTW, errno=%d", socket_errno)); DBUG_VOID_RETURN; } @@ -102,7 +77,7 @@ void vio_ssl_delete(Vio * vio) int vio_ssl_errno(Vio *vio __attribute__((unused))) { - return errno; /* On Win32 this mapped to WSAGetLastError() */ + return socket_errno; /* On Win32 this mapped to WSAGetLastError() */ } @@ -118,8 +93,11 @@ int vio_ssl_read(Vio * vio, gptr buf, int size) #endif /* DBUG_OFF */ r = SSL_read(vio->ssl_, buf, size); #ifndef DBUG_OFF - if ( r< 0) + if ( r<= 0) { + r=SSL_get_error(vio->ssl_, r); + DBUG_PRINT("info",("SSL_get_error returned %d",r)); report_errors(); + } #endif /* DBUG_OFF */ DBUG_PRINT("exit", ("%d", r)); DBUG_RETURN(r); @@ -192,8 +170,9 @@ int vio_ssl_keepalive(Vio* vio, my_bool set_keep_alive) my_bool vio_ssl_should_retry(Vio * vio __attribute__((unused))) { - int en = errno; - return en == EAGAIN || en == EINTR || en == EWOULDBLOCK; + int en = socket_errno; + return (en == SOCKET_EAGAIN || en == SOCKET_EINTR || + en == SOCKET_EWOULDBLOCK); } @@ -207,7 +186,6 @@ int vio_ssl_close(Vio * vio) r = SSL_shutdown(vio->ssl_); SSL_free(vio->ssl_); vio->ssl_= 0; - vio->bio_ = 0; } if (shutdown(vio->sd,2)) r= -1; @@ -215,7 +193,7 @@ int vio_ssl_close(Vio * vio) r= -1; if (r) { - DBUG_PRINT("error", ("close() failed, error: %d",errno)); + DBUG_PRINT("error", ("close() failed, error: %d",socket_errno)); report_errors(); /* FIXME: error handling (not critical for MySQL) */ } @@ -255,7 +233,7 @@ my_bool vio_ssl_peer_addr(Vio * vio, char *buf) if (getpeername(vio->sd, (struct sockaddr *) (& (vio->remote)), &addrLen) != 0) { - DBUG_PRINT("exit", ("getpeername, error: %d", errno)); + DBUG_PRINT("exit", ("getpeername, error: %d", socket_errno)); DBUG_RETURN(1); } /* FIXME */ @@ -298,12 +276,11 @@ my_bool vio_ssl_poll_read(Vio *vio,uint timeout) #endif } -void sslaccept(struct st_VioSSLAcceptorFd* ptr, Vio* vio) +void sslaccept(struct st_VioSSLAcceptorFd* ptr, Vio* vio, long timeout) { - X509* client_cert; + X509* client_cert; char *str; - int i; -// const int blocking = vio_is_blocking(vio); + char buf[1024]; DBUG_ENTER("sslaccept"); DBUG_PRINT("enter", ("sd=%d ptr=%p", vio->sd,ptr)); vio_reset(vio,VIO_TYPE_SSL,vio->sd,0,FALSE); @@ -316,49 +293,12 @@ void sslaccept(struct st_VioSSLAcceptorFd* ptr, Vio* vio) DBUG_VOID_RETURN; } DBUG_PRINT("info", ("ssl_=%p",vio->ssl_)); + SSL_clear(vio->ssl_); vio_blocking(vio, FALSE); + SSL_SESSION_set_timeout(SSL_get_session(vio->ssl_), timeout); SSL_set_fd(vio->ssl_,vio->sd); SSL_set_accept_state(vio->ssl_); - - /* FIXME possibly infinite loop */ - while (SSL_is_init_finished(vio->ssl_)) { - DBUG_PRINT("info",("SSL_is_init_finished(vio->ssl_) is not 1")); - if((i=SSL_do_handshake(vio->ssl_))!=SSL_ERROR_NONE) - { - DBUG_PRINT("info",("*** errno %d",errno)); - switch (SSL_get_error(vio->ssl_,i)) - { - case SSL_ERROR_NONE: - DBUG_PRINT("info",("SSL_ERROR_NONE: handshake finished")); - break; - case SSL_ERROR_SSL: - DBUG_PRINT("info",("SSL_ERROR_SSL: SSL protocol error ")); - break; - case SSL_ERROR_WANT_CONNECT: - DBUG_PRINT("info",("SSL_ERROR_WANT_CONNECT:If you are doing non-blocking connects call again when the connection is established")); - break; - case SSL_ERROR_WANT_READ: - DBUG_PRINT("info",("SSL_ERROR_WANT_READ: if non-blocking etc, call again when data is available")); - break; - case SSL_ERROR_WANT_WRITE: - DBUG_PRINT("info",("SSL_ERROR_WANT_WRITE: if non-blocking etc, call again when data is available to write")); - break; - case SSL_ERROR_WANT_X509_LOOKUP: - DBUG_PRINT("info",("SSL_ERROR_WANT_X509_LOOKUP: /* not used yet but could be :-) */")); - break; - case SSL_ERROR_SYSCALL: - DBUG_PRINT("info",("SSL_ERROR_SYSCALL: An error than the error code can be found in errno (%d)",errno)); - break; - case SSL_ERROR_ZERO_RETURN: - DBUG_PRINT("info",("SSL_ERROR_ZERO_RETURN: 0 returned on the read, normally means the socket is closed :-) */")); - break; - default: - DBUG_PRINT("info",("Unknown SSL error returned")); - break; - } - } - usleep(100); - } + SSL_do_handshake(vio->ssl_); vio->open_ = TRUE; #ifndef DBUF_OFF DBUG_PRINT("info",("SSL_get_cipher_name() = '%s'" @@ -374,23 +314,28 @@ void sslaccept(struct st_VioSSLAcceptorFd* ptr, Vio* vio) DBUG_PRINT("info",("\t issuer: %s", str)); free (str); - /* We could do all sorts of certificate verification stuff here before - * deallocating the certificate. */ - X509_free (client_cert); } else DBUG_PRINT("info",("Client does not have certificate.")); + + str=SSL_get_shared_ciphers(vio->ssl_, buf, sizeof(buf)); + if(str) + { + DBUG_PRINT("info",("SSL_get_shared_ciphers() returned '%s'",str)); + } + else + { + DBUG_PRINT("info",("no shared ciphers!")); + } + #endif DBUG_VOID_RETURN; } -void sslconnect(struct st_VioSSLConnectorFd* ptr, Vio* vio) +void sslconnect(struct st_VioSSLConnectorFd* ptr, Vio* vio, long timeout) { char *str; -// char s[]="abc"; -int i; X509* server_cert; - const int blocking = vio_is_blocking(vio); DBUG_ENTER("sslconnect"); DBUG_PRINT("enter", ("sd=%d ptr=%p ctx: %p", vio->sd,ptr,ptr->ssl_context_)); vio_reset(vio,VIO_TYPE_SSL,vio->sd,0,FALSE); @@ -403,50 +348,13 @@ int i; report_errors(); DBUG_VOID_RETURN; } - DBUG_PRINT("info", ("ssl_=%p",vio->ssl_)); + DBUG_PRINT("info",("ssl_=%p",vio->ssl_)); + SSL_clear(vio->ssl_); vio_blocking(vio, FALSE); + SSL_SESSION_set_timeout(SSL_get_session(vio->ssl_), timeout); SSL_set_fd (vio->ssl_, vio->sd); SSL_set_connect_state(vio->ssl_); - - /* FIXME possibly infinite loop */ - while (SSL_is_init_finished(vio->ssl_)) { - DBUG_PRINT("info",("SSL_is_init_finished(vio->ssl_) is not 1")); - if((i=SSL_do_handshake(vio->ssl_))!=SSL_ERROR_NONE) - { - DBUG_PRINT("info",("*** errno %d",errno)); - switch (SSL_get_error(vio->ssl_,i)) - { - case SSL_ERROR_NONE: - DBUG_PRINT("info",("SSL_ERROR_NONE: handshake finished")); - break; - case SSL_ERROR_SSL: - DBUG_PRINT("info",("SSL_ERROR_SSL: SSL protocol error ")); - break; - case SSL_ERROR_WANT_CONNECT: - DBUG_PRINT("info",("SSL_ERROR_WANT_CONNECT:If you are doing non-blocking connects call again when the connection is established")); - break; - case SSL_ERROR_WANT_READ: - DBUG_PRINT("info",("SSL_ERROR_WANT_READ: if non-blocking etc, call again when data is available")); - break; - case SSL_ERROR_WANT_WRITE: - DBUG_PRINT("info",("SSL_ERROR_WANT_WRITE: if non-blocking etc, call again when data is available to write")); - break; - case SSL_ERROR_WANT_X509_LOOKUP: - DBUG_PRINT("info",("SSL_ERROR_WANT_X509_LOOKUP: /* not used yet but could be :-) */")); - break; - case SSL_ERROR_SYSCALL: - DBUG_PRINT("info",("SSL_ERROR_SYSCALL: An error than the error code can be found in errno (%d)",errno)); - break; - case SSL_ERROR_ZERO_RETURN: - DBUG_PRINT("info",("SSL_ERROR_ZERO_RETURN: 0 returned on the read, normally means the socket is closed :-) */")); - break; - default: - DBUG_PRINT("info",("Unknown SSL error returned")); - break; - } - } - usleep(100); - } + SSL_do_handshake(vio->ssl_); vio->open_ = TRUE; #ifndef DBUG_OFF DBUG_PRINT("info",("SSL_get_cipher_name() = '%s'" @@ -469,9 +377,7 @@ int i; } else DBUG_PRINT("info",("Server does not have certificate.")); #endif - vio_blocking(vio, blocking); DBUG_VOID_RETURN; } - #endif /* HAVE_OPENSSL */ diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 077807726fe..579f37f3dda 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -168,15 +168,17 @@ vio_verify_callback(int ok, X509_STORE_CTX *ctx) struct st_VioSSLConnectorFd* new_VioSSLConnectorFd(const char* key_file, const char* cert_file, const char* ca_file, - const char* ca_path) + const char* ca_path, + const char* cipher) { int verify = SSL_VERIFY_PEER; struct st_VioSSLConnectorFd* ptr; + int result; DH *dh=NULL; DBUG_ENTER("new_VioSSLConnectorFd"); DBUG_PRINT("enter", - ("key_file=%s, cert_file=%s, ca_path=%s, ca_file=%s", - key_file, cert_file, ca_path, ca_file)); + ("key_file=%s, cert_file=%s, ca_path=%s, ca_file=%s, cipher=%s", + key_file, cert_file, ca_path, ca_file, cipher)); ptr=(struct st_VioSSLConnectorFd*)my_malloc(sizeof(struct st_VioSSLConnectorFd),MYF(0)); ptr->ssl_context_=0; ptr->ssl_method_=0; @@ -206,8 +208,12 @@ struct st_VioSSLConnectorFd* new_VioSSLConnectorFd(const char* key_file, /* * SSL_CTX_set_options * SSL_CTX_set_info_callback - * SSL_CTX_set_cipher_list */ + if(cipher) + { + result=SSL_CTX_set_cipher_list(ptr->ssl_context_, cipher); + DBUG_PRINT("info",("SSL_set_cipher_list() returned %d",result)); + } SSL_CTX_set_verify(ptr->ssl_context_, verify, vio_verify_callback); if (vio_set_cert_stuff(ptr->ssl_context_, cert_file, key_file) == -1) { @@ -231,14 +237,6 @@ struct st_VioSSLConnectorFd* new_VioSSLConnectorFd(const char* key_file, SSL_CTX_set_tmp_dh(ptr->ssl_context_,dh); DH_free(dh); -/*if (cipher != NULL) - if(!SSL_CTX_set_cipher_list(ctx,cipher)) { - BIO_printf(bio_err,"error setting cipher list\n"); - ERR_print_errors(bio_err); - goto end; - } -*/ - DBUG_RETURN(ptr); ctor_failure: DBUG_PRINT("exit", ("there was an error")); @@ -253,18 +251,20 @@ struct st_VioSSLAcceptorFd* new_VioSSLAcceptorFd(const char* key_file, const char* cert_file, const char* ca_file, - const char* ca_path) + const char* ca_path, + const char* cipher) { int verify = (SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE); struct st_VioSSLAcceptorFd* ptr; + int result; DH *dh=NULL; DBUG_ENTER("new_VioSSLAcceptorFd"); DBUG_PRINT("enter", - ("key_file=%s, cert_file=%s, ca_path=%s, ca_file=%s", - key_file, cert_file, ca_path, ca_file)); + ("key_file=%s, cert_file=%s, ca_path=%s, ca_file=%s, cipher=%s", + key_file, cert_file, ca_path, ca_file, cipher)); ptr=(struct st_VioSSLAcceptorFd*)my_malloc(sizeof(struct st_VioSSLAcceptorFd),MYF(0)); ptr->ssl_context_=0; @@ -293,12 +293,19 @@ new_VioSSLAcceptorFd(const char* key_file, report_errors(); goto ctor_failure; } + if(cipher) + { + result=SSL_CTX_set_cipher_list(ptr->ssl_context_, cipher); + DBUG_PRINT("info",("SSL_set_cipher_list() returned %d",result)); + } /* * SSL_CTX_set_quiet_shutdown(ctx,1); * */ SSL_CTX_sess_set_cache_size(ptr->ssl_context_,128); + + /* DH? */ SSL_CTX_set_verify(ptr->ssl_context_, verify, vio_verify_callback); @@ -328,14 +335,6 @@ new_VioSSLAcceptorFd(const char* key_file, SSL_CTX_set_tmp_dh(ptr->ssl_context_,dh); DH_free(dh); -/*if (cipher != NULL) - if(!SSL_CTX_set_cipher_list(ctx,cipher)) { - BIO_printf(bio_err,"error setting cipher list\n"); - ERR_print_errors(bio_err); - goto end; - } -*/ - DBUG_RETURN(ptr); ctor_failure: DBUG_PRINT("exit", ("there was an error")); |
