An error occurred fetching the project authors.
  1. 18 Jun, 2006 3 commits
  2. 17 Jun, 2006 11 commits
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6bd6c469
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50
      
      
      6bd6c469
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · 81202460
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      ndb/Makefile.am:
        Auto merged
      81202460
    • unknown's avatar
      Makefile.am: · 4d366600
      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
      4d366600
    • unknown's avatar
      Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50 · 4c9815a9
      unknown authored
      into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
      
      
      4c9815a9
    • unknown's avatar
      ndb - bug#19285 minor fixes · 76d2ecea
      unknown authored
      ndb/src/ndbapi/NdbBlob.cpp:
        bug#19285 minor fixes
      ndb/src/ndbapi/ndberror.c:
        bug#19285 minor fixes
      76d2ecea
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · 7775e0a1
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      scripts/make_win_src_distribution.sh:
        Auto merged
      7775e0a1
    • unknown's avatar
      make_win_src_distribution.sh: · d1e21c2c
      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
      d1e21c2c
    • unknown's avatar
      make_win_src_distribution.sh: · 2aa2db7a
      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
      2aa2db7a
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · dc340f82
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      scripts/make_win_src_distribution.sh:
        Auto merged
      dc340f82
    • unknown's avatar
      make_win_src_distribution.sh: · 4a4a82a4
      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
      4a4a82a4
    • unknown's avatar
      Merge · b1b5dbb0
      unknown authored
      BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
        Auto merged
      b1b5dbb0
  3. 16 Jun, 2006 22 commits
    • unknown's avatar
      Merge moonbone.local:/work/tmp_merge-5.0 · 9ec3f63f
      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
      9ec3f63f
    • unknown's avatar
      Manually merged · 9d3ddf38
      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
      9d3ddf38
    • unknown's avatar
      select.result: · 60d55cc5
      unknown authored
        After merge fix
      
      
      mysql-test/r/select.result:
        After merge fix
      60d55cc5
    • unknown's avatar
      configure.in, net_serv.cc, compile-netware-END: · 91fb8310
      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
      91fb8310
    • unknown's avatar
      Manually merged · d0f39b6a
      unknown authored
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      d0f39b6a
    • unknown's avatar
      Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt · 707de39a
      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
      707de39a
    • unknown's avatar
      Manually merged · de292d67
      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
      de292d67
    • unknown's avatar
      .del-mysql_install.def~8da659e7c0f7e571: · e2d3943c
      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
      e2d3943c
    • unknown's avatar
      item_strfunc.cc: · ca22a81b
      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.
      ca22a81b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 12ea72d1
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      12ea72d1
    • unknown's avatar
      Set default valgrind options to "-v --show-reachable=yes" and make it possible... · 4ef7be4c
      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
      4ef7be4c
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5f065c54
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      5f065c54
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3796e37c
      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
      3796e37c
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0802a8a3
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      
      0802a8a3
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue · 70cf8240
      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
      70cf8240
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · a6686964
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      a6686964
    • unknown's avatar
      after-merge fixes. · dd285aac
      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.
      dd285aac
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 710abe53
      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
      710abe53
    • unknown's avatar
      Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index · 64c856c9
      unknown authored
      Don't rely on table->null_row when no index is used - it may be a multi-table search
      
      
      64c856c9
    • unknown's avatar
      Post_merges fixes. · b47705ab
      unknown authored
      b47705ab
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1-opt · 79966e67
      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
      79966e67
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · eb219834
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0-opt
      
      
      sql/field.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      eb219834
  4. 15 Jun, 2006 4 commits
    • unknown's avatar
      9668198e
    • unknown's avatar
      Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt · 02b9f5b5
      unknown authored
      into moonbone.local:/work/18175-bug-5.0-opt
      
      
      02b9f5b5
    • unknown's avatar
      Fixed bug#18175: The nest_level counter wasn't decremented for union parts which · 548b9aef
      unknown authored
      resulted in a wrong error message.
      
      The nest_level counter indicates the depth of nesting for a subselect. It is
      needed to properly resolve aggregate functions in nested subselects. Obviously 
      it shouldn't be incremented for UNION parts because they have the same level of
      nesting. This counter was incremented by 1 in the mysql_new_select() function
      for any new select and wasn't decremented for UNION parts. This resulted in
      wrongly reported error messages.
      
      Now the nest_level counter is decremented by 1 for any union part.
      
      
      mysql-test/t/union.test:
        Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
        resulted in a wrong error message.
      mysql-test/r/union.result:
        Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
        resulted in a wrong error message.
      sql/sql_yacc.yy:
        Fixed bug#18175: The nest_level counter wasn't decremented for union parts which
        resulted in a wrong error message.
        Now the nest_level counter is decremented by 1 for any union part.
      548b9aef
    • unknown's avatar
      Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt · 629830d9
      unknown authored
      into moonbone.local:/work/16377-4.1-after
      
      
      629830d9