mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50330 commits 2784 branches 343 tags 1.6 GiB
Commit graph

2523 commits

Author SHA1 Message Date
istruewing@synthia.local
fd58622757 Post-merge fixes. 2007-06-30 18:17:20 +02:00
istruewing@synthia.local
bc3e18cd39 Merge synthia.local:/home/mydev/mysql-5.0-axmrg 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-06-30 13:17:49 +02:00
istruewing@synthia.local
b747b6b9d9 Merge synthia.local:/home/mydev/mysql-5.1-ateam 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-06-30 00:42:59 +02:00
svoj@june.mysql.com
0cb2099c2d Merge mysql.com:/home/svoj/devel/mysql/BUG29250/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29250/mysql-5.1-engines
 2007-06-28 12:13:57 +05:00
tomas@poseidon.mysql.com
5d5b7ac244 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-28 07:08:37 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2ca3289e3e Fix for bug #29353: inserting a negative value to a csv table leads to the table corruption 
Problem: we believe a number cannot start with '-' ['+'] sign reading rows.

Fix: let field->store() check given values.
 2007-06-27 16:20:00 +05:00
jonas@perch.ndb.mysql.com
c54681a48c 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-06-26 15:42:50 +02:00
jonas@perch.ndb.mysql.com
2411cbeecb 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-06-26 15:20:19 +02:00
jonas@perch.ndb.mysql.com
0e753bbb47 ndb - bug#29331 (51) 
Add better handling of GCP Stop
    Only kill "offending" node
 2007-06-26 15:19:42 +02:00
pekka@ndb13.mysql.com
e033bd20a6 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51-gca 
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug29176
 2007-06-25 09:16:43 +02:00
jonas@perch.ndb.mysql.com
ef74a65cf1 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-06-25 07:18:00 +02:00
jonas@perch.ndb.mysql.com
dfd8deebd5 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-06-25 07:14:21 +02:00
jonas@perch.ndb.mysql.com
259810d458 ndb - post merge 50/51 - bug#29057 bug#29067 and bug#29118 2007-06-25 07:12:27 +02:00
jonas@perch.ndb.mysql.com
3c3b680764 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-06-25 07:09:53 +02:00
pekka@clam.ndb.mysql.com/ndb13.mysql.com
0946ceeb7d ndb - bug#29176 pgman: another missing stack pruning related to drop table 2007-06-24 22:14:09 +02:00
istruewing@chilla.local
9d3c6858af Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-24 16:46:16 +02:00
svoj@april.(none)
c62450bbb9 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG28971/mysql-5.1-engines
 2007-06-22 23:14:59 +05:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
bbcfb1801a updated for bug#28770 2007-06-22 17:05:14 +02:00
tsmith@maint1.mysql.com
764a7a911c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-22 11:30:17 +02:00
mats@kindahl-laptop.dnsalias.net
ad065829f2 Fixes to replication team tree. 2007-06-22 07:32:39 +02:00
mats@kindahl-laptop.dnsalias.net
6821e5ca5d BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 
Removing dead code.
 2007-06-22 02:27:18 +02:00
mats@kindahl-laptop.dnsalias.net
7672a81590 BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 
Minor fixes to get proper detection of transaction isolation level when
inside external_lock().
 2007-06-22 01:08:26 +02:00
mats@kindahl-laptop.dnsalias.net
8e5d1784c9 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
 2007-06-21 21:35:26 +02:00
iggy@amd64.(none)
08cb616544 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  amd64.(none):/src/bug27029/my51-bug27029
 2007-06-21 12:53:03 -04:00
iggy@amd64.(none)
adcf736687 Merge amd64.(none):/src/bug27029/my50-bug27029 
into  amd64.(none):/src/bug27029/my51-bug27029
 2007-06-21 12:47:55 -04:00
mats@kindahl-laptop.dnsalias.net
5491df5ae9 BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 
Moving error generating code from table_flags() to external_lock().
 2007-06-21 14:02:46 +02:00
