igor@rurik.mysql.com
6ea960c8d6
opt_range.cc:
...
Fixed bug #11853 .
Corrected the code of the range optimization for
NOT IN and NOT BETWEEN.
range.test, range.result:
Fixed bug #11853 .
2005-07-16 08:19:20 -07:00
konstantin@mysql.com
8b0adacbc6
After-merge fixes (4.1 -> 5.0).
2005-07-16 16:10:42 +04:00
konstantin@mysql.com
8e72214d74
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/media/sda1/mysql/mysql-5.0-merge
2005-07-16 13:45:32 +04:00
konstantin@mysql.com
e08caeeee2
A fix and a test case for Bug#9359 "Prepared statements take snapshot
...
of system vars at PREPARE time": implement a special Item
to handle system variables. This item substitutes itself with
a basic constant containing variable value at fix_fields.
2005-07-16 03:29:13 +04:00
evgen@moonbone.local
0298bc347a
Fix bug#11482 4.1.12 produces different resultset for a complex query
...
than in previous 4.1.x
Wrongly applied optimization were adding NOT NULL constraint which results in
rejecting valid rows and reduced result set.
The problem was that add_notnull_conds() while checking subquery were adding
NOT NULL constraint to left joined table, to which, normally, optimization
don't have to be applied.
2005-07-16 03:29:12 +04:00
bell@sanja.is.com.ua
8aad35f9d2
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
2005-07-16 00:17:05 +03:00
bell@sanja.is.com.ua
6114bee47c
stop evaluation constant functions in WHERE (BUG#4663)
...
correct value of CURRENT_USER() in SP with "security definer" (BUG#7291)
2005-07-16 00:01:44 +03:00
pem@mysql.com
d503283863
Post-review fix: Made test bug9538 test robust.
2005-07-15 19:46:44 +02:00
pem@mysql.com
f66c839ef0
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-07-15 19:46:43 +02:00
tomas@poseidon.ndb.mysql.com
d6e2fae0ae
Bug#9442, moved ps ucs2 test from ps.test to ctype_ucs.test
2005-07-15 19:46:42 +02:00
pem@mysql.com
7d7f34cf1c
Fixed BUG#9538: SProc: Creation fails if we try to SET system variable
...
using @@var_name in proc
Made sure we don't lose the tokenizer state when swapping lex in during SET
parsing.
2005-07-15 17:24:19 +02:00
tomas@poseidon.ndb.mysql.com
d8a584f064
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 17:14:34 +02:00
tomas@poseidon.ndb.mysql.com
d0d82338cb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-07-15 15:40:15 +02:00
tomas@poseidon.ndb.mysql.com
b144b920a0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
2005-07-15 14:14:59 +02:00
tomas@poseidon.ndb.mysql.com
f54afc792f
Merge
2005-07-15 14:13:23 +02:00
tomas@poseidon.ndb.mysql.com
cd590a6a02
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
2005-07-15 13:32:08 +02:00
ramil@mysql.com
cd20ee4361
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-07-15 16:27:59 +05:00
ramil@mysql.com
b11d04e50a
a fix (bug #9881 : ALTER TABLE gives wrong error message with sql-mode TRADITIONAL).
2005-07-15 15:50:57 +05:00
dlenev@mysql.com
2564656307
Added test case for bug #9565 "Wrong locking in stored procedure if a
...
sub-sequent procedure is called" which was fixed by the same patch
as bug #9597 "read lock stays when querying view from stored procedure".
2005-07-15 13:34:48 +04:00
bell@sanja.is.com.ua
0f6e1380dc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-07-15 01:29:37 +03:00
bell@sanja.is.com.ua
a7834de02d
take into account table lock mode when opening table:
...
try to find most suitable table, to avouid pickup table with too low locking mode or occupy table with write mode for select when it will be need for update later
(BUG#9597)
2005-07-15 01:22:14 +03:00
konstantin@mysql.com
fbf35e0e37
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-15 02:13:08 +04:00
konstantin@mysql.com
a4a5bc42a6
Fix ps.test in --ps-protocol
2005-07-15 02:11:07 +04:00
konstantin@mysql.com
60e7d6ff37
Post-merge fixes.
2005-07-15 00:41:58 +04:00
konstantin@mysql.com
3274b050bc
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-15 00:31:09 +04:00
konstantin@mysql.com
a2b11ff266
A fix and a test case for Bug#11299 "prepared statement makes wrong SQL
...
syntax in binlog which stops replication":
disallow the use of parameter markers which can lead to generation
of malformed binlog queries.
2005-07-15 00:01:49 +04:00
konstantin@mysql.com
36810d25f3
Post-merge fixes.
2005-07-14 20:02:37 +04:00
konstantin@mysql.com
4099582be2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-14 20:02:35 +04:00
konstantin@mysql.com
3f28ad8eb7
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-14 20:02:32 +04:00
konstantin@mysql.com
3892f1d298
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-root
2005-07-14 20:02:31 +04:00
sergefp@mysql.com
86d3c07836
Merge mysql.com:/home/psergey/mysql-4.1-build-tree
...
into mysql.com:/home/psergey/mysql-4.1-merge-from-build
2005-07-14 16:02:30 +00:00
lenz@mysql.com
63ffc74532
- suppress warning when running this test with a "classic" build (which does not
...
include InnoDB)
2005-07-14 17:50:33 +02:00
sergefp@mysql.com
0b3db181bf
Fix for BUG#11869: In Item_func_match::fix_index() handle the case when there is no
...
source table present (this happens for ORDER BY after UNION)
2005-07-14 15:19:26 +00:00
sergefp@mysql.com
e1273aec6d
Fix for BUG#11700: in add_not_null_conds(), call full fix_fields() for the created NOT NULL.
...
This is needed because in some cases range optimization is performed twice and added
NOT NULL item must have correct const_table_map() value.
2005-07-14 15:13:36 +00:00
hf@deer.(none)
8f9a268a1c
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-14 19:12:03 +05:00
hf@deer.(none)
1969a1622e
Fix for bug #10929 (type_newdecimal.test requires InnoDB)
2005-07-14 18:51:05 +05:00
konstantin@mysql.com
d4df2660c6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-root
2005-07-14 15:14:40 +04:00
konstantin@mysql.com
62b8e6fdd1
A fix and a test case for Bug#9735.
...
No separate typecode for MEDIUMTEXT/LONGTEXT is added, as we
have no sound decision yet what typecodes and for what types are
sent by the server (aka what constitutes a distinct type in MySQL).
2005-07-14 15:13:23 +04:00
bar@mysql.com
7d405e3c65
Merge mysql.com:/usr/home/bar/mysql-4.1.num-conv
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-14 16:11:55 +05:00
bar@mysql.com
1b612b0006
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.num-conv
2005-07-14 10:46:15 +05:00
konstantin@mysql.com
3cf9a4c4fc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-14 01:39:40 +04:00
konstantin@mysql.com
7b507e8bb0
Merge mysql.com:/opt/local/work/mysql-4.1-9379
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-14 00:52:57 +04:00
konstantin@mysql.com
ef1e748ef1
A test case for Bug#9442 "Set parameter make query fail if column
...
character set is UCS2".
The bug is no longer repeatable.
2005-07-14 00:15:23 +04:00
dlenev@mysql.com
200c751df8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
2005-07-14 00:11:15 +04:00
dlenev@mysql.com
14b93bf18a
Now when we create or drop trigger we will open only subject table and not
...
all tables suggested by prelocking algorithm.
Added test for bug #11889 "Server crashes when dropping trigger using stored
routine" (which was fixed by previous patch).
2005-07-13 23:51:09 +04:00
konstantin@mysql.com
b6da7f6227
Merge mysql.com:/opt/local/work/mysql-4.1-9379
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-13 23:49:45 +04:00
konstantin@mysql.com
1755df7649
A fix and a test case for Bug#9379 (collation of a parameter marker is
...
binary).
2005-07-13 23:43:46 +04:00
konstantin@mysql.com
a25c4ead10
Merge mysql.com:/opt/local/work/mysql-4.1-11458
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-13 18:23:20 +04:00
konstantin@mysql.com
618f7d9449
Merge mysql.com:/opt/local/work/mysql-4.1-11458
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-13 18:05:57 +04:00
konstantin@mysql.com
2dc2ec3ef7
Cleanup after test for Bug#11458
2005-07-13 18:01:04 +04:00