1. 02 Dec, 2005 11 commits
  2. 01 Dec, 2005 12 commits
    • unknown's avatar
      Post-merge result file cleanup · 025d8c14
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Fix results
      025d8c14
    • unknown's avatar
      Fix bug#15028 Multitable update returns different numbers of matched rows · 136c8173
      unknown authored
      depending on table order
      
      multi_update::send_data() was counting updates, not updated rows. Thus if one 
      record have several updates it will be counted several times in 'rows matched'
      but updated only once.
      
      multi_update::send_data() now counts only unique rows.
      
      
      sql/sql_update.cc:
        Fix bug#15028  Multitable update returns different numbers of matched rows
        depending on table order
        multi_update::send_data() now counts only unique rows.
      mysql-test/t/update.test:
        Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
      mysql-test/r/update.result:
        Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
      136c8173
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-13318 · 3016ec15
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Resolve conflicts
      mysql-test/t/mysqldump.test:
        Resolve conflicts
      3016ec15
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12612 · f604204f
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/r/func_equal.result:
        Auto merged
      mysql-test/t/func_equal.test:
        Auto merged
      sql/item_cmpfunc.cc:
        SCCS merged
      f604204f
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-keysize · 5df3be70
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      5df3be70
    • unknown's avatar
      Enable key lengths of up to 3K on 32-bit platforms. · 4b4f7f76
      unknown authored
      
      mysql-test/r/bdb.result:
        Add new results
      mysql-test/r/innodb.result:
        Add new results
      mysql-test/t/bdb.test:
        Add simple test that large keys are allowed
      mysql-test/t/innodb.test:
        Add simple test that large keys are allowed
      sql/unireg.h:
        Allow key length of 3K even on 32-bit platforms
      4b4f7f76
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9dcae047
      unknown authored
      into  selena.:H:/MYSQL/src/#14902-mysql-5.0
      
      
      mysql-test/r/analyze.result:
        SCCS merged
      mysql-test/t/analyze.test:
        SCCS merged
      9dcae047
    • unknown's avatar
      We should skip beggining '(' characters when test query on possibility · a050707b
      unknown authored
      to be in the query cache. (BUG#14652)
      
      
      mysql-test/r/query_cache.result:
        BUG#14652 test suite.
      mysql-test/t/query_cache.test:
        BUG#14652 test suite.
      sql/sql_cache.cc:
        We should skip beggining '(' characters when test query on possibility
        to be in the query cache.
      a050707b
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · babaa74e
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      babaa74e
    • unknown's avatar
      Fix for bug #14304: auto_increment field incorrect set from within stored... · f853fbc9
      unknown authored
      Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
      
      
      sql/sp_head.cc:
        Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
        - call thd->cleanup_after_query() to clean next_insert_id.
      sql/sql_class.cc:
        Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
        - save/restore clear_next_insert_id
      sql/sql_class.h:
        Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
        - clear_next_insert_id added
      f853fbc9
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · c9ef4091
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-bug-14920
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/group_min_max.result:
        Manually merged test cases.
      mysql-test/t/group_min_max.test:
        Manually merged test cases.
      c9ef4091
    • unknown's avatar
      Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value · ba079bad
      unknown authored
        store TABLES.TABLE_TYPE in case of error during table opening
      
      
      mysql-test/r/information_schema.result:
        Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
          test case
      mysql-test/t/information_schema.test:
        Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
          test case
      ba079bad
  3. 30 Nov, 2005 10 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-14610 · 3c8a8de4
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      3c8a8de4
    • unknown's avatar
      Fix union.result · b775d23f
      unknown authored
      
      mysql-test/r/union.result:
        Fix order of test results
      b775d23f
    • unknown's avatar
      598cc2db
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 03e057cd
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      vio/viosslfactories.c:
        Auto merged
      03e057cd
    • unknown's avatar
      Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 30dfba37
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-virgin
      
      
      30dfba37
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · c3937487
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      vio/viosslfactories.c:
        Auto merged
      c3937487
    • unknown's avatar
      WL#2486 - natural/using join according to SQL:2003 · e26eb47b
      unknown authored
      Commented out one failing query in the regression test (reported as a bug).
      
      
      mysql-test/r/join.result:
        Commented out failing query.
      mysql-test/t/join.test:
        Commented out failing query.
      e26eb47b
    • unknown's avatar
      WL#2486 - natural/using join according to SQL:2003. · 7c38fc51
      unknown authored
      Implemented specialized regression test for the WL.
      
      
      mysql-test/r/join.result:
        Test results for natural join tests.
      mysql-test/t/join.test:
        Specialized test for natural join, and join ... on.
      7c38fc51
    • unknown's avatar
      Fix for BUG#14920 Ordering aggregated result sets corrupts resultset. · e3f57552
      unknown authored
      The cause of the bug was the use of end_write_group instead of end_write
      in the case when ORDER BY required a temporary table, which didn't take
      into account the fact that loose index scan already computes the result
      of MIN/MAX aggregate functions (and performs grouping).
      
      The solution is to call end_write instead of end_write_group and to add
      the MIN/MAX functions to the list of regular functions so that their
      values are inserted into the temporary table.
      
      
      mysql-test/r/group_min_max.result:
        Test for BUG#14920
      mysql-test/t/group_min_max.test:
        Test for BUG#14920
      sql/sql_class.cc:
        Added new member to TMP_TABLE_PARAM.
      sql/sql_class.h:
        Added new member to TMP_TABLE_PARAM.
      sql/sql_select.cc:
        Enable result rows generated by loose index scan being written into
        a temporary table. The change is necessary because loose index
        scan already computes the result of GROUP BY and the MIN/MAX aggregate
        functions. This is realized by three changes:
        - create_tmp_table allocates space for aggregate functions in the
          list of regular functions,
        - use end_write instead of end_write group,
        - copy the pointers to the MIN/MAX aggregate functions to the list
          of regular functions TMP_TABLE_PARAM::items_to_copy.
      sql/sql_select.h:
        New parameter to create_tmp_table.
      e3f57552
    • unknown's avatar
      Addition to fix for bug #12956: cast make differ rounding. · 490a1e28
      unknown authored
      - use rint() in some other val_int() methods as well.
      
      
      490a1e28
  4. 29 Nov, 2005 7 commits