evgen@moonbone.local
1459784aba
Reverted wrong bug fix (Bug#11228)
2006-07-01 01:37:20 +04:00
evgen@moonbone.local
a989f7261e
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
...
into moonbone.local:/work/merge-5.1
2006-06-30 16:10:26 +04:00
monty@hasky.mysql.fi
0b00ae6bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-29 23:41:33 +03:00
lars@dl145k.mysql.com
f3d8d60259
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-29 14:24:02 +02:00
tomas@poseidon.ndb.mysql.com
0d22cc662b
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-29 10:48:31 +02:00
monty@mysql.com
3f22bc07c6
Fixed failing test rpl_ndb_auto_inc.test
...
Mark events_stress.test as 'big' as it's very slow on some machines
2006-06-29 03:24:33 +03:00
monty@narttu.mysql.fi
7b0f8635ae
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-29 00:09:53 +03:00
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
evgen@moonbone.local
82369c4e65
Manual merge
2006-06-28 19:34:04 +04: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
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
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
lars@mysql.com
38501d8804
Disabled test case for Windows (BUG#20753)
2006-06-28 15:07:41 +02: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
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
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
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
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
konstantin@bodhi.netgear
632c6e607b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/opt/local/work/mysql-5.1-runtime
2006-06-27 03:38:46 +04:00
jmiller@ndb08.mysql.com
cf58d2b544
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/data0/mysql-5.1
2006-06-26 22:31:31 +02:00
jonas@perch.ndb.mysql.com
4af95eb79c
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-26 20:14:40 +02:00
rburnett@bk-internal.mysql.com
93210b0a28
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-26 16:53:53 +02:00
konstantin@mysql.com
a04bfd8e2a
Merge mysql.com:/opt/local/work/tmp_merge
...
into mysql.com:/opt/local/work/mysql-5.1-runtime
2006-06-26 18:49:20 +04:00
konstantin@mysql.com
5e0a692723
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/opt/local/work/mysql-5.1-runtime
2006-06-26 18:45:46 +04:00
lars@mysql.com
2a945d77b6
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-26 16:45:32 +02:00
knielsen@rt.int.sifira.dk
b6c587695b
Merge mysql.com:/usr/local/mysql/mysql-5.1-pristine
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-06-26 16:04:06 +02:00
knielsen@mysql.com
3ba774f1d7
BUG#20676: debug warnings about too many lock waiters cause test failure.
...
The 250 simultaneous events all accessing the same table caused the
events_stress test to fail due to debug warnings about too many table
waiters. Fixed by using three different tables.
2006-06-26 15:49:58 +02:00
jonas@perch.ndb.mysql.com
33339fdf40
ndb - bug#20053
...
make sure we can only drop files from correct file group
2006-06-26 15:08:09 +02:00
andrey@lmy004.
23340f3fdd
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lmy004.:/work/mysql-5.1-runtime-bug16992
2006-06-26 12:22:13 +02:00
jonas@perch.ndb.mysql.com
50b8eb8538
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-26 10:02:03 +02:00
andrey@lmy004.
d617241c3f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lmy004.:/work/mysql-5.1-runtime-bug18897
2006-06-26 08:55:49 +02:00
elliot@mysql.com
bc2b96fee3
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
2006-06-25 09:59:34 -04:00
knielsen@mysql.com
b9b25ada28
BUG#20677: Sporadic failure of test case 'ndb_binlog_multi'.
...
Start test case with a dummy table create and drop. This ensures that
NDB event subscription is properly set up before the real test starts,
which otherwise could sometimes cause INSERT events to be lost.
2006-06-25 08:59:44 +02:00
knielsen@rt.int.sifira.dk
7491454f78
Merge mysql.com:/usr/local/mysql/tmp-5.0
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-06-24 13:14:24 +02:00
knielsen@mysql.com
34cf139bd9
Fix race condition in test case wait_timeout.
...
Sometimes the helper connection (that is watching for the main connection
to time out) would itself time out first, causing the test to fail.
2006-06-24 13:11:09 +02:00
rburnett@bk-internal.mysql.com
b1f4ea4555
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-24 06:01:57 +02:00
elliot@mysql.com
d4796d9df6
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
2006-06-23 17:27:54 -04:00
andrey@lmy004.
e71ef73d53
Fix for bug #18897 "Events: unauthorized action possible with
...
alter event rename".
ALTER EVENT ... RENAME statement hasn't checked privileges
for the target database. It also caused server crashes when
target database was not specified explicitly and there was
no current database.
This fix adds missing privilege check and check for the case
when target database is not specified explicitly or implicitly.
2006-06-23 17:29:01 +02:00
rburnett@bk-internal.mysql.com
d9d2bf5b94
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-06-23 15:29:33 +02:00
evgen@moonbone.local
e74c47fb04
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-23 16:09:33 +04:00
evgen@moonbone.local
9a9224da68
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-23 14:53:41 +04:00
bar@mysql.com
cfb08851f7
Bug#11228: DESC shows arbitrary column as "PRI"
...
An UNIQUE KEY consisting of NOT NULL columns
was displayed as PRIMARY KEY in "DESC t1".
According to the code, that was intentional
behaviour for some reasons unknown to me.
This code was written before bitkeeper time,
so I cannot check who and why made this.
After discussing on dev-public, a decision
was made to remove this code
2006-06-23 13:19:30 +05:00
andrey@lmy004.
ef5c261afe
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lmy004.:/work/mysql-5.1-runtime-bug20624
2006-06-23 09:42:11 +02:00
andrey@lmy004.
08f9d359d4
disable events tests in embedded
...
(fix for bug#20290 Event mechanism incompatible with embedded server, but tests tried)
2006-06-23 09:40:06 +02:00