Commits · 6fc77871610ab38b49610ce2f85f95a26736e61b · nexedi / MariaDB

13 Jun, 2007 9 commits

Merge trift2.:/MySQL/M50/push-5.0 · 6fc77871

unknown authored Jun 13, 2007

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/my_print_defaults.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
sql/Makefile.am:
  Auto merged

6fc77871

Merge trift2.:/MySQL/M41/push-4.1 · a7a10615
unknown authored Jun 13, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
a7a10615

Merge trift2.:/MySQL/M50/merge-5.0 · 53999adf

unknown authored Jun 13, 2007

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/my_print_defaults.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
sql/Makefile.am:
  Keep the existing version, the only difference is formatting.

53999adf

Merge trift2.:/MySQL/M51/merge-5.1 · 2f2efed3

unknown authored Jun 13, 2007

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/my_print_defaults.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
sql/Makefile.am:
  Keep the existing version, the only difference is formatting.

2f2efed3

Merge trift2.:/MySQL/M50/push-5.0 · 19f42b7f

unknown authored Jun 13, 2007

into  trift2.:/MySQL/M51/push-5.1


scripts/make_win_bin_dist:
  To be done separate, later.

19f42b7f

Merge trift2.:/MySQL/M50/merge-5.0 · ea571aad

unknown authored Jun 13, 2007

into  trift2.:/MySQL/M51/merge-5.1


configure.in:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
sql/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  "real_id" is not needed in 5.1, so the change need not propagate.
sql/item_func.cc:
  "real_id" is not needed in 5.1, so the change need not propagate.

ea571aad

Merge trift2.:/MySQL/M41/tmp-4.1 · e076792b

unknown authored Jun 13, 2007

into  trift2.:/MySQL/M50/merge-5.0


configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
sql/item_func.cc:
  Auto merged
netware/my_print_defaults.def:
  5.0 already has 128 kB stack size.
sql/Makefile.am:
  Manual merge.

e076792b

Merge trift2.:/MySQL/M41/tmp-4.1 · e13168f3
unknown authored Jun 13, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
e13168f3

sql/item_func.cc · 99db65d6

unknown authored Jun 13, 2007

    Improved check for thread identity in the "embedded" case,
    provided by Monty.
    
    This finishes the fixes for bug#27078.


sql/item_func.cc:
  Improved check for thread identity in the "embedded" case,
  provided by Monty.
  
  This finishes the fixes for bug#27078.

99db65d6

12 Jun, 2007 1 commit

make_win_bin_dist: · 5c6259e6

unknown authored Jun 12, 2007

  Aligned headers to include with Unix 'make install'


scripts/make_win_bin_dist:
  Aligned headers to include with Unix 'make install'

5c6259e6

11 Jun, 2007 2 commits
- Merge trift2.:/MySQL/M50/push-5.0 · baf70fb2
  unknown authored Jun 11, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  baf70fb2
- Merge trift2.:/MySQL/M41/push-4.1 · 66c59ea6
  unknown authored Jun 11, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  66c59ea6
08 Jun, 2007 1 commit

Add a cast, needed by some platforms. · 3737db15

unknown authored Jun 08, 2007

Still part of the fix for bug#27078.


libmysqld/lib_sql.cc:
  Some platforms need a cast.
  Still part of the fix for bug#27078.

3737db15

07 Jun, 2007 5 commits

Do not use the "thd" pointer to identify a thread in the embedded lib, · c78aea1e

unknown authored Jun 07, 2007

but rather use the "thread_id" counter.

Fixes bug#27078:
Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision


libmysqld/lib_sql.cc:
  Avoid casting a pointer to a (possibly) int, which will not compile on some platforms:
  Do not use the "thd" pointer to identify a thread in the embedded lib,
  but rather use the "thread_id" counter.
  
  Patch is proposed by Monty.  Fixes bug#27078.

c78aea1e

Merge trift2.:/MySQL/M41/bug23504-4.1 · eabbf72f
unknown authored Jun 07, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
eabbf72f

Merge trift2.:/MySQL/M50/push-5.0 · a7bb31a7

unknown authored Jun 07, 2007

