mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46750 commits 2784 branches 343 tags 1.6 GiB
Commit graph

2234 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
ce23702510 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-12 21:35:39 +02:00
jonas@perch.ndb.mysql.com
bdd0e4543e 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-12 16:01:45 +02:00
jonas@perch.ndb.mysql.com
6b67f57249 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-12 16:00:51 +02:00
jonas@perch.ndb.mysql.com
f06225a6e1 ndb - bug#27756 
make sure that copy tuple is released in all cases
 2007-04-12 15:55:39 +02:00
jonas@perch.ndb.mysql.com
967eb52b68 ndb - bug#27756 
testcase only
  new pseudo column NDB$COPY_ROWID
 2007-04-12 11:47:38 +02:00
jonas@perch.ndb.mysql.com
3411ba8ba6 ndb - hugo - add new method for setting primary key(s) 2007-04-12 11:43:56 +02:00
tomas@whalegate.ndb.mysql.com
98c2e79af4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-12 11:29:05 +02:00
tomas@whalegate.ndb.mysql.com
2e620e3db6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-12 11:12:43 +02:00
jonas@perch.ndb.mysql.com
890b19c895 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-12 07:40:15 +02:00
jonas@perch.ndb.mysql.com
ca94188aae ndb - bug#27757 
tupscan misses uncommitted inserts by own transaction
    let tupkeyreq handle dirty/savepoint

  also siable diskscan as temporary fix for bug#27776
 2007-04-12 06:59:56 +02:00
tomas@whalegate.ndb.mysql.com
ec6476cbef Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-11 20:30:23 +02:00
tomas@whalegate.ndb.mysql.com
537af12420 correct merge error 2007-04-11 19:38:29 +02:00
tomas@whalegate.ndb.mysql.com
deec4449ac Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 
- try to catch as many malloc failures as possible and give error messages
(more for 5.1)
 2007-04-11 18:10:45 +02:00
tomas@whalegate.ndb.mysql.com
da1ebc7fce Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-11 15:51:09 +02:00
jonas@perch.ndb.mysql.com
9696d5b465 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-10 10:30:22 +02:00
jonas@perch.ndb.mysql.com
8723380db2 ndb - 
add event log listener test tool
 2007-04-10 10:27:02 +02:00
jonas@perch.ndb.mysql.com
6dca65b57b 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-10 10:22:55 +02:00
jonas@perch.ndb.mysql.com
406620d71d 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-10 10:16:07 +02:00
jonas@perch.ndb.mysql.com
cd3c4a9786 ndb - bug#27651 (5.1) 
Only prepare "next" GCI if we're in the first 4 highest GCI's
    to avoid we can get several buckets with same GCI
 2007-04-10 10:15:35 +02:00
jonas@perch.ndb.mysql.com
d2225f0894 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-10 10:06:04 +02:00
jonas@perch.ndb.mysql.com
ee4a94a0c1 ndb - bug#27728 (5.1) 
Make sure API is connected to nodes when subscribing
 2007-04-10 10:05:01 +02:00
holyfoot/hf@hfmain.(none)
33ed2ead2a Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-09 11:07:20 +05:00
kent@kent-amd64.(none)
a16289d550 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
 2007-04-08 20:48:07 +02:00
holyfoot/hf@hfmain.(none)
ce426dd622 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-07 14:59:53 +05:00
acurtis/antony@ltamd64.xiphis.org
78734f145d Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
 2007-04-06 17:18:26 +00:00
tomas@whalegate.ndb.mysql.com
70fa6a4e5d ndb: change attribute id for ANY_VALUE as id was already reserved for upcoming read pached patch 2007-04-05 12:01:01 +02:00
tomas@whalegate.ndb.mysql.com
d04730c06d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-05 10:21:41 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
10dffc5a19 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-04-05 12:26:01 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
fdf57c7ac2 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-04-05 10:47:40 +08:00
tomas@whalegate.ndb.mysql.com
6ec3cd9836 set name for ndb tools 2007-04-04 14:46:09 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
888c2057e9 sync the initialization configuration information between ConfigInfo.cpp and ParamInfo.cpp 2007-04-04 19:30:43 +08:00
gluh@mysql.com/eagle.(none)
2d47f0cb1b Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 2007-04-03 16:13:27 +05:00
tomas@whalegate.ndb.mysql.com
81ac116dfa Bug #17095 Cluster RBR in circle does not terminate 
- add any value to ndb
- use it to update correct server id in binlog thread
 2007-04-03 12:57:18 +02:00
gni/root@dev3-221.dev.cn.tlan
e1971cfa51 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-bug21699
 2007-04-03 18:05:10 +08:00
gni/root@dev3-221.dev.cn.tlan
96c37edd5c 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-bug21699
 2007-04-03 18:01:43 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c8d0b6fc89 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
 2007-04-03 17:07:00 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
85c0d0554c Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
 2007-04-03 17:03:12 +08:00
msvensson@pilot.blaudden
fc904eaead Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-02 11:15:09 +02:00
msvensson@pilot.blaudden
cbe7c63fc7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-02 10:45:51 +02:00
jonas@perch.ndb.mysql.com
fbcfa4be3d 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-02 09:34:33 +02:00
jonas@perch.ndb.mysql.com
6f12c538c4 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-02 09:30:35 +02:00
jonas@perch.ndb.mysql.com
27902d6507 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-04-02 09:29:11 +02:00
jonas@perch.ndb.mysql.com
48e890be45 fix atrt mysql_install_db, make sure no extra my.cnf is read 2007-04-02 08:39:58 +02:00
svoj@april.(none)
51710387ab Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.1-engines
 2007-03-31 17:29:40 +05:00
