Commits · 034522f47dd56dffb4b590ab02d3ab3cdb65b6c8 · nexedi / MariaDB

11 Jul, 2006 3 commits
- Merge chilla.local:/home/mydev/mysql-5.0-release · 034522f4
  unknown authored Jul 11, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-amerge


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
```
  034522f4
- Raise the version number. · 0859819a
  unknown authored Jul 11, 2006
  
  0859819a
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e694880
  unknown authored Jul 11, 2006
```
into  trift2.:/M50/mysql-5.0
```
  0e694880
10 Jul, 2006 14 commits

Merge trift2.:/M50/clone-5.0 · 8e4a6061
unknown authored Jul 10, 2006
```
into  trift2.:/M50/mysql-5.0


configure.in:
  Auto merged
```
8e4a6061
Raise the version number. · 9c35a6e7
unknown authored Jul 10, 2006

9c35a6e7
Revoking patch for Bug#10952 on behalf of Brian. · 1a7e4ac0
unknown authored Jul 10, 2006

1a7e4ac0

Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50 · 66fc547d

unknown authored Jul 10, 2006

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

66fc547d

ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam) · 001c7f5f

unknown authored Jul 10, 2006


ndb/src/kernel/blocks/dbdict/DictLock.txt:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/vm/SimulatedBlock.cpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/vm/SimulatedBlock.hpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/test/run-test/daily-basic-tests.txt:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD

001c7f5f

ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam) · f98f5d63

unknown authored Jul 10, 2006


ndb/include/kernel/GlobalSignalNumbers.h:
  5.0 : add NODE_START_REP from 5.1
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/vm/SimulatedBlock.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/vm/SimulatedBlock.hpp:
  5.0 : add NODE_START_REP from 5.1

f98f5d63

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0eaae415
unknown authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
```
0eaae415
ndb - bug#20847: non-debug compile fix (repeat since cannot merge 4.1->5.0) · ce3f15be
unknown authored Jul 10, 2006
```
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  non-debug compile fix
```
ce3f15be
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 895758a4
unknown authored Jul 10, 2006
```
into  trift2.:/M50/mysql-5.0
```
895758a4

support-files/mysql.spec.sh : Fix a typing error. · 5ea0420e

unknown authored Jul 10, 2006


support-files/mysql.spec.sh:
  Fix a typing error in the "make" target for the Perl script to run the tests.

5ea0420e

Merge trift2.:/M50/clone-5.0 · cdd07074

unknown authored Jul 10, 2006

into  trift2.:/M50/back23-5.0


support-files/mysql.spec.sh:
  Auto merged

cdd07074

Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 · 2cd1d33b
unknown authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
```
2cd1d33b
mysql-test/Makefile.am: fix cp of mode 444 files (re-commit) · f83d39b5
unknown authored Jul 10, 2006
```
mysql-test/Makefile.am:
  fix cp of mode 444 files
```
f83d39b5
Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 · 32e99ab1
unknown authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
```
32e99ab1

08 Jul, 2006 1 commit
- Merge chilla.local:/home/mydev/mysql-5.0--main · e6f010b6
  unknown authored Jul 08, 2006
```
into  chilla.local:/home/mydev/mysql-5.0-amerge
```
  e6f010b6
07 Jul, 2006 2 commits

Merge mysql.com:/space_old/pekka/ndb/version/my41-bug20847 · 8de29d3a

unknown authored Jul 07, 2006

into  mysql.com:/space_old/pekka/ndb/version/my50-bug20847


BitKeeper/etc/config:
  auto
ndb/src/kernel/blocks/ERROR_codes.txt:
  manual
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  SCCS merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  SCCS merged
ndb/test/ndbapi/testDict.cpp:
  SCCS merged
ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged
sql/opt_range.cc:
  SCCS merged

8de29d3a

ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies · 2c48aaa1

unknown authored Jul 07, 2006


ndb/src/kernel/blocks/ERROR_codes.txt:
  DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  DbtupTabDesMan: add merge with left buddies
ndb/test/ndbapi/testDict.cpp:
  DbtupTabDesMan: add merge with left buddies
ndb/test/run-test/daily-basic-tests.txt:
  DbtupTabDesMan: add merge with left buddies

2c48aaa1

06 Jul, 2006 18 commits

Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951 · 5ac016a8
unknown authored Jul 06, 2006
```
into  ymer.(none):/usr/local/mysql/tmp-5.0
```
5ac016a8

BUG#19951: Race conditions in test wait_timeout. · 224082fc

unknown authored Jul 06, 2006

Fix random failures in test 'wait_timeout' that depend on exact timing.

1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.

2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.


mysql-test/r/wait_timeout.result:
  Fix two races in test.
mysql-test/t/wait_timeout.test:
  Fix two races in test.

224082fc

Merge chilla.local:/home/mydev/mysql-5.0 · 08477de3

unknown authored Jul 06, 2006

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


mysql-test/r/key.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/table.cc:
  Auto merged

08477de3

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 567df161
unknown authored Jul 06, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
567df161

Merge chilla.local:/home/mydev/mysql-5.0-bug16218 · a810c61f

unknown authored Jul 06, 2006

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


sql/field.cc:
  Auto merged
sql/table.cc:
  Auto merged

a810c61f

Merge chilla.local:/home/mydev/mysql-5.0 · 013cbc39

unknown authored Jul 06, 2006

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


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/table.cc:
  Auto merged

013cbc39

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 99e347b1
unknown authored Jul 06, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
99e347b1
Bug #20820 auto inc table not handled correctly when restored from cluster backup · ce554d56
unknown authored Jul 06, 2006

ce554d56
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8cb6392c
unknown authored Jul 06, 2006
```
into trift2.:/M50/merge-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
```
8cb6392c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · af3f5c9e
unknown authored Jul 06, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
af3f5c9e

Merge chilla.local:/home/mydev/mysql-5.0 · 5d6e7a00

unknown authored Jul 06, 2006

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


libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge
mysql-test/r/key.result:
  Manual merge
mysql-test/t/ctype_utf8.test:
  Manual merge

5d6e7a00

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 3e9758bc

unknown authored Jul 06, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

3e9758bc

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 123c0a98

unknown authored Jul 06, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/ndbapi/DictCache.cpp:
  Auto merged

123c0a98

backport of ndb DictCache fix · 7997d847
unknown authored Jul 06, 2006
```
- don't invalidate tables that are in state RETRIEVING
```
7997d847

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 54f3f026

unknown authored Jul 06, 2006

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


ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged

54f3f026

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

unknown authored Jul 06, 2006

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


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

d2eeb79e

ndb - revert bug fix for bug#20442 · 0890735c
unknown authored Jul 06, 2006

0890735c

Merge xiphis.org:/home/antony/work2/mysql-5.0-engines · cee36215

unknown authored Jul 05, 2006

into  xiphis.org:/home/antony/work2/p2-bug8706.3-merge-5.0


configure.in:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

cee36215

05 Jul, 2006 2 commits
- ndbd: added missing jamEntry(); · 623f8bee
  unknown authored Jul 05, 2006
  
  623f8bee
- Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails · 051f3892
  unknown authored Jul 05, 2006
```
- updated error message to more correctly reflect the issue
```
  051f3892