1. 16 Jun, 2006 9 commits
    • 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
      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
      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
      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
  2. 15 Jun, 2006 8 commits
    • 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
    • unknown's avatar
      item_cmpfunc.h, cast.result: · e4bfa961
      unknown authored
        Post fix for bug#16377
      
      
      mysql-test/r/cast.result:
        Post fix for bug#16377
      sql/item_cmpfunc.h:
        Post fix for bug#16377
      e4bfa961
    • unknown's avatar
      Fix for bug#19667 group by a decimal expression yields wrong result · 689205ae
      unknown authored
      
      mysql-test/r/type_newdecimal.result:
        Fix for bug#19667 group by a decimal expression yields wrong result
         test case
      mysql-test/t/type_newdecimal.test:
        Fix for bug#19667 group by a decimal expression yields wrong result
         test case
      689205ae
    • unknown's avatar
      Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt · 81bc8d3b
      unknown authored
      into moonbone.local:/work/19789-bug-5.0-opt-mysql
      
      
      81bc8d3b
    • unknown's avatar
      Merge moonbone.local:/work/15351-bug-4.1-mysql · 99c320d7
      unknown authored
      into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt
      
      
      sql/item_strfunc.cc:
        Auto merged
      99c320d7
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · ef02d496
      unknown authored
      into  mysql.com:/usr/home/ram/work/4.1.b15558
      
      
      ef02d496
  3. 14 Jun, 2006 23 commits