lzhou/zhl@dev3-63.(none)
4e39f3bb18 Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug24793 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug24793
 2007-03-30 16:43:39 +00:00
lzhou/zhl@dev3-63.(none)
439202bd9b Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354
 2007-03-30 13:30:58 +00:00
lzhou/zhl@dev3-63.(none)
984f807f5c Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354
 2007-03-30 11:02:36 +00:00
istruewing@chilla.local
8ad2472e24 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-30 12:33:44 +02:00
tomas@whalegate.ndb.mysql.com
1296080941 5.1.17 not compatible with 5.1.18 because of change in var page reference size 2007-03-30 11:37:21 +02:00
msvensson@pilot.blaudden
266cd861e7 Add missing \ causing CMakelists.txt etc not to be included in dist 2007-03-30 06:57:58 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
a9464595ea Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25446-5.1-new-ndb-bj
 2007-03-30 11:03:44 +08:00
tomas@whalegate.ndb.mysql.com
ca5f4f4642 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-29 14:15:19 +02:00
tomas@whalegate.ndb.mysql.com
b327e23c5b 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-03-29 14:10:51 +02:00
tomas@whalegate.ndb.mysql.com
90113ac9ee Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory 
- also run this patch on 32 bit machines to allow online upgrade
 2007-03-29 14:10:21 +02:00
tomas@whalegate.ndb.mysql.com
8f8a659b79 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-03-29 13:52:17 +02:00
tsmith@quadxeon.mysql.com
0b0d2c3258 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-29 12:58:26 +02:00
tomas@whalegate.ndb.mysql.com
5660e224c2 Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory 
- increase var part reference from 32 to 64 bits on 64 bit systems
- note current patch does not allow for online upgrade from 32 to 64 bit systems or vice versa
 2007-03-29 11:05:32 +02:00
istruewing@chilla.local
d0ad6cd45b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-29 08:36:57 +02:00
tsmith@siva.hindu.god
4ffeba761f Applied innodb-5.1-ss1381 snapshot 
Bug #27381: InnoDB exits when attempting to rename table to non-existant database
  Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
  os_file_handle_error().
 2007-03-28 22:46:28 -06:00
antony@ppcg5.local
6f21d39d51 WL#2936 
"Plugin Server Variables"
  Post review cleanups.
 2007-03-28 21:29:16 -07:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
566f48d07f Bug#24521, ndbd node crashes if try to create many datafiles for tablespace 2007-03-29 10:59:05 +08:00
baker@bk-internal.mysql.com
1b9c4358a8 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-03-28 22:31:10 +02:00
istruewing@chilla.local
3f0bfd831a Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-28 17:06:09 +02:00
istruewing@chilla.local
20bb4ae8cf Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-28 16:59:09 +02:00
istruewing@chilla.local
350c5da724 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-03-28 16:57:08 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
cf21cf2c73 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj
 2007-03-28 11:11:11 +08:00
istruewing@chilla.local
f90c056b5c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug24985
 2007-03-27 17:59:49 +02:00
jonas@perch.ndb.mysql.com
c1946a59b9 ndb - 
remove compiler warning/error
 2007-03-27 16:47:08 +02:00
jonas@perch.ndb.mysql.com
050dcdee40 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-03-27 16:16:02 +02:00
jonas@perch.ndb.mysql.com
52469dee16 ndb - 
reformat code a bit to be more compiler friendly
 2007-03-27 16:15:22 +02:00
jonas@perch.ndb.mysql.com
924036859f 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-03-27 16:00:15 +02:00
jonas@perch.ndb.mysql.com
3aa1a59a77 ndb - 
remove compiler warning from last changeset
 2007-03-27 15:57:36 +02:00
jonas@perch.ndb.mysql.com
d50539b624 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-03-27 14:33:18 +02:00
jonas@perch.ndb.mysql.com
e5faf16bc0 ndb - bug#27466 nf during nr can leave cluster in inconsistent state (recommit in 5.1) 
Fix race condition between NODE_FAILREP and local INCL_NODEREQ loop
    Also retry on ZNODE_START_DISALLOWED_ERROR
 2007-03-27 14:27:43 +02:00
istruewing@chilla.local
49884979b4 Merge chilla.local:/home/mydev/mysql-5.0-bug24985 
into  chilla.local:/home/mydev/mysql-5.1-bug24985
 2007-03-27 12:46:54 +02:00
tomas@whalegate.ndb.mysql.com
a39fe6c128 Bug #27444 DataMemory missing from report in cluster logs 
- error in initial signal length giving uninitialized variable
 2007-03-27 11:12:26 +02:00
brian@zim.(none)
e661d6eeb6 Making sure thar archive is inited for info AUTO call. 2007-03-26 22:50:08 -07:00
brian@zim.(none)
9e1565e37e Merge piggy:/home/brian/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/pread-archive-5.1
 2007-03-26 17:31:52 -07:00
brian@zim.(none)
88719428f5 Centralized init logic for starting a scan. 2007-03-26 17:15:31 -07:00
brian@piggy.tangent.org
414da94c04 Adjusting locks for concurrency issue (not found, but suspect). 2007-03-26 16:45:17 -07:00
tomas@whalegate.ndb.mysql.com
d4982247cf Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-26 20:57:10 +02:00
brian@zim.(none)
ff9da1f048 New comments, additional init for rebuild options. 2007-03-25 11:38:49 -07:00
pekka@clam.(none)
5f061a7e5c Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
 2007-03-25 15:06:19 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