into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged

a7bb31a7

Merge trift2.:/MySQL/M41/bug23504-4.1 · c06e3435

unknown authored Jun 07, 2007

into  trift2.:/MySQL/M50/push-5.0


netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
netware/my_print_defaults.def:
  Use 5.0 version

c06e3435

netware/*.def : Allocate 128K stack for all executables (bug#23504) · 71516c02

unknown authored Jun 07, 2007


netware/comp_err.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/libmysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/my_print_defaults.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisam_ftdump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisampack.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_install_db.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_test_run.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_waitpid.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqladmin.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlbinlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlcheck.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld_safe.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqldump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlimport.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlshow.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqltest.def:
  Allocate 128K stack for all executables (bug#23504)
netware/pack_isam.def:
  Allocate 128K stack for all executables (bug#23504)
netware/perror.def:
  Allocate 128K stack for all executables (bug#23504)
netware/replace.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolve_stack_dump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolveip.def:
  Allocate 128K stack for all executables (bug#23504)

71516c02

06 Jun, 2007 12 commits

Merge trift2.:/MySQL/M41/mysql-4.1 · 5587133a
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
5587133a

Merge trift2.:/MySQL/M50/mysql-5.0 · cfc1512e

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


CMakeLists.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ctype_cp932_binlog.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

cfc1512e

Merge trift2.:/MySQL/M51/mysql-5.1 · d571c8c9

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
CMakeLists.txt:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

d571c8c9

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · ab5f3ee5
unknown authored Jun 06, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
```
ab5f3ee5
Merge trift2.:/MySQL/M50/push-5.0 · 64bd15db
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
```
64bd15db

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 5f07f512

unknown authored Jun 06, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged

5f07f512

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-build · f27c2f26

unknown authored Jun 06, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged

f27c2f26

Merge trift2.:/MySQL/M41/push-4.1 · ec6f93c7

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Version change in 4.1 does not propagate to 5.0

ec6f93c7

Merge trift2.:/MySQL/M41/mysql-4.1 · 9352fe32
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1


configure.in:
  Auto merged
```
9352fe32
Raise version number after cloning 4.1.23 · 7430e256
unknown authored Jun 06, 2007

7430e256

Merge trift2.:/MySQL/M50/mysql-5.0 · f5dc3306

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged

f5dc3306

mtr_report.pl: · d6032e96

unknown authored Jun 06, 2007

Add another exception to the acceptable mysqld errors, for test case for bug 28436

mysql-test/lib/mtr_report.pl:
Add another exception to the acceptable mysqld errors, for test case for bug 28436

d6032e96

05 Jun, 2007 10 commits

ctype-bin.c: · 0f98f03b

unknown authored Jun 06, 2007

  Post-merge fix warning


strings/ctype-bin.c:
  Post-merge fix warning

0f98f03b

sql_prepare.cc: · e9aee315

unknown authored Jun 05, 2007

  Post-merge fix (byte -> uchar)


sql/sql_prepare.cc:
  Post-merge fix (byte -> uchar)

e9aee315

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · 73868505

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

73868505

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · a04b8ee3

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

a04b8ee3

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6e6d0c31

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

6e6d0c31

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · 01609990

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

01609990

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41 · 027f7f8c
unknown authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
```
027f7f8c

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 7bd08831

unknown authored Jun 05, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/ndb/ndb_config_2_node.ini:
  Auto merged
storage/ndb/include/ndb_global.h.in:
  Auto merged
storage/ndb/src/common/portlib/NdbTick.c:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/restore.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged

7bd08831

Merge trift2.:/MySQL/M51/clone-5.1 · bb191fae

unknown authored Jun 05, 2007

into  trift2.:/MySQL/M51/push-5.1


sql/my_decimal.h:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_3innodb.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_4heap.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_5merge.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.
mysql-test/r/ps_7ndb.result:
  Do not use the "result" file from the 5.1.19 tree, rather the main one.

bb191fae

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 05ff34a2

unknown authored Jun 05, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


mysql-test/ndb/ndb_config_2_node.ini:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  manual merge

05ff34a2