1. 23 Sep, 2005 2 commits
  2. 22 Sep, 2005 13 commits
  3. 21 Sep, 2005 13 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-zlib · 14926bf9
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      zlib/ChangeLog:
        Auto merged
      zlib/FAQ:
        Auto merged
      zlib/README:
        Auto merged
      zlib/crc32.c:
        Auto merged
      zlib/deflate.c:
        Auto merged
      zlib/deflate.h:
        Auto merged
      zlib/gzio.c:
        Auto merged
      zlib/infback.c:
        Auto merged
      zlib/inffast.c:
        Auto merged
      zlib/inflate.c:
        Auto merged
      zlib/inftrees.c:
        Auto merged
      zlib/inftrees.h:
        Auto merged
      zlib/trees.c:
        Auto merged
      zlib/zconf.h:
        Auto merged
      zlib/zlib.3:
        Auto merged
      zlib/zlib.h:
        Auto merged
      zlib/zutil.h:
        Auto merged
      14926bf9
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 14deb963
      unknown authored
      into moonbone.local:/work/13180-bug-4.1-mysql
      
      
      14deb963
    • unknown's avatar
      Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing. · 1b02a815
      unknown authored
      thd->allow_sum_func was left 'true' after previous statement thus allowing
      sum funcs to be present in conditions.
      
      thd->allow_sum_func should be set to 0 for each query and each prepared
      statement reinitialization. This is done in lex_start() and 
      reset_stmt_for_execute().
      
      
      sql/sql_lex.cc:
        Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
        thd->allow_sum_func is set to 0 in lex_start().
      sql/sql_prepare.cc:
        Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
        thd->allow_sum_func is set to 0 in  reset_stmt_for_execute().
      mysql-test/t/update.test:
        Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
        processing.
      mysql-test/r/update.result:
        Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
        processing.
      1b02a815
    • unknown's avatar
      Fix compiler error: C++ code in C · a808e97d
      unknown authored
      a808e97d
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/4.1-virgin · 09225cef
      unknown authored
      into  mysql.com:/home/timka/mysql/src/4.1-dbg
      
      
      09225cef
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 02fe27b3
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      02fe27b3
    • unknown's avatar
      bug#12950 · 3c8a296f
      unknown authored
          ndb backup with charsets and simultanious updates
          make sure that backup _dont_ read xfrm data
      
      
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Backup can do dirty read
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Fix so that backup dont read xfrm data
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        Fix so that backup dont read xfrm data
      3c8a296f
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1c2cb842
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      sql/mysqld.cc:
        Auto merged
      1c2cb842
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 98bbb1ae
      unknown authored
      into  mysql.com:/usr/home/ram/work/4.1.b7589
      
      
      98bbb1ae
    • unknown's avatar
      a fix (bug #7589: Decimal types are ignored when updating data from another column). · 24922a30
      unknown authored
      
      mysql-test/r/union.result:
        a fix (bug #7589: Decimal types are ignored when updating data from another column).
        removed wrong test result (see #13372)
      mysql-test/t/union.test:
        a fix (bug #7589: Decimal types are ignored when updating data from another column).
        removed wrong test result (see #13372)
      sql/field_conv.cc:
        a fix (bug #7589: Decimal types are ignored when updating data from another column).
        use memcpy() only for identical decimals.
      24922a30
    • unknown's avatar
      Don't add all args to mysqltest to MYSQL_TEST env var · 30681cf5
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.
      30681cf5
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/4.1-virgin · a4243d3c
      unknown authored
      into  mysql.com:/home/timka/mysql/src/4.1-dbg
      
      
      sql/opt_sum.cc:
        Auto merged
      a4243d3c
    • unknown's avatar
      Fix for BUG#12882 - min/max inconsistent on empty table. · 8e7217e4
      unknown authored
      The problem was in that the MIN/MAX optimization in opt_sum_query was
      replacing MIN/MAX functions with their constant argument without
      taking into account that a query has no result rows.
      
      
      mysql-test/r/func_group.result:
        Test for BUG#12882.
      mysql-test/t/func_group.test:
        Test for BUG#12882.
      sql/item_sum.cc:
        If it is known that a query has no result rows, do not call add()
        via the call to Item_sum::no_rows_in_result() which calls reset().
        Instead directly call clear() so that the MIN and MAX functions
        produce NULL when there are no result rows.
      sql/opt_sum.cc:
        * Do not apply MIN/MAX optimization when the operand of MIN/MAX is
          a constant if it can't be determined whether the query has any
          result rows. The reason is that if the query has result rows,
          then the result of MIN/MAX is its constant argument, but if the
          query result is empty, then the result of MIN/MAX must be NULL
          irrespective of its argument.
        
        * The patch also simplifies a bit the branch that hadles COUNT().
      8e7217e4
  4. 20 Sep, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/home/psergey/bk-trees/mysql-4.1 · 458a4234
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
      
      
      sql/mysqld.cc:
        Auto merged
      458a4234
    • unknown's avatar
      BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index · a2a8216b
      unknown authored
      statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)
      
      
      include/myisam.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      myisam/mi_check.c:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      myisam/myisamchk.c:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      mysql-test/r/myisam.result:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      mysql-test/t/myisam.test:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/ha_myisam.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/handler.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/mysqld.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/set_var.cc:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      sql/sql_class.h:
        BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
      a2a8216b
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1818ff1c
      unknown authored
      into  selena.:H:/MYSQL/src/#12929-mysql-4.1
      
      
      include/my_sys.h:
        Auto merged
      1818ff1c
    • unknown's avatar
      ac604f71
    • unknown's avatar
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7aad3ae6
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      7aad3ae6
  5. 19 Sep, 2005 6 commits