ccb9d448f3 BUG#26257 New Federated Server Functionality Doesn't support differently named tables 
* Modified Federated memory allocation to use MEM_ROOT
* Modified sql_servers and federated to allocate share connection
  parameters to use MEM_ROOT
* Modified Federated to allow tablename in addition to server name
* Implicit flushing of tables using altered/dropped server name
* Added tests to prove new functionality works

Contributors to this patch: Patrick Galbraith, Antony Curtis
 2007-03-24 01:18:19 -07:00
brian@zim.(none)
8c322769dc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/bk/mysql-5.1-arch
 2007-03-23 19:05:48 -07:00
brian@zim.(none)
bbe97fa4e3 Added delayed open of file descriptors to cut down on issues surrounding large collections of partitions being open by many threads. 2007-03-23 18:51:56 -07:00
tomas@whalegate.ndb.mysql.com
d5f63f25c5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 21:50:57 +01:00
antony@ppcg5.local
d4d37f113e WL#2936 
"Server variables for plugins"
  Post review fixes.
 2007-03-23 10:14:46 -07:00
tomas@whalegate.ndb.mysql.com
78dce2dd97 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 17:17:44 +01:00
tomas@whalegate.ndb.mysql.com
df278bd605 BUG#27254: Single User Mode.Mysql hangs if it tries delete a ndb table 2007-03-23 17:12:06 +01:00
tomas@whalegate.ndb.mysql.com
aadd161d65 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 17:09:10 +01:00
tomas@whalegate.ndb.mysql.com
9af7e2c5a4 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
 2007-03-23 17:08:33 +01:00
tomas@whalegate.ndb.mysql.com
f4fed734c6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 14:17:08 +01:00
tomas@whalegate.ndb.mysql.com
8823a1a29f correction of merge 2007-03-23 14:16:31 +01:00
tomas@whalegate.ndb.mysql.com
9899df36bd Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
 2007-03-23 14:06:00 +01:00
istruewing@chilla.local
942cd7d424 Bug#17332 - changing key_buffer_size on a running server 
can crash under load
After review fixes
 2007-03-23 11:52:45 +01:00
istruewing@chilla.local
32da2907f8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug26782
 2007-03-23 10:27:33 +01:00
istruewing@chilla.local
3a726ab6e2 Bug#26782 - Patch: myisamchk -rq creates .MYI.MYI file on packed MyISAM tables 
After merge fix
In conjunction with the newest 5.1 we always need to
create a real path name to be able to detect already
open tables.
 2007-03-23 10:26:14 +01:00
tomas@whalegate.ndb.mysql.com
05984c7aeb Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 08:20:36 +01:00
stewart@willster.(none)
21e9072775 WL#3704 mgmapi timeouts: fix compile warning 2007-03-23 15:25:58 +11:00
tsmith@siva.hindu.god
baddc4e91c Apply the following InnoDB snapshots: 
innodb-5.1-ss1318
innodb-5.1-ss1330
innodb-5.1-ss1332
innodb-5.1-ss1340

Fixes:
- Bug #21409: Incorrect result returned when in READ-COMMITTED with query_cache ON
  At low transaction isolation levels we let each consistent read set
  its own snapshot.

- Bug #23666: strange Innodb_row_lock_time_% values in show status; also millisecs wrong
  On Windows ut_usectime returns secs and usecs relative to the UNIX
  epoch (which is Jan, 1 1970).

- Bug #25494: LATEST DEADLOCK INFORMATION is not always cleared
  lock_deadlock_recursive(): When the search depth or length is exceeded,
  rewind lock_latest_err_file and display the two transactions at the
  point of aborting the search.

- Bug #25927: Foreign key with ON DELETE SET NULL on NOT NULL can crash server
  Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
  there is a foreign key constraint ON ... SET NULL.

- Bug #26835: Repeatable corruption of utf8-enabled tables inside InnoDB
  The bug could be reproduced as follows:

  Define a table so that the first column of the clustered index is
  a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
  of differing length are considered equivalent.

  Insert and delete a record.  Before the delete-marked record is
  purged, insert another record whose first column is of different
  length but equivalent to the first record.  Under certain conditions,
  the insertion can be incorrectly performed as update-in-place.

  Likewise, an operation that could be done as update-in-place can
  unnecessarily be performed as delete and insert, but that would not
  cause corruption but merely degraded performance.
 2007-03-22 15:59:35 -06:00
istruewing@chilla.local
52debcb820 After merge fix 2007-03-22 21:28:28 +01:00
tsmith@siva.hindu.god
de07f782a9 Merge siva.hindu.god:/home/tsmith/m/bk/maint/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-03-22 11:48:49 -06:00
istruewing@chilla.local
1943b5da2c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug26996
 2007-03-22 16:57:07 +01:00
stewart@mysql.com[stewart]
7256b93b2e [PATCH] WL#3704 mgmapi timeouts: Fix error insert to NOT_STARTED nodes 
Turns out I broke it.

Index: ndb-work/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
===================================================================
 2007-03-22 22:36:43 +11:00
stewart@mysql.com[stewart]
f40d852fcc [PATCH] WL#3704 mgmapi timeouts: Print full error from mgmd in NdbRestarter errors 
Turns out they can be useful in working out what's going wrong.

Index: ndb-work/storage/ndb/test/src/NdbRestarter.cpp
===================================================================
 2007-03-22 22:36:31 +11:00
