Commit graph

33437 commits

Author SHA1 Message Date
mskold@mysql.com
09d4105f7d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-04-21 12:16:17 +02:00
tomas@poseidon.ndb.mysql.com
fa21279e8e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 11:32:25 +02:00
tomas@poseidon.ndb.mysql.com
8e8c4e89e8 Merge jonas@perch:src/51-work/
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 11:29:34 +02:00
tomas@poseidon.ndb.mysql.com
824552a2d6 bug#18594 ndb_restore log boken in 5.1
- corrected previous patch
- read log entry variables out into explicit variables for siimpler code (and backwards compatability code)
2006-04-21 11:26:21 +02:00
pem@mysql.com
8c5ae25ff5 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug18344/mysql-5.0-runtime
2006-04-21 10:22:06 +02:00
mskold@mysql.com
aed6916d16 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-21 10:21:43 +02:00
mskold@mysql.com
472aeeb9df Fix for bug#19088: NDBAPI: Segfault in NdbIndexScanOperation::setBound(...) 2006-04-21 10:17:55 +02:00
msvensson@neptunus.(none)
e984716c01 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/my50-bug19190
2006-04-21 10:17:16 +02:00
tomas@poseidon.ndb.mysql.com
9a2938b571 added one more missing install path for new files 2006-04-21 09:43:21 +02:00
igor@rurik.mysql.com
37ac782206 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-21 00:36:20 -07:00
jonas@perch.ndb.mysql.com
79a275fe22 ndb - bug#19245
A-insert/B-insert/A-rollback/B-rollback leads to node crash, as bits in tuple header gets incorrectly assigned in second insert
  this also likely fixes bug 18589 and explains 18808
2006-04-21 09:09:33 +02:00
tomas@poseidon.ndb.mysql.com
b9b202327d added missing install paths for new files 2006-04-21 08:53:25 +02:00
ramil@mysql.com
b9fc8e1f69 Bug #17896: MIN of CASE WHEN returns non-minimum value!
- after review fixes
2006-04-21 11:48:00 +05:00
igor@rurik.mysql.com
fd3e924164 Merge rurik.mysql.com:/home/igor/mysql-4.1
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-04-20 22:34:37 -07:00
igor@rurik.mysql.com
fc7514151f Fixed bug #18767.
The bug caused wrong result sets for union constructs of the form
(SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2.
For such queries order lists were concatenated and limit clause was
completely neglected.
2006-04-20 22:15:38 -07:00
jonas@perch.ndb.mysql.com
e97b67c280 ndb -
fix bug#19244, dd page got locked in page cache
  likely fix bug 18780
2006-04-21 06:51:58 +02:00
jonas@perch.ndb.mysql.com
ba10d4c71b ndb -
fix memory corruption in event-api
  maybe bug fix for 18621, 19154, 19172, 19174
2006-04-21 06:40:47 +02:00
tomas@poseidon.ndb.mysql.com
1fbac122de added missing files 2006-04-21 02:05:27 +02:00
tomas@poseidon.ndb.mysql.com
424a2a7f8d added missing files 2006-04-21 02:01:13 +02:00
igor@rurik.mysql.com
1afc70d03e Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2
2006-04-20 17:00:29 -07:00
tomas@poseidon.ndb.mysql.com
c247d853ab diabled failing tests again 2006-04-21 01:59:22 +02:00
tomas@poseidon.ndb.mysql.com
8f957a8058 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 01:56:15 +02:00
tomas@poseidon.ndb.mysql.com
8f9cc67841 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-21 01:53:44 +02:00
tomas@poseidon.ndb.mysql.com
cc138b5a3b Bug#18594 ndb_restore log boken in 5.1
- added compatability with 5.0
- added test case for compatability with 5.0 and 5.1
2006-04-21 01:51:58 +02:00
igor@rurik.mysql.com
0b2318f07f Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2
2006-04-20 16:51:13 -07:00
igor@rurik.mysql.com
0a65106cfb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 16:14:17 -07:00
konstantin@mysql.com
97f001a477 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-21 02:48:48 +04:00
aivanov@mysql.com
b56f50555e Merge mysql.com:/home/alexi/innodb/mysql-5.0-work
into  mysql.com:/home/alexi/innodb/mysql-5.1
 Null-merge.
2006-04-21 02:03:30 +04:00
aivanov@mysql.com
364621abc0 Restoring changes erroneously removed by applying
the innodb-5.0-ss476 snapshot.
2006-04-21 01:37:31 +04:00
aivanov@mysql.com
25d9a75d12 Applied innodb-5.0-ss476 snapshot.
Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
 Also, fix memory leaks in row_create_table_for_mysql() in rare
 corner cases.
2006-04-21 01:07:37 +04:00
serg@serg.mylan
7a746d5905 fix for make distcheck 2006-04-20 23:04:55 +02:00
serg@serg.mylan
e21f10f66e bug#19220
mi_open() should accept filename w/i extension and with .MYI
2006-04-20 23:03:13 +02:00
tomas@poseidon.ndb.mysql.com
2bc490d42b BUG#18594 ndb_restore log boken in 5.1
- corrected log read after fragment id addition
2006-04-20 22:04:09 +02:00
aivanov@mysql.com
721191c0f9 Merge mysql.com:/home/alexi/innodb/mysql-4.1-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-work
 Null-merge.
2006-04-20 23:18:29 +04:00
aivanov@mysql.com
b758353735 Applied innodb-4.1-ss22 snapshot.
Fix BUG#16814: "SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section"
     Add a missing newline to the LAST FOREIGN KEY ERROR section in SHOW INNODB STATUS
     output.
 Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID".
     Refuse tables that use reserved column names.
2006-04-20 23:09:49 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
a3f152cc6e Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
2006-04-20 14:16:27 -04:00
mleich@mysql.com
4cbad914ca Post merge correction for the Changesset
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
2006-04-20 19:43:02 +02:00
pekka@mysql.com
a272f257c2 ndb/repl - bug#19004 rpl_ndb_2myisam ok, rpl_ndb_2innodb new bug(number)19227 2006-04-20 18:53:23 +02:00
konstantin@mysql.com
f14040e4d8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-20 20:49:41 +04:00
igor@rurik.mysql.com
18149be57c Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 07:24:34 -07:00
pem@mysql.com
2dc3026c08 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug18949/mysql-5.0-runtime
2006-04-20 16:00:33 +02:00
tomas@poseidon.ndb.mysql.com
6be87a41a2 added missing cleanup in test causing later test to fail 2006-04-20 15:28:31 +02:00
mleich@mysql.com
26b9d40309 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-20 15:25:28 +02:00
tomas@poseidon.ndb.mysql.com
f8ca779aca Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-20 14:47:49 +02:00
tomas@poseidon.ndb.mysql.com
c73d00dcf9 Bug #19214 running mysqld without binlog causes 10s timeout to drigger on schema ops
- binlog thread should not wait for apply status share if binlog is not enabled
2006-04-20 14:44:16 +02:00
tomas@poseidon.ndb.mysql.com
271d7178e3 add mysql test run (from shell script) option to skip binlogs 2006-04-20 14:43:06 +02:00
mskold@mysql.com
fdd6d3ca8c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-04-20 13:35:34 +02:00
mskold@mysql.com
778e362bc3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-20 13:35:31 +02:00
mskold@mysql.com
ed31665b2a Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code: updated with new expected error codes 2006-04-20 13:32:41 +02:00
mleich@mysql.com
e8178cabb1 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-20 12:35:10 +02:00