Commit graph

2511 commits

Author SHA1 Message Date
serg@janus.mylan
859304f708 fix for smarter index mergein fulltext
to work for queries like "+a (b)"
2007-07-11 15:26:19 +02:00
tomas@whalegate.ndb.mysql.com
e22ba29c2b fix ndb_version.h so that it is usable and make some functions public to handle ndb version 2007-07-11 14:36:44 +02:00
gkodinov/kgeorge@magare.gmz
8acb73363f porting 29070 to 5.1-opt 2007-07-11 13:09:39 +03:00
gkodinov/kgeorge@magare.gmz
b4ad2eccd1 Merge magare.gmz:/home/kgeorge/mysql/autopush/B29325-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B29325-merge-5.1-opt
2007-07-11 12:44:49 +03:00
gkodinov/kgeorge@magare.gmz
49285e96d9 Merge magare.gmz:/home/kgeorge/mysql/work/B29325-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B29325-5.1-opt
2007-07-11 11:57:49 +03:00
tsmith@sita.local
0e04d31c46 Merge sita.local:/Users/tsmith/m/bk/inno/jul5/51-snap
into  sita.local:/Users/tsmith/m/bk/maint/51
2007-07-10 07:31:08 -06:00
tsmith@sita.local
7cb5374120 Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569.
After applying the snapshots, ensure that code conforms to the final version
of WL 3914.

It is signficant that, after these changes, InnoDB does not define MYSQL_SERVER,
and can be built as an independent storage engine plugin.

Fixes:
Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
Bug#18828: If InnoDB runs out of undo slots, it returns misleading 'table is full'
Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
Bug#20352: Make ibuf_contract_for_n_pages tunable
Bug#21101: Wrong error on exceeding max row size for InnoDB table
Bug#21293: Deadlock detection prefers to kill long running FOR UPDATE queries
Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
Bug#25078: Make the replication thread to ignore innodb_thread_concurrency
Bug#25645: Assertion failure in file srv0srv.c
Bug#28138: indexing column prefixes produces corruption in InnoDB
2007-07-10 05:37:43 -06:00
svoj@mysql.com/june.mysql.com
31c8efc812 BUG#29445 - match ... against () never returns
Part 1:
Do not perform index search for a plus-word with truncation operator
in case there are other plus-words in expression.

Specifically this optimization was enforced for expression like
"+word1 +word2*", but wasn't enforced for expression like
"+word1 word2*".
2007-07-10 15:37:39 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5fb5f2a9a5 Fix for bug #29652: csv.test failure: two changes conflict after merge
Problem: we don't take into account the length of the data written
to the temporary data file during update on a CSV table.

Fix: properly calculate the data file length during update.
2007-07-10 13:09:07 +05:00
tsmith@sita.local
59c570ba78 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sita.local:/Users/tsmith/m/bk/maint/51
2007-07-09 10:33:33 -06:00
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