stewart@mysql.com[stewart]
4df1bd9c10 [PATCH] WL#3704 mgmapi timeouts: Fix infinite (0) timeout for ndb_logevent_get_next 
Index: ndb-work/storage/ndb/src/mgmapi/ndb_logevent.cpp
===================================================================
 2007-03-22 22:36:19 +11:00
stewart@mysql.com[stewart]
471469a674 [PATCH] WL#3704 mgmapi timeouts: For mgm server, have timeout per operation, not for entire connection (i.e. fix the bug) 
for TransporterRegistry, keep connection to management server alive.


Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:36:07 +11:00
stewart@mysql.com[stewart]
75cff8cd26 [PATCH] WL#3704 mgmapi timeouts: Correct cpc client usage of Socket Input/OutputStream for timeouts 
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:35:55 +11:00
stewart@mysql.com[stewart]
2d11a87978 [PATCH] WL#3704 mgmapi timeouts: Add MGMAPI tests to autotest daily run 
Index: ndb-work/storage/ndb/test/run-test/daily-basic-tests.txt
===================================================================
 2007-03-22 22:35:43 +11:00
stewart@mysql.com[stewart]
acb61e810c [PATCH] WL#3704 mgmapi timeouts: update NDBAPI usage of mgmapi for timeouts 
Default timout of 30secs for ConfigRetriever

Default timout of 5sec for use by Transporter (ports etc).

And Ndb_cluster_connection::set_timeout() api for setting timeout from
NDBAPI applications. Should be called before connect. e.g.

c.set_timeout(4200);
c.connect();

Index: ndb-work/storage/ndb/include/mgmcommon/ConfigRetriever.hpp
===================================================================
 2007-03-22 22:35:31 +11:00
stewart@mysql.com[stewart]
420e9ed86e [PATCH] WL#3704 mgmapi timeouts: use timeouts in mgm client 
as side effect - turbo accellerator patch for ndb_mgm - sholud make it quicker... so that 4mhz cpu will seem even faster.

Index: ndb-work/storage/ndb/src/mgmclient/CommandInterpreter.cpp
===================================================================
 2007-03-22 22:35:19 +11:00
stewart@mysql.com[stewart]
c537c27796 [PATCH] WL#3704 mgmapi timeouts: Change to have total timeout for call, not per request 
use portable method, getting milliseconds between calls - Linux would
let us do funky stuff by getting the timeout from select(2). Everywhere
else sucks and doesn't let us do that :(

Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:35:07 +11:00
stewart@mysql.com[stewart]
298719def2 [PATCH] WL#3704 mgmapi timeouts: clarify multiple mgmd connect timeout semantics 
Index: ndb-work/storage/ndb/include/mgmapi/mgmapi.h
===================================================================
 2007-03-22 22:34:55 +11:00
stewart@mysql.com[stewart]
e77a4480ab [PATCH] WL#3704 mgmapi timeouts: consolidate NdbMgmHandle timeouts into one 
Only one timeout value is needed. Also saves 8bytes per NdbMgmHandle :)

Index: ndb-work/storage/ndb/include/mgmapi/mgmapi.h
===================================================================
 2007-03-22 22:34:43 +11:00
stewart@mysql.com[stewart]
450d89651c [PATCH] WL#3704 mgmapi timeouts: Test for structured events timeouts (with err injection). 
Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp
===================================================================
 2007-03-22 22:34:31 +11:00
stewart@mysql.com[stewart]
6ce049dcb6 [PATCH] WL#3704 mgmapi timeouts: manipulate some things to get infrastructure for event timeouts 
Index: ndb-work/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
===================================================================
 2007-03-22 22:34:19 +11:00
stewart@mysql.com[stewart]
398d97aae0 [PATCH] WL#3704 mgmapi timeouts: renumber mgmd err insert to not have duplicates. 
Also add an ERROR_codes.txt file for mgmd

Index: ndb-work/storage/ndb/src/mgmsrv/ERROR_codes.txt
===================================================================
 2007-03-22 22:34:08 +11:00
stewart@mysql.com[stewart]
e8121e50e8 [PATCH] WL#3704 mgmapi timeouts: Return sane errors for timeout in mgmapi 
In ndb_mgm_call, add checks for expired timeout in (Input|Output)Stream.
In case of timeout, we set NdbMgmHandle->last_error and return NULL.

In api calls not using ndb_mgm_call (or using it in conjunction with
own IO), they'll need to check for timeouts manually. Macros are provided
to do this.

Add ndb_mgm_disconnect_quiet(h) to disconnect without checking errors
(so we don't clobber NdbMgmHandle->last_error). This helps us provide
the *consistent* semantic that on timeout we leave the NdbMgmHandle
*disconnected*. We check for this in testMgm.

Change CHECK_REPLY in mgmapi to also check for set error in handle->last_error
This will pick up the ETIMEDOUT errors and return them to client (through
returning correct failure code for API call and setting NdbMgmHandle error).
Applications written to MGMAPI before this patch will behave as before,
and even hopefully check get_last_error and report the error back to the
end user!

Adding the last CHECK_TIMEDOUT_RET and delete in ndb_mgm_call() we
slightly change behaviour of mgmapi. Previously, if disconnect
midway through a reply, where there were only optional parameters left,
we'd get a Properties object from ndb_mgm_call() containing NULLs for
the optional parameters, leading to interesting error messages. This
enables the returning of the *real* message and actually improves the API
without breaking compatibility.

ndb_mgm_start_signallog
ndb_mgm_stop_signallog
ndb_mgm_log_signals
ndb_mgm_set_trace
ndb_mgm_insert_error
ndb_mgm_set_int64_parameter [1]
ndb_mgm_set_string_parameter [1]
ndb_mgm_purge_stale_sessions [2]
 - return error code on error during ndb_mgm_call

TODO:
ndb_mgm_report_event [2]

[1] marked for removal, unused.
[2] return codes incorrect in CHECK_HANDLE/CONNECTED. undocumented.


Server side:
 in Services (per session) add macro for injecting timeout error
 (just waiting 10 seconds before continuing... it does work!)

 We inject these errors in a number of critical places - including
 the tricky api functions that don't just use ndb_mgm_call but do
 their own thing (get_config, get_status and friends)

ATRT:
 Expand testMgm to add timout tests for API. Fully automated.
 *THEORETICALLY* timing dependent - an ultra-slow network will
 cause problems and "fake" failures... I welcome other solutions.

 Tests aren't exhaustive, but cover the generics and the tricky bits.
 Also test some calling semantics (incl disconnected on error).

 It is encouraged to add *more* mgmapi tests, not less :)

