1. 22 Jul, 2005 1 commit
    • unknown's avatar
      Faster alter table code for 5.1. · a2701c78
      unknown authored
      
      mysql-test/r/alter_table.result:
        Added some additional tests for new alter table code.
      mysql-test/t/alter_table.test:
        Added some additional tests for new alter table code.
      sql/field.cc:
        Functions to check whether new field is equal with old field.
        Classes for different types.
      sql/field.h:
        Functions to check whether new field is equal with old field.
        Classes for different types.
      sql/ha_berkeley.cc:
        check_if_incompatible_data() for BDB.
      sql/ha_berkeley.h:
        check_if_incompatible_data() for BDB.
      sql/ha_heap.cc:
        check_if_incompatible_data() for HEAP.
      sql/ha_heap.h:
        check_if_incompatible_data() for HEAP.
      sql/ha_innodb.cc:
        check_if_incompatible_data() for InnoDB.
      sql/ha_innodb.h:
        check_if_incompatible_data() for InnoBD.
      sql/ha_myisam.cc:
        check_if_incompatible_data() for MyISAM.
      sql/ha_myisam.h:
        check_if_incompatible_data() for MyISAM.
      sql/ha_myisammrg.cc:
        check_if_incompatible_data() for Merge tables.
      sql/ha_myisammrg.h:
        check_if_incompatible_data() for Merge tables.
      sql/ha_ndbcluster.cc:
        check_if_incompatible_data() for NDB.
      sql/ha_ndbcluster.h:
        check_if_incompatible_data() for NDB.
      sql/handler.h:
        Defines for COMPATIBLE_DATA (yes and no) and the default function
        for check_if_incompatible_data().
      sql/mysql_priv.h:
        Defines for IS_EQUAL_*
      sql/mysqld.cc:
        Added option --old-alter-table to disable new alter table code.
      sql/set_var.cc:
        Added option --old-alter-table to disable new alter table code.
      sql/set_var.h:
        Added option --old-alter-table to disable new alter table code.
      sql/sql_class.h:
        Added option --old-alter-table to disable new alter table code.
      sql/sql_lex.h:
        Added a flag for forcing recreation of a table
        (needed for optimize table mapped to alter table)
      sql/sql_table.cc:
        Made a function of setting table default charset, used
        now in two places.
        
        Added defines for ALTER_TABLE_* possible changes.
        Currently just overall data and index.
        
        Added function compare_tables, which checks fields
        compatibility in old and new tables.
      BitKeeper/etc/config:
        Disabled logging
      a2701c78
  2. 16 Jun, 2005 15 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1128e41a
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      sql/item.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      storage/ndb/include/transporter/TransporterDefinitions.hpp:
        Auto merged
      storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
        Auto merged
      storage/ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      1128e41a
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 340c871c
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      storage/ndb/src/kernel/main.cpp:
        Auto merged
      340c871c
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · efc7e8cf
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
      
      efc7e8cf
    • unknown's avatar
      WL#2286 - Compile MySQL w/YASSL support · abd795a1
      unknown authored
      Merge with latest yaSSL.
      
      
      extra/yassl/include/lock.hpp:
        Merge with latest yaSSL.
      extra/yassl/include/socket_wrapper.hpp:
        Merge with latest yaSSL.
      extra/yassl/mySTL/helpers.hpp:
        Merge with latest yaSSL.
      extra/yassl/src/lock.cpp:
        Merge with latest yaSSL.
      extra/yassl/src/log.cpp:
        Merge with latest yaSSL.
      extra/yassl/src/socket_wrapper.cpp:
        Merge with latest yaSSL.
      extra/yassl/src/ssl.cpp:
        Merge with latest yaSSL.
      extra/yassl/src/timer.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/include/misc.hpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/include/random.hpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/include/types.hpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/asn.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/integer.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/misc.cpp:
        Merge with latest yaSSL.
      extra/yassl/taocrypt/src/random.cpp:
        Merge with latest yaSSL.
      abd795a1
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 266f9464
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132
      
      266f9464
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0474a8a7
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
      
      
      sql/sql_lex.h:
        Auto merged
      storage/ndb/src/common/transporter/TransporterRegistry.cpp:
        Auto merged
      0474a8a7
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6208ef0c
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      6208ef0c
    • unknown's avatar
      Fix for bug#9434 SHOW CREATE DATABASE `information_schema`; · 991e7613
      unknown authored
        added ability to do SHOW CREATE DATABASE `information_schema`
      
      991e7613
    • unknown's avatar
      BUG#11132 Connections stuck in CLOSE_WAIT · a8e426d2
      unknown authored
      This fixes the problem in 5.0 in the correct way.
      
      The previous patch (for 4.1) is only valid for 4.1 and is done at the right time
      for 4.1.
      
      
      ndb/src/kernel/main.cpp:
        The ndbd angel process keeps the mgm connection open as it retains a reference
        to the socket.
        
        this means that when the mgm server is killed, the socket stays in CLOSE_WAIT 
        (the ndb process will close() it okay in 5.0, as we reused it for a transporter
        but this isn't enough as the angel process still has a reference to that socket).
        
        so, by adding in a theConfig->closeConfiguration(); in the angel process, the ndb
        process is left with the only reference to the socket - which it can close whenever
        it likes (namely when the connection is terminated).
      a8e426d2
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 290a4e95
      unknown authored
      into mysql.com:/usr/home/ram/work/mysql-5.0
      
      290a4e95
    • unknown's avatar
      a fix (bug #10650: Bit literal case sensitivity). · 6941ad79
      unknown authored
      
      mysys/charset.c:
        a fix (bug #10650: Bit literal case sensitivity).
        typo fixed.
      6941ad79
    • unknown's avatar
    • unknown's avatar
      fix debug string in TR::report_disconnect · 54969a14
      unknown authored
      
      ndb/src/common/transporter/TransporterRegistry.cpp:
        fix debug string for TR::report_disconnect
      54969a14
    • unknown's avatar
      BUG#11132 Connections stuck in CLOSE_WAIT · 0305a34a
      unknown authored
      The 4.1 fix is not valid for 5.0. Remove it.
      
      
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        This fix is not valid for 5.0 as we use the mgm server connection for more than
        just fetching the initial configuration
      0305a34a
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11132 · cb9e97a1
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132
      
      
      ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      cb9e97a1
  3. 15 Jun, 2005 24 commits