tomas@whalegate.ndb.mysql.com
3bd4019fad Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-20 06:26:23 +02:00
tomas@whalegate.ndb.mysql.com
956b92059b 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-06-20 05:46:36 +02:00
tomas@whalegate.ndb.mysql.com
0510a696a9 Bug #29229 memory corruption in dbtup 2007-06-20 05:41:54 +02:00
tomas@whalegate.ndb.mysql.com
6a51e0f8a2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-18 23:55:48 +02:00
tomas@whalegate.ndb.mysql.com
f3a7284521 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-06-18 23:49:30 +02:00
pekka@clam.ndb.mysql.com/ndb13.mysql.com
405f6a1681 ndb - bug#29176 missing stack pruning in drop_page 2007-06-18 16:03:41 +02:00
lars/lthalmann@dl145h.mysql.com
a2d93c53db Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 12:10:36 +02:00
lars/lthalmann@dl145j.mysql.com
ae52876fd0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 09:42:22 +02:00
jonas@perch.ndb.mysql.com
6d6eca5f3e 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-06-18 07:49:33 +02:00
jonas@perch.ndb.mysql.com
8308d3781b ndb - bug#29167 
Fix case where all node in node group dies before they saved sysfile (wrt gcp)
  and Qmgr incorrectly thinks that "node group is missing"
 2007-06-18 07:48:59 +02:00
tomas@whalegate.ndb.mysql.com
830be6deac Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 17:21:27 +02:00
istruewing@chilla.local
938fc3d66e Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-16 13:14:23 +02:00
iggy@alf.
e0adab8ce7 Merge alf.:D:/src/mysql-5.1-maint 
into  alf.:D:/src/mysql-5.1-maint_winemb
 2007-06-15 14:45:44 -04:00
iggy@alf.
c15a2647a0 Embedded Server doesn't build on Windows. 
- Add build configuration parameter EMBEDDED_ONLY which will configure 
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
 2007-06-15 14:32:16 -04:00
bar@bar.myoffice.izhnet.ru
615297df8b Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28862
 2007-06-15 11:27:10 +05:00
antony@ppcg5.local
21c233440d Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6 
into  ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge
 2007-06-14 16:04:52 -07:00
svoj@mysql.com/april.(none)
8f5b6ec237 BUG#28971 - ALTER TABLE followed by UPDATE for a CSV table 
make server crash

UPDATE against CSV table may cause server crash or update a table with wrong
values.

CSV can write only a whole row at once. That means it must read all columns,
that it is not going to update, and write them along with updated columns.
But only limited set of columns was read, those that were needed for the
UPDATE query.

With this fix all columns are read in case we're performing an UPDATE.
 2007-06-15 03:22:40 +05:00
mskold/marty@linux.site
2b2bdf74a3 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-06-14 21:57:30 +02:00
mskold/marty@linux.site
7b99f8a0fc 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-06-14 19:08:46 +02:00
tomas@whalegate.ndb.mysql.com
c9798697df 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-06-14 19:07:29 +02:00
tomas@whalegate.ndb.mysql.com
0da2eb5ce3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-14 18:43:29 +02:00
mskold/marty@linux.site
754b7f59a4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-06-14 16:18:40 +02:00
tomas@whalegate.ndb.mysql.com
1c8219c58d bug#29099 - slow backup for disk data 
- implement read ahead during disk data scan
 2007-06-14 16:10:13 +02:00
mskold/marty@linux.site
c487c38111 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-06-14 16:10:11 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
27430cd10b 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/bug27640-5.1-new-ndb
 2007-06-14 20:30:48 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
36584cf3f7 Bug#27640, backup id not dispalyed in the output of "ndb_mgm start backup wait completed" 
correct related sourcecode after merge from 5.0
 2007-06-14 20:25:45 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
04931cfcd6 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
 2007-06-14 19:57:50 +08:00