InputStream:
  Fix where timedout error is set


Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================
 2007-03-22 22:33:56 +11:00
stewart@mysql.com[stewart]
64361ee36f [PATCH] WL#3704 mgmapi timeouts: Add bool timeout flag to Streams 
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:33:43 +11:00
stewart@mysql.com[stewart]
c2f0a25dc4 [PATCH] WL#3704 mgmapi timeouts: Rename inputstream timeout 
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:33:31 +11:00
stewart@mysql.com[stewart]
36888199ac [PATCH] WL#3704 mgmapi timeouts: add ndb_mgm_set_timeout(h,ms) 
Add not so neat set_timeout call to make testMgm work

Index: ndb-work/storage/ndb/include/mgmapi/mgmapi.h
===================================================================
 2007-03-22 22:33:19 +11:00
stewart@mysql.com[stewart]
395a24409d [PATCH] WL#3704 mgmapi timeouts: Add ndb_mgmd error injection 
Add error injection either for this connection or for whole server.

Currently nothing for injecting errors into *another* connection... but that's
perhaps getting tricky-dicky for this point in time. Perhaps needed for events
if we don't do anything fancy.

Index: ndb-work/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
===================================================================
 2007-03-22 22:33:07 +11:00
stewart@mysql.com[stewart]
272779e71e [PATCH] WL#3704 mgmapi timeouts: use NdbMgmHandle write_timeout 
Start using the write_timeout we already have in NdbMgmHandle

Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================
 2007-03-22 22:32:54 +11:00
jonas@perch.ndb.mysql.com
05a8790f0b 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-03-22 11:23:47 +01:00
jonas@perch.ndb.mysql.com
4a1c8d296b 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-03-22 11:21:26 +01:00
jonas@perch.ndb.mysql.com
155e3d1139 ndb - 
fix testprg
 2007-03-22 11:20:38 +01:00
jonas@perch.ndb.mysql.com
0e1974d2bf ndb - fix test prg 2007-03-22 11:17:57 +01:00
tomas@whalegate.ndb.mysql.com
753bc96eca Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-22 10:33:26 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
cf64eb21c3 Bug#25446, START BACKUP NOWAIT Reports error and then continues 2007-03-22 15:54:41 +08:00
pekka@clam.(none)
2082a9e35b Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
 2007-03-22 07:40:04 +01:00
tomas@whalegate.ndb.mysql.com
6e7528bd34 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-22 05:45:17 +01:00
tsmith@quadxeon.mysql.com
54e7bc8daa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-22 01:04:39 +01:00
istruewing@chilla.local
c0f03fed94 Merge chilla.local:/home/mydev/mysql-5.0-bug26996 
into  chilla.local:/home/mydev/mysql-5.1-bug26996
 2007-03-21 17:38:42 +01:00
tomas@poseidon.mysql.com
e1cd5c67dc 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-03-21 16:34:23 +01:00
jonas@perch.ndb.mysql.com
ca00e63853 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-03-21 15:37:14 +01:00
jonas@perch.ndb.mysql.com
2cd7ff4e8a 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-03-21 15:36:23 +01:00
jonas@perch.ndb.mysql.com
8a149f2638 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-21 15:35:22 +01:00
svoj@june.mysql.com
9f3320e2e1 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25908/mysql-5.1-engines
 2007-03-21 17:13:19 +04:00
svoj@mysql.com/june.mysql.com
b88e7e0f97 BUG#25908 - corrupted myisam table crashes server even after repair 
Opening certain tables that have different definitions in .MYI and
.frm may result in a server crash.

Compare .MYI and .frm definition when myisam table is opened. In case
definitions are diffirent refuse to open such table.

No test case, since it requires broken table.
 2007-03-21 17:12:30 +04:00
tomas@whalegate.ndb.mysql.com
db9a44ce49 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-03-21 09:29:03 +01:00
tomas@whalegate.ndb.mysql.com
d2f8bd9ae7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-21 09:28:22 +01:00
jonas@perch.ndb.mysql.com
62fde95e08 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-03-21 09:07:55 +01:00
jonas@perch.ndb.mysql.com
762ddadc24 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-03-21 09:06:44 +01:00
jonas@perch.ndb.mysql.com
ec97b008f0 ndb - bug#27286 
make sure master node is sendable, when getting ref::NotMaster
 2007-03-21 08:47:54 +01:00
