mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48457 commits 2778 branches 343 tags 1.6 GiB
Commit graph

48457 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaa@polly.local
43286bf4a5 Merge polly.local:/home/kaa/src/maint/bug24192/my50-bug24192 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-07-11 19:29:11 +04:00
kaa@polly.local
8c6b65a442 Merge polly.local:/home/kaa/src/maint/bug24192/my51-bug24192 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-07-11 19:16:37 +04:00
kaa@polly.local
cbc6fc4acc Merge polly.local:/home/kaa/src/maint/bug24192/my50-bug24192 
into  polly.local:/home/kaa/src/maint/bug24192/my51-bug24192
 2007-07-11 18:52:50 +04:00
kaa@polly.local
b270fa6736 Fix for bug #24192 "MySQL replication does not exit server when running out of memory" 
In case of out-of-memory error received from the master, print the corresponding message to the error log and stop slave I/O thread to avoid reconnecting with a wrong binary log position.
 2007-07-11 18:38:45 +04:00
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
svoj@june.mysql.com
05a12b7bb7 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29445/mysql-5.1-engines
 2007-07-11 15:58:08 +05:00
tnurnberg@mysql.com/sin.intern.azundris.com
3a9e84826e Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
Streamlining test for RBR
 2007-07-11 04:33:19 +02:00
dkatz@damien-katzs-computer.local
0de57df0ac Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-07-10 14:24:10 -04:00
tnurnberg@sin.intern.azundris.com
087ddbb573 Merge mysql.com:/home/tnurnberg/22540/50-22540 
into  mysql.com:/home/tnurnberg/22540/51-22540
 2007-07-10 18:42:58 +02:00
tnurnberg@sin.intern.azundris.com
f1b5fa93ac Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/tnurnberg/22540/51-22540
 2007-07-10 18:38:14 +02:00
tnurnberg@sin.intern.azundris.com
9b4c3d0db4 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/tnurnberg/22540/50-22540
 2007-07-10 18:33:20 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
bef7899334 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
streamlining the test
 2007-07-10 18:31:50 +02:00
tnurnberg@sin.intern.azundris.com
9310ad5f48 Merge mysql.com:/home/tnurnberg/22540/50-22540 
into  mysql.com:/home/tnurnberg/22540/51-22540
 2007-07-10 18:21:06 +02:00
tsmith@sita.local
31ac3dfd6b Merge sita.local:/Users/tsmith/m/bk/inno/jul10/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-10 08:34:21 -06:00
tsmith@sita.local
ccea97fa6f NULL MERGE UP to 5.1. 
Apply innodb-5.0-* snapshots:  ss1489 and ss1547.

Fixes:
Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
Bug#25645: Assertion failure in file srv0srv.c
Bug#27294: insert into ... select ... causes crash with innodb_locks_unsafe_for_binlog=1
Bug#28138: indexing column prefixes produces corruption in InnoDB
 2007-07-10 08:16:51 -06: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@ramil.myoffice.izhnet.ru
372856cd72 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/mysql-5.1-maint
 2007-07-10 14:22:37 +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
tomas@whalegate.ndb.mysql.com
810db44e4f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-10 09:03:21 +02:00
tomas@whalegate.ndb.mysql.com
503f86f3ba Bug #29570 
- correct result files
 2007-07-10 09:00:15 +02:00
tsmith@sita.local
63dd4251e4 Bug #29634: mysqld_safe does not set err_log variable, error log file is not created 
Dont touch & chmod the err_log file if using syslog (mysqld_safe)
 2007-07-09 16:10:43 -06:00
tsmith@sita.local
0ed9e3eb4c Merge sita.local:/Users/tsmith/m/bk/maint/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 15:45:13 -06:00
tsmith@sita.local
06c8087070 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 15:38:36 -06:00
tsmith@sita.local
e345a242f4 mysqld_safe.sh: 
Fix a few typos in comments (from Paul DuBois)
 2007-07-09 15:30:19 -06:00
tsmith@sita.local
832eb83777 Merge sita.local:/Users/tsmith/m/bk/maint/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 13:28:37 -06:00
tsmith@sita.local
4b1da38b13 rpl_misc_functions.result, rpl_misc_functions.test: 
Backport from 5.1 a fix to make this test deterministic
 2007-07-09 13:18:27 -06:00
tsmith@sita.local
92cad567ba Merge sita.local:/Users/tsmith/m/bk/maint/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 10:41:58 -06: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
tsmith@sita.local
1e0d809992 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 10:32:04 -06:00
istruewing@chilla.local
4b76695000 Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-09 16:06:09 +02: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
278a5dfa83 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-09 12:17:47 +02:00
tomas@whalegate.ndb.mysql.com
14a20dad62 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:17:03 +02:00
tomas@whalegate.ndb.mysql.com
658d12aea8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-07-09 12:15:52 +02: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
tomas@whalegate.ndb.mysql.com
81eb732880 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-07-09 12:05:07 +02:00
tsmith@sita.local
5cba44239a disabled.def: 
post-merge fix: re-enable rpl_udf test
 2007-07-09 03:31:27 -06: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
tsmith@sita.local
00c6793075 Merge sita.local:/Users/tsmith/m/bk/maint/41 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 01:47:33 -06:00
tomas@whalegate.ndb.mysql.com
7dd1f323a8 Bug #29570 
- correct result files
 2007-07-09 09:35:27 +02:00
tsmith@sita.local
7b2b10e462 Merge sita.local:/Users/tsmith/m/bk/50 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 01:22:54 -06:00
tsmith@sita.local
1106dddfa2 Merge sita.local:/Users/tsmith/m/bk/41 
into  sita.local:/Users/tsmith/m/bk/maint/41
 2007-07-09 01:21:22 -06:00
tsmith@sita.local
75810fbc22 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 01:14:33 -06:00
tnurnberg@mysql.com/sin.intern.azundris.com
3dfc83f1a1 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
dollin' it up for Guilhem ;) -- test streamlined,
better comments, faster code, add'l assert.
 2007-07-09 08:11:38 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
b37c24c439 after-merge fix. 2007-07-09 10:39:49 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
ede22768a9 Merge mysql.com:/home/ram/work/b28808/b28808.5.0 
into  mysql.com:/home/ram/work/b28808/b28808.5.1
 2007-07-09 10:20:45 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a10759d070 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28808/b28808.5.0
 2007-07-09 10:17:04 +05:00