Commits · 47893e23c8808b6a0c8b3285a526f2d9ef8c2230 · nexedi / MariaDB

24 Mar, 2006 16 commits

unknown authored Mar 24, 2006

  fix \ in makefile (merge error)


storage/ndb/test/run-test/Makefile.am:
  fix makefile

47893e23

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2e9d8c24
unknown authored Mar 24, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
2e9d8c24
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 60b13ec6
unknown authored Mar 24, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
60b13ec6

disabled.def: · 501d4e84

unknown authored Mar 24, 2006

  enabled rpl_ndb_blob since a "hanging" bug was fixed


mysql-test/t/disabled.def:
  enabled rpl_ndb_blob since a "hanging" bug was fixed

501d4e84

ndb - bug#18295 · 05323a24

unknown authored Mar 24, 2006

  more work-arounds for gcc4


storage/ndb/src/kernel/vm/Pool.hpp:
  More gcc4 craziness

05323a24

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fd7331d9
unknown authored Mar 24, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
fd7331d9

ndb - · abe78844

unknown authored Mar 24, 2006

  more compiler warnings...


storage/ndb/include/util/InputStream.hpp:
  more warnings

abe78844

ndb - · 5725b696

unknown authored Mar 24, 2006

  still some compiler warnings


storage/ndb/include/util/OutputStream.hpp:
  still some compiler warnings
storage/ndb/include/util/SimpleProperties.hpp:
  still some compiler warnings
storage/ndb/src/kernel/vm/Pool.hpp:
  still some compiler warnings

5725b696

Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb · 37f59a00
unknown authored Mar 24, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
37f59a00
Merge ndbdev@ndbmaster.mysql.com:jonas/mysql-5.1-new · be76a0a2
unknown authored Mar 24, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
be76a0a2

- corrected bug causing hang in getTable when using blob tables · f7cc9d33

unknown authored Mar 24, 2006

- make sure cluster/schema table is always created first


sql/ha_ndbcluster_binlog.cc:
  make sure cluster/schema table is always created first
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  corrected bug causing hang in getTable when using blob tables

f7cc9d33

after merge fix · 38db7be3
unknown authored Mar 24, 2006

38db7be3

ndb - bug#18295 · 58565df4

unknown authored Mar 24, 2006

  rewrite/clean up code a bit to avoid a gcc4 compiler bug


storage/ndb/src/kernel/vm/DLFifoList.hpp:
  Fix compiler bug
storage/ndb/src/kernel/vm/DLList.hpp:
  Fix compiler bug
storage/ndb/src/kernel/vm/SLList.hpp:
  Fix compiler bug

58565df4

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new · fefc7ace
unknown authored Mar 24, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
```
fefc7ace

ndb - merge fixes · 2654fe07

unknown authored Mar 24, 2006


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  merge
storage/ndb/src/ndbapi/Ndbif.cpp:
  merge

2654fe07

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · cded9469

unknown authored Mar 24, 2006

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.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/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  Auto merged
storage/ndb/test/run-test/conf-dl145a.txt:
  Auto merged
storage/ndb/test/run-test/conf-ndbmaster.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/run-test/conf-shark.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  merge
storage/ndb/test/run-test/Makefile.am:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
storage/ndb/tools/desc.cpp:
  merge

cded9469

23 Mar, 2006 24 commits

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7d8f580d
unknown authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
7d8f580d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 14ed9796
unknown authored Mar 23, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster_binlog.cc:
  Auto merged
```
14ed9796
Bug #18472 race condition between multiple mysqld's when setting up cluster/schema · 60a60a0a
unknown authored Mar 23, 2006
```
- check that event is the correct one, and only delete if wrong version
```
60a60a0a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 49505b24
unknown authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
49505b24

ctype-utf8.c, ctype-simple.c: · c22e3f99

unknown authored Mar 23, 2006

  Forgot to include into the previous changeset.