mats@kindahl-laptop.dnsalias.net
0341be4eb3 BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 
Temporarily using thd_tx_isolation() until decision is made on how to
get the isolation level.
 2007-06-14 13:33:31 +02:00
svoj@june.mysql.com
09cd5b5ef8 Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
 2007-06-14 16:19:47 +05:00
tomas@whalegate.ndb.mysql.com
48c43e00b9 Makefile.am: 
new public file needs to get into distribution
 2007-06-14 12:57:32 +02:00
tomas@whalegate.ndb.mysql.com
b2aa8dd4d3 Bug #29103 ndb_restore segfaults on NULL var[char|binary] 2007-06-14 12:51:13 +02:00
tomas@whalegate.ndb.mysql.com
ca7180c73e get mgmapi error codes into perror 2007-06-14 12:35:35 +02:00
tomas@whalegate.ndb.mysql.com
71bbcc0e84 move all error codes to ndberror.c 
- step 1 mgmtsrvr error codes
 2007-06-14 11:26:54 +02:00
stewart@willster.(none)
afdee6e0a5 fix build of mgm client with history - caught by pb. 2007-06-14 11:59:25 +10:00
stewart@flamingspork.com[stewart]
13c4d317bb [PATCH] add knielsen as MAINTAINER of NDBAPI NdbRecord examples 
Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================
 2007-06-13 23:53:01 +10:00
stewart@flamingspork.com[stewart]
1518abe7f9 [PATCH] Add MAINTAINERS file for NDB 
Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================
 2007-06-13 23:52:47 +10:00
stewart@flamingspork.com[stewart]
155390c3a7 [PATCH] BUG#29074 preserve file timestamps in ndb_error_reporter 
Index: ndb-work/storage/ndb/tools/ndb_error_reporter
===================================================================
 2007-06-13 23:34:36 +10:00
stewart@flamingspork.com[stewart]
7a8961fca3 [PATCH] BUG#29073 Store history for ndb_mgm 
Index: ndb-work/storage/ndb/src/mgmclient/main.cpp
===================================================================
 2007-06-13 23:34:09 +10:00
stewart@flamingspork.com[stewart]
23eb8698dc [PATCH] BUG#29063 mgmapi: connect timeout set incorrectly 
correctly divide timeout by 1000 to convert to seconds for SocketClient

Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================
 2007-06-13 22:54:14 +10:00
stewart@flamingspork.com[stewart]
17fc7a8161 [PATCH] BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly 
Add test to testMgm for Connect timeout. add to autotest.

Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp
===================================================================
 2007-06-13 22:54:00 +10:00
mats@kindahl-laptop.dnsalias.net
143a895b4f Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
 2007-06-12 22:14:54 +02:00
mats@kindahl-laptop.dnsalias.net
ec58bfb28a Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
 2007-06-12 22:02:46 +02:00
mats@kindahl-laptop.dnsalias.net
526a0cecda BUG#23051 (READ COMMITTED breaks mixed and statement-based 
replication):

Patch to add binlog format capabilities to the InnoDB storage engine.
The engine will not allow statement format logging when in READ COMMITTED
or READ UNCOMMITTED transaction isolation level.

In addition, an error is generated when trying to use READ COMMITTED
or READ UNCOMMITTED transaction isolation level in STATEMENT binlog
mode.
 2007-06-12 21:47:00 +02:00
tomas@whalegate.ndb.mysql.com
e0f321333f 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-06-12 10:38:10 +02:00
tomas@whalegate.ndb.mysql.com
2606bb1ce5 Bug#29044 - memory buddy allocator "unoptimal" memory handling 
- add config param to have better behavior with large tables
 2007-06-12 10:35:21 +02:00