tomas@whalegate.ndb.mysql.com
38ac10df54 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-21 08:23:15 +01:00
tomas@whalegate.ndb.mysql.com
3ab996f18f correct event buffer status reporting 2007-03-21 08:22:36 +01:00
brian@zim.(none)
9da24df4e0 Modified read buffer to see if performance difference existed. 
Re-enabled 8gig unit test.
 2007-03-20 22:13:55 -07:00
tsmith@quadxeon.mysql.com
7018d9c5aa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:12:46 +01:00
tsmith@quadxeon.mysql.com
2250d1a752 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:05:48 +01:00
istruewing@chilla.local
0282c199a0 Merge chilla.local:/home/mydev/mysql-5.1-bug17332-old 
into  chilla.local:/home/mydev/mysql-5.1-bug17332
 2007-03-20 17:59:09 +01:00
kent@kent-amd64.(none)
a149769b2d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 17:58:30 +01:00
tomas@whalegate.ndb.mysql.com
3f16977b32 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-20 17:08:23 +01:00
tomas@whalegate.ndb.mysql.com
7bd5241cb4 enabled test case 
+ some fixes to do the enable
 2007-03-20 17:07:53 +01:00
jonas@perch.ndb.mysql.com
8c3751209c 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-03-20 16:36:31 +01:00
jonas@perch.ndb.mysql.com
42b3e0a5af Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-20 16:32:11 +01:00
iggy@recycle.(none)
ebbd5525ca Post Merge Fix. 2007-03-20 10:22:15 -04:00
tomas@whalegate.ndb.mysql.com
64b9bda21f BUG#24363 If the table structure has been changed, the default action about the restore will fail. 
- correction of patch, original patch will segfault for print option
 2007-03-20 11:11:08 +01:00
tomas@poseidon.
0312d1bf91 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2007-03-20 08:57:34 +01:00
gni/root@dev3-221.dev.cn.tlan
61dd58beb3 BUG#21699 DROP last DATAFILE from TABLESPACE even though there are still table in it. And it gives the cofusing error message. 2007-03-20 10:36:20 +08:00
kostja@bodhi.local
bdb10baec1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-03-20 00:42:11 +03:00
jonas@perch.ndb.mysql.com
925f06e511 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-03-19 18:30:06 +01:00
jonas@perch.ndb.mysql.com
229ee6d4f1 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-03-19 14:55:13 +01:00
jonas@perch.ndb.mysql.com
886e11736b ndb - test_event 
Fix compile error with gcc4
 2007-03-19 14:51:17 +01:00
tomas@whalegate.ndb.mysql.com
571c869e12 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-19 12:58:17 +01:00
jonas@perch.ndb.mysql.com
6856693904 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-03-19 12:39:03 +01:00
tomas@whalegate.ndb.mysql.com
9b90dd9c9f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-19 12:31:33 +01:00
jonas@perch.ndb.mysql.com
09e403aa9e ndb - bug#20185 
Fix race in testprg...causing random TC crashes
 2007-03-19 12:31:23 +01:00
tomas@poseidon.
a0bbe77c9c Merge poseidon.:/home/tomas/mysql-5.1 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2007-03-19 11:37:09 +01:00
jonas@perch.ndb.mysql.com
582312fd34 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-03-19 11:15:05 +01:00
jonas@perch.ndb.mysql.com
bdb70f7b43 ndb - autotest 
increase some timeouts...
 2007-03-19 11:13:10 +01:00
tomas@poseidon.
12fd06a6cb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2007-03-19 10:54:47 +01:00
serg@janus.mylan
68fd66e853 wl#3700 - post-review fixes: 
s/ulonglong/key_part_map/, comments
 2007-03-17 00:13:25 +01:00
serg@janus.mylan
55a548cf4d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-03-16 20:33:27 +01:00
istruewing@chilla.local
02d318e4bd Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug26782
 2007-03-16 16:44:21 +01:00
serg@janus.mylan
f813272125 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-03-16 14:09:30 +01:00
jonas@perch.ndb.mysql.com
40c3797ef0 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-03-16 11:13:01 +01:00
jonas@perch.ndb.mysql.com
a8a220534c 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-03-16 11:12:15 +01:00
jonas@perch.ndb.mysql.com
f161857d3e ndb - bug#27203 
Allow readTablePk to stumble on scan+deleted tuple,
      reporting no-match instead of crash (in case scan is lock-owner)
 2007-03-16 10:58:24 +01:00
istruewing@blade08.mysql.com
dba23b56e5 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25289
 2007-03-16 09:17:12 +01:00
holyfoot/hf@hfmain.(none)
1d0b7020b3 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-16 11:54:36 +04:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
8d40069c3c Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-merge
 2007-03-16 11:02:57 +08:00
kostja@bodhi.local
7d84ef0e11 Bug#26765 "typo when running mysql-test-run" 
Fix a typo (togheter -> together)
 2007-03-15 23:17:44 +03:00
istruewing@chilla.local
b1c5288e2e Merge chilla.local:/home/mydev/mysql-5.0-bug25289 
into  chilla.local:/home/mydev/mysql-5.1-bug25289
 2007-03-15 14:45:25 +01:00
hartmut@hartmut-desktop.buero.foebud.org
d2986bff2e Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/home/hartmut/projects/mysql/dev/bug-trees/mysql-5.1-bug25933
 2007-03-15 13:52:25 +01:00
