monty@narttu.mysql.fi
91c3e28d77
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-28 20:03:46 +03:00
acurtis@ltamd64.xiphis.org
9d99e180f5
Merge xiphis.org:/home/antony/work2/p4-bug12096.3
...
into xiphis.org:/home/antony/work2/p4-bug12096.3-merge
2006-06-28 10:02:47 -07:00
evgen@moonbone.local
82369c4e65
Manual merge
2006-06-28 19:34:04 +04:00
tomas@poseidon.ndb.mysql.com
470087cb58
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-28 17:20:01 +02:00
tomas@poseidon.ndb.mysql.com
63c72dc02b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-28 17:12:18 +02:00
lars@dl145k.mysql.com
315ae8f4cc
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-28 16:56:15 +02:00
lars@dl145k.mysql.com
d4f7943594
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-28 16:44:54 +02:00
monty@mysql.com
500dd048b9
Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to initialize mutex"
2006-06-28 17:23:54 +03:00
lars@mysql.com
6036c30b57
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-28 16:18:57 +02:00
lars@dl145k.mysql.com
00fc05ff1b
Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
2006-06-28 15:34:09 +02:00
gkodinov@mysql.com
96ceb6c234
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
lars@mysql.com
c75584d8d9
Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
2006-06-28 15:27:25 +02:00
knielsen@mysql.com
10abc3e244
BUG#20739.
...
In the Windows build files, the "Max nt" configuration for some reason
had the mysql_client_test project disabled. Enable it.
2006-06-28 15:15:49 +02:00
lars@mysql.com
38501d8804
Disabled test case for Windows (BUG#20753)
2006-06-28 15:07:41 +02:00
gkodinov@mysql.com
2cda7f5d80
4.1->5.0 merge for bug #16458
2006-06-28 15:53:54 +03:00
stewart@willster.(none)
1cc537d9fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/bug20725
2006-06-28 22:47:25 +10:00
knielsen@mysql.com
e8df7d43a5
BUG#20739
...
Improved definition of mysys configuration for -nt builds.
2006-06-28 14:25:17 +02:00
stewart@willster.(none)
c19578fbfd
Merge mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/merge
2006-06-28 22:16:04 +10:00
stewart@willster.(none)
e5567d8402
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/merge
2006-06-28 22:06:26 +10:00
stewart@mysql.com
bfda9249a2
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/merge
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/merge
2006-06-28 21:54:04 +10:00
stewart@mysql.com
3d01caa9c1
BUG#19894 Data nodes fail during loading data if NoOfFragmentLogFiles=1
...
change default minimum to 3
bug is *very* timing dependent, unable to reproduce here, but theoretically possible.
2006-06-28 21:52:24 +10:00
monty@mysql.com
31fdcd3be0
Added purecov comment for new, not executed code for my recent changeset
...
(Found by dgcov)
2006-06-28 14:03:08 +03:00
knielsen@mysql.com
529a2d1291
BUG#20739: __NT__ not probably defined for mysys project.
...
Make sure for the mysys project that __NT__ is defined in *nt solution
configurations (but not in other configurations).
2006-06-28 12:30:14 +02:00
aivanov@mysql.com
c18a4e36f4
Adding __NT__ to Max Win32 configuration.
2006-06-28 14:30:13 +04:00
jonas@perch.ndb.mysql.com
f54b1e0dcf
ndb -
...
50->51 merge of bug#20442, force close scan (with locks)
2006-06-28 12:16:10 +02:00
jonas@perch.ndb.mysql.com
ff2528f3c0
ndb -
...
ndbapi test of bug#20252
2006-06-28 11:38:22 +02:00
jonas@perch.ndb.mysql.com
7f30766001
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-06-28 11:32:29 +02:00
jonas@perch.ndb.mysql.com
0ff6b66425
ndb - bug#20442
...
force close of scan (of outstanding scan_frag)
2006-06-28 11:27:37 +02:00
stewart@willster.(none)
a61cf1116e
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug11459
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/merge
2006-06-28 18:21:37 +10:00
gluh@eagle.intranet.mysql.r18.ru
3e22ea44e5
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
2006-06-28 11:55:15 +05:00
jonas@perch.ndb.mysql.com
b26e651f98
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-06-28 08:47:43 +02:00
aivanov@mysql.com
0a9c238993
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/alexi/bugs/mysql-5.0-19208
2006-06-28 10:24:10 +04:00
aivanov@mysql.com
7dc30c68f4
Fixing BUG#17719 "Delete of binlog files fails on Windows"
...
and BUG#19208 "Test 'rpl000017' hangs on Windows".
Both bugs are caused by attempting to delete an opened
file and to create immediatedly a new one with the same
name. On Windows it can be supported only on NT-platforms
(by using FILE_SHARE_DELETE mode and with renaming the
file before deletion). Because deleting not-closed files
is not supported on all platforms (e.g. Win 98|ME) this
is to be considered harmful and should be eliminated by
a "code redesign".
2006-06-28 10:21:01 +04:00
tomas@poseidon.ndb.mysql.com
a23259c2ef
Bug #20705 table truncation from one mysqld causes ERROR 1412 on other mysqld servers
...
- make sure to invalidate even if table is not binlogged
2006-06-28 02:35:13 +02:00
tomas@poseidon.ndb.mysql.com
40267422eb
corrected partition test case results that were put back
2006-06-28 01:03:10 +02:00
tomas@poseidon.ndb.mysql.com
ec4738fcf0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-27 22:27:25 +02:00
tomas@poseidon.ndb.mysql.com
9791d53445
partition functions to pass create_info, not only max_rows
2006-06-27 22:19:27 +02:00
gluh@eagle.intranet.mysql.r18.ru
0ccd44cdf2
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
2006-06-27 22:02:06 +05:00
jmiller@mysql.com
909e81fbf0
rpl_ndb_dd_partitions.test, rpl_ndb_dd_partitions.result:
...
Adding back ndb partition tests from mysql-test-extra per tomas and clavin
new file
2006-06-27 18:44:25 +02:00
jmiller@ndb08.mysql.com
4dcee064c4
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/data0/mysql-5.1
2006-06-27 18:36:52 +02:00
jmiller@mysql.com
40e27a25f5
Many files:
...
Adding back ndb partition tests from mysql-test-extra per tomas and clavin
new file
2006-06-27 18:35:10 +02:00
gkodinov@mysql.com
be3c4a154f
Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean
...
into mysql.com:/home/kgeorge/mysql/4.1/B16458
2006-06-27 18:47:22 +03:00
stewart@mysql.com
bd54e6769b
BUG#20725 MySQLD cluster use "fast count" is broken
...
fix based on review by tomas.
conform to bug we haven't fixed yet.
2006-06-28 01:28:07 +10:00
stewart@mysql.com
bc91efe0ae
BUG#20725 MySQLD cluster use "fast count" is broken
...
Post recent handler changes, fast count(*) for cluster was broken.
Seeing as we maintain an exact count for ndb, we can easily use this for an optimisation.
With this patch, and use_exact_count DISABLED, we will use the fast way
of getting count(*) but not use the exact count for the optimiser.
With this patch and use_exact_count ENABLED, we will use the fast way of
getting count(*) and use the exact count for the optimiser.
2006-06-28 01:07:44 +10:00
gkodinov@mysql.com
7149f48d97
Merge mysql.com:/home/kgeorge/mysql/4.1/B16458
...
into mysql.com:/home/kgeorge/mysql/5.0/B16458
2006-06-27 17:59:49 +03:00
gkodinov@mysql.com
9ec681ef35
Bug #16458 : Simple SELECT FOR UPDATE causes "Result Set not updatable" error
...
'SELECT DISTINCT a,b FROM t1' should not use temp table if there is unique
index (or primary key) on a.
There are a number of other similar cases that can be calculated without the
use of a temp table : multi-part unique indexes, primary keys or using GROUP BY
instead of DISTINCT.
When a GROUP BY/DISTINCT clause contains all key parts of a unique
index, then it is guaranteed that the fields of the clause will be
unique, therefore we can optimize away GROUP BY/DISTINCT altogether.
This optimization has two effects:
* there is no need to create a temporary table to compute the
GROUP/DISTINCT operation (or the temporary table will be smaller if only GROUP
is removed and DISTINCT stays or if DISTINCT is removed and GROUP BY stays)
* this causes the statement in effect to become updatable in Connector/Java
because the result set columns will be direct reference to the primary key of
the table (instead to the temporary table that it currently references).
Implemented a check that will optimize away GROUP BY/DISTINCT for queries like
the above.
Currently it will work only for single non-constant table in the FROM clause.
2006-06-27 17:40:19 +03:00
gluh@eagle.intranet.mysql.r18.ru
49afa7d075
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
2006-06-27 18:24:14 +05:00
tomas@poseidon.ndb.mysql.com
08bec7b954
changed signature of get_default_no_partitions
2006-06-27 14:31:34 +02:00
tomas@poseidon.ndb.mysql.com
9bc0c99aca
Bug #19852 Restoring backup made from cluster with full data memory fails
...
- post merge fixes for 5.1
2006-06-27 13:40:33 +02:00
tomas@poseidon.ndb.mysql.com
49c8863bbf
Bug #19852 Restoring backup made from cluster with full data memory fails
...
- post merge fixes for 5.1
2006-06-27 13:12:34 +02:00