1. 04 Nov, 2001 3 commits
    • unknown's avatar
      use local version when doing merge with 3.23.44 · ca133bc9
      unknown authored
      ca133bc9
    • unknown's avatar
      merge with 3.23.44 · 9facbc80
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      Docs/manual.texi:
        Auto merged
      include/my_base.h:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/join.test:
        Auto merged
      mysql-test/t/rpl000012.test:
        Auto merged
      BUILD/FINISH.sh:
        Auto merged
      BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
        Auto merged
      BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
        Auto merged
      BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
        Auto merged
      BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
        Auto merged
      Build-tools/Do-all-build-steps:
        Auto merged
      client/client_priv.h:
        Auto merged
      client/mysqladmin.c:
        Auto merged
      innobase/include/srv0srv.h:
        Auto merged
      innobase/include/univ.i:
        Auto merged
      innobase/log/log0log.c:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      isam/pack_isam.c:
        Auto merged
      libmysql_r/Makefile.am:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      mysql-test/t/having.test:
        Auto merged
      mysql-test/t/rpl000015-slave.sh:
        Auto merged
      mysql-test/t/rpl000016-slave.sh:
        Auto merged
      mysys/mf_cache.c:
        Auto merged
      mysys/mf_casecnv.c:
        Auto merged
      mysys/mf_tempfile.c:
        Auto merged
      readline/vi_mode.c:
        Auto merged
      strings/strto.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/time.cc:
        Auto merged
      BUILD/SETUP.sh:
        Use -mcpu as default (safe for all x86 cpu's)
      client/mysqldump.c:
        Merge from 3.23.44
      configure.in:
        Update version number
      extra/resolveip.c:
        Portability fix
      9facbc80
    • unknown's avatar
      Fix error messages · 53eac7f4
      unknown authored
      mysqltest now also writes failed error messages to log
      
      
      Docs/manual.texi:
        Applied changes missed in last merge
      client/mysqltest.c:
        Write failed error messages to log.
        Remove space from start of line when doing 'eval'
      mysql-test/include/master-slave.inc:
        Fixed after adding output of error messages to mysqltest
      mysql-test/r/alter_table.result:
        Removed wrong space
      mysql-test/r/rpl000001.result:
        Removed wrong space
      mysql-test/r/rpl000003.result:
        Fixed after adding output of error messages to mysqltest
      mysql-test/r/rpl000015.result:
        Removed wrong space
      mysql-test/r/rpl000016.result:
        Removed wrong space
      mysql-test/t/drop.test:
        Change error numbers
      mysql-test/t/union.test:
        Change error numbers
      sql/share/czech/errmsg.txt:
        Fix error messages
      sql/share/danish/errmsg.txt:
        Fix error messages
      sql/share/english/errmsg.txt:
        Fix error messages
      sql/share/french/errmsg.txt:
        Fix error messages
      sql/share/german/errmsg.txt:
        Fix error messages
      sql/share/greek/errmsg.txt:
        Fix error messages
      sql/share/hungarian/errmsg.txt:
        Fix error messages
      sql/share/italian/errmsg.txt:
        Fix error messages
      sql/share/japanese/errmsg.txt:
        Fix error messages
      sql/share/korean/errmsg.txt:
        Fix error messages
      sql/share/norwegian-ny/errmsg.txt:
        Fix error messages
      sql/share/norwegian/errmsg.txt:
        Fix error messages
      sql/share/polish/errmsg.txt:
        Fix error messages
      sql/share/portuguese/errmsg.txt:
        Fix error messages
      sql/share/romanian/errmsg.txt:
        Fix error messages
      sql/share/slovak/errmsg.txt:
        Fix error messages
      sql/share/spanish/errmsg.txt:
        Fix error messages
      sql/share/swedish/errmsg.txt:
        Fix error messages
      sql/share/ukrainian/errmsg.txt:
        Fix error messages
      53eac7f4
  2. 03 Nov, 2001 4 commits
    • unknown's avatar
      merge · 063df98f
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      acinclude.m4:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/german/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      sql/share/swedish/errmsg.txt:
        Auto merged
      Docs/manual.texi:
        Bad merge.
      include/mysqld_error.h:
        Merge with 3.23
      063df98f
    • unknown's avatar
      Added STDCALL to mysql_sever and mysql_thread variables · 7edaaf34
      unknown authored
      Merged error messages with 3.23.44
      Fixed bug with DATA DIRECTORY on windows
      
      
      Docs/internals.texi:
        Update coding policies
      Docs/manual.texi:
        Minor general corrections
      acinclude.m4:
        Fixed wrong cpu-test
      configure.in:
        Remove CPU test, because this makes unportable binaries.
      include/mysql.h:
        Added STDCALL to mysql_sever and mysql_thread variables
      include/mysqld_error.h:
        Merged error messages with 3.23.44
      libmysql/libmysql.c:
        Added STDCALL to mysql_sever and mysql_thread variables
      libmysqld/lib_sql.cc:
        Added STDCALL to mysql_sever and mysql_thread variables
      sql-bench/limits/db2.cfg:
        New limits file
      sql-bench/test-select.sh:
        Fixed bug in cache test
      sql/share/czech/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/danish/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/dutch/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/english/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/estonian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/french/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/german/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/greek/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/hungarian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/italian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/japanese/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/korean/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/norwegian-ny/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/norwegian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/polish/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/portuguese/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/romanian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/russian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/slovak/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/spanish/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/swedish/errmsg.txt:
        Merged error messages with 3.23.44
      sql/share/ukrainian/errmsg.txt:
        Merged error messages with 3.23.44
      sql/sql_parse.cc:
        Fix bug with DATA DIRECTORY on windows.
      sql/sql_select.cc:
        Cleanup
      7edaaf34
    • unknown's avatar
      Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when... · 60030236
      unknown authored
      Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column is declared as NOT NULL.
      
      
      BUILD/SETUP.sh:
        Use -O1 to avoid problem with INLINE functions
      Docs/manual.texi:
        Changelog
      mysql-test/r/join.result:
        Test for bugfix
      mysql-test/t/join.test:
        Test for bugfix
      sql/sql_select.cc:
        Fixed problem with t1 LEFT_JOIN t2 ... WHERE t2.date_column IS NULL when date_column was declared as NOT NULL.
      BitKeeper/etc/ignore:
        Added bdb/include/db_ext.h bdb/include/mutex_ext.h to the ignore list
      60030236
    • unknown's avatar
      Fix that mysqladmin shutdown can be interrupted with ^C · d47add59
      unknown authored
      Fixed bug with BLOB keys in BDB tables
      Fixed problem with MERGE tables on OS with 32 bit files
      Fixed that TIME_TO_SEC() works with negative times
      
      
      Docs/manual.texi:
        Changelog
      client/mysqladmin.c:
        Fix that mysqladmin shutdown can be interrupted with ^C
      include/mysqld_error.h:
        Fixed typo
      mysql-test/r/func_time.result:
        Added test case for negative times
      mysql-test/t/func_time.test:
        Added test case for negative times
      mysql-test/t/rpl000015-slave.sh:
        Removed warnings
      mysql-test/t/rpl000016-slave.sh:
        Removed warnings
      sql/field.cc:
        Fixed bug with BLOB keys in BDB tables
      sql/field.h:
        Fixed bug with BLOB keys in BDB tables
      sql/ha_berkeley.cc:
        Fixed bug with BLOB keys in BDB tables
      sql/ha_myisammrg.cc:
        Fixed problem with MERGE tables on OS with 32 bit files
      sql/item_timefunc.cc:
        Fixed that TIME_TO_SEC() works with negative times.
      sql/share/swedish/errmsg.txt:
        Merge with 4.0
      sql/sql_acl.cc:
        Fixed typo
      d47add59
  3. 02 Nov, 2001 11 commits
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql-4.0 into black.box:/u/home/tim/my/4 · c3246c2d
      unknown authored
      
      Docs/manual.texi:
        Auto merged
      c3246c2d
    • unknown's avatar
      Removed unused code in VIO · 5312e8f4
      unknown authored
      
      vio/viossl.c:
        Removed unused code in VIO
        made sslaccept() and sslconnect() more similar
      5312e8f4
    • unknown's avatar
      Portability fixes. · dbc15220
      unknown authored
      
      BitKeeper/deleted/.del-configure.in~c6fc04d4e3d6e291:
        Delete: libmysql/configure.in
      BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
        Delete: bdb/include/db_ext.h
      BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
        Delete: bdb/include/mutex_ext.h
      Build-tools/Do-all-build-steps:
        Portability fix (-j 2 doesn't always work)
      configure.in:
        Added extra compiler options for libmysqld (required for HPUX)
      libmysql/Makefile.am:
        Added extra compiler options for libmysqld (required for HPUX)
      libmysql_r/Makefile.am:
        Added extra compiler options for libmysqld (required for HPUX)
      sql/log_event.cc:
        Removed warning
      dbc15220
    • unknown's avatar
      328a4f4c
    • unknown's avatar
      da478af5
    • unknown's avatar
      82baafc2
    • unknown's avatar
      28accd05
    • unknown's avatar
      manual.texi: · 467360b4
      unknown authored
        InnoDB section merge from Heikki.
      
      
      Docs/manual.texi:
        InnoDB section merge from Heikki.
      467360b4
    • unknown's avatar
      Portability fixes for AIX 4.x · c70ca493
      unknown authored
      
      include/my_global.h:
        Don't define _AIX32_CURSES; this breaks AIX 4.3 (maybe others?).  If
        it is needed for some AIX systems which we support, we will need to
        define it conditionally.
      ltconfig:
        Under AIX, the -bexpall flag exports all symbols except those which
        start with an underscore.  MySQL needs to export symbols which start
        with an underscore (e.g., _my_b_write), so -bexpall doesn't work.  It
        seems that -qmkshrobj does what we want.
      c70ca493
    • unknown's avatar
      Remove bdb/include/*_ext.h from revision control. They are · 95dece7a
      unknown authored
      generated automatically.
      
      
      BitKeeper/deleted/.del-db_ext.h~a1e210bbd0de0a48:
        Delete: bdb/include/db_ext.h
      BitKeeper/deleted/.del-mutex_ext.h~f20f47ddc346598b:
        Delete: bdb/include/mutex_ext.h
      BitKeeper/deleted/.del-btree_ext.h~5d53d710f170c6b6:
        Delete: bdb/include/btree_ext.h
      BitKeeper/deleted/.del-clib_ext.h~ed9d9f7965f0e1d3:
        Delete: bdb/include/clib_ext.h
      BitKeeper/deleted/.del-common_ext.h~35c8aab64ee3b8fd:
        Delete: bdb/include/common_ext.h
      BitKeeper/deleted/.del-env_ext.h~33a5fdef1aeecefd:
        Delete: bdb/include/env_ext.h
      BitKeeper/deleted/.del-hash_ext.h~5b31ff8413481606:
        Delete: bdb/include/hash_ext.h
      BitKeeper/deleted/.del-lock_ext.h~ccd0785bb206933f:
        Delete: bdb/include/lock_ext.h
      BitKeeper/deleted/.del-log_ext.h~2988f11d4545c76b:
        Delete: bdb/include/log_ext.h
      BitKeeper/deleted/.del-mp_ext.h~a528b772d42d6455:
        Delete: bdb/include/mp_ext.h
      BitKeeper/deleted/.del-os_ext.h~a1771032b4d2d53b:
        Delete: bdb/include/os_ext.h
      BitKeeper/deleted/.del-qam_ext.h~9993db1fb3428b6d:
        Delete: bdb/include/qam_ext.h
      BitKeeper/deleted/.del-tcl_ext.h~6759d22aa2ff5f39:
        Delete: bdb/include/tcl_ext.h
      BitKeeper/deleted/.del-txn_ext.h~9db24c14f204890c:
        Delete: bdb/include/txn_ext.h
      BitKeeper/deleted/.del-xa_ext.h~50918e5ef9f095b6:
        Delete: bdb/include/xa_ext.h
      BitKeeper/etc/ignore:
        Added bdb/include/btree_ext.h bdb/include/clib_ext.h bdb/include/common_ext.h bdb/include/db_ext.h bdb/include/env_ext.h bdb/include/hash_ext.h bdb/include/lock_ext.h bdb/include/log_ext.h bdb/include/mp_ext.h bdb/include/mutex_ext.h bdb/include/os_ext.h bdb/include/qam_ext.h bdb/include/tcl_ext.h bdb/include/txn_ext.h bdb/include/xa_ext.h to the ignore list
      95dece7a
    • unknown's avatar
  4. 01 Nov, 2001 10 commits
  5. 31 Oct, 2001 11 commits
    • unknown's avatar
      Changed time -> query_time in slow query log. · 6bff28b8
      unknown authored
      Fixed Rows_examined in slow query log.
      
      
      Docs/manual.texi:
        Changlog
      sql/log.cc:
        Changed time -> query_time in slow query log.
      sql/sql_select.cc:
        Fixed Rows_examined count in slow query log.
      6bff28b8
    • unknown's avatar
      Portability fixes · 8ea1c487
      unknown authored
      8ea1c487
    • unknown's avatar
      manual.texi Test push in 4.0 repository · c07ad600
      unknown authored
      
      Docs/manual.texi:
        Test push in 4.0 repository
      c07ad600
    • unknown's avatar
      Portability fixes · d40ce9db
      unknown authored
      Fix for consistent 0000-00-00 date handling
      Close + open binary logs on flush tables
      Fix for AVG() in HAVING.
      
      
      BUILD/SETUP.sh:
        Compile MySQL with -O0 to make debugging easier.
      Docs/manual.texi:
        Changelog
      configure.in:
        Version change
      innobase/buf/buf0lru.c:
        Fix for windows
      mysql-test/r/func_time.result:
        Updated tests
      mysql-test/r/having.result:
        Updated tests
      mysql-test/t/func_time.test:
        Updated tests
      mysql-test/t/having.test:
        Updated tests
      mysys/mf_casecnv.c:
        Portability fix
      mysys/mf_qsort.c:
        Portability fix
      mysys/my_compress.c:
        Portability fix
      mysys/my_tempnam.c:
        More comments
      sql/field.cc:
        Fix for consistent 0000-00-00 date handling
      sql/item.h:
        Fix for AVG() in HAVING
      sql/log.cc:
        Close + open update logs on flush tables
      sql/sql_select.cc:
        More debugging info
      sql/time.cc:
        Fix for consistent 0000-00-00 date handling
      strings/ctype.c:
        Portability fix
      strings/strto.c:
        Portability fix
      d40ce9db
    • unknown's avatar
      manual.texi: · e94c3769
      unknown authored
        Added 2 new mirrors
      
      
      Docs/manual.texi:
        Added 2 new mirrors
      e94c3769
    • unknown's avatar
      Merge tfr@work.mysql.com:/home/bk/mysql-4.0 · 740423d0
      unknown authored
      into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0
      
      
      Docs/manual.texi:
        Auto merged
      740423d0
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql-4.0 · 1ea0be65
      unknown authored
      into volk.internalnet:/home/tonu/mysql-4.0
      
      1ea0be65
    • unknown's avatar
      row0mysql.c Fix an assertion when an empty database is dropped · eab771f3
      unknown authored
      
      innobase/row/row0mysql.c:
        Fix an assertion when an empty database is dropped
      eab771f3
    • unknown's avatar
      Added MySQL AB Certification. · 0cf7b832
      unknown authored
      Updated Training, Consulting info with additional text from Bertrand.
      Added certification and press info to contact details.
      
      0cf7b832
    • unknown's avatar
    • unknown's avatar
      Update for OS2 (patch from Yuri Dario). · 2fb0a673
      unknown authored
      Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts
      Fixed error messages.
      Fixed problem with const propagation when comparing columns of different types
      
      
      BitKeeper/deleted/.del-.cvsignore~a91d63182f0b2366:
        Delete: sql/share/norwegian/.cvsignore
      BitKeeper/deleted/.del-.cvsignore~469064b5190d703d:
        Delete: sql/share/norwegian-ny/.cvsignore
      Docs/manual.texi:
        Changelog
      client/client_priv.h:
        Update for OS2
      client/mysqldump.c:
        Update for OS2
      include/mysqld_error.h:
        Updated error texts
      isam/create.c:
        Removed warning
      myisam/myisamchk.c:
        Fix for OS2
      myisam/myisampack.c:
        Fix for OS2
      mysys/mf_cache.c:
        Fix for OS2
      mysys/mf_tempfile.c:
        Fix for OS2
      mysys/my_os2file64.c:
        Fix for OS2
      mysys/my_tempnam.c:
        Fix for OS2
      os2/ChangeLog.os2:
        Fix for OS2
      os2/MySQL-Client.icc:
        Fix for OS2
      os2/MySQL-Opt.icc:
        Fix for OS2
      os2/MySQL-Source.icc:
        Fix for OS2
      os2/MySQL-Sql.icc:
        Fix for OS2
      os2/MySQL-Util.icc:
        Fix for OS2
      sql/mysqld.cc:
        Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts. This avoids some problems when users spefices wrong arguments to mysqld.
      sql/nt_servc.cc:
        C
      sql/share/czech/errmsg.txt:
        Updated error texts
      sql/share/danish/errmsg.txt:
        Updated error texts
      sql/share/dutch/errmsg.txt:
        Updated error texts
      sql/share/english/errmsg.txt:
        Updated error texts
      sql/share/estonian/errmsg.txt:
        Updated error texts
      sql/share/french/errmsg.txt:
        Updated error texts
      sql/share/german/errmsg.txt:
        Updated error texts
      sql/share/greek/errmsg.txt:
        Updated error texts
      sql/share/hungarian/errmsg.txt:
        Updated error texts
      sql/share/italian/errmsg.txt:
        Updated error texts
      sql/share/japanese/errmsg.txt:
        Updated error texts
      sql/share/korean/errmsg.txt:
        Updated error texts
      sql/share/norwegian-ny/errmsg.txt:
        Updated error texts
      sql/share/norwegian/errmsg.txt:
        Updated error texts
      sql/share/polish/errmsg.txt:
        Updated error texts
      sql/share/portuguese/errmsg.txt:
        Updated error texts
      sql/share/romanian/errmsg.txt:
        Updated error texts
      sql/share/russian/errmsg.txt:
        Updated error texts
      sql/share/slovak/errmsg.txt:
        Updated error texts
      sql/share/spanish/errmsg.txt:
        Updated error texts
      sql/share/swedish/errmsg.txt:
        Updated error texts
      sql/share/ukrainian/errmsg.txt:
        Updated error texts
      sql/sql_select.cc:
        Fixed problem with const propagation when comparing columns of different types.
        Fixed bug when HEAP table is converted to MyISAM tables in GROUP BY on long strings.
      2fb0a673
  6. 30 Oct, 2001 1 commit