mskold/marty@mysql.com/linux.site
5df38bfc3e
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-02-07 12:29:34 +01:00
mskold/marty@mysql.com/linux.site
2d0bd82a06
NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc:
...
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
Removed stray mthod declaration
2007-02-07 11:36:34 +01:00
mskold/marty@mysql.com/linux.site
259d3dce26
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value
2007-02-07 09:19:33 +01:00
mskold/marty@mysql.com/linux.site
0446aa9cbd
Fix for bug#25821 Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range
2007-02-06 23:06:58 +01:00
mskold/marty@mysql.com/linux.site
0e20ef0ae4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-02-01 13:59:34 +01:00
mskold/marty@mysql.com/linux.site
c16251ad7c
Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment
2007-02-01 09:48:45 +01:00
mskold/marty@mysql.com/linux.site
5cd40ad30b
Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached
2007-01-31 22:38:06 +01:00
stewart@willster.(none)
b0d94e9d35
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
2007-01-24 16:24:21 +11:00
stewart@willster.(none)
4889ea2321
fix hpux build problem and some ndb connect errors being missed
2007-01-24 16:12:39 +11:00
tomas@poseidon.mysql.com
f869a0d605
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-01-24 09:13:47 +07:00
pekka@clam.ndb.mysql.com/clam.(none)
d3462b9af1
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
2007-01-23 15:20:50 +01:00
stewart@willster.(none)
a1a7816161
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487
2007-01-24 00:44:11 +11:00
pekka@clam.ndb.mysql.com/clam.(none)
56e2d4ffcb
ndb - bug#25562 use byte-size max_data_length() when setting blob part size
2007-01-23 12:58:10 +01:00
stewart@willster.(none)
5b886fa358
round up Transporter connect timeout
2007-01-23 17:19:27 +11:00
stewart@willster.(none)
4984af30ec
Bug #25487 deleting ndb_cluster_connection object takes long time
...
aim is to:
a) if set_connect_timeout called, timeout connect attempt (for retry on
next call) after timeout period
b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
Related to customer issue with long time deleting ndb_cluster_connection
object. believe we're hanging on the connect(2) call until timeout (when
we then realise we should exit the thread).
2007-01-23 17:07:09 +11:00
tomas@poseidon.mysql.com
6825593df8
ndb - bug#22013
...
Fix bug in event handling wrt early node shutdown
2007-01-23 11:44:42 +07:00
tomas@poseidon.mysql.com
12911bb5c0
bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
...
- post review changes
2007-01-23 07:12:03 +07:00
tomas@poseidon.mysql.com
9605aee4fe
bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
...
- make sure keys are copied correctly when varchar has 2 length bytes
- test case
2007-01-23 00:34:00 +07:00
iggy@recycle.(none)
205f7a0583
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-19 13:20:52 -05:00
iggy@recycle.(none)
d3e6cb6b3b
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Corrected compiler warnings and performance problems with new
dynstr_append_os_quoted function.
2007-01-19 13:09:48 -05:00
cmiller@zippy.cornsilk.net
20faa77a5f
Rearrange disable_warnings to enclose the warning emitters properly.
2007-01-19 10:33:07 -05:00
cmiller@zippy.cornsilk.net
85eb07ff98
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-19 08:56:33 -05:00
cmiller@zippy.cornsilk.net
a8ff939d83
The rpl tree added a test case, and another source added a warning,
...
and combined, they add a platform-specific warning. The warnings
are not the goal of the test, in any case.
2007-01-19 08:56:06 -05:00
msvensson@pilot.mysql.com
b1a9115d88
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-19 11:11:34 +01:00
msvensson@pilot.mysql.com
2c60829f3b
Bug #15518 Reusing a stmt that has failed during prepare does not clear error
...
- Additional patch removing check for mysql_errno on already closed
mysql1
2007-01-19 11:07:20 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
86322e269f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-19 08:56:03 +04:00
jonas@perch.ndb.mysql.com
7aeddb4ce2
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-01-19 04:37:23 +01:00
jonas@perch.ndb.mysql.com
8aea461461
ndb - bug#25711
...
fix cpu peak in big clusters during unpack of config
2007-01-19 04:36:33 +01:00
tsmith@siva.hindu.god
f135f34ebc
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 13:26:48 -07:00
tsmith@siva.hindu.god
f5aab8b213
ndb_types.test: sleep a bit longer, to ensure that timestamp > @now
2007-01-18 13:26:26 -07:00
tsmith@siva.hindu.god
dac5bb3819
Makefile.am: Fix previous bad merge. Re-enable the test-ps target.
2007-01-18 13:15:16 -07:00
tsmith@siva.hindu.god
f3d321a2af
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:37:45 -07:00
tsmith@siva.hindu.god
5817465426
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
2007-01-18 10:36:46 -07:00
tsmith@siva.hindu.god
02ddf3d04c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:33:28 -07:00
tsmith@siva.hindu.god
244b2004ee
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:06:36 -07:00
tsmith@siva.hindu.god
6fd02a439f
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
2007-01-18 09:53:30 -07:00
iggy@recycle.(none)
294af0a42e
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-18 11:46:29 -05:00
iggy@recycle.(none)
ef5f757ac2
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Create space safe strings for system() calls in mysql_upgrade.exe
2007-01-18 11:38:05 -05:00
tsmith@siva.hindu.god
eec44018b2
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
2007-01-18 09:32:41 -07:00
tsmith@siva.hindu.god
d4aa9f0c62
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
2007-01-18 09:21:27 -07:00
tsmith@siva.hindu.god
2dc96063b4
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-18 09:20:25 -07:00
tsmith@siva.hindu.god
e39a4e6006
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
2007-01-18 08:55:33 -07:00
tsmith@siva.hindu.god
4b3840612e
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-18 08:52:45 -07:00
joerg/mysqldev@mysql.com/production.mysql.com
c3ab6de255
Raise version number after cloning 4.0.29
2007-01-18 16:41:32 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
6eba677517
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-18 17:10:00 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c57442d6d8
after merge fix.
2007-01-18 15:28:45 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5c42e68388
after merge fix.
2007-01-18 10:51:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
e8968822dc
Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
...
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-18 09:39:47 +04:00
tsmith@siva.hindu.god
2ae081e041
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-17 17:43:26 -07:00
tsmith@siva.hindu.god
8f5fdfe730
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
2007-01-17 16:44:10 -07:00