Commits · 8a4c0714ce3481d9ecf73313d72d8442af47645f · Kirill Smelkov / mariadb

22 Jul, 2005 3 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 · 8a4c0714

unknown authored Jul 22, 2005

into  mysql.com:/home/jonas/src/mysql-5.1-push


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged

8a4c0714

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 80437546
unknown authored Jul 22, 2005
```
into  mysql.com:/Users/mikron/mysql-5.1
```
80437546

Fixed error in constants · 37a4780d

unknown authored Jul 22, 2005


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Set up node group information as default if no node group info is
  passed in create table message.

37a4780d

21 Jul, 2005 37 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · f653a686
unknown authored Jul 21, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
f653a686

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0821e118

unknown authored Jul 21, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


scripts/Makefile.am:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged

0821e118

merge fix · 482cf550
unknown authored Jul 21, 2005

482cf550

Fixed test cases for hash and linear hash and fixed guess in NDB API · 1eabb412

unknown authored Jul 21, 2005

for this as well


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fixed guess of proper transaction coordinator for NDB API users
storage/ndb/test/ndbapi/testPartitioning.cpp:
  Test case for both hash and linear hash

1eabb412

Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 4ca63ea4

unknown authored Jul 21, 2005

into mysql.com:/home/gluh/MySQL/Merge/5.0


sql/share/charsets/Index.xml:
  Auto merged
strings/ctype-latin1.c:
  Auto merged

4ca63ea4

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0f6030b1
unknown authored Jul 21, 2005
```
into mysql.com:/M51/mysql-5.1


configure.in:
  Auto merged
```
0f6030b1
Increase the version to 5.1.1, as 5.1.0 has been cloned off. · 40d895d8
unknown authored Jul 21, 2005

40d895d8
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · b5487d1a
unknown authored Jul 21, 2005
```
into  mysql.com:/usr/home/bar/mysql-4.1.b11216
```
b5487d1a
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ad99802
unknown authored Jul 21, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.10839
```
4ad99802
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 824f512e
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-4.1-push
```
824f512e

ctype-latin1.c: · 84904fbb

unknown authored Jul 21, 2005

  removing extra empty line
  ,


strings/ctype-latin1.c:
  removing extra empty line
  ,

84904fbb

Bug#11216: 'show character set' describes latin1 incorrectly · e5c4a3e1

unknown authored Jul 21, 2005

Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.



strings/ctype-latin1.c:
  Bug#11216: 'show character set' describes latin1 incorrectly
  Fixed to- and from-Unicode conversion maps.
mysql-test/r/ctype_latin1.result:
  changeing test results accordingly.
sql/share/charsets/Index.xml:
  Fixing comment: iso-8859-1 -> cp1252

e5c4a3e1

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · f3174388
unknown authored Jul 21, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.10839
```
f3174388
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · dca732f1
unknown authored Jul 21, 2005
```
into mysql.com:/space/my/mysql-4.1
```
dca732f1

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5805fd26

unknown authored Jul 21, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged

5805fd26

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2e92355b
unknown authored Jul 21, 2005
```
into mysql.com:/space/my/mysql-5.0
```
2e92355b
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 1bbc69c7
unknown authored Jul 21, 2005
```
into deer.(none):/home/hf/work/mysql-5.0.10839


myisam/mi_create.c:
  Auto merged
```
1bbc69c7
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · b54bec55
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-4.1-push
```
b54bec55
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 552e4711
unknown authored Jul 21, 2005
```
into mysql.com:/space/my/mysql-5.0
```
552e4711
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0aca86a8
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
0aca86a8

Merge mysql.com:/home/jonas/src/mysql-5.0 · eb9f8480

unknown authored Jul 21, 2005

into  mysql.com:/home/jonas/src/mysql-5.1-push


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

eb9f8480

Merge mysql.com:/home/jonas/src/mysql-5.0 · 8cf24577

unknown authored Jul 21, 2005

into  mysql.com:/home/jonas/src/mysql-5.0-push


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

8cf24577

Merge mysql.com:/home/jonas/src/mysql-4.1 · c556acbf

unknown authored Jul 21, 2005

into  mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

c556acbf

Merge mysql.com:/home/jonas/src/mysql-4.1 · bacc9e9e
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-4.1-push
```
bacc9e9e
bug#11942 - ndb - backup during DDL · 3f916d29
unknown authored Jul 21, 2005
```
  fix bug introduced in alter table
```
3f916d29

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · bdf9d193

unknown authored Jul 21, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged

bdf9d193

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 13ed403f
unknown authored Jul 21, 2005
```
into mysql.com:/space/my/mysql-4.1
```
13ed403f

Merge mysql.com:/usr/home/bar/mysql-4.1 · 718942d8

unknown authored Jul 21, 2005

into  mysql.com:/usr/home/bar/mysql-5.0


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged

718942d8

ctype-cp932.c: · e9687c10

unknown authored Jul 21, 2005

  After backporting from 5.0 fix.
  There is no an extra argument in 4.1.


strings/ctype-cp932.c:
  After backporting from 5.0 fix.
  There is no an extra argument in 4.1.

e9687c10

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · a29829b7
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-4.1-push
```
a29829b7
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 09e07ceb
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push


sql/ha_ndbcluster.cc:
  Auto merged
```
09e07ceb
Included partitioning into embedded server · 15424cb9
unknown authored Jul 21, 2005

15424cb9
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 · 17c2e61a
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.1-push


sql/ha_ndbcluster.cc:
  Auto merged
```
17c2e61a

Merge mysql.com:/home/jonas/src/mysql-5.0 · 16cdb388

unknown authored Jul 21, 2005

into  mysql.com:/home/jonas/src/mysql-5.1-push


storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged

16cdb388

Merge mysql.com:/home/jonas/src/mysql-5.0 · 83587008
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
83587008
Merge mysql.com:/space/my/mysql-4.1 · 8a1a13e5
unknown authored Jul 21, 2005
```
into mysql.com:/space/my/mysql-4.1-build
```
8a1a13e5
merge · de5af58d
unknown authored Jul 21, 2005

de5af58d