Commits · edbc99d95f5d634074a03ac00498b38236ee9f1d · nexedi / MariaDB

11 Jul, 2006 3 commits
- Merge chilla.local:/home/mydev/mysql-5.0-release · edbc99d9
  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
```
  edbc99d9
- Raise the version number. · 3d5d9e0b
  unknown authored Jul 11, 2006
  
  3d5d9e0b
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · cf7a380b
  unknown authored Jul 11, 2006
```
into  trift2.:/M50/mysql-5.0
```
  cf7a380b
10 Jul, 2006 14 commits

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


configure.in:
  Auto merged
```
b6e3a53a
Raise the version number. · 6362eafe
unknown authored Jul 10, 2006

6362eafe
Revoking patch for Bug#10952 on behalf of Brian. · 2c3fd953
unknown authored Jul 10, 2006

2c3fd953

Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50 · 49ce58f4

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

49ce58f4

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

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

7bb7cd45

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

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

ae7f89a6

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

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

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.

b22d8cee

Merge trift2.:/M50/clone-5.0 · 85996bab

unknown authored Jul 10, 2006

into  trift2.:/M50/back23-5.0


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

85996bab

Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 · 33d751ef
unknown authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
```
33d751ef
mysql-test/Makefile.am: fix cp of mode 444 files (re-commit) · d32ca715
unknown authored Jul 10, 2006
```
mysql-test/Makefile.am:
  fix cp of mode 444 files
```
d32ca715
Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 · 5189c734
unknown authored Jul 10, 2006
```
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
```
5189c734

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

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

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

45168708

ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies · 31fbfc08

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

31fbfc08

06 Jul, 2006 18 commits

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

BUG#19951: Race conditions in test wait_timeout. · 836f8592

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.

836f8592

Merge chilla.local:/home/mydev/mysql-5.0 · 0845e4a7

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

0845e4a7

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

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

unknown authored Jul 06, 2006

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


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

86084994

Merge chilla.local:/home/mydev/mysql-5.0 · 573eaade

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

573eaade

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

93b4b0a4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 38dc588d
unknown authored Jul 06, 2006
```
into trift2.:/M50/merge-5.0


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

Merge chilla.local:/home/mydev/mysql-5.0 · 0314ec5d

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

0314ec5d

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

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

c5619678

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 0603b439

unknown authored Jul 06, 2006

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


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

0603b439

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

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 77bf996a

unknown authored Jul 06, 2006

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


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

77bf996a

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

unknown authored Jul 06, 2006

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


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

e73cb1a5

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

aca5d20c

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

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

ae3de1ed

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