1. 06 Nov, 2004 1 commit
    • unknown's avatar
      A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows). · e19427d3
      unknown authored
      
      sql/item_func.cc:
        A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows).
        Do nothing in the udf_handler destructor if not_original flag is set.
      sql/item_sum.h:
        A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows).
        Set udf.not_original flag if we create an Item from the existent one.
      sql/sql_udf.h:
        A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows).
        not_original flag added.
      e19427d3
  2. 05 Nov, 2004 7 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4d8eb5e3
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      4d8eb5e3
    • unknown's avatar
      ps.result, ctype_ucs.result, ctype_ucs.test, ps.test: · bbb31403
      unknown authored
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
      
      
      mysql-test/t/ps.test:
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
      mysql-test/t/ctype_ucs.test:
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
      mysql-test/r/ctype_ucs.result:
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
      mysql-test/r/ps.result:
        Bug #6351 make test failure "Unknown character set"
        UCS2 related tests were moved into ctype_ucs.
      bbb31403
    • unknown's avatar
      mysqldump.c: · 92b89585
      unknown authored
        - 'mysqldump --help' comment that --xeh-blob
          doesn't work with --extended-inserts was removed.
          It does work now. Thanks to Lachlan
          who noticed this wrong help message.
        - Switched to use the recently introduced
          mysql_hex_string() instead of slow sprintf().
          Thanks to Sinisa for the idea.
        - 'mysqldump --hex-blob' dumps in HEX not only
          BLOBs but also BINARY(x) columns. 
          Thanks to Paul.
      
      
      client/mysqldump.c:
        - comment that --xeh-blob doesn't work with --extended-inserts was removed. It does work now.
        - Switched to use recently introduced mysql_hex_string()
          instead of sprintf()
        - BINARY(x) are dumped in HEX too
      92b89585
    • unknown's avatar
      libmysql.def, libmysql.c: · 94c09b1e
      unknown authored
        Minor clean-ups
      
      
      libmysql/libmysql.c:
        Minor clean-ups
      libmysql/libmysql.def:
        bk commit
      94c09b1e
    • 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
  3. 04 Nov, 2004 19 commits
  4. 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
  5. 02 Nov, 2004 4 commits