Commit graph

2451 commits

Author SHA1 Message Date
svoj@june.mysql.com
c188110565 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG29464/mysql-5.1-engines
2007-07-09 16:07:08 +05:00
tomas@whalegate.ndb.mysql.com
b66fac4fc1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-07-09 12:07:33 +02:00
tsmith@sita.local
5f12f35c34 Merge sita.local:/Users/tsmith/m/bk/51
into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
2007-07-09 03:27:03 -06:00
antony@ppcg5.local
a6f9981ebd Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1
into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
2007-07-06 14:33:14 -07:00
antony@ppcg5.local
6402e4324a Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
2007-07-06 09:03:50 -07:00
jani@labbari.dsl.inet.fi
12a7af3728 Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
into  labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel
2007-07-06 13:49:15 +03:00
svoj@mysql.com/june.mysql.com
69acbc7759 BUG#29464 - load data infile into table with big5 chinese fulltext index
hangs 100% cpu

Fulltext parser may fall into infinite loop when it gets illegal
multibyte sequence (or a sequence that doesn't have mapping to unicode).

Affects 5.1 only.
2007-07-05 15:17:06 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
ba650762d1 Fix for bug #29411: deleting from a csv table leads to the table corruption
Problem: we don't adjust share->rows_recorded and local_saved_data_file_length
deleting rows from a CSV table, so following table check may fail.

Fix: properly adjust those values.
2007-07-05 11:55:06 +05:00
tsmith@maint1.mysql.com
21b401bd26 WL#3914: Additonal accessors required to compile InnoDB as a plugin storage engine
Add more accessors to MySQL internals in mysql/plugin.h, for storage
engine plugins.

Add some accessors specific to the InnoDB storage engine, to allow
InnoDB to be compiled as a plugin (without MYSQL_SERVER).  InnoDB
has additional requirements, due to its foreign key support, etc.
2007-07-05 01:05:47 +02:00
jonas@perch.ndb.mysql.com
5659314a93 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-07-04 22:45:24 +02:00
jonas@perch.ndb.mysql.com
6a6e87fd2e 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-07-04 22:41:41 +02:00
jonas@perch.ndb.mysql.com
42000d3fbe Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-07-04 22:40:39 +02:00
tsmith@maint1.mysql.com
54253a0763 Merge maint1.mysql.com:/data/localhome/tsmith/bk/51
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-07-04 22:38:53 +02:00
tomas@whalegate.ndb.mysql.com
8ab2c73d3a backport compute hash 2007-07-04 20:16:42 +02:00
lzhou/zhl@dev3-63.(none)
1c52e967c1 Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug25941
2007-07-04 16:32:26 +00:00
jonas@perch.ndb.mysql.com
2ed75f25ae 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-07-03 16:37:15 +02:00
jonas@perch.ndb.mysql.com
7fbcaa87b5 ndb - bug#28642 - Tablespace returning incorrect usage status
make free 64 bit (as it represents free bytes, not free extents as originally designed)
2007-07-03 16:29:25 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
ee5403110d Complementary fix for bug #29353: inserting a negative value to a csv table
leads to the table corruption

New Field::store() method implemented to explicitly set thd->count_cuted_fields
before value storing, instead of (incorrectly) setting it in the CSV storage engine.
Thread row counter now properly incremented during check and repair in the CSV engine.
2007-07-03 17:17:58 +05:00
jonas@perch.ndb.mysql.com
b57f59909e ndb - bug#25901
handle undofile/logfile groups that were created while node was node
2007-07-03 14:12:27 +02:00
tomas@whalegate.ndb.mysql.com
0a1c65b6e3 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-07-03 13:10:07 +02:00
jonas@perch.ndb.mysql.com
af76e150c8 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-07-03 08:41:52 +02:00
jonas@perch.ndb.mysql.com
b940b92ede Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-07-03 08:41:05 +02:00
jonas@perch.ndb.mysql.com
a3c733c395 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-07-02 14:08:22 +02:00
jonas@perch.ndb.mysql.com
627a56be1e ndb - bug#29364 - port merge (5.0 -> 5.1) 2007-07-02 13:59:17 +02:00
jonas@perch.ndb.mysql.com
b47ee8cec9 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-07-02 13:54:27 +02:00
lars/lthalmann@dl145j.mysql.com
a4c81471e8 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-07-02 13:42:39 +02:00
antony@anubis.xiphis.org
673a8708d1 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-merge
2007-07-01 20:56:47 -07:00
igor@olga.mysql.com
259fdbf9ca Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
2007-06-30 20:49:28 -07:00
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