1. 05 Jul, 2007 1 commit
    • unknown's avatar
      Fix for bug #29420: crash with show and purge binlogs · 0d8f353b
      unknown authored
      Problem: in case of failed 'show binlog events...' we don't inform that 
      the log is not in use anymore. That may confuse following 'purge logs...'
      command as it takes into account logs in use.
      
      Fix: always notify that the log is not in use anymore.
      
      
      mysql-test/r/rpl_rotate_logs.result:
        Fix for bug #29420: crash with show and purge binlogs
          - test result.
      mysql-test/t/rpl_rotate_logs.test:
        Fix for bug #29420: crash with show and purge binlogs
          - test case.
      sql/sql_repl.cc:
        Fix for bug #29420: crash with show and purge binlogs
          - always zero thd->current_linfo at the end of the mysql_show_binlog_events().
      0d8f353b
  2. 04 Jul, 2007 3 commits
  3. 03 Jul, 2007 1 commit
  4. 02 Jul, 2007 6 commits
  5. 01 Jul, 2007 2 commits
  6. 30 Jun, 2007 3 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-4.1-opt · 8dcd5fca
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      
      mysql-test/r/type_enum.result:
        Auto merged
      mysql-test/t/type_enum.test:
        Auto merged
      sql/field_conv.cc:
        SCCS merged
      8dcd5fca
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0b0cef48
      unknown authored
      into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
      
      
      0b0cef48
    • unknown's avatar
      Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB · 59ab2d46
      unknown authored
      previous correction didn't. make sure "tail" is fixed up
      when filling cache several times; rework formulae.
      
      
      mysql-test/r/binlog.result:
        Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
        
        show that fix for absolute end_log_pos in binlog also
        works when cache is read several times and headers are
        split across that boundary
      mysql-test/t/binlog.test:
        Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
        
        show that fix for absolute end_log_pos in binlog also
        works when cache is read several times and headers are
        split across that boundary
      59ab2d46
  7. 29 Jun, 2007 12 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29205 · a89259fa
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      a89259fa
    • unknown's avatar
      Fixed bug #29205. · db397d16
      unknown authored
      When a UNION statement forced conversion of an UTF8
      charset value to a binary charset value, the byte
      length of the result values was truncated to the
      CHAR_LENGTH of the original UTF8 value.
      
      
      sql/item.cc:
        Fixed bug #29205.
        The calculation of data length was modified in
        the Item_type_holder::join_types method to take into
        account possible conversion of a multibyte charset
        value to a binary charset value, when each
        multibyte character is converted into a sequence
        of bytes (not to a single byte of binary charset).
      mysql-test/t/ctype_utf8.test:
        Updated test case for bug #29205.
      mysql-test/r/ctype_utf8.result:
        Updated test case for bug #29205.
      db397d16
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 6a00ce71
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/29261-bug-5.0-opt-mysql
      
      
      6a00ce71
    • unknown's avatar
      Bug#29261: Sort order of the collation wasn't used when comparing trailing · 4772a012
      unknown authored
      spaces.
      
      When the my_strnncollsp_simple function compares two strings and one is a prefix
      of another then this function compares characters in the rest of longer key
      with the space character to find whether the longer key is greater or less.
      But the sort order of the collation isn't used in this comparison. This may
      lead to a wrong comparison result, wrongly created index or wrong order of the
      result set of a query with the ORDER BY clause.
      
      Now the my_strnncollsp_simple function uses collation sort order to compare
      the characters in the rest of longer key with the space character.
      
      
      mysql-test/t/ctype_collate.test:
        Added a test case for the bug#29261: Sort order of the collation wasn't used
        when comparing trailing spaces.
      mysql-test/r/ctype_collate.result:
        Added a test case for the bug#29261: Sort order of the collation wasn't used
        when comparing trailing spaces.
      strings/ctype-simple.c:
        Bug#29261: Sort order of the collation wasn't used when comparing trailing
        spaces.
        Now the my_strnncollsp_simple function uses collation sort order to compare
        the characters in the rest of longer key with the space character.
      4772a012
    • unknown's avatar
      Update result files. · f10d930b
      unknown authored
      
      mysql-test/r/ps_6bdb.result:
        Update result file.
      mysql-test/r/ps_7ndb.result:
        Update result file.
      f10d930b
    • unknown's avatar
      Follow up to the patch for the BUG#10491. · 54c3809d
      unknown authored
      
      mysql-test/r/ps_1general.result:
        Update result file.
      mysql-test/r/ps_2myisam.result:
        Update result file.
      mysql-test/r/ps_3innodb.result:
        Update result file.
      mysql-test/r/ps_4heap.result:
        Update result file.
      mysql-test/r/ps_5merge.result:
        Update result file.
      tests/mysql_client_test.c:
        Fix test -- after field changing character set to utf8 in the server,
        length should be calculated differently.
      54c3809d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · f30a53a0
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      f30a53a0
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/bug28356/my50-bug28356 · c8dde6df
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/t/sp.test:
        Auto merged
      c8dde6df
    • unknown's avatar
      Bug#28356 Exec'ing "diff" from "mysqltest" loses the output, no information available · 0870afe3
      unknown authored
       - Use SQL for diffing master and slave
      
      
      mysql-test/r/rpl_misc_functions.result:
        Dump t1 on slave and load it back into temporary table on master
        to allow comapre with SQL
      mysql-test/t/rpl_misc_functions.test:
        Dump t1 on slave and load it back into temporary table on master
        to allow comapre with SQL
      0870afe3
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 33eb22a3
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B27333-gcov-5.0-opt
      
      
      33eb22a3
    • unknown's avatar
      Bug#27333: subquery grouped for aggregate of outer · c2e961cf
      unknown authored
      query / no aggregate of subquery
       The optimizer counts the aggregate functions that 
       appear as top level expressions (in all_fields) in 
       the current subquery. Later it makes a list of these
       that it uses to actually execute the aggregates in
       end_send_group().
       That count is used in several places as a flag whether
       there are aggregates functions.
       While collecting the above info it must not consider
       aggregates that are not aggregated in the current 
       context. It must treat them as normal expressions 
       instead. Not doing that leads to incorrect data about
       the query, e.g. running a query that actually has no
       aggregate functions as if it has some (and hence is
       expected to return only one row).
       Fixed by ignoring the aggregates that are not aggregated
       in the current context. 
       One other smaller omission discovered and fixed in the 
       process : the place of aggregation was not calculated for
       user defined functions. Fixed by calling 
       Item_sum::init_sum_func_check() and 
       Item_sum::check_sum_func() as it's done for the rest of 
       the aggregate functions.
      
      
      mysql-test/r/subselect.result:
        Bug #27333: test case
      mysql-test/t/subselect.test:
        Bug #27333: test case
      sql/item_subselect.cc:
        Bug#27333: need select_lex to filter out
         aggregates that are not aggregated in
         the current select.
      sql/item_sum.cc:
        Bug#27333: need select_lex to filter out
         aggregates that are not aggregated in
         the current select.
      sql/item_sum.h:
        Bug#27333: calculate the place of 
         aggregation for user defined functions.
      sql/sql_select.cc:
        Bug#27333: When counting the aggregated functions
         and collecting a list of them we must not consider
         the aggregates that are not aggregated in the local
         context as "local" : i.e. we must treat them as 
         normal functions and not add them to the aggregate
         functions list.
      sql/sql_select.h:
        Bug#27333: need select_lex to filter out
         aggregates that are not aggregated in
         the current select.
      c2e961cf
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 73023608
      unknown authored
      into  mysql.com:/home/hf/work/29247/my50-29247
      
      
      sql-common/client.c:
        Auto merged
      73023608
  8. 28 Jun, 2007 6 commits
    • unknown's avatar
      Fix for BUG#10491: Server returns data as charset binary · 925c33db
      unknown authored
      SHOW CREATE TABLE or SELECT FROM I_S.
      
      Actually, the bug discovers two problems:
        - the original query is not preserved properly. This is the problem
          of BUG#16291;
        - the resultset of SHOW CREATE TABLE statement is binary.
      
      This patch fixes the second problem for the 5.0.
      
      Both problems will be fixed in 5.1.
      
      
      mysql-test/r/show_check.result:
        Update result file.
      mysql-test/t/show_check.test:
        Provide test case for BUG#10491.
      sql/item.h:
        Use utf8_general_ci instead of binary collation by default,
        because for views and base tables utf8 is the character set
        in which their definition is stored. For system constants
        it's the default character set, and for other objects
        (routines, triggers), no character set is stored, and
        therefore no character set is known, so returning utf8
        is just as good as any non-binary character set.
        This latter problem is fixed in 5.1 by 16291. In 5.1
        we will return the "real" character set.
      925c33db
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/bug29361/my50-bug29361 · 71964600
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      71964600
    • unknown's avatar
      Bug#29361 mysqldump creates stray file when too long path name is passed · dec626f4
      unknown authored
       - Move the check of too long path to 'get_one_option'
      
      
      client/mysqldump.c:
        Move the check of too long path to 'get_one_option'
      mysql-test/r/mysqldump.result:
        Update result file after changing error message
      dec626f4
    • unknown's avatar
      Bug#29414 HPUX build fails - 'noinst_HEADERS' does not exist · b98c96e6
      unknown authored
      
      sql/Makefile.am:
        Avoid "noinst_HEADERS" being sucked into mysql_LDADD 
        target if @MYSQLD_EXTRA_IBS@ are empty
      b98c96e6
    • unknown's avatar
      Bug#27345 Incorrect data returned when range-read from utf8_danish_ci indexes · 54344f68
      unknown authored
      Problem: like_range() returned wrong ranges for contractions (like 'ch' in Czech').
      Fix: adding a special code to handle tricky cases:
      - contraction head followed by a wild character
      - full contraction
      - contraction part followed by another contraction part,
        but they are not a contraction together.
      
      
      mysql-test/r/ctype_uca.result:
        Adding test case
      mysql-test/t/ctype_uca.test:
        Adding test case
      strings/ctype-mb.c:
        Adding test case
      strings/ctype-uca.c:
        Allocate additional 256 bytes for flags "is contraction part".
      strings/ctype-ucs2.c:
        Adding test case
      54344f68
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b728d0a6
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26642-5.0-opt
      
      
      b728d0a6
  9. 27 Jun, 2007 6 commits
    • unknown's avatar
      Change "exec rm" to "remove_file" · 61c423a2
      unknown authored
      
      mysql-test/t/sp.test:
        Change "exec rm" to "remove_file"
        Change two "remove file if exists" to "check that file not exist"
      61c423a2
    • unknown's avatar
      Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · d99af839
      unknown authored
      into  damien-katzs-computer.local:/Users/dkatz/mysql50
      
      
      d99af839
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base · 6f059005
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
      
      
      6f059005
    • unknown's avatar
      Bug#24924: shared-memory-base-name that is too long causes buffer overflow · f0ccaddf
      unknown authored
      show that shm communication still works on windows,
      and that we can't overflow the base-name.
      
      
      mysql-test/t/windows_shm-master.opt:
        Bug#24924: shared-memory-base-name that is too long causes buffer overflow
        
        start a server with shm communication if we're on
        windows.
      mysql-test/t/windows_shm.test:
        Bug#24924: shared-memory-base-name that is too long causes buffer overflow
        
        .opt has started a server with shm communication
        if we're on windows. now start a client with shm
        and connect to that server.
      f0ccaddf
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 00b3d3c2
      unknown authored
      into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug28677
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      00b3d3c2
    • unknown's avatar
      Bug #26642: create index corrupts table definition in .frm · 0c31d0bb
      unknown authored
        
        Thanks to Martin Friebe for finding and submitting a fix for this bug!
        
        A table with maximum number of key segments and maximum length key name
        would have a corrupted .frm file, due to an incorrect calculation of the
        complete key length.  Now the key length is computed correctly (I hope) :-)
        
        MyISAM would reject a table with the maximum number of keys and the maximum
        number of key segments in all keys.  It would allow one less than this total
        maximum.  Now MyISAM accepts a table defined with the maximum.  (This is a
        very minor issue.)
      
      
      myisam/mi_open.c:
        Bug #26642: change >= to > in a comparison (i.e., error 
        only if key_parts_in_table really is greater than 
        MAX_KEY * MAX_KEY_SEG)
      mysql-test/r/create.result:
        Bug #26642: test case
      mysql-test/t/create.test:
        Bug #26642: test case
      sql/table.cc:
        Bug #26642: In create_frm(), fix formula for key_length; 
        it was too small by (keys * 2) bytes
      0c31d0bb