1. 28 Nov, 2007 1 commit
    • unknown's avatar
      Fix for bug #32726: crash with cast in order by clause and cp932 charset · 720a4882
      unknown authored
        - fix for #31070 (missed during merging) applied for cp932 charset.
        - tests/results adjusted.
      
      
      mysql-test/include/ctype_common.inc:
        Fix for bug #32726: crash with cast in order by clause and cp932 charset
          - tests/results adjusted.
      mysql-test/r/ctype_big5.result:
        Fix for bug #32726: crash with cast in order by clause and cp932 charset
          - tests/results adjusted.
      mysql-test/r/ctype_cp932.result:
        Fix for bug #32726: crash with cast in order by clause and cp932 charset
          - tests/results adjusted.
      mysql-test/r/ctype_euckr.result:
        Fix for bug #32726: crash with cast in order by clause and cp932 charset
          - tests/results adjusted.
      mysql-test/r/ctype_gb2312.result:
        Fix for bug #32726: crash with cast in order by clause and cp932 charset
          - tests/results adjusted.
      mysql-test/r/ctype_gbk.result:
        Fix for bug #32726: crash with cast in order by clause and cp932 charset
          - tests/results adjusted.
      mysql-test/r/ctype_uca.result:
        Fix for bug #32726: crash with cast in order by clause and cp932 charset
          - tests/results adjusted.
      mysql-test/t/ctype_cp932.test:
        Fix for bug #32726: crash with cast in order by clause and cp932 charset
          - tests/results adjusted.
      strings/ctype-cp932.c:
        Fix for bug #32726: crash with cast in order by clause and cp932 charset
          - fix for #31070 (missed during merging) applied for cp932.
      720a4882
  2. 25 Nov, 2007 1 commit
  3. 23 Nov, 2007 8 commits
  4. 21 Nov, 2007 10 commits
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-4.1-axmrg · 3d58c0cd
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      3d58c0cd
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-amain · dc06b5be
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      dc06b5be
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-4.1-amain · 4b34622b
      unknown authored
      into  stella.local:/home2/mydev/mysql-4.1-axmrg
      
      4b34622b
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 0bdc06e8
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      0bdc06e8
    • unknown's avatar
      add wrong warning to suppression file · eeae7489
      unknown authored
      
      support-files/compiler_warnings.supp:
        we want that.
      eeae7489
    • unknown's avatar
      Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e86dfae3
      unknown authored
      into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
      
      e86dfae3
    • unknown's avatar
      ignore readline warnings · 1b5c57d4
      unknown authored
      
      support-files/compiler_warnings.supp:
        readline is not maintained by us
      1b5c57d4
    • unknown's avatar
      Fix for bug #32558: group by null-returning expression with rollup causes crash · ee886016
      unknown authored
      Problem: setting Item_func_rollup_const::null_value property to argument's null_value
      before (without) the argument evaluation may result in a crash due to wrong null_value.
      
      Fix: use is_null() to set Item_func_rollup_const::null_value instead as it evaluates
      the argument if necessary and returns a proper value.
      
      
      mysql-test/r/olap.result:
        Fix for bug #32558: group by null-returning expression with rollup causes crash
          - test result.
      mysql-test/t/olap.test:
        Fix for bug #32558: group by null-returning expression with rollup causes crash
          - test case.
      sql/item_func.h:
        Fix for bug #32558: group by null-returning expression with rollup causes crash
          - use args[0]->is_null() to obtain Item_func_rollup_const::null_value 
            instead of args[0]->null_value as it's not set in advance in case of 
            constant functions.
      ee886016
    • unknown's avatar
      This changeset fixes · c68db60f
      unknown authored
         Bug#31567 "datadict" tests (all engines) fail:
                   Reference protocol is non-standard build
         Bug#30418 "datadict" tests (all engines) fail:
                   Dependency on the host name for ordering   
      Modifications:
         1. The standard builds (build team) do not contain
            the collation 'utf8_general_cs'.
            The common developer builds (compuile-....-max)
            contain this collation.
            Solution fitting to both build variants:
               Exclude the collation 'utf8_general_cs' from
               result sets.
         2. Use mysqltest builtin sorting of result set for
            the statement where the hostname affects the
            row order.
      
      
      mysql-test/suite/funcs_1/datadict/datadict_master.inc:
        Exclude collation 'utf8_general_cs' from result set.
      mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
        Use mysqltest builtin sorting of result set.
      mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
        Exclude collation 'utf8_general_cs' from result set.
      mysql-test/suite/funcs_1/r/innodb__datadict.result:
        Updated  results
      mysql-test/suite/funcs_1/r/memory__datadict.result:
        Updated  results
      mysql-test/suite/funcs_1/r/myisam__datadict.result:
        Updated  results
      c68db60f
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-amain · 1ac563d3
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      1ac563d3
  5. 20 Nov, 2007 3 commits
    • unknown's avatar
      Applied InnoDB snapshot innodb-5.0-ss2095 · 31561cfa
      unknown authored
      Fixes the following bugs:
      
      - Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'
      
        Fixed a race condition in the rw_lock where an os_event_reset()
        can overwrite an earlier os_event_set() triggering an indefinite
        wait.
        NOTE: This fix for windows is different from that for other platforms.
        NOTE2: This bug is introduced in the scalability fix to the
        sync0arr which was applied to 5.0 only. Therefore, it need not be
        applied to the 5.1 tree. If we decide to port the scalability fix
        to 5.1 then this fix should be ported as well.
      
      - Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase
      
        When unknown find_flag is encountered in convert_search_mode_to_innobase()
        do not call assert(0); instead queue a MySQL error using my_error() and
        return the error code PAGE_CUR_UNSUPP. Change the functions that call
        convert_search_mode_to_innobase() to handle that error code by "canceling"
        execution and returning appropriate error code further upstream.
      
      
      innobase/include/db0err.h:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2091:
        branches/5.0:
         
        Merge r2088 from trunk:
         
        log for r2088:
        
        Fix Bug#32125 (http://bugs.mysql.com/32125)
        "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
        
        When unknown find_flag is encountered in convert_search_mode_to_innobase()
        do not call assert(0); instead queue a MySQL error using my_error() and
        return the error code PAGE_CUR_UNSUPP. Change the functions that call
        convert_search_mode_to_innobase() to handle that error code by "canceling"
        execution and returning appropriate error code further upstream.
        
        Approved by:	Heikki
      innobase/include/os0sync.h:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2082:
        branches/5.0:  bug#29560
        
        Fixed a race condition in the rw_lock where an os_event_reset()
        can overwrite an earlier os_event_set() triggering an indefinite
        wait.
        NOTE: This fix for windows is different from that for other platforms.
        NOTE2: This bug is introduced in the scalability fix to the
        sync0arr which was applied to 5.0 only. Therefore, it need not be
        applied to the 5.1 tree. If we decide to port the scalability fix
        to 5.1 then this fix should be ported as well.
        
        Reviewed by: Heikki
      innobase/include/page0cur.h:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2091:
        branches/5.0:
         
        Merge r2088 from trunk:
         
        log for r2088:
        
        Fix Bug#32125 (http://bugs.mysql.com/32125)
        "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
        
        When unknown find_flag is encountered in convert_search_mode_to_innobase()
        do not call assert(0); instead queue a MySQL error using my_error() and
        return the error code PAGE_CUR_UNSUPP. Change the functions that call
        convert_search_mode_to_innobase() to handle that error code by "canceling"
        execution and returning appropriate error code further upstream.
        
        Approved by:	Heikki
      innobase/include/sync0rw.h:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2082:
        branches/5.0:  bug#29560
        
        Fixed a race condition in the rw_lock where an os_event_reset()
        can overwrite an earlier os_event_set() triggering an indefinite
        wait.
        NOTE: This fix for windows is different from that for other platforms.
        NOTE2: This bug is introduced in the scalability fix to the
        sync0arr which was applied to 5.0 only. Therefore, it need not be
        applied to the 5.1 tree. If we decide to port the scalability fix
        to 5.1 then this fix should be ported as well.
        
        Reviewed by: Heikki
      innobase/include/sync0rw.ic:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2082:
        branches/5.0:  bug#29560
        
        Fixed a race condition in the rw_lock where an os_event_reset()
        can overwrite an earlier os_event_set() triggering an indefinite
        wait.
        NOTE: This fix for windows is different from that for other platforms.
        NOTE2: This bug is introduced in the scalability fix to the
        sync0arr which was applied to 5.0 only. Therefore, it need not be
        applied to the 5.1 tree. If we decide to port the scalability fix
        to 5.1 then this fix should be ported as well.
        
        Reviewed by: Heikki
      innobase/include/sync0sync.ic:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2082:
        branches/5.0:  bug#29560
        
        Fixed a race condition in the rw_lock where an os_event_reset()
        can overwrite an earlier os_event_set() triggering an indefinite
        wait.
        NOTE: This fix for windows is different from that for other platforms.
        NOTE2: This bug is introduced in the scalability fix to the
        sync0arr which was applied to 5.0 only. Therefore, it need not be
        applied to the 5.1 tree. If we decide to port the scalability fix
        to 5.1 then this fix should be ported as well.
        
        Reviewed by: Heikki
      innobase/os/os0sync.c:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2082:
        branches/5.0:  bug#29560
        
        Fixed a race condition in the rw_lock where an os_event_reset()
        can overwrite an earlier os_event_set() triggering an indefinite
        wait.
        NOTE: This fix for windows is different from that for other platforms.
        NOTE2: This bug is introduced in the scalability fix to the
        sync0arr which was applied to 5.0 only. Therefore, it need not be
        applied to the 5.1 tree. If we decide to port the scalability fix
        to 5.1 then this fix should be ported as well.
        
        Reviewed by: Heikki
      innobase/srv/srv0srv.c:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2082:
        branches/5.0:  bug#29560
        
        Fixed a race condition in the rw_lock where an os_event_reset()
        can overwrite an earlier os_event_set() triggering an indefinite
        wait.
        NOTE: This fix for windows is different from that for other platforms.
        NOTE2: This bug is introduced in the scalability fix to the
        sync0arr which was applied to 5.0 only. Therefore, it need not be
        applied to the 5.1 tree. If we decide to port the scalability fix
        to 5.1 then this fix should be ported as well.
        
        Reviewed by: Heikki
      innobase/sync/sync0arr.c:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2082:
        branches/5.0:  bug#29560
        
        Fixed a race condition in the rw_lock where an os_event_reset()
        can overwrite an earlier os_event_set() triggering an indefinite
        wait.
        NOTE: This fix for windows is different from that for other platforms.
        NOTE2: This bug is introduced in the scalability fix to the
        sync0arr which was applied to 5.0 only. Therefore, it need not be
        applied to the 5.1 tree. If we decide to port the scalability fix
        to 5.1 then this fix should be ported as well.
        
        Reviewed by: Heikki
      innobase/sync/sync0rw.c:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2082:
        branches/5.0:  bug#29560
        
        Fixed a race condition in the rw_lock where an os_event_reset()
        can overwrite an earlier os_event_set() triggering an indefinite
        wait.
        NOTE: This fix for windows is different from that for other platforms.
        NOTE2: This bug is introduced in the scalability fix to the
        sync0arr which was applied to 5.0 only. Therefore, it need not be
        applied to the 5.1 tree. If we decide to port the scalability fix
        to 5.1 then this fix should be ported as well.
        
        Reviewed by: Heikki
      innobase/sync/sync0sync.c:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2082:
        branches/5.0:  bug#29560
        
        Fixed a race condition in the rw_lock where an os_event_reset()
        can overwrite an earlier os_event_set() triggering an indefinite
        wait.
        NOTE: This fix for windows is different from that for other platforms.
        NOTE2: This bug is introduced in the scalability fix to the
        sync0arr which was applied to 5.0 only. Therefore, it need not be
        applied to the 5.1 tree. If we decide to port the scalability fix
        to 5.1 then this fix should be ported as well.
        
        Reviewed by: Heikki
      sql/ha_innodb.cc:
        Applied InnoDB snapshot innodb-5.0-ss2095
        
        Revision r2091:
        branches/5.0:
         
        Merge r2088 from trunk:
         
        log for r2088:
        
        Fix Bug#32125 (http://bugs.mysql.com/32125)
        "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
        
        When unknown find_flag is encountered in convert_search_mode_to_innobase()
        do not call assert(0); instead queue a MySQL error using my_error() and
        return the error code PAGE_CUR_UNSUPP. Change the functions that call
        convert_search_mode_to_innobase() to handle that error code by "canceling"
        execution and returning appropriate error code further upstream.
        
        Approved by:	Heikki
        
        
        Revision r2095:
        branches/5.0: Merge r2093 from trunk:
        
        convert_search_mode_to_innobase(): Add the missing case label
        HA_READ_MBR_EQUAL that was forgotten in r2088.
      31561cfa
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · b39cd4cf
      unknown authored
      into  mysql.com:/home/kent/bk/tmpmerge/mysql-5.0-build
      
      b39cd4cf
    • unknown's avatar
      Raise version number after cloning 5.0.52 · 773b30ca
      unknown authored
      773b30ca
  6. 19 Nov, 2007 3 commits
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 0190b029
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
      
      0190b029
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-18431 · 62243160
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      62243160
    • unknown's avatar
      Update readline to version 5.2. This fixes bug#18431. · 6e66651e
      unknown authored
      
      cmd-line-utils/readline/INSTALL:
        update readline to version 5.2
      cmd-line-utils/readline/README:
        update readline to version 5.2
      cmd-line-utils/readline/bind.c:
        update readline to version 5.2
      cmd-line-utils/readline/callback.c:
        update readline to version 5.2
      cmd-line-utils/readline/chardefs.h:
        update readline to version 5.2
      cmd-line-utils/readline/compat.c:
        update readline to version 5.2
      cmd-line-utils/readline/complete.c:
        update readline to version 5.2
      cmd-line-utils/readline/configure.in:
        update readline to version 5.2
      cmd-line-utils/readline/display.c:
        update readline to version 5.2
      cmd-line-utils/readline/funmap.c:
        update readline to version 5.2
      cmd-line-utils/readline/histexpand.c:
        update readline to version 5.2
      cmd-line-utils/readline/histfile.c:
        update readline to version 5.2
      cmd-line-utils/readline/history.c:
        update readline to version 5.2
      cmd-line-utils/readline/histsearch.c:
        update readline to version 5.2
      cmd-line-utils/readline/input.c:
        update readline to version 5.2
      cmd-line-utils/readline/isearch.c:
        update readline to version 5.2
      cmd-line-utils/readline/keymaps.c:
        update readline to version 5.2
      cmd-line-utils/readline/kill.c:
        update readline to version 5.2
      cmd-line-utils/readline/macro.c:
        update readline to version 5.2
      cmd-line-utils/readline/mbutil.c:
        update readline to version 5.2
      cmd-line-utils/readline/misc.c:
        update readline to version 5.2
      cmd-line-utils/readline/nls.c:
        update readline to version 5.2
      cmd-line-utils/readline/parens.c:
        update readline to version 5.2
      cmd-line-utils/readline/readline.c:
        update readline to version 5.2
      cmd-line-utils/readline/readline.h:
        update readline to version 5.2
      cmd-line-utils/readline/rlconf.h:
        update readline to version 5.2
      cmd-line-utils/readline/rldefs.h:
        update readline to version 5.2
      cmd-line-utils/readline/rlmbutil.h:
        update readline to version 5.2
      cmd-line-utils/readline/rlprivate.h:
        update readline to version 5.2
      cmd-line-utils/readline/rltty.c:
        update readline to version 5.2
      cmd-line-utils/readline/savestring.c:
        update readline to version 5.2
      cmd-line-utils/readline/search.c:
        update readline to version 5.2
      cmd-line-utils/readline/shell.c:
        update readline to version 5.2
      cmd-line-utils/readline/signals.c:
        update readline to version 5.2
      cmd-line-utils/readline/terminal.c:
        update readline to version 5.2
      cmd-line-utils/readline/text.c:
        update readline to version 5.2
      cmd-line-utils/readline/tilde.c:
        update readline to version 5.2
      cmd-line-utils/readline/tilde.h:
        update readline to version 5.2
      cmd-line-utils/readline/undo.c:
        update readline to version 5.2
      cmd-line-utils/readline/util.c:
        update readline to version 5.2
      cmd-line-utils/readline/vi_keymap.c:
        update readline to version 5.2
      cmd-line-utils/readline/vi_mode.c:
        update readline to version 5.2
      cmd-line-utils/readline/xmalloc.c:
        update readline to version 5.2
      6e66651e
  7. 16 Nov, 2007 9 commits
  8. 14 Nov, 2007 5 commits