strings/ctype-simple.c:
  Forgot to include into the previous changeset.
strings/ctype-utf8.c:
  Forgot to include into the previous changeset.

c22e3f99

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f1ac6668
unknown authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
f1ac6668
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6bbd4f30
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
6bbd4f30

Merge perch.ndb.mysql.com:/home/jonas/src/41-work · aed226dc

unknown authored Mar 23, 2006

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

aed226dc

ndb - · abf403a4

unknown authored Mar 23, 2006

  remove bug#18385 from autotest as it only works on 2 node clusters


ndb/test/run-test/daily-basic-tests.txt:
  remove bug#18385 as it only works on 2 node clusters

abf403a4

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 440295f6
unknown authored Mar 23, 2006
```
into  zim.(none):/home/brian/mysql/dep-5.1
```
440295f6

Refactored some code to remove ifdef and removed dead code related to un-useable sync code. · c45086b4

unknown authored Mar 23, 2006


sql/ha_innodb.cc:
  Removing dead code
sql/handler.cc:
  Removing dead code
sql/handler.h:
  Removing Dead code
sql/sql_class.cc:
  Removing unneeded ifdef code.
sql/sql_repl.cc:
  Removing dead code.

c45086b4

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6ae067bf
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
6ae067bf
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · be57c772
unknown authored Mar 23, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
be57c772

ndb - · f4911027

unknown authored Mar 23, 2006

  minor fixes in test programs


ndb/src/kernel/blocks/ERROR_codes.txt:
  Fix conflicting error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix conflicting error codes
ndb/test/ndbapi/testNodeRestart.cpp:
  Fix test program

f4911027

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1bc0de63
unknown authored Mar 23, 2006
```
into  mysql.com:/export/space/pekka/ndb/version/my51
```
1bc0de63
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 1819198e
unknown authored Mar 23, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.0
```
1819198e

m_ctype.h: · 5f34afa0

unknown authored Mar 23, 2006

  Bug##15376
  After merge fix: removing redundant macros.


include/m_ctype.h:
  Bug##15376
  After merge fix: removing redundant macros.

5f34afa0

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · 42265644
unknown authored Mar 23, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new


sql-common/client.c:
  Auto merged
```
42265644

Merge mysql.com:/usr/home/bar/mysql-5.0 · a7b26aa7

unknown authored Mar 23, 2006

into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.

a7b26aa7

Bug#15376: Unassigned multibyte codes are converted to U+0000 · 63fde462

unknown authored Mar 23, 2006

Mergeing changes into 5.0


mysql-test/r/ctype_eucjpms.result:
  Adding test
mysql-test/r/ctype_ujis.result:
  After merge fix
mysql-test/t/ctype_eucjpms.test:
  Adding test
strings/ctype-cp932.c:
  After merge fix
strings/ctype-eucjpms.c:
  Applying changes to eucjpms, similar to ujis.
  Note: eucjpms appeared in 5.0 so the original patch,
  which was for for 4.1, didn't fix eucjpms.

63fde462

m_ctype.h: · 13d27530

unknown authored Mar 23, 2006

  Removing duplicate old definition.
  After merge fix for bug#15375


include/m_ctype.h:
  Removing duplicate old definition.
  After merge fix for bug#15375

13d27530

Merge mysql.com:/usr/home/bar/mysql-4.1.b15376 · 4287e45e

unknown authored Mar 23, 2006

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


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
sql/sql_string.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.
mysql-test/r/ctype_ujis.result:
  After merge fix

4287e45e

Merge mysql.com:/users/lthalmann/bk/mysql-5.0 · 6fc595ab

unknown authored Mar 23, 2006

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new


BitKeeper/deleted/.del-wait_slave_status.inc:
  Delete: mysql-test/include/wait_slave_status.inc
sql-common/client.c:
  Auto merged

6fc595ab

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · bea8e074
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
bea8e074