1. 23 May, 2007 4 commits
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b28509/b28509.5.0 · 05564ebb
      unknown authored
      into  mysql.com:/home/ram/work/b28509/b28509.5.1
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      05564ebb
    • unknown's avatar
      Merge mysql.com:/home/ram/work/mysql-5.1-maint · 85053383
      unknown authored
      into  mysql.com:/home/ram/work/b23810/b23810.5.1
      
      85053383
    • unknown's avatar
      Fix for bug #23810: Server crashes on various "show status ..." commands · 85d31765
      unknown authored
      We access some variable values using casts like *(long *) buff
      that may cause crashes on some platforms (e.g. solaris 64) if buff is
      not properly aligned.
      Fix: align the buffer used.
      
      
      include/my_global.h:
        Fix for bug #23810: Server crashes on various "show status ..." commands
          - MY_DIV_UP(A, B) macro introduced, which devides A then rounds up by B.
          - MY_ALIGNED_BYTE_ARRAY(N, S, T) macro introduced, which declares an S-byte long
            (aligned) N array of type T.
      sql/sql_show.cc:
        Fix for bug #23810: Server crashes on various "show status ..." commands
          - align the buffer used.
      85d31765
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b21476/b21476.5.0 · 06860fee
      unknown authored
      into  mysql.com:/home/ram/work/b21476/b21476.5.1
      
      
      sql/mysql_priv.h:
        Auto merged
      06860fee
  2. 22 May, 2007 1 commit
    • unknown's avatar
      Fix for bug #21476: stack overflow crashes server; error-message stack reservation too small · b7a57265
      unknown authored
      Increase STACK_BUFF_ALLOC to avoid execution_constants test failure on the hpita2.
      
      
      sql/mysql_priv.h:
        Fix for bug #21476: stack overflow crashes server; error-message stack reservation too small
          - due to the failing execution_constants test on the hpita2, 
            increase STACK_BUFF_ALLOC, that is used in the Item_func::fix_fields() to 
            allocate on the stack a "dummy" buffer large enough for the corresponding exec.
      b7a57265
  3. 21 May, 2007 8 commits
  4. 20 May, 2007 1 commit
  5. 19 May, 2007 5 commits
  6. 18 May, 2007 21 commits
    • unknown's avatar
      merging · 61c27bd4
      unknown authored
      61c27bd4
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 31f321e5
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      sql/item.cc:
        Auto merged
      mysql-test/r/sp_trans.result:
        merging
      mysql-test/t/sp_trans.test:
        merging
      31f321e5
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 1cccaaed
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      1cccaaed
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b52fb6e9
      unknown authored
      into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      b52fb6e9
    • unknown's avatar
      added cleanup to some tests · 9c49971f
      unknown authored
      
      mysql-test/r/sp_trans.result:
        added cleanup
      mysql-test/r/strict.result:
        added cleanup
      mysql-test/t/sp_trans.test:
        added cleanup
      mysql-test/t/strict.test:
        added cleanup
      9c49971f
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 8a965e41
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      8a965e41
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1 · fdbcc593
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      fdbcc593
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · f3d55b1c
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      f3d55b1c
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 368c1bd3
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/item.cc:
        Auto merged
      368c1bd3
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · f570c2d5
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
      
      f570c2d5
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 509079e6
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      mysql-test/t/func_group.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      mysql-test/r/ps.result:
        merging
      mysql-test/r/subselect.result:
        merging
      mysql-test/r/type_datetime.result:
        SCCS merged
      mysql-test/t/ps.test:
        merging
      mysql-test/t/subselect.test:
        merging
      mysql-test/t/type_datetime.test:
        merging
      sql/opt_sum.cc:
        SCCS merged
      509079e6
    • unknown's avatar
      Fox for bug #28509: strange behaviour: passing a decimal value to PS · 60ec5a16
      unknown authored
      Set parameter's type to Item::DECIMAL_ITEM assigning a decimal value.
      
      
      mysql-test/r/ps.result:
        Fox for bug #28509: strange behaviour: passing a decimal value to PS
          - test result.
      mysql-test/t/ps.test:
        Fox for bug #28509: strange behaviour: passing a decimal value to PS
          - test case.
      sql/item.cc:
        Fox for bug #28509: strange behaviour: passing a decimal value to PS
          - set Item_param::item_type to Item::DECIMAL_ITEM in case of DECIMAL_RESULT variable.
          - removed redundant item_result_type assignments as it's set before.
      60ec5a16
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-maint · e80de8b3
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      e80de8b3
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 8d680262
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      8d680262
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · 568e96ab
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
      
      568e96ab
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 92a29576
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      92a29576
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 8df1ce7c
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        SCCS merged
      8df1ce7c
    • unknown's avatar
      WL#2247 mysqltest: add option for sorting results · 347b65ad
      unknown authored
       - Final touchups
      
      
      client/mysqltest.c:
        Final touch ups, rename sorted_results to sorted_result
      mysql-test/r/mysqltest.result:
        Update test result
      mysql-test/t/mysqltest.test:
        Update results with additional subtests for empty result set,
        NULL values and 1024 rows
      347b65ad
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 0a9e0787
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      0a9e0787
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 340b6fe9
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/28261-bug-5.0-opt-mysql
      
      340b6fe9
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 43c58ea4
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
      
      
      sql-common/my_time.c:
        Manual merge
      43c58ea4