1. 11 Feb, 2005 1 commit
  2. 10 Feb, 2005 8 commits
    • unknown's avatar
      Merge commit trigger · a20374e3
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      extra/replace.c:
        Auto merged
      BitKeeper/triggers/post-commit:
        Merge changes
      a20374e3
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0 · 77d24615
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.0-clean
      
      
      77d24615
    • unknown's avatar
    • unknown's avatar
      BUG#6749: If there is no current database, then nothing should be binlogged if · 9f4f7980
      unknown authored
      binlog-do-db or binlog-ignore-db are in effect.   (In the future 5.1? 5.0? I think 
      each statement should be verified against the filtering criteria based on the database
      it *uses* and not the *current* one.  But, right now the *current* database is what 
      counts according to the semantics of the manual.)
      
      
      sql/log.cc:
        BUG#6749: If there is no current database, then nothing should be binlogged if
        binlog-do-db or binlog-ignore-db are in effect.   (In the future I think that each 
        statement should be verified against the filtering criteria based on the database
        it *uses* and not the *current* one.  But, right now the *current* database is what 
        counts according to the semantics of the manual.)
      9f4f7980
    • unknown's avatar
      Follow-up for bug#7990 · d9039e87
      unknown authored
      
      libmysql/libmysql.c:
        And now put it to the proper place and make it work (Bug#7990)
      tests/mysql_client_test.c:
        Enable the test for bug#7990
      d9039e87
    • unknown's avatar
      A fix and test case for Bug#7990 "mysql_stmt_close doesn't · a26ce94f
      unknown authored
      reset mysql->net.last_error": the solution is to clear
      MYSQL->net error before performing COM_CLOSE: if the call
      succeeds, the connection is usable for other statements.
      More comprehensive fix is to clear MYSQL->net for all
      recoverable errors at the time they happen, it will be
      implemented in 5.0 as it introduces incompatibility in behavior.
      
      
      libmysql/libmysql.c:
        A simple fix for Bug#7990 "mysql_stmt_close doesn't reset 
        mysql->net.last_error"
      tests/mysql_client_test.c:
        A test case for Bug#7990 " mysql_stmt_close doesn't reset 
        mysql->net.last_error"
      a26ce94f
    • unknown's avatar
      A fix and test case for Bug#8330 "mysql_stmt_execute crashes" (libmysql). · fca90750
      unknown authored
      
      libmysql/libmysql.c:
        Fix for bug#8330 "mysql_stmt_execute crashes": we need to bail out
        from mysql_stmt_execute if mysql->net is occupied with a result set of
        another statement. Otherwise on the next attempt to use net we get
        a crash, as it's freed in case of error.
      tests/mysql_client_test.c:
        A test case for Bug#8330 "mysql_stmt_execute craches" (libmysql)
      fca90750
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-zlib · 425f2f91
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      425f2f91
  3. 09 Feb, 2005 8 commits
  4. 08 Feb, 2005 8 commits
    • unknown's avatar
      Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table · 37e2873f
      unknown authored
      
      mysql-test/r/heap_hash.result:
        Testcase for BUG#8371: wrong rec_per_key value for hash index on temporary table
      mysql-test/t/heap_hash.test:
        Testcase for BUG#8371: wrong rec_per_key value for hash index on temporary table
      sql/ha_heap.cc:
        Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table:
        Don't assume that table->rec_per_key==NULL if table->tmp_table != NO_TMP_TABLE, 
        this is not true for tables created with "CREATE TEMPORARY TABLE" (while it holds
        for temporary tables created during query execution)
      sql/sql_select.cc:
        Initialize rec_per_key for all keys in temporary table.
      37e2873f
    • unknown's avatar
      Applied a patch for Netware. · ffe417fd
      unknown authored
      ffe417fd
    • unknown's avatar
      Merge mysql.com:/home/wax/mysql/mysql-4.1 · 30e89d0a
      unknown authored
      into mysql.com:/home/wax/mysql/mysql-4.1test2
      
      
      30e89d0a
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · a7325649
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-4.1
      
      
      a7325649
    • unknown's avatar
      Better bugfix for "HAVING when refering to RAND()" (Bug #8216) · 63982db9
      unknown authored
      Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
      This will ensure that any reference to these has a valid value.
      Generalized the code for split_sum_func()
      
      
      BitKeeper/etc/ignore:
        added support-files/ndb-config-2-node.ini
      mysql-test/r/group_by.result:
        More complicated test to assure that rand() is only calulated once
      mysql-test/r/user_var.result:
        Back to old results :(  (ok but not perfect)
      mysql-test/t/group_by.test:
        More complicated test to assure that rand() is only calulated once
      sql/item.cc:
        Better bugfix for "HAVING when refering to RAND()"
        This will ensure that when refering to things like RAND() in HAVING through an alias we will not recalculate that rand() value in the HAVING part but use the value in the row
        Generalize split_sum_func()
      sql/item.h:
        Better bugfix for "HAVING when refering to RAND()"
        T
      sql/item_cmpfunc.cc:
        Better bugfix for "HAVING when refering to RAND()"
        Use generalized split_sum_func2() function
      sql/item_func.cc:
        Better bugfix for "HAVING when refering to RAND()"
        Use generalized split_sum_func2() function
      sql/item_row.cc:
        Better bugfix for "HAVING when refering to RAND()"
        Use generalized split_sum_func2() function
      sql/item_strfunc.cc:
        Better bugfix for "HAVING when refering to RAND()"
        Use generalized split_sum_func2() function
      sql/sql_list.h:
        Add functions to concatenate lists
      sql/sql_select.cc:
        Better bugfix for "HAVING when refering to RAND()"
        Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
        This will ensure that any reference to these has a valid value.
      63982db9
    • unknown's avatar
      Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and · 6cee60ea
      unknown authored
      single table DELETE...SELECT clauses when innobase_locks_unsafe_for_binlog
      is used and isolation level of the transaction is not serializable. 
      InnoDB uses consistent read in these cases for a selected table.
      Backported from 5.0.x.
      
      
      sql/ha_innodb.cc:
        Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and 
        single table DELETE...SELECT clauses when innobase_locks_unsafe_for_binlog
        is used and isolation level of the transaction is not serializable. 
        InnoDB uses consistent read in these cases for a selected table.
      6cee60ea
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 · 82de648b
      unknown authored
      into mysql.com:/usr/home/ram/work/4.0
      
      
      82de648b
    • unknown's avatar
      6a1e7562
  5. 07 Feb, 2005 15 commits