1. 23 Mar, 2007 4 commits
  2. 22 Mar, 2007 6 commits
    • unknown's avatar
      NULL MERGE this to 5.1 · 805c2d52
      unknown authored
      Apply the following InnoDB snapshots:
      innodb-5.0-ss1319
      innodb-5.0-ss1331
      innodb-5.0-ss1333
      innodb-5.0-ss1341
      
      Fixes:
      - Bug #21409: Incorrect result returned when in READ-COMMITTED with query_cache ON
        At low transaction isolation levels we let each consistent read set
        its own snapshot.
      - Bug #23666: strange Innodb_row_lock_time_% values in show status; also millisecs wrong
        On Windows ut_usectime returns secs and usecs relative to the UNIX
        epoch (which is Jan, 1 1970).
      
      - Bug #25494: LATEST DEADLOCK INFORMATION is not always cleared
        lock_deadlock_recursive(): When the search depth or length is exceeded,
        rewind lock_latest_err_file and display the two transactions at the
        point of aborting the search.
      
      - Bug #25927: Foreign key with ON DELETE SET NULL on NOT NULL can crash server
        Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
        there is a foreign key constraint ON ... SET NULL.
      
      - Bug #26835: Repeatable corruption of utf8-enabled tables inside InnoDB
        The bug could be reproduced as follows:
      
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
      
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
      
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      
      
      innobase/dict/dict0dict.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1317:
        branches/5.0: Port r1316 from trunk:
        
        Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
        there is a foreign key constraint ON ... SET NULL.  (Bug #25927)
        
        dict_foreign_find_index(): Add paramettter check_null.
        
        dict_foreign_add_to_cache(): Do not allow ON DELETE SET NULL
        or ON UPDATE SET NULL if any of the referencing columns are declared NOT NULL.
      innobase/include/rem0rec.ic:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1339:
        branches/5.0: Merge r1338 from trunk:
        
        rec_offs_nth_size(): Treat n==0 as a special case.  (Bug #26835)
      innobase/include/sync0sync.ic:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1293:
        branches/5.0: Fixed inline asm code, it didn't work with GCC > ver 3.x.
      innobase/lock/lock0lock.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1331:
        branches/5.0: Merge r1330 from trunk:
        
        lock_deadlock_recursive(): When the search depth or length is exceeded,
        rewind lock_latest_err_file and display the two transactions at the
        point of aborting the search.  (Bug #25494)
        
        
        Revision r1333:
        branches/5.0: Merge r1332 from trunk:
        
        lock_deadlock_recursive(): When aborting the search, display a note
        regardless of start->undo_no.  Otherwise, aborted searches may show
        up as genuine deadlocks.  This mistake was made in r1330.
      innobase/srv/srv0srv.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1261:
        branches/5.0: Fix for Bug# 23666. On Windows ut_usectime returns secs 
        and usecs relative to the UNIX epoch (which is Jan, 1 1970).
      innobase/ut/ut0ut.c:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1261:
        branches/5.0: Fix for Bug# 23666. On Windows ut_usectime returns secs 
        and usecs relative to the UNIX epoch (which is Jan, 1 1970).
      mysql-test/r/innodb.result:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1319:
        branches/5.0: Port r1318 from trunk:
        
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1328:
        branches/5.0: mysql-test: Merge changes from MySQL AB.
        
        
        Revision r1341:
        branches/5.0: Merge r1340 from trunk:
        
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
        
        Revision r1284:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/24 14:49:36+04:00 holyfoot@mysql.com 
          bug #22682 Test fails --without-geometry
          geometry dependent parts moved to proper .test files
        
        mysql-test/r/innodb.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -2
          result fixed
        
        mysql-test/r/innodb_gis.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +2 -0
          result fixed
        
        mysql-test/t/innodb.test
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -6
          HAVE_GEOMETRY dependent part moved to innodb_gis.test
        
        mysql-test/t/innodb_gis.test
          2007/01/24 14:49:35+04:00 holyfoot@mysql.com +6 -0
          HAVE_GEOMETRY dependent part moved here from innodb.test
        
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug #24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug #20877).
        
        innodb.test, innodb.result: Add a test case.
        
        
        Revision r1318:
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1340:
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      mysql-test/t/innodb.test:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1279:
        branches/5.0: Merge changes from MySQL AB:
        
        ChangeSet
          2006/11/20 22:42:06+02:00 monty@mysql.com 
          Remove compiler warnings
          (Mostly in DBUG_PRINT() and unused arguments)
          Fixed bug in query cache when used with traceing (--with-debug)
          Fixed memory leak in mysqldump
          Removed warnings from mysqltest scripts (replaced -- with #)
        
        mysql-test/t/innodb.test
          2006/11/20 22:41:41+02:00 monty@mysql.com +1 -1
          Remove mysqltest warnings
        
        sql/ha_innodb.cc
          2006/11/20 22:41:51+02:00 monty@mysql.com +2 -2
          Fixed compiler warning
        
        
        Revision r1319:
        branches/5.0: Port r1318 from trunk:
        
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1328:
        branches/5.0: mysql-test: Merge changes from MySQL AB.
        
        
        Revision r1341:
        branches/5.0: Merge r1340 from trunk:
        
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
        
        Revision r1284:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/24 14:49:36+04:00 holyfoot@mysql.com 
          bug #22682 Test fails --without-geometry
          geometry dependent parts moved to proper .test files
        
        mysql-test/r/innodb.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -2
          result fixed
        
        mysql-test/r/innodb_gis.result
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +2 -0
          result fixed
        
        mysql-test/t/innodb.test
          2007/01/24 14:49:34+04:00 holyfoot@mysql.com +0 -6
          HAVE_GEOMETRY dependent part moved to innodb_gis.test
        
        mysql-test/t/innodb_gis.test
          2007/01/24 14:49:35+04:00 holyfoot@mysql.com +6 -0
          HAVE_GEOMETRY dependent part moved here from innodb.test
        
        
        Revision r1283:
        Merge changes from MySQL AB:
        
        ChangeSet
          2007/01/22 18:42:52+02:00 monty@mysql.com 
          Give warnings for unused objects
          Changed error message to be compatible with old error file
          Added new error message for new DUP_ENTRY syntax
        
        mysql-test/t/innodb.test
          2007/01/22 18:42:49+02:00 monty@mysql.com +14 -14
          Changed to use new error message
        
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug #24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug #20877).
        
        innodb.test, innodb.result: Add a test case.
        
        
        Revision r1318:
        Add a test case for r1316 (Bug #25927).
        
        
        Revision r1329:
        Merge changes from MySQL AB to mysql-test directives.
        The results are not affected.
        
        
        Revision r1340:
        innodb.test, innodb.result: Add test case for Bug #26835.
        The bug could be reproduced as follows:
        
        Define a table so that the first column of the clustered index is
        a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
        of differing length are considered equivalent.
        
        Insert and delete a record.  Before the delete-marked record is
        purged, insert another record whose first column is of different
        length but equivalent to the first record.  Under certain conditions,
        the insertion can be incorrectly performed as update-in-place.
        
        Likewise, an operation that could be done as update-in-place can
        unnecessarily be performed as delete and insert, but that would not
        cause corruption but merely degraded performance.
      sql/ha_innodb.cc:
        NULL MERGE this to 5.1
        
        Apply the following InnoDB snapshots:
        innodb-5.0-ss1319
        innodb-5.0-ss1331
        innodb-5.0-ss1333
        innodb-5.0-ss1341
        
        Revision r1279:
        branches/5.0: Merge changes from MySQL AB:
        
        ChangeSet
          2006/11/20 22:42:06+02:00 monty@mysql.com 
          Remove compiler warnings
          (Mostly in DBUG_PRINT() and unused arguments)
          Fixed bug in query cache when used with traceing (--with-debug)
          Fixed memory leak in mysqldump
          Removed warnings from mysqltest scripts (replaced -- with #)
        
        mysql-test/t/innodb.test
          2006/11/20 22:41:41+02:00 monty@mysql.com +1 -1
          Remove mysqltest warnings
        
        sql/ha_innodb.cc
          2006/11/20 22:41:51+02:00 monty@mysql.com +2 -2
          Fixed compiler warning
        
        
        Revision r1280:
        branches/5.0: Merge a change from MySQL AB:
        
        ChangeSet
          2006/11/30 18:25:05+02:00 monty@mysql.com 
          Fixed portability issue in my_thr_init.c (was added in my last push)
          
          Fixed compiler warnings (detected by VC++):
          - Removed not used variables
          - Added casts
          - Fixed wrong assignments to bool
          - Fixed wrong calls with bool arguments
          - Added missing argument to store(longlong), which caused wrong store
          method to be called.
        
        sql/ha_innodb.cc
          2006/11/30 18:24:53+02:00 monty@mysql.com +0 -1
          Removed not used variable
        
        
        Revision r1260:
        branches/5.0: Fix for Bug# 21409. At low transaction isolation levels
        we let each consistent read set its own snapshot.
        
        
        Revision r1326:
        branches/5.0: Merge code from MySQL AB:
        
        ChangeSet@1.2417.3.1  2007-02-22 16:59:57+02:00  monty@mysql.fi
        
        Fixed compiler warnings (for linux and win32 and win64)
      805c2d52
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · bdb9b448
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      bdb9b448
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 39e7b560
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      39e7b560
    • unknown's avatar
      ndb - · 4dee1e6a
      unknown authored
        fix test prg
      
      
      ndb/test/ndbapi/testNodeRestart.cpp:
        fix test prg
      4dee1e6a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 4e288dc3
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      4e288dc3
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8f69cbdb
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      8f69cbdb
  3. 21 Mar, 2007 14 commits
  4. 20 Mar, 2007 16 commits
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-release · 309a36f6
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
      
      
      309a36f6
    • unknown's avatar
      Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/41 · bbe0990b
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
      
      
      sql/sql_class.cc:
        Auto merged
      bbe0990b
    • unknown's avatar
      Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 971f15f8
      unknown authored
      into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysqltest.c:
        Auto merged
      971f15f8
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 4fed8327
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
      
      
      4fed8327
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 6bb78b95
      unknown authored
      into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
      
      
      6bb78b95
    • unknown's avatar
      ec81cfdc
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 23fa1ee8
      unknown authored
      into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
      
      
      23fa1ee8
    • unknown's avatar
      Bug #27231: Server crash when dumping into outfile with long FIELDS ENCLOSED BY option · d59272fb
      unknown authored
      - Problem: data separators were copied to a fixed-size buffer
        on the stack; memcpy was used, without bounds checking; a
        server crash could result if long FIELDS ENCLOSED BY, etc.,
        was given
      - Fix: write the separators directly, instead of copying to
        a buffer first (in select_export::send_data())
      
      
      sql/sql_class.cc:
        In select_export::send_data(), write data separators
        directly, instead of copying into a fixed-size memory
        buffer before writing.  This avoids a buffer overflow
        when very large separators are specified.
      d59272fb
    • unknown's avatar
      Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-init · 971124a7
      unknown authored
      into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
      
      
      971124a7
    • unknown's avatar
      echo.c: · 298cebc1
      unknown authored
        Corrected GPL to be version 2 only
      
      
      client/echo.c:
        Corrected GPL to be version 2 only
      298cebc1
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 43848796
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      ndb/test/src/UtilTransactions.cpp:
        Auto merged
      43848796
    • unknown's avatar
      ndb - bug#27283 (wl2325-5.0) · 26afc93a
      unknown authored
          Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        new error codes
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Handle race condtition between MASTER_GCPCONF and execGCP_NODEFINISH
      ndb/test/ndbapi/testNodeRestart.cpp:
        testcase
      ndb/test/run-test/daily-basic-tests.txt:
        testcase
      26afc93a
    • unknown's avatar
      ndb - bug#27291 · 54edcb18
      unknown authored
        Fix correct min-value for LockPagesInMemory
      
      
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Fix correct min-value
      54edcb18
    • unknown's avatar
      Bug#23736 Pointer free error in mysqlbinlog · 6fb66342
      unknown authored
      - Mis-matched SAFEMALLOC defines caused misleading error message.
      
      
      client/mysqlbinlog.cc:
        Bug#23736 Pointer free error in mysqlbinlog
        - Re-worked the Load_log_processor so that it frees it's resources before 
        my_end is called.  This is necessary because SAFEMALLOC's _my_free calls
        pthread_mutex_lock() using THR_LOCK_malloc which is cleaned up in my_end().
      include/my_sys.h:
        Bug#23736 Pointer free error in mysqlbinlog
        - Define DYNAMIC_ARRAY beofore MY_TMPDIR
        - Add DYNAMIC_ARRAY to MY_TMP_DIR
      mysys/array.c:
        Bug#23736 Pointer free error in mysqlbinlog
        - SAFEMALLOC should not be unconditionally undef'd.
      mysys/mf_tempdir.c:
        Bug#23736 Pointer free error in mysqlbinlog
        - Use struct's DYNAMIC_ARRAY.
        - Use DYNAMIC_ARRAY:delete_dynamic function instead of my_free
      6fb66342
    • unknown's avatar
      Merge polly.local:/tmp/maint/bug23775/my50-bug23775 · da8e832a
      unknown authored
      into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
      
      
      sql/slave.cc:
        Auto merged
      da8e832a
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e5f2e263
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      e5f2e263