tomas@whalegate.ndb.mysql.com
a09ef976d3 extend backup dump to give more info 2007-06-12 10:06:20 +02:00
jonas@perch.ndb.mysql.com
c11806db9a 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-06-12 09:17:39 +02:00
jonas@perch.ndb.mysql.com
4b8baaaed1 ndb - bug#29044 
Improve buddy high order allocation
  Make removeCommonArea O(1) instead of O(N)
  Add limit to left/right search
 2007-06-12 09:13:42 +02:00
tomas@whalegate.ndb.mysql.com
0b58af0911 make function static 2007-06-11 17:50:39 +02:00
tomas@whalegate.ndb.mysql.com
5556ec7cef change include file 2007-06-11 17:28:52 +02:00
tomas@whalegate.ndb.mysql.com
352e93df73 internal interface to ndb (to be used by e.g. ndb_restore) 2007-06-11 17:19:20 +02:00
pekka@clam.ndb.mysql.com/ndb15.mysql.com
03fc4e6ca0 ndb - bug#28724 for blobs, op flag to not set error on trans (fix, recommit) 2007-06-08 12:27:52 +02:00
svoj@mysql.com/june.mysql.com
a1529d92d1 BUG#26976 - Missing table in merge not noted in related error msg + 
SHOW CREATE TABLE fails

After merge fixes.
 2007-06-08 11:20:50 +05:00
svoj@june.mysql.com
d0a044a0bf Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
 2007-06-07 13:53:23 +05:00
tomas@whalegate.ndb.mysql.com
016cf69867 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-06-06 16:51:04 +02:00
istruewing@chilla.local
a28abc0554 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-06-05 21:40:46 +02:00
tomas@poseidon.mysql.com
8fd5212a9f Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-05 18:00:42 +02:00
tomas@poseidon.mysql.com
ce93bc3d13 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-06-05 17:51:53 +02:00
tomas@poseidon.mysql.com
47d5fb91d2 Bug #28751 Lots of memory locked in memory causes high kswapd 
- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
- writing odirect removes need for kernel write buffers avoiding kswapd to kick in
 2007-06-05 17:29:50 +02:00
tomas@poseidon.mysql.com
8c35f44b21 Bug #28899 not possible to set separate watchdog timeout at startup 2007-06-05 17:06:33 +02:00
tomas@whalegate.ndb.mysql.com
c5e13ae053 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-06-04 22:23:14 +02:00
jonas@perch.ndb.mysql.com
50d2a6de0c 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-06-04 11:59:14 +02:00
jonas@perch.ndb.mysql.com
130667233a ndb - bug#28726 
make sure to remove LCP files aswell if specifying --initial
 2007-06-04 11:58:25 +02:00
joerg@trift2.
d822cf03e5 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-04 11:24:49 +02:00
jonas@perch.ndb.mysql.com
79da61069b ndb - 
update dl145a config for autotest
 2007-06-04 10:32:32 +02:00
jonas@perch.ndb.mysql.com
eab3e836e8 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-06-04 10:29:57 +02:00
jonas@perch.ndb.mysql.com
b8e43a1d9d ndb - make size of redo log files (fragment log files) configurable 
using new config variable FragmentLogFileSize (4M - 1G)
 2007-06-04 10:27:10 +02:00
tomas@whalegate.ndb.mysql.com
4ef92c285b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-06-03 19:41:14 +02:00
tomas@whalegate.ndb.mysql.com
7523452de1 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-06-03 19:31:53 +02:00
tomas@whalegate.ndb.mysql.com
8a9bf13922 Bug#20612. 2007-06-03 19:30:37 +02:00
tomas@whalegate.ndb.mysql.com
eb5fd16e59 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
 2007-06-02 06:33:18 +02:00
kostja@bodhi.(none)
16633169e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-06-01 12:12:06 +04:00
istruewing@chilla.local
4ba6a0fb7e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-05-31 21:28:04 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
2c8f4f9791 Added casts to avoid compiler warnings and fixed a wrong type. 
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.
 2007-05-31 17:45:22 +03:00
