1. 20 Aug, 2004 30 commits
  2. 19 Aug, 2004 10 commits
    • unknown's avatar
      merged · 83e6ea37
      unknown authored
      83e6ea37
    • unknown's avatar
      5b85dca5
    • unknown's avatar
      merged · 04c39153
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      include/my_global.h:
        Auto merged
      mysys/mf_tempfile.c:
        Auto merged
      mysql-test/r/rpl_heap.result:
        Auto merged
      mysql-test/t/rpl_heap.test:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      04c39153
    • unknown's avatar
      sql_class.h: · 560d8ea3
      unknown authored
        removing unneeded var left from 4.0
      
      
      sql/sql_class.h:
        removing unneeded var left from 4.0
      560d8ea3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 6e1b567a
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      6e1b567a
    • unknown's avatar
      (manual port from 4.0 - was needed) · e7157aba
      unknown authored
      Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
      replacing the no_log argument of mysql_create_table() by some safer method
      (temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
      DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
      is opened by mysql_create_table().
      
      
      mysql-test/r/rpl_heap.result:
        result update
      mysql-test/t/rpl_heap.test:
        changing test to test a bug (but anyway, mysql-test-run --manager looks like not working in 4.1 currently,
        so this test is never run).
      sql/log.cc:
        new class Disable_binlog used to temporarily disable binlogging for one thread.
      sql/mysql_priv.h:
        removing argument no_log from mysql_create_table(); no_log was not perfect as some
        binlogging could still be done by open_unireg_entry() for a HEAP table.
      sql/sql_class.h:
        new class Disable_binlog used to temporarily disable binlogging for one thread.
      sql/sql_parse.cc:
        removing no_log arg from mysql_create_table()
      sql/sql_table.cc:
        removing no_log from mysql_create_table(); instead using new class Disable_binlog.
        Disabling binlogging in some cases, where the binlogging is done later by some other code
        (case of CREATE SELECT and ALTER).
      e7157aba
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · d1c5ca31
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      d1c5ca31
    • unknown's avatar
      432a0f36
    • unknown's avatar
      ha_innodb.cc: · 03a20c23
      unknown authored
        innobase_mysql_tmpfile(): call dup() and my_close() on the file
        returned by create_temp_file()
        in order to avoid memory leak caused by my_open() being paired with close()
      
      
      sql/ha_innodb.cc:
        innobase_mysql_tmpfile(): call dup() and my_close() on the file
        returned by create_temp_file()
        in order to avoid memory leak caused by my_open() being paired with close()
      03a20c23
    • unknown's avatar
      Build bug on 64-Bit platforms. · 8c1af755
      unknown authored
      Removed improper casts.
      Thanks to Joerg Bruehe for the fix.
      
      
      include/my_global.h:
        Build bug on 64-Bit platforms.
        Removed improper casts.
        Changed to uniform writing style.
        Appended 'L' to 32-Bit constants which doesn't hurt on 32-Bit,
        but can be important for some 64-Bit compilers.
      8c1af755