1. 28 Feb, 2007 6 commits
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · a2b4f529
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b24478
      
      
      a2b4f529
    • unknown's avatar
      Additional test changes for · 4a83cd38
      unknown authored
      Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
      Positions of some binlog events were changed because of
      additional logging of @@collation_database.
      
      
      4a83cd38
    • unknown's avatar
      After merge fix · 18f1d1a2
      unknown authored
      18f1d1a2
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · de61d5b0
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b15126
      
      
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/mysqlbinlog.result:
        After merge fix
      mysql-test/t/mysqlbinlog.test:
        After merge fix
      de61d5b0
    • unknown's avatar
      Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it) · c3a3aff5
      unknown authored
      This patch fixes problem that LOAD DATA could use different
      character sets when loading files on master and on slave sides:
      - Adding replication of thd->variables.collation_database
      - Adding optional character set clause into LOAD DATA
      
      Note, the second way, with explicit CHARACTER SET clause
      should be the recommended way to load data using an alternative
      character set.
      The old way, using "SET @@character_set_database=xxx" should be
      gradually depricated.
      
      
      mysql-test/r/mysqlbinlog.result:
        Adding test case
      mysql-test/t/mysqlbinlog.test:
        Adding test case
      sql/log_event.cc:
        Adding logging of thd->variables.collation_database
      sql/log_event.h:
        Adding declarations
      sql/sql_class.cc:
        Exchange character set is null by default
      sql/sql_class.h:
        Adding character set into sql_exchange
      sql/sql_load.cc:
        - Using exchange character set (if it was specified in LOAD DATA syntax)
        - Using thd->variables.collation_database by default
      sql/sql_yacc.yy:
        Adding optional character set clause into LOAD DATA syntax
      mysql-test/r/rpl_loaddata2.result:
        New BitKeeper file ``mysql-test/r/rpl_loaddata2.result''
      mysql-test/std_data/loaddata6.dat:
        New BitKeeper file ``mysql-test/std_data/loaddata6.dat''
      mysql-test/t/rpl_loaddata2.test:
        New BitKeeper file ``mysql-test/t/rpl_loaddata2.test''
      c3a3aff5
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · 9c8637dc
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-bug25306
      
      
      9c8637dc
  2. 27 Feb, 2007 5 commits
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · f0e5877c
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-bug25306
      
      
      sql/slave.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      f0e5877c
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 0ddc3250
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/sql_load.cc:
        Manual merge
      0ddc3250
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 3f507f29
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      3f507f29
    • unknown's avatar
      BUG#20141 "User-defined variables are not replicated properly for · 4be9d3cc
      unknown authored
                SF/Triggers in SBR mode."
      BUG#14914 "SP: Uses of session variables in routines are not always replicated"
      BUG#25167 "Dupl. usage of user-variables in trigger/function is not replicated
                correctly"
      
      This patch corrects a minor error in the previous patch for BUG#20141. This patch
      corrects an errant code change to sp_head.cc. The comments for the first patch follow:
      
      User-defined variables used inside of stored functions/triggers in
      statements which did not update tables directly were not replicated.
      We also had problems with replication of user-defined variables which
      were used in triggers (or stored functions called from table-updating
      statements) more than once.
      
      This patch addresses the first issue by enabling logging of all
      references to user-defined variables in triggers/stored functions
      and not only references from table-updating statements.
      
      The second issue stemmed from the fact that for user-defined
      variables used from triggers or stored functions called from
      table-updating statements we were writing binlog events for each
      reference instead of only one event for the first reference.
      This problem is already solved for stored functions called from
      non-updating statements with help of "event unioning" mechanism.
      So the patch simply extends this mechanism to the case affected.
      It also fixes small problem in this mechanism which caused wrong
      logging of references to user-variables in cases when non-updating
      statement called several stored functions which used the same
      variable and some of these function calls were omitted from binlog
      as they were not updating any tables.
      
      
      sql/sp_head.cc:
        BUG#20141 "User-defined variables are not replicated properly for 
                  SF/Triggers in SBR mode."
        
        This patch corrects a minor error in the previous patch for BUG#20141. The code:
        
        q= ::query_id; 
        
        was an errant line of code that was not intended to be in the patch. Instead, the
        correct line of code is:
        
        q= global_query_id;
      4be9d3cc
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · e91d2738
      unknown authored
      into  mysql.com:/home/bar/mysql-5.0.b24478
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_trigger.h:
        Auto merged
      e91d2738
  3. 26 Feb, 2007 4 commits
    • unknown's avatar
      Fix for BUG#26050 "LOAD DATA INFILE breaks ACID"; the ok must be sent · 2e669d8e
      unknown authored
      to the client only after the binlog write and engine commit.
      No testcase for this bug, as to reproduce it, we need to "kill -9" mysqld,
      which we cannot do in the testsuite. But, I tested by hand.
      
      
      sql/sql_load.cc:
        D in ACID means that once the client got the ok from the server, the data
        is durable on disk. Implies that the ok must be sent after the binlog write
        and after the engine commit, not before.
      2e669d8e
    • unknown's avatar
      Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 1636d00f
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
      
      
      sql/item_func.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      1636d00f
    • unknown's avatar
      Bug#24478 DROP TRIGGER is not caught by replicate-*-table filters · 7d883c0d
      unknown authored
      Problem: DROP TRIGGER was not properly handled in combination
      with slave filters, which made replication stop
      Fix: loading table name before checking slave filters when
      dropping a trigger.
      
      
      mysql-test/r/rpl_replicate_do.result:
        Adding test case
      mysql-test/t/rpl_replicate_do.test:
        Adding test case
      sql/sql_parse.cc:
        Loading table name when dropping a trigger
        before checking slave filtering rules.
      sql/sql_trigger.cc:
        Making add_table_for_trigger() public
      sql/sql_trigger.h:
        Making add_table_for_trigger() public
      7d883c0d
    • unknown's avatar
      Compiler warning suppression fix: Add missing file to 'make dist'. · 8c336fbc
      unknown authored
      
      support-files/Makefile.am:
        Add missing file to 'make dist'.
      8c336fbc
  4. 24 Feb, 2007 7 commits
  5. 23 Feb, 2007 4 commits
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl · 3a8a519a
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_20141
      
      
      sql/log.cc:
        Auto merged
      3a8a519a
    • unknown's avatar
      BUG#20141 "User-defined variables are not replicated properly for SF/ · e52ec3e6
      unknown authored
                 Triggers in SBR mode."
      BUG#14914 "SP: Uses of session variables in routines are not always
                 replicated"
      BUG#25167 "Dupl. usage of user-variables in trigger/function is not
                 replicated correctly"
      
      User-defined variables used inside of stored functions/triggers in
      statements which did not update tables directly were not replicated.
      We also had problems with replication of user-defined variables which
      were used in triggers (or stored functions called from table-updating
      statements) more than once.
      
      This patch addresses the first issue by enabling logging of all
      references to user-defined variables in triggers/stored functions
      and not only references from table-updating statements.
      
      The second issue stemmed from the fact that for user-defined
      variables used from triggers or stored functions called from
      table-updating statements we were writing binlog events for each
      reference instead of only one event for the first reference.
      This problem is already solved for stored functions called from
      non-updating statements with help of "event unioning" mechanism.
      So the patch simply extends this mechanism to the case affected.
      It also fixes small problem in this mechanism which caused wrong
      logging of references to user-variables in cases when non-updating
      statement called several stored functions which used the same
      variable and some of these function calls were omitted from binlog
      as they were not updating any tables.
      
      
      mysql-test/r/rpl_user_variables.result:
        BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
        This patch adds the correct results for execution of the added test procedures to the
        rpl_user_variables test.
      mysql-test/t/rpl_user_variables.test:
        BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
        This patch adds additional tests to the rpl_user_variables test that test many of the
        different ways user-defined variables can be required to be replicated.
      sql/item_func.cc:
        BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
        To properly log accesses to user-defined variables from stored functions/triggers,
        the get_var_with_binlog() method needs to log references to such variables even from 
        non-table-updating statements within them.
      sql/log.cc:
        BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
        This patch modifies the start_union_events method to accept the query id from a parameter.
        This allows callers to set the query_id to the id of the sub statement such as a trigger
        or stored function. Which permits the code to identify when a user defined variable has
        been used by the statement and this already present in THD::user_var_event.
        
        Note:
        The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the proper 
        replication of access to user-defined variables under a special test case (the last case 
        shown in rpl_user_variables.test).
      sql/sp_head.cc:
        BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
        This patch modifies the code to allow for cases where events for function calls have
        a separate union for each event and thus cannot use the query_id of the caller as the
        start of the union. Thus, we use an artifically created query_id to set the start of 
        the events.
        
        Note:
        The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the proper 
        replication of access to user-defined variables under a special test case (the last case 
        shown in rpl_user_variables.test).
      sql/sql_class.cc:
        BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
        This patch adds the query_id parameter to the calls to mysql_bin_log.start_union_events().
        
        Note:
        The changes to sql_class.cc, sp_head.cc, and log.cc are designed to allow the proper 
        replication of access to user-defined variables under a special test case (the last case 
        shown in rpl_user_variables.test).
      sql/sql_class.h:
        BUG#20141 - User-defined variables are not replicated properly for SF/Triggers in SBR mode.
        This patch adds the query_id parameter to the calls to mysql_bin_log.start_union_events().
      e52ec3e6
    • unknown's avatar
      the fix for BUG#24432 · 8c07265c
      unknown authored
        "INSERT... ON DUPLICATE KEY UPDATE skips auto_increment values"
      didn't make it into 5.0.36 and 5.1.16,
      so we need to adjust the bug-detection-based-on-version-number code.
      Because the rpl tree has a too old version, rpl_insert_id cannot pass,
      so I disable it (like is already the case in 5.1-rpl for the same reason),
      and the repl team will re-enable it when they merge 5.0 and 5.1 into
      their trees (thus getting the right version number).
      
      
      mysql-test/t/disabled.def:
            rpl_insert_id tests statement-based replication of INSERT ON
            DUPLICATE KEY UPDATE. This type of INSERT had BUG#24432, which is
            fixed in 5.0.38; we made the slave detect if it is connected to a
            <5.0.38 master and if so refuse to replicate.
            The problem is that this 5.0-rpl tree, even though it will produce
            the 5.0.38 release, still has a 5.0.36 version in configure.in.
            Thus rpl_insert_id fails. So I disable it. As soon as the 5.0-rpl
            tree gets the changesets from the main 5.0, its version will change
            to 5.0.38 and so the repl team will re-enable the test.
      sql/slave.cc:
        the fix for BUG#24432 didn't make it into 5.0.36 and 5.1.16,
        so we need to adjust the bug-detection-based-on-version-number code.
      8c07265c
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · 44bdb070
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-bug25306
      
      
      sql/slave.cc:
        Auto merged
      44bdb070
  6. 22 Feb, 2007 6 commits
    • unknown's avatar
      Merge monty@192.168.0.9:/home/my/mysql-5.0 · 1967fbe4
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      ndb/include/util/OutputStream.hpp:
        Auto merged
      ndb/src/common/debugger/EventLogger.cpp:
        Auto merged
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      ndb/src/ndbapi/ClusterMgr.hpp:
        Auto merged
      ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      1967fbe4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9a8f8497
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      mysys/my_thr_init.c:
        Auto merged
      ndb/include/util/OutputStream.hpp:
        Auto merged
      ndb/src/common/debugger/EventLogger.cpp:
        Auto merged
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      ndb/src/ndbapi/ClusterMgr.hpp:
        Auto merged
      ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      9a8f8497
    • unknown's avatar
      Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · 36f03e48
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      36f03e48
    • unknown's avatar
      Portability fix · 77db9754
      unknown authored
      Suppress compiler warnings from bdb and (for the moment) warnings from ndb
      
      
      client/mysqltest.c:
        Portability fix for windows (windows doesn't have mode_t)
      support-files/compiler_warnings.supp:
        Suppress warnings from bdb and (for the moment) warnings from ndb
      77db9754
    • unknown's avatar
      Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · 62b5893c
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      62b5893c
    • unknown's avatar
      Fixed compiler warnings (for linux and win32 and win64) · 50bd97a9
      unknown authored
      Fixed a couple of usage of not initialized warnings (unlikely cases)
      
      
      client/mysqldump.c:
        Fixed compiler warnings from 'max' build
      client/mysqltest.c:
        Removed compiler warnings
      cmd-line-utils/readline/xmalloc.c:
        Fixed compiler warnings from 'max' build
      extra/comp_err.c:
        Fixed compiler warnings from 'max' build
      extra/yassl/include/openssl/ssl.h:
        Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit
      extra/yassl/include/socket_wrapper.hpp:
        Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit
      extra/yassl/src/ssl.cpp:
        Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit
      extra/yassl/taocrypt/src/integer.cpp:
        Fixed compiler warnings
      include/my_global.h:
        Added my_offsetof() macro from 5.1 to get rid of compiler warnings
      innobase/include/ut0byte.ic:
        Fixed compiler warnings on win64
      innobase/include/ut0ut.ic:
        Fixed compiler warnings on win64
      libmysql/libmysql.def:
        Fixed compiler warnings on win64
      myisam/mi_packrec.c:
        Fixed compiler warnings on win64
      myisam/myisamchk.c:
        Fixed compiler warnings from 'max' build
      mysys/base64.c:
        Fixed compiler warnings on win64
      mysys/mf_keycache.c:
        Fixed compiler warnings from 'max' build
      mysys/my_getopt.c:
        Fixed compiler warnings from 'max' build
      mysys/my_init.c:
        Fixed compiler warnings from 'max' build
      mysys/my_thr_init.c:
        Fixed compiler warnings
      mysys/ptr_cmp.c:
        Fixed compiler warnings from 'max' build
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Fixed compiler warnings
      server-tools/instance-manager/mysql_connection.cc:
        Fixed compiler warnings
      server-tools/instance-manager/mysqlmanager.cc:
        Fixed compiler warnings
      sql/filesort.cc:
        Initalize variable that was used unitialized in error conditions
      sql/ha_berkeley.cc:
        Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64
      sql/ha_berkeley.h:
        Moved get_auto_primary_key() to ha_berkeley.cc
      sql/ha_innodb.cc:
        Fixed compiler warnings
      sql/item.cc:
        Fixed compiler warnings from 'max' build
      sql/item_timefunc.cc:
        Fixed compiler warnings
      sql/mysqld.cc:
        Fixed compiler warnings
      sql/sql_acl.cc:
        Fixed compiler warnings from 'max' build
      sql/sql_base.cc:
        Fixed compiler warnings from 'max' build
      sql/sql_insert.cc:
        Initialize variable that may be used unitialized on error conditions (not fatal)
      sql/sql_prepare.cc:
        Fixed compiler warnings from 'max' build
      sql/sql_select.cc:
        Fixed compiler warnings
      sql/sql_show.cc:
        Fixed compiler warnings
      sql/udf_example.def:
        Fixed compiler warnings on win64
      sql/unireg.cc:
        Initialize variable that may be used unitialized on error conditions
      strings/ctype-ucs2.c:
        Fixed compiler warnings
      strings/ctype-utf8.c:
        Fixed compiler warnings
      strings/decimal.c:
        Fixed compiler warnings
      support-files/compiler_warnings.supp:
        Ignore warnings from sql_yacc.cc that are hard to remove
        Ignore some not important warnings from windows 64 bit build
      tools/mysqlmanager.c:
        Fixed compiler warnings
      50bd97a9
  7. 21 Feb, 2007 7 commits
    • unknown's avatar
      Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8ee22036
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      ndb/include/util/OutputStream.hpp:
        Auto merged
      ndb/src/common/debugger/EventLogger.cpp:
        Auto merged
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
        Auto merged
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      ndb/src/ndbapi/ClusterMgr.hpp:
        Auto merged
      ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      8ee22036
    • unknown's avatar
      After merge fixes · e5706080
      unknown authored
      This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
      
      
      extra/yassl/src/ssl.cpp:
        Removed compiler warning
      extra/yassl/taocrypt/src/asn.cpp:
        After merge fixes
      extra/yassl/testsuite/testsuite.cpp:
        Removed compiler warning
      mysql-test/r/ndb_lock.result:
        After merge fixes
      ndb/src/common/debugger/EventLogger.cpp:
        Removed compiler warning
      ndb/src/common/util/ConfigValues.cpp:
        Removed compiler warning
      ndb/src/common/util/NdbSqlUtil.cpp:
        Removed compiler warning
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Removed compiler warning
      ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
        Removed compiler warning
      ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
        Removed compiler warning
      ndb/src/kernel/vm/ndbd_malloc.cpp:
        Removed compiler warning
      ndb/src/mgmclient/main.cpp:
        Removed compiler warning
      ndb/src/ndbapi/SignalSender.cpp:
        Removed compiler warning
      sql/ha_ndbcluster.cc:
        Some extra safety
      sql/item_cmpfunc.cc:
        After merge fixes
      sql/item_subselect.cc:
        After merge fixes
      sql/sql_insert.cc:
        After merge fixes
        (This actually fixes a bug in old code when many connections are in use)
      support-files/compiler_warnings.supp:
        Removed some suppressed warnings
      e5706080
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · e128a436
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      e128a436
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1953d57d
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.0
      
      
      1953d57d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1384e640
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      BitKeeper/etc/ignore:
        auto-union
      BUILD/SETUP.sh:
        Auto merged
      Makefile.am:
        Auto merged
      client/mysql.cc:
        Auto merged
      cmd-line-utils/readline/display.c:
        Auto merged
      configure.in:
        Auto merged
      extra/yassl/include/buffer.hpp:
        Auto merged
      extra/yassl/include/crypto_wrapper.hpp:
        Auto merged
      extra/yassl/include/yassl_imp.hpp:
        Auto merged
      extra/yassl/include/yassl_int.hpp:
        Auto merged
      extra/yassl/src/crypto_wrapper.cpp:
        Auto merged
      extra/yassl/taocrypt/include/algebra.hpp:
        Auto merged
      extra/yassl/taocrypt/include/des.hpp:
        Auto merged
      extra/yassl/taocrypt/include/hash.hpp:
        Auto merged
      extra/yassl/taocrypt/include/hmac.hpp:
        Auto merged
      extra/yassl/taocrypt/include/modarith.hpp:
        Auto merged
      extra/yassl/taocrypt/include/modes.hpp:
        Auto merged
      extra/yassl/taocrypt/include/rsa.hpp:
        Auto merged
      extra/yassl/taocrypt/include/type_traits.hpp:
        Auto merged
      extra/yassl/taocrypt/mySTL/list.hpp:
        Auto merged
      extra/yassl/taocrypt/src/aes.cpp:
        Auto merged
      extra/yassl/taocrypt/src/algebra.cpp:
        Auto merged
      extra/yassl/testsuite/testsuite.cpp:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysys/default.c:
        Auto merged
      ndb/src/common/transporter/Transporter.cpp:
        Auto merged
      ndb/src/common/util/File.cpp:
        Auto merged
      ndb/src/common/util/SocketClient.cpp:
        Auto merged
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
        Auto merged
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/ndbapi/ClusterMgr.hpp:
        Auto merged
      ndb/src/ndbapi/Ndb.cpp:
        Auto merged
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      ndb/src/ndbapi/SignalSender.cpp:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/opt_range.h:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      extra/yassl/taocrypt/src/asn.cpp:
        Manual merge (Fix shadowed variable name)
      extra/yassl/taocrypt/test/test.cpp:
        No changes
      ndb/src/common/util/ConfigValues.cpp:
        Manual merge (Fix shadowed variable name)
      sql/field.h:
        manual merge
      sql/ha_myisam.cc:
        manual merge
      sql/ha_ndbcluster.cc:
        manual merge
      sql/item_cmpfunc.cc:
        manual merge
      sql/item_subselect.cc:
        Manual merge (Fix shadowed variable name)
      sql/mysqld.cc:
        no changes
      1384e640
    • unknown's avatar
      Fixed unsafe define of uint4korr() · 2f3a17b6
      unknown authored
      Fixed that --extern works with mysql-test-run.pl
      Small trivial cleanups
      
      
      include/my_global.h:
        Fixed unsafe define of uint4korr()
      mysql-test/lib/mtr_report.pl:
        Removed wrong messages when using --extern
      mysql-test/mysql-test-run.pl:
        Fixed that --extern works
        Print help on stdout instead of stderr (make it easier to pipe it to less)
      mysql-test/t/ndb_lock.test:
        Added other possible error code
      sql/sql_prepare.cc:
        Removed not needed casts
      2f3a17b6
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · a0933646
      unknown authored
      into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      a0933646
  8. 20 Feb, 2007 1 commit
    • unknown's avatar
      Merge trift2.:/MySQL/M41/merge-4.1 · 76e2b3e5
      unknown authored
      into  trift2.:/MySQL/M50/merge-5.0
      
      
      include/config-win.h:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      support-files/mysql.spec.sh:
        SCCS merged
      76e2b3e5