Commit graph

2195 commits

Author SHA1 Message Date
cmiller@zippy.cornsilk.net
bc90657830 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my51-bug27976
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-05-07 09:15:28 -04:00
jonas@perch.ndb.mysql.com
08c906793e Fix compile error with some compilers 2007-05-07 14:53:55 +02:00
jonas@perch.ndb.mysql.com
5f9d1cf77c ndb - bug#28276
Fix DeleteRead in multi-operation
    Dont use setup_read, as it will (correctly) find that tuple is deleted
2007-05-07 13:48:27 +02:00
acurtis/antony@ltamd64.xiphis.org
a4dbc0990c Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
2007-05-04 23:35:14 -07:00
cmiller@zippy.cornsilk.net
424ee09a2b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my51-bug27976
2007-05-04 23:30:29 -04:00
cmiller@zippy.cornsilk.net
6fd39b4948 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27173/my50-bug27173
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27173/my51-bug27173
2007-05-04 13:28:15 -04:00
tomas@whalegate.ndb.mysql.com
76bedc6a03 bugfix in checksum with force varpart 2007-05-04 12:19:06 +02:00
msvensson@pilot.blaudden
a8125f359a Add atrt.hpp to EXTRA_DIST 2007-05-02 13:02:07 +02:00
mskold/marty@linux.site
3fa2a53e67 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-05-02 12:48:35 +02:00
jonas@perch.ndb.mysql.com
fd797249ca ndb - dynarr256
fix release iterator
2007-05-01 20:48:39 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
a2e63487e8 strict compilers do not permit auto casting 'longlong *' to 'long long *' 2007-04-30 17:46:05 -07:00
tomas@whalegate.ndb.mysql.com
1e06586c90 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-30 16:31:08 +02:00
mskold/marty@linux.site
27ac6c19af Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-30 14:21:29 +02:00
jonas@perch.ndb.mysql.com
15cfd0fd03 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-30 13:00:36 +02:00
jonas@perch.ndb.mysql.com
5db64df3dc Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-30 12:57:20 +02:00
jonas@perch.ndb.mysql.com
6559c77022 ndb - bug#28161
fix commit triggers with DD but not using DD
2007-04-30 12:56:16 +02:00
tomas@whalegate.ndb.mysql.com
598a60285f ndb_restore to set correct value force varpart
+ some tests
2007-04-30 11:43:50 +02:00
jonas@perch.ndb.mysql.com
636a380efa Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-30 09:29:43 +02:00
jonas@perch.ndb.mysql.com
b5339a8059 ndb - force var part, part III 2007-04-30 09:02:52 +02:00
jonas@perch.ndb.mysql.com
7de7f8c1ff Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-30 07:11:56 +02:00
serg@sergbook.mysql.com
1bd2953c02 compilation/test fixes 2007-04-29 17:46:18 -07:00
holyfoot/hf@mysql.com/hfmain.(none)
2fe860e84b 'no DBUG_RETURN' warning fixed 2007-04-30 01:06:16 +05:00
serg@sergbook.mysql.com
9ac2824145 compilation failure on nocona (gcc (GCC) 3.2.3 20030502) 2007-04-29 08:34:51 -07:00
holyfoot/hf@hfmain.(none)
e0b6a9baa0 Merge bk@192.168.21.1:mysql-5.1
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-29 18:52:14 +05:00
holyfoot/hf@hfmain.(none)
2fcebef31f Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-29 13:19:32 +05:00
tomas@whalegate.ndb.mysql.com
870c2a5b3f Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-27 21:01:23 +02:00
tomas@whalegate.ndb.mysql.com
d424f0d890 ndb: missing init and copy of m_force_var_part 2007-04-27 21:00:21 +02:00
istruewing@chilla.local
e327818c28 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
2007-04-27 19:09:39 +02:00
tomas@whalegate.ndb.mysql.com
10be9bf531 Bug#24951, Data nodes died(lgman) during creating tables
- reverting wrong part in patch
2007-04-27 13:50:33 +02:00
tomas@whalegate.ndb.mysql.com
f53e1929a2 Bug#24560 Data nodes died(lgman) if undo_buffer_size from logfile group has small value 2007-04-27 12:26:13 +02:00
tomas@whalegate.ndb.mysql.com
cfd4183e5e Bug#24951, Data nodes died(lgman) during creating tables 2007-04-27 12:23:40 +02:00
tomas@whalegate.ndb.mysql.com
9b41ce38ef Bug #25741 Unable to allocate node id during restarting data node
- add additional sleep so that we don't get 100% cpu usage retrying saomething that can take some time before succeeding
2007-04-27 12:11:29 +02:00
tomas@whalegate.ndb.mysql.com
c1cdd288b9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-27 11:45:03 +02:00
tomas@whalegate.ndb.mysql.com
2061324ed1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-26 22:51:38 +02:00
tomas@whalegate.ndb.mysql.com
9e9df36d8e BUG#25741 AllocNodeIdRef::NodeFailureHandlingNotCompleted 2007-04-26 22:49:58 +02:00
svoj@april.(none)
640b3e4e74 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-04-27 01:33:16 +05:00
joerg@trift-lap.fambruehe
044f2e110e Merge trift-lap.fambruehe:/MySQL/M50/push-5.0
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 17:11:33 +02:00
gni@dev3-221.dev.cn.tlan
8b2e8fb2f0 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug25741
2007-04-26 22:10:32 +08:00
lzhou/zhl@dev3-63.(none)
6847a7489e Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug27207
2007-04-26 14:10:31 +00:00
joerg@trift-lap.fambruehe
f723388b18 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 16:03:02 +02:00
tomas@whalegate.ndb.mysql.com
9edb19eedf Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-26 13:56:32 +02:00
tomas@whalegate.ndb.mysql.com
99b81f15f5 remove compiler warning 2007-04-26 13:56:09 +02:00
tomas@whalegate.ndb.mysql.com
0326179d10 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-26 13:50:04 +02:00
tomas@whalegate.ndb.mysql.com
ef77deda42 Bug #27205 Occational 899 if delete+insert during LCP
- put page of deleted row last in list
2007-04-26 13:41:33 +02:00
tomas@whalegate.ndb.mysql.com
8dd90e8817 WL#1190 preparatory work needed for compatability with future online add column 2007-04-26 13:36:51 +02:00
tomas@whalegate.ndb.mysql.com
3b38c544eb ndb: force varpart part I, allow setting of flag in dictionary 2007-04-26 08:34:38 +02:00
jonas@perch.ndb.mysql.com
35b65dbf14 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-25 23:49:37 +02:00
jonas@perch.ndb.mysql.com
0fc59172aa Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-25 23:48:31 +02:00
jonas@perch.ndb.mysql.com
7c7f5104eb ndb -
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
2007-04-25 22:50:35 +02:00
knielsen@ymer.(none)
5dff16eb80 Merge bk-internal:/home/bk/mysql-5.1-telco-gca
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
2007-04-25 20:45:48 +02:00
jonas@perch.ndb.mysql.com
7b215a5762 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-25 18:02:40 +02:00
lzhou/zhl@dev3-63.(none)
fcec5410bf BUG#27207 Return correct error message when ndb_mgmd start with wrong config.ini parameter in TCP section 2007-04-25 14:39:16 +00:00
knielsen@ymer.(none)
0faa86bb86 After-merge fixes. 2007-04-25 15:48:12 +02:00
knielsen@ymer.(none)
39914c9b9b Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-04-25 15:40:13 +02:00
knielsen@ymer.(none)
0027a93dc5 Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca-bug28073
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
2007-04-25 15:21:05 +02:00
knielsen@ymer.(none)
7a54b41925 Merge ymer.(none):/usr/local/mysql/mysql-5.0-telco-gca
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
2007-04-25 15:18:34 +02:00
knielsen@ymer.(none)
2c65524328 Merge bk-internal:/home/bk/mysql-5.1-new-ndb
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-04-25 15:06:03 +02:00
knielsen@ymer.(none)
45e18df811 After-merge fixes. 2007-04-25 15:02:23 +02:00
knielsen@ymer.(none)
e8c6b76615 BUG#28073: Infinite loop in lock queue.
In a certain code path the NDBD could loop infinitely in the lock queue.
2007-04-25 14:38:05 +02:00
gni@dev3-221.dev.cn.tlan
9aadf5ad20 BUG#25741 AllocNodeIdRef::NodeFailureHandlingNotCompleted 2007-04-25 15:57:42 +08:00
stewart@willster.(none)
14cf73361a Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2007-04-24 13:45:28 -07:00
stewart@willster.(none)
14ff88741c Bug #24228 ndb_size.pl requires non-standard HTML::Template module
Bug #24227  	ndb_size.pl should report default values instead of < default for config params
Bug #24229  	ndb_size.pl doesn't compute Index usage correctly

