Commits · 0e895c1cbbb60e7a1843924ac5fd44af1182e64f · Kirill Smelkov / mariadb

18 Jun, 2007 14 commits

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge · 0e895c1c
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/innodb.test:
  Auto merged
```
0e895c1c

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · 6da3c0fa

unknown authored Jun 18, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

6da3c0fa

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 7969b6a6
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
7969b6a6
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 66330935
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
66330935
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · 7011a51e
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
7011a51e

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl · f9c8d1dd

unknown authored Jun 18, 2007

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_charset.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
mysql-test/t/ndb_replace.test:
  Auto merged
mysql-test/t/ndb_update.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_row_inexist_tbl.test:
  Auto merged
sql/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-ndb_binlog_basic2.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/item_create.cc:
  Manual merge

f9c8d1dd

Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · caf55fff
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


mysql-test/t/innodb.test:
  Auto merged
```
caf55fff
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · eff58f51
unknown authored Jun 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
eff58f51
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 1140898b
unknown authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
1140898b
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5504ca39
unknown authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


configure.in:
  Auto merged
```
5504ca39
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4831826c
unknown authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
4831826c
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 39481ed4
unknown authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
39481ed4
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 4b4c887a
unknown authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1


configure.in:
  Auto merged
```
4b4c887a
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · fe99cf3a
unknown authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
```
fe99cf3a

17 Jun, 2007 20 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines · 26d0ba77
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
26d0ba77
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · cb75b475
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
cb75b475
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 82a7ceb3
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
```
82a7ceb3

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 49c21820

unknown authored Jun 17, 2007

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


mysql-test/t/ndb_restore.test:
  Auto merged
mysql-test/r/ndb_restore.result:
  null merge

49c21820

correct test and result · c9825175
unknown authored Jun 17, 2007

c9825175
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · c8abcae1
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
c8abcae1
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · f8c5e5f7
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
f8c5e5f7
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines · a73b4ce3
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines


sql/handler.h:
  Auto merged
```
a73b4ce3
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 2eb468f3
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines


sql/handler.h:
  Auto merged
```
2eb468f3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 1f2c0193
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
1f2c0193
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines · f1a1255b
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
f1a1255b

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 330ce562

unknown authored Jun 17, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

330ce562

Bug #28989 hpux11 ps_row warnings · 95497dcc

unknown authored Jun 17, 2007

- do not print 701 dictionary busy error


sql/ha_ndbcluster.cc:
  save the ndb error such that it can be traced
sql/ha_ndbcluster.h:
  save the ndb error such that it can be traced
sql/ha_ndbcluster_binlog.cc:
  use the traced ndb error to determine if it is an error that should be printed

95497dcc

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 7d690c0a
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
7d690c0a

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 7bbf3901

unknown authored Jun 17, 2007

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


mysql-test/r/ndb_restore.result:
  null merge
mysql-test/t/ndb_restore.test:
  null merge

7bbf3901

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 57667d06
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
```
57667d06
BUG#27640 · f2c7b62a
unknown authored Jun 17, 2007
```
- correct test and result file
```
f2c7b62a
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines · 6a8a0910
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
```
6a8a0910

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 8f7696d2

unknown authored Jun 17, 2007

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


extra/perror.c:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  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/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
mysql-test/t/disabled.def:
  manual merge

8f7696d2

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 0df9dea4
unknown authored Jun 17, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
```
0df9dea4

16 Jun, 2007 6 commits

Merge chilla.local:/home/mydev/mysql-5.0-axmrg · ce28c41e

unknown authored Jun 16, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged

ce28c41e

Merge chilla.local:/home/mydev/mysql-5.1-amain · d69c6627

unknown authored Jun 16, 2007

into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

d69c6627

Merge chilla.local:/home/mydev/mysql-5.0-amain · 3e2e6ea9

unknown authored Jun 16, 2007

into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged

3e2e6ea9

Bug #28949 · e2380b98

unknown authored Jun 16, 2007

- handler binlog's must be shutdoem before logger.cleanup_base

e2380b98

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · d38d29c3

unknown authored Jun 16, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/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
BitKeeper/deleted/.del-CMakeLists.txt~7:
  merge fix

d38d29c3

Merge bk-internal:/home/bk/mysql-5.1-new-maint · ae729ecc

unknown authored Jun 16, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~7:
  Auto merged

ae729ecc