tsmith@ramayana.hindu.god
b0d01ab27d
Cast away compiler warning on Windows.
2007-11-07 12:59:22 -07:00
tsmith@ramayana.hindu.god
a88d94614c
Apply snapshot innodb-5.1-ss2034
...
The following bugs are fixed:
Bug #31860 : Server crashes after inserting into InnoDB table with auto_increment column
In the Bug 16979 fix there was an erroneous assertion that
autoincrement columns can't contain negative values. With the fix, the
autoincrement table counter is set to 0 if the maximum value read from
the autoinc column index is negative.
2007-11-06 16:40:50 -07:00
tsmith@ramayana.hindu.god
eb65479127
Apply snapshot innodb-5.1-ss1989
...
Fixes the following bugs:
Bug #30706 : SQL thread on slave is allowed to block client queries when slave load is high
Add (innodb|innobase|srv)_replication_delay MySQL config parameter.
Bug #30888 : Innodb table + stored procedure + row deletion = server crash
While adding code for the low level read of the AUTOINC value from the index,
the case for MEDIUM ints which are 3 bytes was missed triggering an
assertion.
Bug #30907 : Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases
We don't rely on *first_value to be 0 when checking whether
get_auto_increment() has been invoked for the first time in a multi-row
INSERT. We instead use trx_t::n_autoinc_rows. Initialize trx::n_autoinc_rows
inside ha_innobase::start_stmt() too.
Bug #31444 : "InnoDB: Error: MySQL is freeing a thd" in innodb_mysql.test
ha_innobase::external_lock(): Update prebuilt->mysql_has_locked and
trx->n_mysql_tables_in_use only after row_lock_table_for_mysql() returns
DB_SUCCESS. A timeout on LOCK TABLES would lead to an inconsistent state,
which would cause trx_free() to print a warning.
Bug #31494 : innodb + 5.1 + read committed crash, assertion
Set an error code when a deadlock occurs in semi-consistent read.
2007-11-06 15:42:58 -07:00
msvensson@pilot.mysql.com
571b178b24
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-11-06 14:55:10 +01:00
istruewing@stella.local
43999692a8
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-06 14:35:02 +01:00
tomas@whalegate.ndb.mysql.com
47a245559c
break out tuple data read
2007-11-06 10:27:56 +01:00
istruewing@stella.local
241cd5f969
Bug#4692 - DISABLE/ENABLE KEYS waste a space
...
Fixed absurd compiler warnings of a Suse 10.1 system.
2007-11-05 10:57:52 +01:00
tomas@whalegate.ndb.mysql.com
883abae508
Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-11-01 11:37:32 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
480ee022ad
Adding dbutil to ndb test lib
2007-10-31 22:37:10 +01:00
istruewing@stella.local
8b1679d769
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-10-31 13:13:20 +01:00
tomas@whalegate.ndb.mysql.com
a214b1b9ba
Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-10-30 11:28:19 +01:00
istruewing@stella.local
7aa8144460
Merge stella.local:/home2/mydev/mysql-5.0-bug4692
...
into stella.local:/home2/mydev/mysql-5.1-bug4692
2007-10-30 09:51:05 +01:00
cmiller@zippy.cornsilk.net
61621a9791
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
2007-10-29 12:42:06 -04:00
gshchepa/uchum@gleb.loc
3cc449465c
ha_archive.cc:
...
Post-merge fix.
2007-10-28 02:33:18 +05:00
gshchepa/uchum@gleb.loc
c6429f7990
Merge gleb.loc:/home/uchum/work/bk/PA/5.1-opt-31036-v
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-28 01:27:47 +05:00
gshchepa/uchum@gleb.loc
5eb3b270d3
Fixed bug #31036 : Using order by with archive table crashes server.
...
1. Memory overrun have been fixed.
2. Server failure on assertion has been fixed.
2007-10-26 21:26:06 +05:00
knielsen@loke.(none)
328fc573e4
Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca
...
into loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
2007-10-25 10:48:42 +02:00
knielsen@loke.(none)
815a63008c
Merge loke.(none):/home/knielsen/devel/bug31761
...
into loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca
2007-10-25 09:27:15 +02:00
gluh@eagle.(none)
17acda6ca8
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 19:08:21 +05:00
jonas@perch.ndb.mysql.com
ac1dc64ebb
ndb - bug#26450
...
partial backport from 6.2 + add fix of bug
2007-10-23 11:24:34 +02:00
tsmith@ramayana.hindu.god
e347c1413a
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-22 14:32:22 -06:00
holyfoot/hf@hfmain.(none)
f4785845b4
Merge mysql.com:/home/hf/work/29801/my51-29801
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-22 10:25:35 +05:00
holyfoot/hf@hfmain.(none)
5a20acc709
Merge mysql.com:/home/hf/work/29801/my50-29801
...
into mysql.com:/home/hf/work/29801/my51-29801
2007-10-22 10:21:32 +05:00
antony@pcg5ppc.xiphis.org
3b95727600
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-10-19 13:06:37 -07:00
jonas@perch.ndb.mysql.com
9cd83c5365
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-10-19 21:25:07 +02:00
antony@pcg5ppc.xiphis.org
407f73c821
Merge pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1
...
into pcg5ppc.xiphis.org:/private/Network/Servers/anubis.xiphis.org/home/antony/work/p1-bug31473.1-merge-5.1-engines
2007-10-18 15:02:20 -07:00
antony@pcg5ppc.xiphis.org
f4a153c3c4
Bug#31473
...
"CSV does not work with NULL value in datetime fields"
Attempting to insert a row with a NULL value for a DATETIME field
results in a CSV file which the storage engine cannot read.
Don't blindly assume that "0" is acceptable for all field types,
Since CSV does not support NULL, we find out from the field the
default non-null value.
Do not permit the creation of a table with a nullable columns.
2007-10-18 14:48:04 -07:00
jonas@perch.ndb.mysql.com
5cf8e94bf8
ndb - bug#31701 Node failure with repl. wo/ load, can lead to endless out of order buckets
...
Correct check for buffer/no buffer
2007-10-18 23:21:18 +02:00
kaa@polly.(none)
97226f1027
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-18 14:32:43 +04:00
cmiller@zippy.cornsilk.net
f3d77c1979
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge
2007-10-17 14:05:43 -04:00
kaa@polly.(none)
a9184873cf
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-16 19:25:04 +04:00
jonas@perch.ndb.mysql.com
dcb7fce7eb
Merge perch.ndb.mysql.com:/home/jonas/src/51-simple-read
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-10-15 11:35:30 +02:00
jonas@perch.ndb.mysql.com
5aacf8b775
ndb - bug#31482
...
(re)impl. simple-read (read that releases lock just before LQHKEYCONF)
use simple-read for blobs
2007-10-15 09:10:14 +02:00
jonas@perch.ndb.mysql.com
15157cd7f5
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-10-14 18:48:10 +02:00
jonas@perch.ndb.mysql.com
f28e73ae4c
ndb - testScan -n InsertDelete
...
fix testcase
2007-10-14 18:42:49 +02:00
pekka@sama.ndb.mysql.com
dfeeb642dd
Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
...
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
2007-10-14 17:51:11 +02:00
pekka@sama.ndb.mysql.com
fe4584c23f
Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug29390
...
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
2007-10-14 17:49:58 +02:00
mtaylor@solace.(none)
2a595c1bc1
Fixed a typo. We have NdbTransactions not NdbTransations.
2007-10-12 01:16:55 -07:00
mtaylor@solace.(none)
04342a487b
Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API.
2007-10-12 00:10:07 -07:00
mtaylor@solace.(none)
6fd6e7c809
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-ndb
2007-10-11 23:47:07 -07:00
mtaylor@solace.(none)
f178f7258d
Fixed header to reflect the implementation.
...
Added accessor method to help out the NDB/Connectors.
2007-10-11 23:46:25 -07:00
jonas@perch.ndb.mysql.com
261c77a0ce
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-10-11 15:53:30 +02:00
jonas@perch.ndb.mysql.com
af5da7057d
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-10-11 15:50:56 +02:00
jonas@perch.ndb.mysql.com
9326e82027
ndb -
...
decrease test time
2007-10-11 15:28:10 +02:00
jonas@perch.ndb.mysql.com
3465c5bc58
ndb - bug#31525
...
Fix bug regarding node that missed 2 LCP's (that was not included in next LCP after SR)
2007-10-11 14:54:05 +02:00
tsmith@ramayana.hindu.god
06c6fce750
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-10 14:15:09 -06:00
istruewing@stella.local
0ab9d3718d
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-10-10 21:25:19 +02:00
gluh@eagle.(none)
27762854ef
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-10 14:33:46 +05:00
pekka@sama.ndb.mysql.com
f83a1beb71
Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
...
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
2007-10-09 13:16:49 +02:00
jonas@perch.ndb.mysql.com
fd4b607f86
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-10-09 10:43:44 +02:00