tomas@whalegate.ndb.mysql.com
4605e9e5a9 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-05-30 17:32:20 +02:00
tomas@whalegate.ndb.mysql.com
fa3c9a0694 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-05-30 17:30:18 +02:00
tomas@whalegate.ndb.mysql.com
44fc6a9288 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-05-30 12:36:33 +02:00
tomas@whalegate.ndb.mysql.com
a0cfb015a7 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-05-30 12:35:00 +02:00
tomas@whalegate.ndb.mysql.com
882535f4c2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-30 09:02:51 +02:00
tomas@whalegate.ndb.mysql.com
2c3c36dfe6 shorten some files for tar to work 2007-05-29 23:39:57 +02:00
tomas@whalegate.ndb.mysql.com
f43bbc123d 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-05-29 09:39:57 +02:00
tomas@whalegate.ndb.mysql.com
c9e5509fcb 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-05-29 09:29:51 +02:00
jonas@perch.ndb.mysql.com
151e4f4534 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-05-29 07:23:39 +02:00
jonas@perch.ndb.mysql.com
226ef1ed22 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-05-29 07:20:32 +02:00
jonas@perch.ndb.mysql.com
dc65597952 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-05-29 07:18:44 +02:00
tomas@whalegate.ndb.mysql.com
75ec66e13e 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-05-28 16:35:37 +02:00
tomas@whalegate.ndb.mysql.com
eb1ab68600 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-05-28 16:32:50 +02:00
tomas@whalegate.ndb.mysql.com
8ea3aeb11b 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-05-28 16:14:52 +02:00
tomas@whalegate.ndb.mysql.com
06a2aab79e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-05-28 16:06:34 +02:00
mskold/marty@linux.site
9ad3721e95 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-28 15:00:18 +02:00
tomas@whalegate.ndb.mysql.com
248c4ac946 Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire 
- correction, backport to 5.0
 2007-05-28 13:05:05 +02:00
tomas@whalegate.ndb.mysql.com
8c3eb6c272 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-28 13:00:09 +02:00
mats@kindahl-laptop.dnsalias.net
9a92325c02 WL#3303 (RBR: Engine-controlled logging format): 
Adding support to allow engines to tell what formats they can handle.
The server will generate an error if it is not possible to log the
statement according to the logging mode in effect.

Adding flags to several storage engines to state what they can handle.

Changes to NDB handler removing code that forces row-based mode and
adding flag saying that NDB can only handle row format.

Adding check that binlog flags are only used for real tables that are
opened for writing.
 2007-05-28 12:50:29 +02:00
tomas@whalegate.ndb.mysql.com
d5303f4aef 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-05-28 12:22:21 +02:00
tomas@whalegate.ndb.mysql.com
3850902ad1 Bug #28525 Node failures in PGMAN at ndbrequire (line 430) 
(part 2)
 2007-05-28 12:20:34 +02:00
svoj@mysql.com/june.mysql.com
5d71c2f885 BUG#18839 - return value of parser->parse() is ignored 
Check value returned by parser->parse(). Better handle situations
when it fails.
 2007-05-28 13:27:26 +05:00
lars/lthalmann@dl145h.mysql.com
95068ddacb Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-05-28 09:25:40 +02:00
tomas@whalegate.ndb.mysql.com
98b4d7a810 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-05-25 12:26:11 +02:00
tomas@whalegate.ndb.mysql.com
d259028183 Bug #28525 Node failures in PGMAN at ndbrequire (line 430) 2007-05-25 12:25:15 +02:00
tomas@whalegate.ndb.mysql.com
28769b0f25 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-24 21:02:44 +02:00
jani@linux-th5m.site
ee4d6b4fc0 Merged from main 5.1 2007-05-24 19:47:58 +03:00
tomas@whalegate.ndb.mysql.com
1b7e33d8f4 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
 2007-05-24 17:01:16 +02:00
