1. 19 Jun, 2006 3 commits
    • unknown's avatar
      Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1 · 774aad61
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
      
      
      mysql-test/r/myisam.result:
        Manual merge.
      mysql-test/t/myisam.test:
        Manual merge.
      sql/sql_update.cc:
        Manual merge.
      774aad61
    • unknown's avatar
      Merge april:devel/BitKeeper/mysql-4.1 · 71cb9b68
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1
      
      71cb9b68
    • unknown's avatar
      BUG#18036 - update of table joined to self reports table as crashed · b424c584
      unknown authored
      Certain updates of table joined to self results in unexpected
      behavior.
      
      The problem was that record cache was mistakenly enabled for
      self-joined table updates. Normally record cache must be disabled
      for such updates.
      
      Fixed wrong condition in code that determines whether to use
      record cache for self-joined table updates.
      
      Only MyISAM tables were affected.
      
      
      mysql-test/r/myisam.result:
        Test case for BUG#18036.
      mysql-test/t/myisam.test:
        Test case for BUG#18036.
      sql/sql_update.cc:
        Fixed wrong condition in code that determines whether to use
        record cache for self-joined table updates.
      b424c584
  2. 18 Jun, 2006 3 commits
  3. 17 Jun, 2006 11 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · a986fdf5
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50
      
      a986fdf5
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · 13d0f402
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      ndb/Makefile.am:
        Auto merged
      13d0f402
    • unknown's avatar
      Makefile.am: · fbc6b181
      unknown authored
        Avoid error message trying 'windoze-dsp' in obsolete directory
      compile-dist:
        Avoid error message for target 'distclean' and no Makefile
      
      
      BUILD/compile-dist:
        Avoid error message for target 'distclean' and no Makefile
      ndb/Makefile.am:
        Avoid error message trying 'windoze-dsp' in obsolete directory
      fbc6b181
    • unknown's avatar
      Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50 · 17fcd2fe
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
      
      17fcd2fe
    • unknown's avatar
      ndb - bug#19285 minor fixes · 8d56eedb
      unknown authored
      
      ndb/src/ndbapi/NdbBlob.cpp:
        bug#19285 minor fixes
      ndb/src/ndbapi/ndberror.c:
        bug#19285 minor fixes
      8d56eedb
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · fb025923
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      scripts/make_win_src_distribution.sh:
        Auto merged
      fb025923
    • unknown's avatar
      make_win_src_distribution.sh: · b8bed644
      unknown authored
        Make output less verbose
        Make temporary directory name unique
        Remove temporary directory on interrupt
      
      
      scripts/make_win_src_distribution.sh:
        Make output less verbose
        Make temporary directory name unique
        Remove temporary directory on interrupt
      b8bed644
    • unknown's avatar
      make_win_src_distribution.sh: · cc2559db
      unknown authored
        Don't try copy non existing extra/{sql_state,mysqld_error}.h
      
      
      scripts/make_win_src_distribution.sh:
        Don't try copy non existing extra/{sql_state,mysqld_error}.h
      cc2559db
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · 5ed45d24
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      scripts/make_win_src_distribution.sh:
        Auto merged
      5ed45d24
    • unknown's avatar
      make_win_src_distribution.sh: · 0f1824af
      unknown authored
        Include "sql_yacc.yy" for completeness (bug#20387)
      
      
      scripts/make_win_src_distribution.sh:
        Include "sql_yacc.yy" for completeness (bug#20387)
        Improved error handling
        Don't list all files packed with tar/zip unless debugging
      0f1824af
    • unknown's avatar
      Merge · 3b1f4ecb
      unknown authored
      
      BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
        Auto merged
      3b1f4ecb
  4. 16 Jun, 2006 22 commits
    • unknown's avatar
      Merge moonbone.local:/work/tmp_merge-5.0 · 45808528
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/archive.result:
        Auto merged
      mysql-test/r/auto_increment.result:
        Auto merged
      mysql-test/r/ndb_lock.result:
        Auto merged
      mysql-test/r/rpl_log.result:
        Auto merged
      mysql-test/t/archive.test:
        Auto merged
      mysql-test/t/auto_increment.test:
        Auto merged
      mysql-test/t/ndb_lock.test:
        Auto merged
      mysql-test/t/rpl_log.test:
        Auto merged
      sql/ha_archive.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      45808528
    • unknown's avatar
      Manually merged · 96099750
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/archive.result:
        Auto merged
      mysql-test/r/auto_increment.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/ndb_lock.result:
        Auto merged
      mysql-test/r/rpl_log.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/archive.test:
        Auto merged
      mysql-test/t/auto_increment.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/ndb_lock.test:
        Auto merged
      mysql-test/t/rpl_log.test:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      96099750
    • unknown's avatar
      select.result: · 1ee952ec
      unknown authored
        After merge fix
      
      
      mysql-test/r/select.result:
        After merge fix
      1ee952ec
    • unknown's avatar
      configure.in, net_serv.cc, compile-netware-END: · a695c3c3
      unknown authored
        Changes for Netware
      
      
      sql/net_serv.cc:
        Netware needs <sys/select.h>
      configure.in:
        Call of "comp_err" has moved, changed code for Netware that
        edits make files to reflect this
      netware/BUILD/compile-netware-END:
        After correcting "configure.in" to edit make files correctly,
        removed obsolete "sed" of "extra/Makefile.am" for Netware
      a695c3c3
    • unknown's avatar
      Manually merged · 6b8b4816
      unknown authored
      
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      6b8b4816
    • unknown's avatar
      Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt · f4741532
      unknown authored
      into moonbone.local:/work/tmp_merge-5.0-opt-mysql
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      f4741532
    • unknown's avatar
      Manually merged · abc76e93
      unknown authored
      
      configure.in:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      abc76e93
    • unknown's avatar
      .del-mysql_install.def~8da659e7c0f7e571: · 9e4d8e99
      unknown authored
        Delete: netware/mysql_install.def
      Makefile.am:
        Removed obsolete "mysql_install.def"
      
      
      netware/Makefile.am:
        Removed obsolete "mysql_install.def"
      BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
        Delete: netware/mysql_install.def
      9e4d8e99
    • unknown's avatar
      item_strfunc.cc: · 6ca6756b
      unknown authored
        Fix for bug#16716 for --ps-protocol mode.
      item_cmpfunc.cc:
        Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
      for bug#16377. Few language corrections.
      
      
      sql/item_cmpfunc.cc:
        Fix for a memory allocation/freeing problem in agg_cmp_type(). Few language corrections.
      sql/item_strfunc.cc:
        Fix for bug#16716 for --ps-protocol mode.
      6ca6756b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · bc966b4d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      bc966b4d
    • unknown's avatar
      Set default valgrind options to "-v --show-reachable=yes" and make it possible... · a8a083f8
      unknown authored
      Set default valgrind options to "-v --show-reachable=yes" and make it possible to override that with --valgrind-options 
      
      
      mysql-test/mysql-test-run.pl:
        Make --valgrind-all a synonym for --valgrind.
        Set "-v --show-reachable=yes" as our default valgrind options. 
        Make --valgrind-options override the default options
        Update usage.
        Turn on valgrinding also when user specified --valgrind-path or --valgrind-options without --valgrind
      a8a083f8
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 857359e7
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      857359e7
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3f2ea5a4
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      3f2ea5a4
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 05e78439
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      05e78439
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue · 6355b3b9
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      6355b3b9
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17681c9e
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      17681c9e
    • unknown's avatar
      after-merge fixes. · 71c7d564
      unknown authored
      
      mysql-test/r/rpl_log.result:
        after-merge fix.
      sql/ha_archive.cc:
        after-merge fix.
      sql/item_func.cc:
        after-merge fix.
      sql/sql_class.cc:
        after-merge fix.
      sql/sql_class.h:
        after-merge fix.
      71c7d564
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a1acb3c2
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      mysql-test/r/ctype_sjis.result:
        Auto merged
      mysql-test/t/ctype_sjis.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      a1acb3c2
    • unknown's avatar
      Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index · 7287f055
      unknown authored
      Don't rely on table->null_row when no index is used - it may be a multi-table search
      
      7287f055
    • unknown's avatar
      Post_merges fixes. · db2ec92c
      unknown authored
      db2ec92c
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1-opt · caa54d31
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0-opt
      
      
      mysql-test/t/func_group.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      mysql-test/r/func_group.result:
        SCCS merged
      caa54d31
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1fd1f3d4
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0-opt
      
      
      sql/field.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      1fd1f3d4
  5. 15 Jun, 2006 1 commit