1. 01 Sep, 2006 5 commits
  2. 31 Aug, 2006 5 commits
  3. 30 Aug, 2006 10 commits
  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
  6. 26 Aug, 2006 1 commit
  7. 25 Aug, 2006 5 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 · e454fb0c
      unknown authored
      into  zim.(none):/home/brian/mysql/arch-5.1
      
      
      BUILD/compile-alpha-cxx:
        Auto merged
      BUILD/compile-alpha-debug:
        Auto merged
      BUILD/compile-dist:
        Auto merged
      BUILD/compile-ia64-debug-max:
        Auto merged
      CMakeLists.txt:
        Auto merged
      client/mysql.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      storage/csv/ha_tina.cc:
        Auto merged
      BUILD/FINISH.sh:
        Innodbase config still needed.
      e454fb0c
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 9f9c3364
      unknown authored
      into  zim.(none):/home/brian/mysql/arch-5.1
      
      
      sql/handler.cc:
        Auto merged
      9f9c3364
    • unknown's avatar
      Cleanup of unused variables. · ac11ba6c
      unknown authored
      Fixed "discover" in the handler API.
      
      Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread. 
      
      
      sql/ha_innodb.h:
        Unused variable
      sql/ha_ndbcluster.cc:
        Added "discover" to handlerton.
      sql/handler.cc:
        Added plugin loop and correctly now use handler API.
      sql/handler.h:
        Removed unused variable. Added discover to handler API
      sql/mysqld.cc:
        Removed unused variables.
      sql/sql_plugin.cc:
        Fixed DBUG Enter comment (obvious cut paste mistake)
      storage/csv/ha_tina.cc:
        Found that if we don't bzero handlerton, that things can go boom!
        
        This probably needs to be fixed for all handlers
      ac11ba6c
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 · 9fac91d4
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
      
      
      storage/innobase/btr/btr0btr.c:
        Null merge.
      storage/innobase/buf/buf0buf.c:
        Null merge.
      storage/innobase/dict/dict0dict.c:
        Null merge.
      storage/innobase/fil/fil0fil.c:
        Null merge.
      storage/innobase/fsp/fsp0fsp.c:
        Null merge.
      storage/innobase/include/btr0cur.ic:
        Null merge.
      storage/innobase/include/buf0buf.ic:
        Null merge.
      storage/innobase/log/log0log.c:
        Null merge.
      storage/innobase/log/log0recv.c:
        Null merge.
      storage/innobase/os/os0file.c:
        Null merge.
      storage/innobase/row/row0mysql.c:
        Null merge.
      storage/innobase/row/row0sel.c:
        Null merge.
      storage/innobase/srv/srv0start.c:
        Null merge.
      storage/innobase/ut/ut0dbg.c:
        Null merge.
      client/mysqltest.c:
        Manual merge.
      include/config-netware.h:
        Manual merge.
      mysql-test/r/func_time.result:
        Manual merge.
      mysql-test/t/func_time.test:
        Manual merge.
      sql/ha_innodb.cc:
        Manual merge.
      sql/item_timefunc.cc:
        Manual merge.
      sql/sql_acl.cc:
        Manual merge.
      tests/mysql_client_test.c:
        Manual merge.
      9fac91d4
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_mergable · 3f53d3d5
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-maint
      
      
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      sql-common/client.c:
        Auto merged
      3f53d3d5