1. 18 Mar, 2003 1 commit
    • unknown's avatar
      Fixes to avoid errors from valgrind · aa08887f
      unknown authored
      Fixed problem with 'wrong packet number' in union
      
      
      include/my_global.h:
        Fix for valgrind
      mysql-test/t/rpl_rotate_logs.test:
        Fix to avoid timeing problem
      sql/item.h:
        Indentation change
      sql/set_var.cc:
        Fix to avoid reference to uninitialized memory
      sql/sql_select.cc:
        More DBUG_PRINT messages
        Fixed problem with 'wrong packet number' in union (tmp_join.error was not correctly reset)
      sql/sql_union.cc:
        Simple code cleanup
      strings/ctype-simple.c:
        Fix for valgrind
      aa08887f
  2. 17 Mar, 2003 5 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 8cb27d2f
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      sql/field.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      8cb27d2f
    • unknown's avatar
      After merge fixes · b0b315dc
      unknown authored
      Don't create temporary objects with no table name
      
      
      myisam/mi_open.c:
        After merge fix
      mysql-test/r/analyse.result:
        After merge fix
      mysql-test/r/backup.result:
        After merge fix
      mysql-test/r/create.result:
        After merge fix
      mysql-test/r/delete.result:
        After merge fix
      mysql-test/r/func_like.result:
        After merge fix
      mysql-test/r/innodb.result:
        After merge fix
      mysql-test/r/rpl_loaddatalocal.result:
        After merge fix
      mysql-test/r/type_timestamp.result:
        After merge fix
      mysql-test/t/delete.test:
        Change to not use table 't'
      sql/sql_class.h:
        Remove usage of thd when creating 'Table_ident'
        Don't create temporary objects with no table name
      sql/sql_derived.cc:
        Indentation fix
      sql/sql_select.cc:
        After merge fix
        Fixed wrong return -> DBUG_RETURN()
      sql/sql_yacc.yy:
        Remove usage of thd when creating 'Table_ident'
      b0b315dc
    • unknown's avatar
      sql_string.cc: · 61ca875e
      unknown authored
        Copy as is if src or dst are binary
      
      
      sql/sql_string.cc:
        Copy as is if src or dst are binary
      61ca875e
    • unknown's avatar
      Preparing to client<->server autoconvert · 3a407e58
      unknown authored
      3a407e58
    • unknown's avatar
      sql_select.cc: · 11bd5990
      unknown authored
        binary comparing alway must be used, because sort_string() is executed for textual data.
      
      
      sql/sql_select.cc:
        binary comparing alway must be used, because sort_string() is executed for textual data.
      11bd5990
  3. 16 Mar, 2003 9 commits
    • unknown's avatar
      Merge with 4.0 · a8217039
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      BitKeeper/deleted/.del-compile-netware-standard:
        Delete: netware/BUILD/compile-netware-standard
      BitKeeper/deleted/.del-mwenv:
        Delete: netware/BUILD/mwenv
      BitKeeper/deleted/.del-nwbootstrap:
        Delete: netware/BUILD/nwbootstrap
      BitKeeper/deleted/.del-compile-AUTOTOOLS:
        Delete: netware/BUILD/compile-AUTOTOOLS
      BitKeeper/deleted/.del-compile-linux-tools:
        Delete: netware/BUILD/compile-linux-tools
      BitKeeper/deleted/.del-compile-netware-END:
        Delete: netware/BUILD/compile-netware-END
      BitKeeper/deleted/.del-compile-netware-START:
        Delete: netware/BUILD/compile-netware-START
      BitKeeper/deleted/.del-compile-netware-all:
        Delete: netware/BUILD/compile-netware-all
      BitKeeper/deleted/.del-compile-netware-debug:
        Delete: netware/BUILD/compile-netware-debug
      BitKeeper/deleted/.del-mwasmnlm~bc5746809d67feb5:
        Auto merged
      BitKeeper/deleted/.del-mwenv~35c8b56062f4b6aa:
        Auto merged
      BitKeeper/deleted/.del-mwccnlm~be63afd25a14c3f:
        Auto merged
      BitKeeper/deleted/.del-mwldnlm~efb26c57cba3c980:
        Auto merged
      BitKeeper/deleted/.del-netware.patch~f70a3a965f54d9ee:
        Auto merged
      Docs/internals.texi:
        Auto merged
      VC++Files/bdb/bdb.dsp:
        Auto merged
      VC++Files/bdb/build_win32/Berkeley_DB.dsw:
        Auto merged
      VC++Files/bdb/build_win32/db_archive.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_buildall.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_checkpoint.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_deadlock.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_dll.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_dump.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_java.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_load.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_printlog.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_recover.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_stat.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_static.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_static1.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_tcl.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_test.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_upgrade.dsp:
        Auto merged
      VC++Files/bdb/build_win32/db_verify.dsp:
        Auto merged
      VC++Files/bdb/build_win32/ex_access.dsp:
        Auto merged
      VC++Files/bdb/build_win32/ex_btrec.dsp:
        Auto merged
      VC++Files/bdb/build_win32/ex_env.dsp:
        Auto merged
      VC++Files/bdb/build_win32/ex_lock.dsp:
        Auto merged
      VC++Files/bdb/build_win32/ex_mpool.dsp:
        Auto merged
      VC++Files/bdb/build_win32/ex_tpcb.dsp:
        Auto merged
      VC++Files/bdb/build_win32/excxx_access.dsp:
        Auto merged
      VC++Files/bdb/build_win32/excxx_btrec.dsp:
        Auto merged
      VC++Files/bdb/build_win32/excxx_env.dsp:
        Auto merged
      VC++Files/bdb/build_win32/excxx_lock.dsp:
        Auto merged
      VC++Files/bdb/build_win32/excxx_mpool.dsp:
        Auto merged
      VC++Files/bdb/build_win32/excxx_tpcb.dsp:
        Auto merged
      VC++Files/client/mysql.dsp:
        Auto merged
      VC++Files/client/mysqladmin.dsp:
        Auto merged
      VC++Files/client/mysqlcheck.dsp:
        Auto merged
      VC++Files/client/mysqlclient.dsp:
        Auto merged
      VC++Files/client/mysqlclient.dsw:
        Auto merged
      VC++Files/client/mysqldump.dsp:
        Auto merged
      VC++Files/client/mysqlimport.dsp:
        Auto merged
      VC++Files/client/mysqlshow.dsp:
        Auto merged
      VC++Files/comp_err/comp_err.dsp:
        Auto merged
      VC++Files/contrib/asm386/zlibvc.dsp:
        Auto merged
      VC++Files/contrib/asm386/zlibvc.dsw:
        Auto merged
      VC++Files/contrib/minizip/zlibvc.dsp:
        Auto merged
      VC++Files/contrib/minizip/zlibvc.dsw:
        Auto merged
      VC++Files/dbug/dbug.dsp:
        Auto merged
      VC++Files/dbug/dbug.dsw:
        Auto merged
      VC++Files/heap/heap.dsp:
        Auto merged
      VC++Files/innobase/innobase.dsp:
        Auto merged
      VC++Files/isam/isam.dsp:
        Auto merged
      VC++Files/isam/isam.dsw:
        Auto merged
      VC++Files/isamchk/isamchk.dsp:
        Auto merged
      VC++Files/libmysql/libmysql.dsp:
        Auto merged
      VC++Files/libmysql/libmysql.dsw:
        Auto merged
      VC++Files/libmysqld/examples/test_libmysqld.dsp:
        Auto merged
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      VC++Files/libmysqltest/myTest.dsp:
        Auto merged
      VC++Files/libmysqltest/mytest.dsw:
        Auto merged
      VC++Files/merge/merge.dsp:
        Auto merged
      VC++Files/merge/merge.dsw:
        Auto merged
      VC++Files/my_print_defaults/my_print_defaults.dsp:
        Auto merged
      VC++Files/myisam/myisam.dsp:
        Auto merged
      VC++Files/myisamchk/myisamchk.dsp:
        Auto merged
      VC++Files/myisamlog/myisamlog.dsp:
        Auto merged
      VC++Files/myisammrg/myisammrg.dsp:
        Auto merged
      VC++Files/mysql.dsp:
        Auto merged
      VC++Files/mysql.dsw:
        Auto merged
      VC++Files/myisampack/myisampack.dsp:
        Auto merged
      VC++Files/mysqlbinlog/mysqlbinlog.dsp:
        Auto merged
      VC++Files/mysqlcheck/mysqlcheck.dsp:
        Auto merged
      VC++Files/mysqldemb/mysqldemb.dsp:
        Auto merged
      VC++Files/mysqlmanager/MySqlManager.dsp:
        Auto merged
      VC++Files/mysqlmanager/mysqlmanager.dsw:
        Auto merged
      VC++Files/mysqlserver/mysqlserver.dsp:
        Auto merged
      VC++Files/mysqlshutdown/myshutdown.dsp:
        Auto merged
      VC++Files/mysqlshutdown/mysqlshutdown.dsp:
        Auto merged
      VC++Files/mysqlwatch/mysqlwatch.dsp:
        Auto merged
      VC++Files/mysys/mysys.dsp:
        Auto merged
      VC++Files/mysys/mysys.dsw:
        Auto merged
      VC++Files/pack_isam/pack_isam.dsp:
        Auto merged
      VC++Files/perror/perror.dsp:
        Auto merged
      VC++Files/regex/regex.dsp:
        Auto merged
      VC++Files/regex/regex.dsw:
        Auto merged
      VC++Files/replace/replace.dsp:
        Auto merged
      VC++Files/sql/mysqld.dsw:
        Auto merged
      VC++Files/sql/mysqldmax.dsp:
        Auto merged
      VC++Files/sql/old/mysqld.dsw:
        Auto merged
      VC++Files/strings/MASM6x/strings.dsp:
        Auto merged
      VC++Files/strings/MASM6x/strings.dsw:
        Auto merged
      VC++Files/strings/backup/strings.dsp:
        Auto merged
      VC++Files/strings/backup/strings.dsw:
        Auto merged
      VC++Files/strings/noMASM/strings.dsp:
        Auto merged
      VC++Files/strings/noMASM/strings.dsw:
        Auto merged
      VC++Files/strings/strings.dsw:
        Auto merged
      VC++Files/test1/test1.dsp:
        Auto merged
      VC++Files/thr_insert_test/thr_insert_test.dsp:
        Auto merged
      VC++Files/thr_test/thr_test.dsp:
        Auto merged
      VC++Files/vio/vio.dsp:
        Auto merged
      VC++Files/zlib/zlib.dsp:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      include/myisam.h:
        Auto merged
      include/thr_lock.h:
        Auto merged
      include/violite.h:
        Auto merged
      innobase/buf/buf0buf.c:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      innobase/trx/trx0sys.c:
        Auto merged
      libmysqld/lib_vio.c:
        Auto merged
      myisam/mi_create.c:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/join.result:
        Auto merged
      mysql-test/r/rpl000001.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/auto_increment.test:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/func_like.test:
        Auto merged
      mysql-test/t/group_by.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/join.test:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      mysql-test/t/type_timestamp.test:
        Auto merged
      mysys/default.c:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      scripts/mysqld_safe.sh:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mf_iocache.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/repl_failsafe.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/slave.h:
        Auto merged
      sql/sql_analyse.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql-bench/crash-me.sh:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_rename.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_repl.h:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/stacktrace.c:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/unireg.h:
        Auto merged
      strings/ctype-tis620.c:
        Auto merged
      strings/t_ctype.h:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      tests/grant.res:
        Auto merged
      vio/viosocket.c:
        Auto merged
      a8217039
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 59bf6f6e
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      59bf6f6e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · bfbb0ad6
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.0
      
      
      bfbb0ad6
    • unknown's avatar
      Write binlog before commit when doing INSERT ... SELECT · 9681f4a8
      unknown authored
      
      mysql-test/r/create.result:
        After merge fix
      sql/sql_insert.cc:
        Write binlog before commit
      sql/sql_update.cc:
        Added comment
      9681f4a8
    • unknown's avatar
      New function my_charset_same() · ed2bb40a
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      ed2bb40a
    • unknown's avatar
      system_charset_info has been moved to /sql directory · 23f25285
      unknown authored
      and isn't used in libraries any longer
      
      
      23f25285
    • unknown's avatar
      mysqltest.c, mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc: · 2aa9f207
      unknown authored
        system_charset_info was removed
      
      
      client/mysql.cc:
        system_charset_info was removed
      client/mysqlcheck.c:
        system_charset_info was removed
      client/mysqldump.c:
        system_charset_info was removed
      client/mysqlimport.c:
        system_charset_info was removed
      client/mysqltest.c:
        system_charset_info was removed
      2aa9f207
    • unknown's avatar
      trx0roll.c: · f08688c5
      unknown authored
        Fix compiler warning in Windows about ib_longlong to ulint conversion
      
      
      innobase/trx/trx0roll.c:
        Fix compiler warning in Windows about ib_longlong to ulint conversion
      f08688c5
    • unknown's avatar
      set_default_charset() is not used anymore · 6b11fa3a
      unknown authored
      Some system_charset_info were removed
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      6b11fa3a
  4. 15 Mar, 2003 12 commits
  5. 14 Mar, 2003 13 commits