1. 31 Oct, 2002 1 commit
    • unknown's avatar
      IN subselect with ORDER BY, HAVING & sum functions · ceb73645
      unknown authored
      
      mysql-test/r/subselect.result:
        IN subselect with ORDER BY, HAVING & sum functions test
      mysql-test/t/subselect.test:
        IN subselect with ORDER BY, HAVING & sum functions test
      sql/item.h:
        removed field, because parent class has same field
      ceb73645
  2. 30 Oct, 2002 12 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 5bb0ca0a
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
      
      
      sql/item.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      5bb0ca0a
    • unknown's avatar
      Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 · 1de7b502
      unknown authored
      into genie.(none):/home/vva/work/mysql-4.1.help/mysql-4.1.help_res
      
      
      sql/sql_yacc.yy:
        Auto merged
      1de7b502
    • unknown's avatar
      addition correction for 'help' command · 8dbfebc7
      unknown authored
      
      include/mysqld_error.h:
        change count of error messages
      libmysqld/Makefile.am:
        add sql_help.cc
      sql/sql_help.cc:
        eliminate warnings
      sql/sql_yacc.yy:
        add ';' to end of 'help' command
      8dbfebc7
    • unknown's avatar
      Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · 87d361aa
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
      
      
      87d361aa
    • unknown's avatar
      717a1ff5
    • unknown's avatar
      date and time fields now have charset arg in constructor · fdff4a99
      unknown authored
      my_charset_latin1
      
      
      include/m_ctype.h:
        my_charset_latin1 is now visible all around the program
      sql/field.cc:
        date and time fields now have charset arg in constructor
      sql/field.h:
        date and time fields now have charset arg in constructor
      sql/item_timefunc.h:
        date and time fields now have charset arg in constructor
      strings/ctype.c:
        my_charset_latin1 is now visible all around the program
      fdff4a99
    • unknown's avatar
      Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · 6cb455a1
      unknown authored
      into mysql.r18.ru:/usr/home/ram/mysql-4.1
      
      
      6cb455a1
    • unknown's avatar
      All String->set() now have charset argument · 85f35cbf
      unknown authored
      85f35cbf
    • unknown's avatar
      Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 · b1de1ef1
      unknown authored
      into mysql.r18.ru:/usr/home/ram/mysql-4.1
      
      
      b1de1ef1
    • unknown's avatar
      BDB 4.1.24 · 155e78f0
      unknown authored
      
      BitKeeper/deleted/.del-ex_access.wpj~3df6ae8c99bf7c5f:
        Delete: bdb/build_vxworks/ex_access/ex_access.wpj
      BitKeeper/deleted/.del-ex_btrec.wpj~a7622f1c6f432dc6:
        Delete: bdb/build_vxworks/ex_btrec/ex_btrec.wpj
      BitKeeper/deleted/.del-ex_dbclient.wpj~7345440f3b204cdd:
        Delete: bdb/build_vxworks/ex_dbclient/ex_dbclient.wpj
      BitKeeper/deleted/.del-ex_env.wpj~fbe1ab10b04e8b74:
        Delete: bdb/build_vxworks/ex_env/ex_env.wpj
      BitKeeper/deleted/.del-ex_mpool.wpj~4479cfd5c45f327d:
        Delete: bdb/build_vxworks/ex_mpool/ex_mpool.wpj
      BitKeeper/deleted/.del-ex_tpcb.wpj~f78093006e14bf41:
        Delete: bdb/build_vxworks/ex_tpcb/ex_tpcb.wpj
      BitKeeper/deleted/.del-db_buildall.dsp~bd749ff6da11682:
        Delete: bdb/build_win32/db_buildall.dsp
      BitKeeper/deleted/.del-cxx_app.cpp~ad8df8e0791011ed:
        Delete: bdb/cxx/cxx_app.cpp
      BitKeeper/deleted/.del-cxx_log.cpp~a50ff3118fe06952:
        Delete: bdb/cxx/cxx_log.cpp
      BitKeeper/deleted/.del-cxx_table.cpp~ecd751e79b055556:
        Delete: bdb/cxx/cxx_table.cpp
      BitKeeper/deleted/.del-namemap.txt~796a3acd3885d8fd:
        Delete: bdb/cxx/namemap.txt
      BitKeeper/deleted/.del-Design.fileop~3ca4da68f1727373:
        Delete: bdb/db/Design.fileop
      BitKeeper/deleted/.del-db185_int.h~61bee3736e7959ef:
        Delete: bdb/db185/db185_int.h
      BitKeeper/deleted/.del-acconfig.h~411e8854d67ad8b5:
        Delete: bdb/dist/acconfig.h
      BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
        Delete: bdb/dist/aclocal/mutex.m4
      BitKeeper/deleted/.del-options.m4~b9d0ca637213750a:
        Delete: bdb/dist/aclocal/options.m4
      BitKeeper/deleted/.del-programs.m4~3ce7890b47732b30:
        Delete: bdb/dist/aclocal/programs.m4
      BitKeeper/deleted/.del-tcl.m4~f944e2db93c3b6db:
        Delete: bdb/dist/aclocal/tcl.m4
      BitKeeper/deleted/.del-types.m4~59cae158c9a32cff:
        Delete: bdb/dist/aclocal/types.m4
      BitKeeper/deleted/.del-script~d38f6d3a4f159cb4:
        Delete: bdb/dist/build/script
      BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c:
        Delete: bdb/dist/configure.in
      BitKeeper/deleted/.del-ltconfig~66bbd007d8024af:
        Delete: bdb/dist/ltconfig
      BitKeeper/deleted/.del-rec_ctemp~a28554362534f00a:
        Delete: bdb/dist/rec_ctemp
      BitKeeper/deleted/.del-s_tcl~2ffe4326459fcd9f:
        Delete: bdb/dist/s_tcl
      BitKeeper/deleted/.del-.IGNORE_ME~d8148b08fa7d5d15:
        Delete: bdb/dist/template/.IGNORE_ME
      BitKeeper/deleted/.del-btree.h~179f2aefec1753d:
        Delete: bdb/include/btree.h
      BitKeeper/deleted/.del-cxx_int.h~6b649c04766508f8:
        Delete: bdb/include/cxx_int.h
      BitKeeper/deleted/.del-db.src~6b433ae615b16a8d:
        Delete: bdb/include/db.src
      BitKeeper/deleted/.del-db_185.h~ad8b373d9391d35c:
        Delete: bdb/include/db_185.h
      BitKeeper/deleted/.del-db_am.h~a714912b6b75932f:
        Delete: bdb/include/db_am.h
      BitKeeper/deleted/.del-db_cxx.h~fcafadf45f5d19e9:
        Delete: bdb/include/db_cxx.h
      BitKeeper/deleted/.del-db_dispatch.h~6844f20f7eb46904:
        Delete: bdb/include/db_dispatch.h
      BitKeeper/deleted/.del-db_int.src~419a3f48b6a01da7:
        Delete: bdb/include/db_int.src
      BitKeeper/deleted/.del-db_join.h~76f9747a42c3399a:
        Delete: bdb/include/db_join.h
      BitKeeper/deleted/.del-db_page.h~e302ca3a4db3abdc:
        Delete: bdb/include/db_page.h
      BitKeeper/deleted/.del-db_server_int.h~e1d20b6ba3bca1ab:
        Delete: bdb/include/db_server_int.h
      BitKeeper/deleted/.del-db_shash.h~5fbf2d696fac90f3:
        Delete: bdb/include/db_shash.h
      BitKeeper/deleted/.del-db_swap.h~1e60887550864a59:
        Delete: bdb/include/db_swap.h
      BitKeeper/deleted/.del-db_upgrade.h~c644eee73701fc8d:
        Delete: bdb/include/db_upgrade.h
      BitKeeper/deleted/.del-db_verify.h~b8d6c297c61f342e:
        Delete: bdb/include/db_verify.h
      BitKeeper/deleted/.del-debug.h~dc2b4f2cf27ccebc:
        Delete: bdb/include/debug.h
      BitKeeper/deleted/.del-hash.h~2aaa548b28882dfb:
        Delete: bdb/include/hash.h
      BitKeeper/deleted/.del-lock.h~a761c1b7de57b77f:
        Delete: bdb/include/lock.h
      BitKeeper/deleted/.del-log.h~ff20184238e35e4d:
        Delete: bdb/include/log.h
      BitKeeper/deleted/.del-mp.h~7e317597622f3411:
        Delete: bdb/include/mp.h
      BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137:
        Delete: bdb/include/mutex.h
      BitKeeper/deleted/.del-os.h~91867cc8757cd0e3:
        Delete: bdb/include/os.h
      BitKeeper/deleted/.del-os_jump.h~e1b939fa5151d4be:
        Delete: bdb/include/os_jump.h
      BitKeeper/deleted/.del-qam.h~6fad0c1b5723d597:
        Delete: bdb/include/qam.h
      BitKeeper/deleted/.del-queue.h~4c72c0826c123d5:
        Delete: bdb/include/queue.h
      BitKeeper/deleted/.del-region.h~513fe04d977ca0fc:
        Delete: bdb/include/region.h
      BitKeeper/deleted/.del-shqueue.h~525fc3e6c2025c36:
        Delete: bdb/include/shqueue.h
      BitKeeper/deleted/.del-tcl_db.h~c536fd61a844f23f:
        Delete: bdb/include/tcl_db.h
      BitKeeper/deleted/.del-txn.h~c8d94b221ec147e4:
        Delete: bdb/include/txn.h
      BitKeeper/deleted/.del-xa.h~ecc466493aae9d9a:
        Delete: bdb/include/xa.h
      BitKeeper/deleted/.del-DbRecoveryInit.java~756b52601a0b9023:
        Delete: bdb/java/src/com/sleepycat/db/DbRecoveryInit.java
      BitKeeper/deleted/.del-DbTxnRecover.java~74607cba7ab89d6d:
        Delete: bdb/java/src/com/sleepycat/db/DbTxnRecover.java
      BitKeeper/deleted/.del-lock_conflict.c~fc5e0f14cf597a2b:
        Delete: bdb/lock/lock_conflict.c
      BitKeeper/deleted/.del-log.src~53ac9e7b5cb023f2:
        Delete: bdb/log/log.src
      BitKeeper/deleted/.del-log_findckp.c~24287f008916e81f:
        Delete: bdb/log/log_findckp.c
      BitKeeper/deleted/.del-log_rec.c~d51711f2cac09297:
        Delete: bdb/log/log_rec.c
      BitKeeper/deleted/.del-log_register.c~b40bb4efac75ca15:
        Delete: bdb/log/log_register.c
      BitKeeper/deleted/.del-Design~b3d0f179f2767b:
        Delete: bdb/mp/Design
      BitKeeper/deleted/.del-os_finit.c~95dbefc6fe79b26c:
        Delete: bdb/os/os_finit.c
      BitKeeper/deleted/.del-os_abs.c~df95d1e7db81924:
        Delete: bdb/os_vxworks/os_abs.c
      BitKeeper/deleted/.del-os_finit.c~803b484bdb9d0122:
        Delete: bdb/os_vxworks/os_finit.c
      BitKeeper/deleted/.del-os_map.c~3a6d7926398b76d3:
        Delete: bdb/os_vxworks/os_map.c
      BitKeeper/deleted/.del-os_finit.c~19a227c6d3c78ad:
        Delete: bdb/os_win32/os_finit.c
      BitKeeper/deleted/.del-log-corruption.patch~1cf2ecc7c6408d5d:
        Delete: bdb/patches/log-corruption.patch
      BitKeeper/deleted/.del-Btree.pm~af6d0c5eaed4a98e:
        Delete: bdb/perl.BerkeleyDB/BerkeleyDB/Btree.pm
      BitKeeper/deleted/.del-BerkeleyDB.pm~7244036d4482643:
        Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pm
      BitKeeper/deleted/.del-BerkeleyDB.pod~e7b18fd6132448e3:
        Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pod
      BitKeeper/deleted/.del-Hash.pm~10292a26c06a5c95:
        Delete: bdb/perl.BerkeleyDB/BerkeleyDB/Hash.pm
      BitKeeper/deleted/.del-BerkeleyDB.pod.P~79f76a1495eda203:
        Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pod.P
      BitKeeper/deleted/.del-BerkeleyDB.xs~80c99afbd98e392c:
        Delete: bdb/perl.BerkeleyDB/BerkeleyDB.xs
      BitKeeper/deleted/.del-Changes~729c1891efa60de9:
        Delete: bdb/perl.BerkeleyDB/Changes
      BitKeeper/deleted/.del-MANIFEST~63a1e34aecf157a0:
        Delete: bdb/perl.BerkeleyDB/MANIFEST
      BitKeeper/deleted/.del-Makefile.PL~c68797707d8df87a:
        Delete: bdb/perl.BerkeleyDB/Makefile.PL
      BitKeeper/deleted/.del-README~5f2f579b1a241407:
        Delete: bdb/perl.BerkeleyDB/README
      BitKeeper/deleted/.del-Todo~dca3c66c193adda9:
        Delete: bdb/perl.BerkeleyDB/Todo
      BitKeeper/deleted/.del-config.in~ae81681e450e0999:
        Delete: bdb/perl.BerkeleyDB/config.in
      BitKeeper/deleted/.del-dbinfo~28ad67d83be4f68e:
        Delete: bdb/perl.BerkeleyDB/dbinfo
      BitKeeper/deleted/.del-mkconsts~543ab60669c7a04e:
        Delete: bdb/perl.BerkeleyDB/mkconsts
      BitKeeper/deleted/.del-mkpod~182c0ca54e439afb:
        Delete: bdb/perl.BerkeleyDB/mkpod
      BitKeeper/deleted/.del-5.004~e008cb5a48805543:
        Delete: bdb/perl.BerkeleyDB/patches/5.004
      BitKeeper/deleted/.del-irix_6_5.pl~61662bb08afcdec8:
        Delete: bdb/perl.BerkeleyDB/hints/irix_6_5.pl
      BitKeeper/deleted/.del-solaris.pl~6771e7182394e152:
        Delete: bdb/perl.BerkeleyDB/hints/solaris.pl
      BitKeeper/deleted/.del-typemap~783b8f5295b05f3d:
        Delete: bdb/perl.BerkeleyDB/typemap
      BitKeeper/deleted/.del-5.004_01~6081ce2fff7b0bc:
        Delete: bdb/perl.BerkeleyDB/patches/5.004_01
      BitKeeper/deleted/.del-5.004_02~87214eac35ad9e6:
        Delete: bdb/perl.BerkeleyDB/patches/5.004_02
      BitKeeper/deleted/.del-5.004_03~9a672becec7cb40f:
        Delete: bdb/perl.BerkeleyDB/patches/5.004_03
      BitKeeper/deleted/.del-5.004_04~e326cb51af09d154:
        Delete: bdb/perl.BerkeleyDB/patches/5.004_04
      BitKeeper/deleted/.del-5.004_05~7ab457a1e41a92fe:
        Delete: bdb/perl.BerkeleyDB/patches/5.004_05
      BitKeeper/deleted/.del-5.005~f9e2d59b5964cd4b:
        Delete: bdb/perl.BerkeleyDB/patches/5.005
      BitKeeper/deleted/.del-5.005_01~3eb9fb7b5842ea8e:
        Delete: bdb/perl.BerkeleyDB/patches/5.005_01
      BitKeeper/deleted/.del-5.005_02~67477ce0bef717cb:
        Delete: bdb/perl.BerkeleyDB/patches/5.005_02
      BitKeeper/deleted/.del-5.005_03~c4c29a1fb21e290a:
        Delete: bdb/perl.BerkeleyDB/patches/5.005_03
      BitKeeper/deleted/.del-5.6.0~e1fb9897d124ee22:
        Delete: bdb/perl.BerkeleyDB/patches/5.6.0
      BitKeeper/deleted/.del-btree.t~e4a1a3c675ddc406:
        Delete: bdb/perl.BerkeleyDB/t/btree.t
      BitKeeper/deleted/.del-db-3.0.t~d2c60991d84558f2:
        Delete: bdb/perl.BerkeleyDB/t/db-3.0.t
      BitKeeper/deleted/.del-db-3.1.t~6ee88cd13f55e018:
        Delete: bdb/perl.BerkeleyDB/t/db-3.1.t
      BitKeeper/deleted/.del-db-3.2.t~f73b6461f98fd1cf:
        Delete: bdb/perl.BerkeleyDB/t/db-3.2.t
      BitKeeper/deleted/.del-destroy.t~cc6a2ae1980a2ecd:
        Delete: bdb/perl.BerkeleyDB/t/destroy.t
      BitKeeper/deleted/.del-env.t~a8604a4499c4bd07:
        Delete: bdb/perl.BerkeleyDB/t/env.t
      BitKeeper/deleted/.del-examples.t~2571b77c3cc75574:
        Delete: bdb/perl.BerkeleyDB/t/examples.t
      BitKeeper/deleted/.del-examples.t.T~8228bdd75ac78b88:
        Delete: bdb/perl.BerkeleyDB/t/examples.t.T
      BitKeeper/deleted/.del-examples3.t.T~66a186897a87026d:
        Delete: bdb/perl.BerkeleyDB/t/examples3.t.T
      BitKeeper/deleted/.del-examples3.t~fe3822ba2f2d7f83:
        Delete: bdb/perl.BerkeleyDB/t/examples3.t
      BitKeeper/deleted/.del-filter.t~f87b045c1b708637:
        Delete: bdb/perl.BerkeleyDB/t/filter.t
      BitKeeper/deleted/.del-hash.t~616bfb4d644de3a3:
        Delete: bdb/perl.BerkeleyDB/t/hash.t
      BitKeeper/deleted/.del-join.t~29fc39f74a83ca22:
        Delete: bdb/perl.BerkeleyDB/t/join.t
      BitKeeper/deleted/.del-mldbm.t~31f5015341eea040:
        Delete: bdb/perl.BerkeleyDB/t/mldbm.t
      BitKeeper/deleted/.del-queue.t~8f338034ce44a641:
        Delete: bdb/perl.BerkeleyDB/t/queue.t
      BitKeeper/deleted/.del-recno.t~d4ddbd3743add63e:
        Delete: bdb/perl.BerkeleyDB/t/recno.t
      BitKeeper/deleted/.del-strict.t~6885cdd2ea71ca2d:
        Delete: bdb/perl.BerkeleyDB/t/strict.t
      BitKeeper/deleted/.del-subdb.t~aab62a5d5864c603:
        Delete: bdb/perl.BerkeleyDB/t/subdb.t
      BitKeeper/deleted/.del-txn.t~65033b8558ae1216:
        Delete: bdb/perl.BerkeleyDB/t/txn.t
      BitKeeper/deleted/.del-unknown.t~f3710458682665e1:
        Delete: bdb/perl.BerkeleyDB/t/unknown.t
      BitKeeper/deleted/.del-Changes~436f74a5c414c65b:
        Delete: bdb/perl.DB_File/Changes
      BitKeeper/deleted/.del-DB_File.pm~ae0951c6c7665a82:
        Delete: bdb/perl.DB_File/DB_File.pm
      BitKeeper/deleted/.del-DB_File.xs~89e49a0b5556f1d8:
        Delete: bdb/perl.DB_File/DB_File.xs
      BitKeeper/deleted/.del-DB_File_BS~290fad5dbbb87069:
        Delete: bdb/perl.DB_File/DB_File_BS
      BitKeeper/deleted/.del-MANIFEST~90ee581572bdd4ac:
        Delete: bdb/perl.DB_File/MANIFEST
      BitKeeper/deleted/.del-Makefile.PL~ac0567bb5a377e38:
        Delete: bdb/perl.DB_File/Makefile.PL
      BitKeeper/deleted/.del-README~77e924a5a9bae6b3:
        Delete: bdb/perl.DB_File/README
      BitKeeper/deleted/.del-config.in~ab4c2792b86a810b:
        Delete: bdb/perl.DB_File/config.in
      BitKeeper/deleted/.del-dbinfo~461c43b30fab2cb:
        Delete: bdb/perl.DB_File/dbinfo
      BitKeeper/deleted/.del-dynixptx.pl~50dcddfae25d17e9:
        Delete: bdb/perl.DB_File/hints/dynixptx.pl
      BitKeeper/deleted/.del-typemap~55cffb3288a9e587:
        Delete: bdb/perl.DB_File/typemap
      BitKeeper/deleted/.del-version.c~a4df0e646f8b3975:
        Delete: bdb/perl.DB_File/version.c
      BitKeeper/deleted/.del-5.004_01~d6830d0082702af7:
        Delete: bdb/perl.DB_File/patches/5.004_01
      BitKeeper/deleted/.del-5.004_02~78b082dc80c91031:
        Delete: bdb/perl.DB_File/patches/5.004_02
      BitKeeper/deleted/.del-5.004~4411ec2e3c9e008b:
        Delete: bdb/perl.DB_File/patches/5.004
      BitKeeper/deleted/.del-sco.pl~1e795fe14fe4dcfe:
        Delete: bdb/perl.DB_File/hints/sco.pl
      BitKeeper/deleted/.del-5.004_03~33f274648b160d95:
        Delete: bdb/perl.DB_File/patches/5.004_03
      BitKeeper/deleted/.del-5.004_04~8f3d1b3cf18bb20a:
        Delete: bdb/perl.DB_File/patches/5.004_04
      BitKeeper/deleted/.del-5.004_05~9c0f02e7331e142:
        Delete: bdb/perl.DB_File/patches/5.004_05
      BitKeeper/deleted/.del-5.005~c2108cb2e3c8d951:
        Delete: bdb/perl.DB_File/patches/5.005
      BitKeeper/deleted/.del-5.005_01~3b45e9673afc4cfa:
        Delete: bdb/perl.DB_File/patches/5.005_01
      BitKeeper/deleted/.del-5.005_02~9fe5766bb02a4522:
        Delete: bdb/perl.DB_File/patches/5.005_02
      BitKeeper/deleted/.del-5.005_03~ffa1c38c19ae72ea:
        Delete: bdb/perl.DB_File/patches/5.005_03
      BitKeeper/deleted/.del-5.6.0~373be3a5ce47be85:
        Delete: bdb/perl.DB_File/patches/5.6.0
      BitKeeper/deleted/.del-db-btree.t~3231595a1c241eb3:
        Delete: bdb/perl.DB_File/t/db-btree.t
      BitKeeper/deleted/.del-db-hash.t~7c4ad0c795c7fad2:
        Delete: bdb/perl.DB_File/t/db-hash.t
      BitKeeper/deleted/.del-db-recno.t~6c2d3d80b9ba4a50:
        Delete: bdb/perl.DB_File/t/db-recno.t
      BitKeeper/deleted/.del-db_server.sed~cdb00ebcd48a64e2:
        Delete: bdb/rpc_server/db_server.sed
      BitKeeper/deleted/.del-db_server_proc.c~d46c8f409c3747f4:
        Delete: bdb/rpc_server/db_server_proc.c
      BitKeeper/deleted/.del-db_server_svc.sed~3f5e59f334fa4607:
        Delete: bdb/rpc_server/db_server_svc.sed
      BitKeeper/deleted/.del-db_server_util.c~a809f3a4629acda:
        Delete: bdb/rpc_server/db_server_util.c
      BitKeeper/deleted/.del-log.tcl~ff1b41f1355b97d7:
        Delete: bdb/test/log.tcl
      BitKeeper/deleted/.del-mpool.tcl~b0df4dc1b04db26c:
        Delete: bdb/test/mpool.tcl
      BitKeeper/deleted/.del-mutex.tcl~52fd5c73a150565:
        Delete: bdb/test/mutex.tcl
      BitKeeper/deleted/.del-txn.tcl~c4ff071550b5446e:
        Delete: bdb/test/txn.tcl
      BitKeeper/deleted/.del-README~e800a12a5392010a:
        Delete: bdb/test/upgrade/README
      BitKeeper/deleted/.del-pack-2.6.6.pl~89d5076d758d3e98:
        Delete: bdb/test/upgrade/generate-2.X/pack-2.6.6.pl
      BitKeeper/deleted/.del-test-2.6.patch~4a52dc83d447547b:
        Delete: bdb/test/upgrade/generate-2.X/test-2.6.patch
      155e78f0
    • unknown's avatar
    • unknown's avatar
      Preparation to thread specific default charset · e086000f
      unknown authored
      e086000f
  3. 29 Oct, 2002 5 commits
    • unknown's avatar
      Merge mysql.com:/home/nick/mysql/repository/mysql-4.1 · 75dc4d5c
      unknown authored
      into mysql.com:/home/nick/mysql/mysql-4.1
      
      
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      75dc4d5c
    • unknown's avatar
      Added comment blocks for all functions · 5cd67c35
      unknown authored
      5cd67c35
    • unknown's avatar
      Changed binlog name padding from binlog.001 to binlog.000001 · 46cd8ff4
      unknown authored
      
      mysql-test/Makefile.am:
        Changed binlog.001 to be binlog.000001
      mysql-test/r/rpl000015.result:
        Changed binlog.001 to be binlog.000001
      mysql-test/r/rpl000018.result:
        Changed binlog.001 to be binlog.000001
      mysql-test/r/rpl_flush_log_loop.result:
        Changed binlog.001 to be binlog.000001
      mysql-test/r/rpl_log.result:
        Changed binlog.001 to be binlog.000001
      mysql-test/r/rpl_log_pos.result:
        Changed binlog.001 to be binlog.000001
      mysql-test/r/rpl_rotate_logs.result:
        Changed binlog.001 to be binlog.000001
      mysql-test/t/rpl000017-slave.sh:
        Changed binlog.001 to be binlog.000001
      mysql-test/t/rpl_log.test:
        Changed binlog.001 to be binlog.000001
      mysql-test/t/rpl_rotate_logs.test:
        Changed binlog.001 to be binlog.000001
      sql/log.cc:
        Changed binlog.001 to be binlog.000001
      46cd8ff4
    • unknown's avatar
      correct English message · b8798d25
      unknown authored
      b8798d25
    • unknown's avatar
      correct English in last message · 33e81799
      unknown authored
      delete ugly comma
      
      
      sql/share/czech/errmsg.txt:
        correct English
      sql/share/danish/errmsg.txt:
        correct English
      sql/share/dutch/errmsg.txt:
        correct English
      sql/share/english/errmsg.txt:
        correct English
      sql/share/estonian/errmsg.txt:
        correct English
      sql/share/french/errmsg.txt:
        correct English
      sql/share/german/errmsg.txt:
        correct English
      sql/share/greek/errmsg.txt:
        correct English
      sql/share/hungarian/errmsg.txt:
        correct English
      sql/share/italian/errmsg.txt:
        correct English
      sql/share/japanese/errmsg.txt:
        correct English
      sql/share/korean/errmsg.txt:
        correct English
      sql/share/norwegian-ny/errmsg.txt:
        correct English
      sql/share/norwegian/errmsg.txt:
        correct English
      sql/share/polish/errmsg.txt:
        correct English
      sql/share/portuguese/errmsg.txt:
        correct English
      sql/share/romanian/errmsg.txt:
        correct English
      sql/share/russian/errmsg.txt:
        correct English
      sql/share/serbian/errmsg.txt:
        correct English
      sql/share/slovak/errmsg.txt:
        correct English
      sql/share/spanish/errmsg.txt:
        correct English
      sql/share/swedish/errmsg.txt:
        correct English
      sql/share/ukrainian/errmsg.txt:
        correct English
      sql/sql_lex.h:
        delete ugly comma
      33e81799
  4. 28 Oct, 2002 1 commit
    • unknown's avatar
      add help command on server side · fc4c9c01
      unknown authored
      
      include/mysqld_error.h:
        add error for corrupt help db
      scripts/Makefile.am:
        add script for fill help db
      scripts/mysql_install_db.sh:
        modify for add help db
      sql/Makefile.am:
        modify for add sql_help.cc
      sql/lex.h:
        add help command
      sql/mysql_priv.h:
        add mysqld_help function declaration
      sql/share/czech/errmsg.txt:
        add message for help-db error
      sql/share/danish/errmsg.txt:
        add message for help-db error
      sql/share/dutch/errmsg.txt:
        add message for help-db error
      sql/share/english/errmsg.txt:
        add message for help-db error
      sql/share/estonian/errmsg.txt:
        add message for help-db error
      sql/share/french/errmsg.txt:
        add message for help-db error
      sql/share/german/errmsg.txt:
        add message for help-db error
      sql/share/greek/errmsg.txt:
        add message for help-db error
      sql/share/hungarian/errmsg.txt:
        add message for help-db error
      sql/share/italian/errmsg.txt:
        add message for help-db error
      sql/share/japanese/errmsg.txt:
        add message for help-db error
      sql/share/korean/errmsg.txt:
        add message for help-db error
      sql/share/norwegian-ny/errmsg.txt:
        add message for help-db error
      sql/share/norwegian/errmsg.txt:
        add message for help-db error
      sql/share/polish/errmsg.txt:
        add message for help-db error
      sql/share/portuguese/errmsg.txt:
        add message for help-db error
      sql/share/romanian/errmsg.txt:
        add message for help-db error
      sql/share/russian/errmsg.txt:
        add message for help-db error
      sql/share/serbian/errmsg.txt:
        add message for help-db error
      sql/share/slovak/errmsg.txt:
        add message for help-db error
      sql/share/spanish/errmsg.txt:
        add message for help-db error
      sql/share/swedish/errmsg.txt:
        add message for help-db error
      sql/share/ukrainian/errmsg.txt:
        add message for help-db error
      sql/sql_lex.h:
        add SQLCOM_END 
        and help_arg in Lex
      sql/sql_parse.cc:
        add SQLCOM_HELP handler
      sql/sql_yacc.yy:
        add help command
      fc4c9c01
  5. 27 Oct, 2002 5 commits
  6. 26 Oct, 2002 2 commits
    • unknown's avatar
      code cleanup · c37bbf06
      unknown authored
      fixed subselect error handling bug
      fixed subselect UNION ALL bug
      fixed thd->lex.select restoring
      explain UNION subselect bug
      
      
      mysql-test/r/subselect.result:
        test for:
          subselect UNION ALL bug
          subselect error handling bug
          explain UNION subselect bug
      mysql-test/t/subselect.test:
        test for:
          subselect UNION ALL bug
          subselect error handling bug
          explain UNION subselect bug
      sql/sql_lex.cc:
        fixed subselect UNION ALL bug
      sql/sql_lex.h:
        fixed subselect UNION ALL bug
      sql/sql_parse.cc:
        fixed subselect UNION ALL bug
      sql/sql_select.cc:
        fixed subselect error handling bug
        fixed explain UNION subselect bug
      sql/sql_union.cc:
        fixed thd->lex.select restoring
        code cleanup
        fixed subselect error handling bug
        fixed subselect UNION ALL bug
      sql/sql_yacc.yy:
        fixed subselect UNION ALL bug
      c37bbf06
    • unknown's avatar
      Merge abelkin@work.mysql.com:/home/bk/mysql-4.1 · 9e829404
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/mysql-4.1.bak
      
      
      BitKeeper/deleted/.del-.del-Makefile.emx~1:
        Delete: BitKeeper/deleted/.del-Makefile.emx~1
      BitKeeper/deleted/.del-.del-Makefile.riscos:
        Delete: BitKeeper/deleted/.del-Makefile.riscos
      9e829404
  7. 25 Oct, 2002 14 commits
    • unknown's avatar
      bad auto-merge fixed · 3ae890ed
      unknown authored
      3ae890ed
    • unknown's avatar
      merged · 7962de4c
      unknown authored
      
      BitKeeper/etc/gone:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-skipkeys~888e38cf95239a33:
        'Auto converge rename'
      Docs/manual.texi:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      myisam/ft_nlq_search.c:
        Auto merged
      myisam/ft_parser.c:
        Auto merged
      myisam/ftdefs.h:
        Auto merged
      myisam/mi_create.c:
        Auto merged
      mysys/my_init.c:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      7962de4c
    • unknown's avatar
      merged · f5563dda
      unknown authored
      
      BitKeeper/etc/gone:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
        Delete: BitKeeper/etc/skipkeys
      BitKeeper/etc/skipkeys:
        Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
      Build-tools/Do-compile:
        Auto merged
      Docs/manual.texi:
        Auto merged
      innobase/pars/lexyy.c:
        Auto merged
      innobase/pars/pars0grm.c:
        Auto merged
      mysys/my_init.c:
        Auto merged
      scripts/mysqlhotcopy.sh:
        Auto merged
      sql/nt_servc.cc:
        Auto merged
      sql/nt_servc.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/t/bdb-crash.test:
        Auto merged
      f5563dda
    • unknown's avatar
      merged · 43abd169
      unknown authored
      
      BitKeeper/etc/gone:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-skipkeys~9d3403dbb31de075:
        'Auto converge rename'
      43abd169
    • unknown's avatar
      BK automatic LOD removal. · 48e93f81
      unknown authored
      
      BitKeeper/etc/skipkeys:
        auto add
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      48e93f81
    • unknown's avatar
      memory leak closed · 4952223e
      unknown authored
      4952223e
    • unknown's avatar
      lexyy.c, pars0grm.c: · f4ebc48e
      unknown authored
        Include univ.i before any system headers to remove a large file compilation failure on AIX
      
      
      innobase/pars/pars0grm.c:
        Include univ.i before any system headers to remove a large file compilation failure on AIX
      innobase/pars/lexyy.c:
        Include univ.i before any system headers to remove a large file compilation failure on AIX
      f4ebc48e
    • unknown's avatar
      typo fixed · d51b72ca
      unknown authored
      d51b72ca
    • unknown's avatar
      Merge work:/home/bk/mysql-4.1 · a46e0cbb
      unknown authored
      into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      
      a46e0cbb
    • unknown's avatar
      ac9445a7
    • unknown's avatar
      support for HA_READ_PREFIX_LAST_OR_PREV in headres · 14e6526a
      unknown authored
      full support for HA_READ_PREFIX_LAST_OR_PREV in MyISAM
      protected by #if NOT_IMPLEMENTED_YET in opt_range.cc as not all table handlers support it
      
      
      BitKeeper/etc/ignore:
        Added configure.lineno innobase/configure.lineno innobase/stamp-h1 myisam/rt_test.MYD myisam/rt_test.MYI stamp-h1 to the ignore list
      include/my_base.h:
        support for HA_READ_PREFIX_LAST_OR_PREV
      myisam/mi_search.c:
        full support of HA_READ_PREFIX_LAST_OR_PREV in MyISAM
      myisam/mi_static.c:
        full support of HA_READ_PREFIX_LAST_OR_PREV in MyISAM
      sql/opt_range.cc:
        support for HA_READ_PREFIX_LAST_OR_PREV
        protected by #if NOT_IMPLEMENTED_YET, not all table handlers support it
      sql/sql_handler.cc:
        support for HA_READ_PREFIX_LAST_OR_PREV
      14e6526a
    • unknown's avatar
      ENUM/SET fields now have charset too · 235068a1
      unknown authored
      235068a1
    • unknown's avatar
      Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · 0525cf47
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      0525cf47
    • unknown's avatar
      e8237515