tomas@whalegate.ndb.mysql.com
fe8db78b9a Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire 
- correction, use recomputed _actual_ redobuffer
 2007-05-24 16:50:38 +02:00
tomas@whalegate.ndb.mysql.com
39aa3e99ea Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire 
- parameterize on RedoBuffer
 2007-05-24 16:40:05 +02:00
jani@linux-th5m.site
f1807e1f25 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  linux-th5m.site:/home/my/mysql-5.1-marvel
 2007-05-24 15:26:10 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
fc3b3a0a86 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
 2007-05-24 13:24:36 +03:00
lars/lthalmann@dl145h.mysql.com
8b1deb28bf Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-05-24 09:07:35 +02:00
svoj@june.mysql.com
442969fd16 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-05-23 12:41:30 +05:00
tomas@whalegate.ndb.mysql.com
a4934466c0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-22 23:21:32 +02:00
tomas@whalegate.ndb.mysql.com
2c715f1ad4 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-05-22 17:57:48 +02:00
tomas@whalegate.ndb.mysql.com
b46c826aee Bug #28593 cluster backup scans in acc index order, bad for disk data 
- change to scan in tup and disk order (if applicable)
 2007-05-22 17:53:07 +02:00
tsmith@quadxeon.mysql.com
672237f5b5 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-21 20:51:31 +02:00
tomas@whalegate.ndb.mysql.com
ffe2982b99 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-21 09:01:06 +02:00
tomas@whalegate.ndb.mysql.com
a2b2bbd925 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-05-21 08:48:33 +02:00
jonas@perch.ndb.mysql.com
be3342cf7c 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-05-18 11:37:30 +02:00
jonas@perch.ndb.mysql.com
2c60a173ab Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-05-18 11:36:24 +02:00
jonas@perch.ndb.mysql.com
f975b3e398 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-05-18 11:16:47 +02:00
jonas@perch.ndb.mysql.com
2457643b40 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-05-18 11:10:04 +02:00
jonas@perch.ndb.mysql.com
fbc43bf607 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-05-18 10:10:20 +02:00
jonas@perch.ndb.mysql.com
1cf5735058 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-05-18 10:00:10 +02:00
tsmith@siva.hindu.god
33181d075c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-05-17 14:24:02 -06:00
tsmith@siva.hindu.god
4a4590cd49 Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-05-17 14:21:35 -06:00
dkatz@damien-katzs-computer.local
da10c5dd0b Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-05-17 16:18:35 -04:00
jonas@perch.ndb.mysql.com
0161ba4893 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-05-17 08:57:03 +02:00
jonas@perch.ndb.mysql.com
1aec91bd1c ndb - bug#28491 
disable "disable expand check" as it does not solve problems anyway
 2007-05-17 08:54:30 +02:00
svoj@april.(none)
820651cd53 Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.1-engines
 2007-05-17 02:16:31 +05:00
kostja@vajra.(none)
e4a3189c4f Comment fix. 2007-05-16 17:19:59 +04:00
tomas@whalegate.ndb.mysql.com
277a5a50b5 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-05-15 13:04:49 +02:00
tomas@whalegate.ndb.mysql.com
84f24ce0f8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-15 12:08:09 +02:00
tomas@whalegate.ndb.mysql.com
db3fcd8a89 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-15 12:05:20 +02:00
tomas@whalegate.ndb.mysql.com
f527479f8c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-15 09:54:42 +02:00
jonas@perch.ndb.mysql.com
7e8cc53abe ndb - bug#24631 
add Dbdict::restartDropObj*
 2007-05-15 09:08:16 +02:00
tomas@whalegate.ndb.mysql.com
60e28cc9aa Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-15 08:36:21 +02:00
jonas@perch.ndb.mysql.com
836597bbc3 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-05-14 10:39:46 +02:00
jonas@perch.ndb.mysql.com
1305016bdc ndb - bug#28348 
remove LCP files when dropping table
 2007-05-14 10:34:21 +02:00