jonas@perch.ndb.mysql.com
85220e3940 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-03-15 13:37:04 +01:00
hartmut@mysql.com/hartmut-desktop.buero.foebud.org
4c9f4a006f added missing prototype implementations (bug #25933) 2007-03-15 13:35:49 +01:00
jonas@perch.ndb.mysql.com
1bf8202fce ndb - bug#27169 
Fix bug in SUMA::resend_bucket which could cause mysqld to crash
 2007-03-15 13:30:42 +01:00
holyfoot/hf@hfmain.(none)
6767673750 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-15 16:22:32 +04:00
jonas@perch.ndb.mysql.com
f8483eccc3 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-03-15 11:06:57 +01:00
jonas@perch.ndb.mysql.com
1c203fcc04 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-15 11:06:01 +01:00
dlenev@mockturtle.local
d9d887ad6d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg25966
 2007-03-15 11:00:54 +03:00
jonas@perch.ndb.mysql.com
14de245543 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-03-15 07:16:44 +01:00
jonas@perch.ndb.mysql.com
1fa2a64778 ndb - 
fix test_event -n EventOperationApplier
 2007-03-15 07:08:15 +01:00
jonas@perch.ndb.mysql.com
a7714519a7 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-03-14 15:41:24 +01:00
jonas@perch.ndb.mysql.com
72bd367013 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-03-14 15:40:06 +01:00
jonas@perch.ndb.mysql.com
3b21f00f87 ndb - bug#27005 
Handle API failure during resend
    API failure could cause release of table object, which will make resend crash
      when dereferencing table object
      
    Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend
 2007-03-14 15:37:47 +01:00
kent@kent-amd64.(none)
ac91a4a89f Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-14 14:37:50 +01:00
kent@kent-amd64.(none)
52ef6aa5ed Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-14 14:32:30 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
1bcac85f04 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
 2007-03-14 18:48:51 +08:00
jonas@perch.ndb.mysql.com
f2465cf677 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-03-14 11:23:58 +01:00
jonas@perch.ndb.mysql.com
820901f928 ndb - bug#27087 
Make sure not to handle API_FAILREQ if it's already handled
 2007-03-14 11:22:11 +01:00
istruewing@blade08.mysql.com
b6a66ee829 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25460
 2007-03-14 11:20:06 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
9b77ac20a5 Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-03-14 10:16:24 +08:00
svoj@april.(none)
94f0977b86 Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
 2007-03-14 04:48:43 +04:00
jonas@perch.ndb.mysql.com
ac52f24ece 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-03-13 21:04:28 +01:00
jonas@perch.ndb.mysql.com
5ea42fb2ea ndb - bug#27102 
Make sure head after undo execute does not point to last page of file
  As this will confuse next write to group
 2007-03-13 21:03:34 +01:00
istruewing@blade08.mysql.com
d3b7fce8cf Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25460
 2007-03-13 17:55:04 +01:00
istruewing@chilla.local
67d97254b0 Bug#25460 - High concurrency MyISAM access causes severe mysqld crash. 
The previous two patches for this bug worked together so that
no permanent table was memory mapped. The first patch tried to
avoid mapping while a table is in use. It allowed mapping only
if there was exactly one lock on the table, assuming that the
calling thread owned it. During mi_open(), a different call to
memory mapping was coded, which did not have this limitation.

The second patch tried to remove the code duplication and just
called mi_extra() from mi_open() an thus inherited the limitation.
But on open, a thread does not have a lock on the table...

A possible solution would be to check for zero or one lock.
But since I learned that it is safe to memory map a file while
normal file I/O is done on it, I removed the restriction altogether
and allow to memory map while a table is in use.

No test case. I do not see a chance to verify with the test suite
which kind of I/O is used on a table.
 2007-03-13 16:43:45 +01:00
svoj@april.(none)
31329c83c0 Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
 2007-03-13 19:05:35 +04:00
svoj@april.(none)
dfc078fc50 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines
 2007-03-13 17:08:11 +04:00
jonas@perch.ndb.mysql.com
023ce289b6 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-03-13 13:56:51 +01:00
jonas@perch.ndb.mysql.com
4a27e9adb9 ndb - bug#27003 
merge to 5.1, adopt testprg to optimized node recovery
 2007-03-13 12:38:47 +01:00
jonas@perch.ndb.mysql.com
620731060f Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-13 12:07:33 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
8b049838bf Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb.test 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.test
 2007-03-13 18:18:17 +08:00
lzhou/zhl@dev3-63.(none)
9fb5e5d08b Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug26307
 2007-03-13 10:13:04 +00:00
knielsen@ymer.(none)
4fe26832e4 Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2007-03-12 08:42:59 +01:00
xxx/istruewing@blade08.mysql.com
1781a96fc5 Merge bk://localhost:5556 
into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25673
 2007-03-09 19:52:14 +01:00
istruewing@chilla.local
3e608ee1f0 Merge chilla.local:/home/mydev/mysql-5.0-bug25673 
into  chilla.local:/home/mydev/mysql-5.1-bug25673
 2007-03-09 19:50:49 +01:00
gkodinov/kgeorge@magare.gmz
c03a483c51 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
 2007-03-09 17:54:13 +02:00
tomas@poseidon.mysql.com
175a7e9e86 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1
 2007-03-09 20:44:44 +07:00
tomas@poseidon.mysql.com
6f5ac3c03a Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-03-09 20:38:10 +07:00
tomas@poseidon.mysql.com
a8cd78dd05 Bug #26825 MySQL Server Crashes in high load 
Bug #26997  	mysqld segfault when in single user mode
 2007-03-09 20:29:46 +07:00
tomas@poseidon.mysql.com
87b8cf843e Merge poseidon.mysql.com:/home/tomas/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-09 18:18:52 +07:00
tomas@poseidon.mysql.com
7e32a4b86b Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1
 2007-03-09 18:10:55 +07:00
jonas@perch.ndb.mysql.com
5a6952b8c5 Merge perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.0-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca
 2007-03-09 11:50:32 +01:00
kroki/tomash@moonlight.home
7bbea96754 Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug9953
 2007-03-09 13:17:46 +03:00
kroki/tomash@moonlight.home
c19affef54 BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked 
The problem was that some facilities (like CONVERT_TZ() function or
server HELP statement) may require implicit access to some tables in
'mysql' database.  This access was done by ordinary means of adding
such tables to the list of tables the query is going to open.
However, if we issued LOCK TABLES before that, we would get "table
was not locked" error trying to open such implicit tables.

The solution is to treat certain tables as MySQL system tables, like
we already do for mysql.proc.  Such tables may be opened for reading
at any moment regardless of any locks in effect.  The cost of this is
that system table may be locked for writing only together with other
system tables, it is disallowed to lock system tables for writing and
have any other lock on any other table.

After this patch the following tables are treated as MySQL system
tables:
  mysql.help_category
  mysql.help_keyword
  mysql.help_relation
  mysql.help_topic
  mysql.proc (it already was)
  mysql.time_zone
  mysql.time_zone_leap_second
  mysql.time_zone_name
  mysql.time_zone_transition
  mysql.time_zone_transition_type

These tables are now opened with open_system_tables_for_read() and
closed with close_system_tables(), or one table may be opened with
open_system_table_for_update() and closed with close_thread_tables()
(the latter is used for mysql.proc table, which is updated as part of
normal MySQL server operation).  These functions may be used when
some tables were opened and locked already.

NOTE: online update of time zone tables is not possible during
replication, because there's no time zone cache flush neither on LOCK
TABLES, nor on FLUSH TABLES, so the master may serve stale time zone
data from cache, while on slave updated data will be loaded from the
time zone tables.
 2007-03-09 13:12:31 +03:00
gni/root@dev3-221.dev.cn.tlan
afd6dbbc57 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug25992
 2007-03-09 18:04:34 +08:00
xxx/istruewing@blade08.mysql.com
0ba036f783 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25673
 2007-03-09 10:08:39 +01:00
tomas@poseidon.mysql.com
451a8b7772 BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), ndbd nodes are crashed 2007-03-09 10:21:11 +07:00
istruewing@chilla.local
651b7b7fc1 Merge chilla.local:/home/mydev/mysql-5.0-bug25673 
into  chilla.local:/home/mydev/mysql-5.1-bug25673
 2007-03-08 21:29:19 +01:00
