1. 01 Sep, 2006 3 commits
    • unknown's avatar
      Merge rama.(none):/home/jimw/my/mysql-5.0-clean · 6a20f743
      unknown authored
      into  rama.(none):/home/jimw/my/mysql-5.1-clean
      
      mysqldump.result is wrong, will need to be cleaned up.
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Resolve conflict (probably wrong)
      mysql-test/t/mysqldump.test:
        Resolve conflicts, make sure all tests new to 5.1 come after 'End of 5.0 tests'
      6a20f743
    • unknown's avatar
      Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.test · 55c61a6e
      unknown authored
      so that 4.1 and 5.0 tests are all in the right place and no tests are duplicated.
      
      
      client/mysqldump.c:
        Restore fix for bug 21215 accidently removed during merge
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/t/mysqldump.test:
        Fix order of tests so that all the tests new to the 5.0 tree come after
        "End of 4.1 tests", and so that each leaves things in the state it found
        them (particularly by returning to the 'test' database. Also remove some
        tests that were duplicated.
      55c61a6e
    • unknown's avatar
      Resolve conflicts · cf749a7a
      unknown authored
      cf749a7a
  2. 31 Aug, 2006 11 commits
  3. 30 Aug, 2006 12 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 85281ce8
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      85281ce8
    • unknown's avatar
      Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/51 · 87e68f20
      unknown authored
      into  maint2.mysql.com:/data/localhome/tsmith/bk/51
      
      
      87e68f20
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053 · 8fb0f8a2
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
      
      
      mysys/my_read.c:
        Auto merged
      8fb0f8a2
    • unknown's avatar
      Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \ · 626abc52
      unknown authored
      	event' from master"
      
      Since there is no repeatable test case, and this is obviously wrong, this is
      the most conservative change that might possibly work.  
      
      The syscall  read()  wasn't checked for a negative return value for an
      interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
      layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
      impossible (on Linux) for  read()  to set errno EINTR without the return 
      value being -1 .
      
      So, if we're checking for EINTR behavior, we should not require that the
      return value be zero.
      
      
      mysys/my_read.c:
        The read() syscall should check for negative one, since that (usually) signals
        errors (like being interrupted) and zero (usually) signals end-of-file .
      626abc52
    • unknown's avatar
      Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50 · 6d48c8c7
      unknown authored
      into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/51
      
      
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      BUILD/SETUP.sh:
        SCCS merged
      BUILD/check-cpu:
        Manual merge.
      6d48c8c7
    • unknown's avatar
      Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41 · 4e16868d
      unknown authored
      into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
      
      
      BUILD/SETUP.sh:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      BUILD/check-cpu:
        Manual merge.
      4e16868d
    • unknown's avatar
    • unknown's avatar
      portability fix in BUILD/* for solaris · 71583c89
      unknown authored
      71583c89
    • unknown's avatar
      Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40 · 4321eb12
      unknown authored
      into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
      
      
      BUILD/SETUP.sh:
        SCCS merged
      4321eb12
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813 · e5bb7b0f
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug21813/my51-bug21813
      
      
      sql/sql_prepare.cc:
        Merge 5.0 to 5.1 
         - mysql_log.write => general_log_write
      tests/mysql_client_test.c:
        Manual merge
      e5bb7b0f
    • unknown's avatar
      Bug#21813 An attacker has the opportunity to bypass query logging, part2 · d4075f66
      unknown authored
       - Use the "%.*b" format when printing prepared and exeuted prepared statements to the log.
       - Add test case to check that also prepared statements end up in the query log
      Bug#14346 Prepared statements corrupting general log/server memory
       - Use "stmt->query" when logging the newly prepared query instead of "packet"
      
      
      sql/sql_prepare.cc:
        mysql_stmt_prepare
         - Use "%.*b" format when printing to log
         - Print the query from stmt instead of "packet", packet points at the net in/out buffer and has most likely been overwritten
           when  result for prepare was written to client.
        mysql_stmt_execute 
         - Use "%.*b" format when printing to log
         - Print the query from thd as the expanded query has been specifially set to be valid also after restore from backup statement
      tests/mysql_client_test.c:
        Add tests for bug#21813 to already existing test for bug#17667. Add functionality for also executing prepared statements and making sure they end up in the log as well.
      d4075f66
    • unknown's avatar
      Fix for bug #20907 · 62accb04
      unknown authored
      CMake versions > 2.4 allow linking to STATIC or SHARED libraries only.
      
      
      
      libmysql/CMakeLists.txt:
        Fix for Cmake BC problems (as suggested by Elliot)
      62accb04
  4. 29 Aug, 2006 10 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 970ebdce
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-5.1-maint
      
      
      970ebdce
    • unknown's avatar
      Merge polly.local:/home/kaa/src/maint/m50-maint--07OGt · ef8c148a
      unknown authored
      into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
      
      
      ef8c148a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a10a5cb6
      unknown authored
      into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
      
      
      a10a5cb6
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · a74e9b97
      unknown authored
      into  gbichot3.local:/home/mysql_src/mysql-5.1-maint
      
      
      a74e9b97
    • unknown's avatar
      Fix for BUG#20866 "show table status on innodb raises assertion" · 4eb10f0b
      unknown authored
      and its duplicate BUG#19057 "Test 'rpl_row_func003' fails on SuSE SLES9 x86".
      It was an assertion failure, only in debug builds, not present
      in released versions (nothing to document).
      It happened when doing SHOW TABLE STATUS on an InnoDB table
      having an auto_increment column, right after creating the table.
      The test which would have caught this problem was disabled in 
      mid-April for another reason (how much I like tests disabled for
      months...).
      
      
      mysql-test/t/disabled.def:
        test now passes (and serves as the test for this bugfix)
      sql/ha_innodb.cc:
        Before a val_() calls on a Field object, if that field was not marked
        for read, we need to mark it. This is explained here:
        ChangeSet 1.2119.601.1 2006/06/04 18:52:22 monty@mysql.com
        quoting the changeset's comment:
        
          - If a handler needs to call Field->val() or Field->store() on columns
            that are not used in the query, one should install a temporary
            all-columns-used map while doing so. For this, we provide the following
            functions:
          
            my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
            field->val();
            dbug_tmp_restore_column_map(table->read_set, old_map);
          
            and similar for the write map:
          
            my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
            field->val();
            dbug_tmp_restore_column_map(table->write_set, old_map);
          
            If this is not done, you will sooner or later hit a DBUG_ASSERT
            in the field store() / val() functions.
            (For not DBUG binaries, the dbug_tmp_restore_column_map() and
            dbug_tmp_restore_column_map() are inline dummy functions and should
            be optimized away be the compiler).
        
        Note that I verified that the bug didn't exist in non-debug builds.
      4eb10f0b
    • unknown's avatar
      Merge lamia.home:/home/timka/mysql/src/5.0-bug-21456 · 2592d4a1
      unknown authored
      into  lamia.home:/home/timka/mysql/src/5.1-bug-21456
      
      
      mysql-test/r/distinct.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      2592d4a1
    • unknown's avatar
      Correcting bad merge. · a2c533ce
      unknown authored
      a2c533ce
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ad9f66b9
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      sql/ha_innodb.cc:
        Auto merged
      ad9f66b9
    • unknown's avatar
      Post merge changes. · a9a675a8
      unknown authored
      
      mysql-test/r/mysqldump.result:
        post-merge fix.
      mysql-test/t/mysqldump.test:
        post-merge fix.
      a9a675a8
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21527 · 80bb699f
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21527
      
      
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      sql-common/client.c:
        Auto merged
      client/mysqldump.c:
        manual merge
      mysql-test/r/mysqldump.result:
        manual merge
      mysql-test/t/mysqldump.test:
        manual merge
      80bb699f
  5. 28 Aug, 2006 4 commits