istruewing@chilla.local
e2fa2becfc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug17332
 2007-05-10 17:30:50 +02:00
monty@mysql.com/narttu.mysql.fi
088e2395f1 WL#3817: Simplify string / memory area types and make things more consistent (first part) 
The following type conversions was done:

- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t

Removed declaration of byte, gptr, my_string, my_size_t and size_s. 

Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
  instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
  as this requires fewer casts in the code and is more in line with how the
  standard functions work.
- Added extra length argument to dirname_part() to return the length of the
  created string.
- Changed (at least) following functions to take uchar* as argument:
  - db_dump()
  - my_net_write()
  - net_write_command()
  - net_store_data()
  - DBUG_DUMP()
  - decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
  argument to my_uncompress() from a pointer to a value as we only return
  one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
  the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
  casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.

Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
  needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
  explicitely as this conflict was often hided by casting the function to
  hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
  get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
  size_t. This was needed to properly detect errors (which are
  returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
  (portability fix)
- Removed windows specific code to restore cursor position as this
  causes slowdown on windows and we should not mix read() and pread()
  calls anyway as this is not thread safe. Updated function comment to
  reflect this. Changed function that depended on original behavior of
  my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
  m_size is the number of elements in the array, not a string/memory
  length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
  Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
  - Replaced some calls to alloc_root + memcpy to use
    strmake_root()/strdup_root().
  - Changed some calls from memdup() to strmake() (Safety fix)
  - Simpler loops in client-simple.c
 2007-05-10 12:59:39 +03:00
mikael@dator3.(none)
80bd7f4ec6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  dator3.(none):/home/mikael/mysql_clones/rt-5.1
 2007-05-10 09:08:34 +02:00
tomas@whalegate.ndb.mysql.com
19a2814f47 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-10 08:06:09 +02:00
mskold/marty@mysql.com/linux.site
11e98f4126 Ndb.hpp, Ndb.cpp, ha_ndbcluster.cc: 
Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment
 2007-05-09 17:09:06 +02:00
tomas@whalegate.ndb.mysql.com
a84d2971fc Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-09 15:04:45 +02:00
tomas@whalegate.ndb.mysql.com
73306167ca Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-09 12:52:23 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
23b1ce1e06 Bug#26241 
"Blackhole tables don't honor table locks"
  Implement neccessary shared lock structure for table locks.
  Imported test case created by Giuseppe Maxia
 2007-05-08 17:16:34 -07:00
jonas@perch.ndb.mysql.com
0f29fa28af 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-05-08 15:10:18 +02:00
jonas@perch.ndb.mysql.com
de3070265d ndb - bug#20535 
set null bits on delete+insert
 2007-05-08 14:59:57 +02:00
mikron@mikael-ronstr-ms-dator.local
927228a99a Merge mikael@192.168.0.203:/home/mikael/mysql_clones/rt-5.1 
into  mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
 2007-05-08 10:15:50 +02:00
gni@dev3-221.dev.cn.tlan
305d0eaf02 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-new-ndb
 2007-05-08 09:52:27 +08:00
acurtis/antony@ltamd64.xiphis.org
b8301263f3 Merge xiphis.org:/home/antony/work2/mysql-5.1-engines 
into  xiphis.org:/home/antony/work2/mysql-5.1-merge
 2007-05-07 12:32:09 -07:00
mikron@mikael-ronstr-ms-dator.local
f1a7d7dded Jamming 2007-05-07 16:07:04 +02:00
jonas@perch.ndb.mysql.com
245e6d1740 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-05-07 16:05:31 +02:00
jonas@perch.ndb.mysql.com
34c0b16403 ndb - bug#27942 
Increase size of memory channel
 2007-05-07 16:02:57 +02:00
mikron@mikael-ronstr-ms-dator.local
8a83924eb6 Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb 
into  mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
 2007-05-07 15:39:36 +02:00
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