1. 17 Mar, 2005 29 commits
  2. 16 Mar, 2005 11 commits
    • unknown's avatar
      olap.result, olap.test: · 31f6b0dd
      unknown authored
        Added a test for bug #8615.
      sql_select.cc:
        Fixed bug #8615.
        This fix only removed the cause of the reported crash.
        It does not resolve other problems of rollup queries
        with DISTINCT. They were fixed in the previous patch 
        for bug 8616.
      
      
      sql/sql_select.cc:
        Fixed bug #8615.
        This fix only removed the cause of the reported crash.
        It does not resolve other problems of rollup queries
        with DISTINCT. They were fixed in the previous patch 
        for bug 8616.
      mysql-test/t/olap.test:
        Added a test for bug #8615.
      mysql-test/r/olap.result:
        Added a test for bug #8615.
      31f6b0dd
    • unknown's avatar
      Merge with global tree · b766082b
      unknown authored
      
      mysql-test/r/federated.result:
        merge
      sql/ha_federated.cc:
        merge
      b766082b
    • unknown's avatar
      Move handler dependent tests to the specific handler (myisam, bdb, innodb) · 1c5ca806
      unknown authored
      Enabled VARCHAR testing for innodb
      
      NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
      I have informed Heikki about this and expect him to fix this ASAP
      
      
      mysql-test/include/varchar.inc:
        Move handler dependent tests to the specific handler (myisam, bdb, innodb)
      mysql-test/r/innodb.result:
        Added varchar tests
      mysql-test/r/myisam.result:
        Update results
      mysql-test/t/bdb.test:
        Move handler dependent tests to the specific handler (myisam, bdb, innodb)
      mysql-test/t/innodb.test:
        Enabled VARCHAR testing
      mysql-test/t/myisam.test:
        Move handler dependent tests to the specific handler (myisam, bdb, innodb)
      sql/sql_parse.cc:
        Indentation fixes
      sql/sql_table.cc:
        Fixed bug introduced when doing cleanup
      1c5ca806
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 06f59b28
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/item_func.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      06f59b28
    • unknown's avatar
      Fixes after Sinisa and Serg comments after push of patch for BUG#9123. · 74007170
      unknown authored
      BUG#9123 is solved earlier than this patch though.
      
      
      74007170
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 61a717f6
      unknown authored
      into krsna.:/home/patg/test/mysql-5.0
      
      
      61a717f6
    • unknown's avatar
      Fixed binlog.test failure which occured after patch implementing · f9792042
      unknown authored
      WL#874 "Extended LOAD DATA" was pushed.
      
      
      mysql-test/r/binlog.result:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar
        changes.
      mysql-test/t/binlog.test:
        Addition of two new types of binary log events shifted binlog positions.
        Updated test's results and made it more robust for future similar
        changes.
      f9792042
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · a97fd472
      unknown authored
      into krsna.:/home/patg/test/mysql-5.0
      
      
      a97fd472
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7fe43b71
      unknown authored
      into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
      
      
      7fe43b71
    • unknown's avatar
      Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.2 · 91df4830
      unknown authored
      into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      91df4830