tomas@poseidon.mysql.com
f4e0bc78dd Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-09 01:01:20 +07:00
tomas@poseidon.mysql.com
1d13b0e2e8 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-09 00:49:30 +07:00
tsmith@bk-internal.mysql.com
8539d9a7bd The most recent push into mysql-5.1 from mysql-5.2 was a mistake. 
This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)
 2007-03-08 18:38:17 +01:00
tsmith@bk-internal.mysql.com
bb273143fc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2
 2007-03-08 17:55:20 +01:00
istruewing@chilla.local
a44009fe75 Merge chilla.local:/home/mydev/mysql-5.0-bug25673 
into  chilla.local:/home/mydev/mysql-5.1-bug25673
 2007-03-08 12:13:54 +01:00
gni/root@dev3-221.dev.cn.tlan
f1b05f294b BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), 
ndbd nodes are crashed
 2007-03-08 17:47:13 +08:00
tomas@poseidon.mysql.com
e4eb1c0087 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-08 15:57:33 +07:00
tomas@poseidon.mysql.com
12bf7fbee5 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-08 10:41:22 +07:00
tulin/mysqldev@mysql.com/production.mysql.com
ecd1dd17f2 Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint
 2007-03-08 04:27:41 +01:00
tsmith@quadxeon.mysql.com
82c403e608 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
 2007-03-08 03:20:16 +01:00
tomas@poseidon.mysql.com
8370b2c5e0 Merge poseidon.mysql.com:/home/tomas/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-08 08:39:49 +07:00
tomas@poseidon.mysql.com
f81ff454f0 new apply_status table test adoption 
new apply_status table ndb_restore adoption
 2007-03-08 08:22:27 +07:00
kent@kent-amd64.(none)
1c09a96cf5 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-07 23:08:54 +01:00
tomas@poseidon.mysql.com
7c6b3d6ca7 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-08 00:27:54 +07:00
istruewing@chilla.local
ef885b8e7e Bug#26782 - Patch: myisamchk -rq creates .MYI.MYI file 
on packed MyISAM tables

When fixing the indexes with "myisamchk -rq" after compressing
the table with "myisampack", an optionally supplied extension
".MYI" of the index file was not detected. The extension was
appended unconditionally. The result was ".MYI.MYI".

Now an extension is no longer appended if present already.
Thanks to David Shrewsbury for providing this patch.

Another problem was a misplaced parenthesis. We did never unpack
the file name ("~/..") and always returned a real path.

No test case. This is manually tested with the utilities
"myisampack" and "myisamchk".
 2007-03-07 16:30:13 +01:00
tomas@poseidon.mysql.com
da38893f6d Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-07 20:06:23 +07:00
tomas@poseidon.mysql.com
3d882032e3 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
 2007-03-07 15:31:11 +07:00
tomas@poseidon.mysql.com
97ceb61fff corrected manual merge 2007-03-07 14:20:37 +07:00