Commits · e6f010b63eb9d846810bff75352fa9aa5424426f · Kirill Smelkov / mariadb

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
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 11 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

Extend the Perl script running the test suite to produce a "Logging:" line... · f0e2be13

unknown authored Jul 05, 2006

Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does).

mysql-test/mysql-test-run.pl:
Now that the RPM spec files use the Perl script to run the tests, we also need the "Logging:"
line in its output, because otherwise we lack the information how the test suite was run.
Add the line.

f0e2be13

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

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

unknown authored Jul 05, 2006

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


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

7a8c4516

Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it. · 53ed06f2
unknown authored Jul 05, 2006
```
- remove some event code to get rid of some bugs
```
53ed06f2
After merge fix · d87e4fbf
unknown authored Jul 05, 2006

d87e4fbf
Merge mysql.com:/home/mydev/mysql-4.1-bug19835 · 55736ce5
unknown authored Jul 05, 2006
```
into  mysql.com:/home/mydev/mysql-5.0-ateam


myisam/mi_dynrec.c:
  Auto merged
```
55736ce5

Merge mysql.com:/home/mydev/mysql-4.1-bug17877 · a4a905f3

unknown authored Jul 05, 2006

into  mysql.com:/home/mydev/mysql-5.0-ateam


myisam/mi_key.c:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
myisam/mi_check.c:
  SCCS merged

a4a905f3

Merge mysql.com:/home/mydev/mysql-4.1-bug14400 · fef31470

unknown authored Jul 05, 2006

into  mysql.com:/home/mydev/mysql-5.0-ateam


libmysqld/libmysqld.c:
  Auto merged
myisam/mi_rkey.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
libmysqld/lib_sql.cc:
  Manual merge
mysql-test/r/func_time.result:
  Manual merge
mysql-test/r/gis.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge
mysql-test/t/gis.test:
  Manual merge
sql-common/client.c:
  Manual merge

fef31470

Merge mysql.com:/home/mydev/mysql-4.1-bug11824 · 516fdb71

unknown authored Jul 05, 2006

into  mysql.com:/home/mydev/mysql-5.0-ateam


myisam/mi_create.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
sql/field.cc:
  Manual merge

516fdb71

04 Jul, 2006 10 commits

Merge mysql.com:/home/mydev/mysql-4.0-bug14400 · 752b826e

unknown authored Jul 04, 2006

into  mysql.com:/home/mydev/mysql-4.1-bug14400


myisam/mi_rkey.c:
  Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
  Manual merge
sql/sql_class.cc:
  Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
  Manual merge

752b826e

Merge bk-internal:/home/bk/mysql-5.0 · 3f659cbe
unknown authored Jul 04, 2006
```
into  mysql.com:/data0/knielsen/tmp-5.0
```
3f659cbe

ndb - ps_7ndb as discovered by pb · 95e37a4a

unknown authored Jul 04, 2006

  fix race in scan close


ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix race in scan close

95e37a4a

Merge bk-internal:/home/bk/mysql-5.0 · 0e1005a4

unknown authored Jul 04, 2006

into  mysql.com:/data0/knielsen/tmp-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_update.cc:
  Auto merged

0e1005a4

Merge tomas@poseidon:mysql-5.0-main · 05348e41
unknown authored Jul 04, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
05348e41

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

unknown authored Jul 04, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_update.cc:
  Auto merged

19096dc0

Merge mysqldev@production:my/mysql-5.0-release · 520cd485

unknown authored Jul 04, 2006

into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.0


include/my_sys.h:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
sql/table.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

520cd485

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

unknown authored Jul 04, 2006

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


sql/ha_ndbcluster.cc:
  Auto merged

ce3e4de9

Bug #20784 Uninitialized memory in update on table with PK not on first column · 8597f663
unknown authored Jul 04, 2006
```
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
```
8597f663
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 27181aa1
unknown authored Jul 04, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
27181aa1