1. 05 Nov, 2004 3 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · 49f32c2f
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      49f32c2f
    • unknown's avatar
      func_in.result, func_in.test: · 6ecd35a7
      unknown authored
        Added a case for bug #6365.
      item_cmpfunc.cc:
        Fixed bug #6365 : Server crashed when list of values
        in IN predicate contains NULL while the tested field is
        of the character type and not of the default set;
        e.g. when f in 'f IN (NULL,'aa') belongs to binary
        character set, while the default character set is latin1.
      
      
      sql/item_cmpfunc.cc:
        Fixed bug #6365 : Server crash when list of values
        in IN predicate contains NULL while the tested field is
        of the character type of not of the default set
        e.g. when f in 'f IN (NULL,'aa') belongs to binary
        character set, while the default character set is latin1.
      mysql-test/t/func_in.test:
        Added a case for bug #6365.
      mysql-test/r/func_in.result:
        Added a case for bug #6365.
      6ecd35a7
    • unknown's avatar
      mysqladmin.c: · 1b764b9b
      unknown authored
        Missing initialized for "lengths" element.
        ,
      
      
      client/mysqladmin.c:
        Missing initialized for "lengths" element.
        ,
      1b764b9b
  2. 04 Nov, 2004 19 commits
  3. 03 Nov, 2004 9 commits
    • unknown's avatar
      ibuf0ibuf.c: · 312db073
      unknown authored
        Do not print to .err log about discarding ibuf entries in DISCARD TABLESPACE; removed compiler warning about unused variable
      
      
      innobase/ibuf/ibuf0ibuf.c:
        Do not print to .err log about discarding ibuf entries in DISCARD TABLESPACE; removed compiler warning about unused variable
      312db073
    • unknown's avatar
      InnoDB: commit after every 10000 rows in ALTER TABLE · e45a57d3
      unknown authored
      
      innobase/include/lock0lock.h:
        Added function lock_get_ix_table()
      innobase/include/row0mysql.h:
        Added parameter "table" to row_lock_table_for_mysql()
      innobase/lock/lock0lock.c:
        Added function lock_get_ix_table()
      innobase/row/row0mysql.c:
        Added parameter "table" to row_lock_table_for_mysql()
      sql/ha_innodb.cc:
        write_row(): commit every 10000 rows in ALTER TABLE
      sql/ha_innodb.h:
        Added member variable num_write_row
      e45a57d3
    • unknown's avatar
      NDB blobs - try to handle insert-update-delete under autocommit=0 · 3b06ac19
      unknown authored
      
      ndb/src/ndbapi/ndberror.c:
        826 error text
      mysql-test/r/ndb_blob.result:
        result displayed error
      mysql-test/t/ndb_blob.test:
        result displayed error
      ndb/src/ndbapi/NdbBlob.cpp:
        update head+inline earlier
      ndb/src/ndbapi/NdbOperationExec.cpp:
        blob IgnoreError bug
      ndb/test/ndbapi/testBlobs.cpp:
        tried to set non-nullable to null, causing a complex abort case
      ndb/src/ndbapi/NdbConnection.cpp:
        prepared ops CAN be left in complex abort
      3b06ac19
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f1e56c6
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      5f1e56c6
    • unknown's avatar
      Merge mysql.com:/home/bkroot/mysql-4.1 · a7396c57
      unknown authored
      into mysql.com:/home/bk/b5551-4.1-v4
      
      a7396c57
    • unknown's avatar
      Fix for bug#5551 (Version 4). · f30fce23
      unknown authored
      The idea of the fix is that the administrative statements 
      OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not 
      generate binlog errors if there is no errors on the master.
      
      
      sql/sql_parse.cc:
        No binlog error generated
      sql/sql_table.cc:
        Documentation
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      f30fce23
    • unknown's avatar
      changed to use the future-proof option to ndb_mgmd · 4493a693
      unknown authored
      there was a clash in using -c, added -f as the future proof switch
      
      
      mysql-test/ndb/ndbcluster.sh:
        changed to use the future-proof option to ndb_mgmd
      ndb/src/mgmsrv/main.cpp:
        there was a clash in using -c, added -f as the future proof switch
      4493a693
    • unknown's avatar
    • unknown's avatar
      opt_range.cc, range.result, range.test: · 12f1b6c6
      unknown authored
        Bug #6045: Binary Comparison regression in MySQL 4.1
        Binary searches didn't use a case insensitive index, now they do.
      
      
      mysql-test/t/range.test:
        Bug #6045: Binary Comparison regression in MySQL 4.1
        Binary searches didn't use a case insensitive index, now they do.
      mysql-test/r/range.result:
        Bug #6045: Binary Comparison regression in MySQL 4.1
        Binary searches didn't use a case insensitive index, now they do.
      sql/opt_range.cc:
        Bug #6045: Binary Comparison regression in MySQL 4.1
        Binary searches didn't use a case insensitive index, now they do.
      12f1b6c6
  4. 02 Nov, 2004 9 commits
    • unknown's avatar
      bad automerge (?) fixed · 65d027bd
      unknown authored
      65d027bd
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 121bdab3
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      configure.in:
        Auto merged
      121bdab3
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e0e8f7d2
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      e0e8f7d2
    • unknown's avatar
      add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11 · 34852614
      unknown authored
          remove compiler warning
          patch for my_vsnprintf not dully implemented
          patch for platfroms that return -1 on snprintf overflow
          compile fix for hpux
      
      
      configure.in:
        add compile flad -DSNPRINTF_RETURN_TRUNC on hp ux 11
      ndb/src/common/editline/sysunix.c:
        remove compiler warning
      ndb/src/common/util/basestring_vsnprintf.c:
        patch for my_vsnprintf not dully implemented
        patch for platfroms that return -1 on snprintf overflow
      ndb/src/kernel/vm/Emulator.hpp:
        compile fix for hpux
      ndb/src/mgmsrv/Services.cpp:
        compile fix for hp ux
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        remove compiler warning
      34852614
    • unknown's avatar
      Remove usage of !$ from mysql-tests · 2bcfcbfe
      unknown authored
      Added protocol::flush() for easier embedded-server code
      Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
      Added option --silent to client_test
      
      
      client/mysqltest.c:
        Removed compiler warning
        Fixed identation & comments from earlier push
        Renamed variable 'disable_abort_on_error' to 'abort_on_error'
        Ensure that '$mysql_errno' also with --ps-protocol
      include/mysql_com.h:
        Removed special handling of net_flush for embedded server
      mysql-test/r/mysqltest.result:
        Remove usage of !$ in tests
      mysql-test/t/client_test.test:
        Use --silent
      mysql-test/t/comments.test:
        Remove usage of !$ in tests
      mysql-test/t/join_outer.test:
        Remove usage of !$ in tests
      mysql-test/t/key.test:
        Remove usage of !$ in tests
      mysql-test/t/mysqltest.test:
        Remove usage of !$ in tests
      mysql-test/t/show_check.test:
        Remove usage of !$ in tests
      mysql-test/t/temp_table.test:
        Remove usage of !$ in tests
      mysql-test/t/type_ranges.test:
        Remove usage of !$ in tests
      sql/mysqld.cc:
        Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
      sql/net_serv.cc:
        Remove special usage of net_flush in embedded server
      sql/protocol.cc:
        Added protocol::flush() for easier embedded-server code
      sql/protocol.h:
        Added protocol::flush() for easier embedded-server code
      sql/sql_prepare.cc:
        Added protocol::flush() for easier embedded-server code
        Remove one extra flush() for prepared statements
      sql/sql_show.cc:
        Added protocol::flush() for easier embedded-server code
      tests/client_test.c:
        Added option --silent
      2bcfcbfe
    • unknown's avatar
      Merge build.mysql.com:/home/bk/mysql-4.1 · a4703018
      unknown authored
      into build.mysql.com:/users/rburnett/mysql-4.1-current
      
      a4703018
    • unknown's avatar
      Bug# 5303 Windows --log-error option doesn't work correctly · f2a1eae8
      unknown authored
      
      sql/mysqld.cc:
        changed to open log_error_file instead of "mysql.err" on Windows
      f2a1eae8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c47deeb5
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      innobase/dict/dict0load.c:
        Auto merged
      c47deeb5