Big ndb_size.pl update
2007-04-24 13:43:13 -07:00
df@pippilotta.erinye.com
6992b90152 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-24 22:34:57 +02:00
tomas@whalegate.ndb.mysql.com
64d2bea65b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-24 19:23:36 +02:00
gni@dev3-221.dev.cn.tlan
98d37e1d6c Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
2007-04-24 18:28:23 +08:00
gni@dev3-221.dev.cn.tlan
1869b2c4d0 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
2007-04-24 17:34:36 +08:00
gni@dev3-221.dev.cn.tlan
40060d2f2e Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240
2007-04-24 17:29:00 +08:00
jonas@perch.ndb.mysql.com
da8931cb98 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-24 09:53:32 +02:00
knielsen@ymer.(none)
ae8f9ac9f3 Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb-bug27370
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-04-24 09:00:13 +02:00
jonas@perch.ndb.mysql.com
542c9e9b5d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-24 08:24:34 +02:00
jonas@perch.ndb.mysql.com
dfa2008911 ndb - bug#21755
table/index (es) need special treatment...
2007-04-24 08:22:30 +02:00
dli@dev3-164.dev.cn.tlan
c98aea71e4 Merge dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-23137
2007-04-24 10:28:11 +08:00
gni@dev3-221.dev.cn.tlan
4648c56769 BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected. With --no-upgrade (-u) option, user can decide if ignore the upgrade, the default action is to upgrade them. 2007-04-24 09:45:15 +08:00
iggy@recycle.(none)
13b54aa963 Bug#24732 Executables do not include Vista manifests
- Post merge cleanup.
2007-04-23 16:23:32 -04:00
tomas@whalegate.ndb.mysql.com
cf8ef29ca0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-23 20:30:26 +02:00
tomas@whalegate.ndb.mysql.com
aca5ac19ed new ndb tool to measure replication latency 2007-04-23 20:27:43 +02:00
tomas@whalegate.ndb.mysql.com
f24ada7fe6 simple extend of listen_event to do apply on remote cluster 2007-04-23 19:18:46 +02:00
tomas@whalegate.ndb.mysql.com
2029c3c26f Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-23 19:03:08 +02:00
msvensson@pilot.blaudden
2ac94c30f4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-23 17:01:02 +02:00
jonas@perch.ndb.mysql.com
c7944ddda5 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-23 15:48:50 +02:00
jonas@perch.ndb.mysql.com
00ee136e45 ndb -
add new functions for (easier) using NdbRestarter
2007-04-23 15:48:06 +02:00
jonas@perch.ndb.mysql.com
aae07fd104 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-23 15:43:56 +02:00
jonas@perch.ndb.mysql.com
8fa46718ec ndb -
add (auto) testcase for bug#28023
2007-04-23 15:38:06 +02:00
jonas@perch.ndb.mysql.com
a92a9b5380 ndb - bug#28023 (51-main)
Add/sub correct offsets (with 2 word varpart ref)
2007-04-23 14:22:23 +02:00
jonas@perch.ndb.mysql.com
770e48fca7 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-23 09:01:35 +02:00
jonas@perch.ndb.mysql.com
347a0bf722 ndb - Fix bug in new Hugo equal code (theStatus: 10) 2007-04-23 08:58:15 +02:00
mats@romeo.(none)
875de0e571 Merge romeo.(none):/home/bkroot/mysql-5.1-rpl
into  romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:46:58 +02:00
tomas@whalegate.ndb.mysql.com
742a4d50e9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-04-20 10:46:34 +02:00
svoj@june.mysql.com
40a3e2fe04 Merge mysql.com:/home/svoj/devel/mysql/warn/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/warn/mysql-5.1-engines
2007-04-19 11:59:20 +05:00
tsmith@siva.hindu.god
cf1cf3a0d1 Applied innodb-5.1-ss1404 snapshot
Fixes:

- Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
  Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
  this flag immediately after open(2)ing. This way an error caused by
  O_DIRECT not being supported can easily be ignored.
- Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables
- Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
  Report the current value of the AUTO_INCREMENT counter to MySQL.
2007-04-18 19:53:28 -06:00
tomas@whalegate.ndb.mysql.com
da2b2300c9 Bug#17095 circular replication
- make sure any value is set for linked operations as well, e.g. blob tables
2007-04-18 15:58:30 +02:00
svoj@june.mysql.com
05a8c545df Merge mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-5.1-engines
2007-04-18 16:35:22 +05:00
tomas@poseidon.mysql.com
78e4f1e74c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-04-18 07:55:31 +02:00
tomas@poseidon.mysql.com
1ccd09a2c1 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-04-18 07:52:45 +02:00
jonas@perch.ndb.mysql.com
f7115f126b Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-17 16:50:08 +02:00
jonas@perch.ndb.mysql.com
6a35dddef4 ndb - bug#21755
redo checkSchemaState to handle bug (plus prepare to handle other DD related bugs in the area)
2007-04-17 16:43:47 +02:00
jonas@perch.ndb.mysql.com
4810b84c3c ndb -
new big test prg testDict -n DictRestart
  new bug test prg testDict -n Bug21755
2007-04-17 16:31:21 +02:00
jonas@perch.ndb.mysql.com
539c67e32a ndb - make NdbMixRestarter a bit more verbose 2007-04-17 16:26:16 +02:00
jonas@perch.ndb.mysql.com
930f5cc234 ndb -
refactor testSRBank and create new class NdbMixRestarter
2007-04-17 09:54:36 +02:00
jonas@perch.ndb.mysql.com
527158baa5 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-16 19:05:19 +02:00