An error occurred fetching the project authors.
  1. 01 Mar, 2007 5 commits
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings · 6632872b
      unknown authored
      into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
      
      
      6632872b
    • unknown's avatar
      Renaming recenly added test case, because of name conflict · ef02cb63
      unknown authored
      when merging into 5.1.
      
      
      mysql-test/t/rpl_loaddata_charset.test:
        Rename: mysql-test/t/rpl_loaddata2.test -> mysql-test/t/rpl_loaddata_charset.test
      mysql-test/r/rpl_loaddata_charset.result:
        Rename: mysql-test/r/rpl_loaddata2.result -> mysql-test/r/rpl_loaddata_charset.result
      ef02cb63
    • unknown's avatar
      Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl · fdb1170e
      unknown authored
      into  quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      fdb1170e
    • unknown's avatar
      Fixes of compilation warnings and errors. · b3fafa40
      unknown authored
      sql/mysql_priv.h:
        Removing compiler warning "NULL used in arithmetic"
      sql/mysqld.cc:
        First argument to WARN_DEPRECATED is supposed to be a pointer (to THD structure)
      sql/sql_insert.cc:
        Removing compiler warning "unused variable". Apparently query is not used when compiling libmysqld.
      sql/sql_yacc.yy:
        Removing compiler error "Macro already defined"
      b3fafa40
    • unknown's avatar
      Additional fix for bug N 15126 · d93c7f39
      unknown authored
      Replacing local directory.
      
      
      mysql-test/r/mysqlbinlog.result:
        Additional fix for bug N 15126
      mysql-test/t/mysqlbinlog.test:
        Additional fix for bug N 15126
      d93c7f39
  2. 28 Feb, 2007 7 commits
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · d5e983aa
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      d5e983aa
    • 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
  3. 27 Feb, 2007 6 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
    • unknown's avatar
      removed unused variable · 3a520a78
      unknown authored
      3a520a78
  4. 26 Feb, 2007 6 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
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · de5d4e32
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      de5d4e32
    • 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
    • unknown's avatar
      item.cc, item.h: · 90d4f809
      unknown authored
        Post fix for bug#23800.
      
      
      sql/item.h:
        Post fix for bug#23800.
      sql/item.cc:
        Post fix for bug#23800.
      90d4f809
  5. 25 Feb, 2007 1 commit
    • unknown's avatar
      item.h: · 84e68927
      unknown authored
        Post fix for bug#23800.
        Copy the table name of an Item_outer_ref to the conventional memory.
      
      
      sql/item.h:
        Post fix for bug#23800.
        Copy the table name of an Item_outer_ref to the conventional memory.
      84e68927
  6. 24 Feb, 2007 9 commits
    • unknown's avatar
      log_on needed also in embedded server · dc8b4bac
      unknown authored
      dc8b4bac
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · c5abf088
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/item_func.cc:
        Auto merged
      c5abf088
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 33dbda5e
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/field.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      33dbda5e
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · c4780ac3
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
      
      
      sql/item_func.cc:
        Auto merged
      c4780ac3
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9d142a6d
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/23800-bug1-5.0-opt-mysql
      
      
      9d142a6d
    • unknown's avatar
      item.cc: · b1e1f77f
      unknown authored
        Post fix for bug#23800.
        The Item_field constructor now increases the select_n_where_fields counter.
      sql_yacc.yy:
        Post fix for bug#23800.
        Take into account fields that might be added by subselects.
      sql_lex.h:
        Post fix for bug#23800.
        Added the select_n_where_fields variable to the st_select_lex class.
      sql_lex.cc:
        Post fix for bug#23800.
        Initialization of the select_n_where_fields variable.
      
      
      sql/sql_lex.cc:
        Post fix for bug#23800.
        Initialization of the select_n_where_fields variable.
      sql/sql_lex.h:
        Post fix for bug#23800.
        Added the select_n_where_fields variable to the st_select_lex class.
      sql/item.cc:
        Post fix for bug#23800.
        The Item_field constructor now increases the select_n_where_fields counter.
      sql/sql_yacc.yy:
        Post fix for bug#23800.
        Take into account fields that might be added by subselects.
      b1e1f77f
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 849b95ce
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/item_func.cc:
        Auto merged
      849b95ce
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · dfb019ea
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
      
      
      sql/field.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      mysql-test/t/disabled.def:
        Manual merge
      dfb019ea
    • unknown's avatar
      Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · 1322c4aa
      unknown authored
      into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
      
      
      sql/item_func.cc:
        Auto merged
      1322c4aa
  7. 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
  8. 22 Feb, 2007 2 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