konstantin@mysql.com
08eff11273
Merge mysql.com:/opt/local/work/tmp_merge2
...
into mysql.com:/opt/local/work/mysql-5.1-merge
2006-03-30 19:12:10 +04:00
pem@mysql.com
b310d4fb4d
Post review fixes for BUG#16474: SP crashed MySQL.
2006-03-28 14:16:21 +02:00
dlenev@mysql.com
8dbdf5237e
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:00:07 +03:00
konstantin@mysql.com
af62c4a959
Merge mysql.com:/opt/local/work/mysql-4.1-13134
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-02-24 00:00:15 +03:00
konstantin@mysql.com
7178f247f5
Remove 'delayed' to make the test deterministic (already
...
fixed in 5.0).
A post-review fix (Bug#13134)
2006-02-23 23:41:15 +03:00
konstantin@mysql.com
442c2ba8af
A fix and a test case for Bug#13134 "Length of VARCHAR() utf8
...
column is increasing when table is recreated with PS/SP":
make use of create_field::char_length more consistent in the code.
Reinit create_field::length from create_field::char_length
for every execution of a prepared statement (actually fixes the
bug).
2006-02-21 19:52:20 +03:00
konstantin@mysql.com
c184aec68d
Merge mysql.com:/opt/local/work/mysql-5.0-for-merge
...
into mysql.com:/opt/local/work/mysql-5.1-merge1
2006-01-26 16:36:33 +03:00
konstantin@mysql.com
739ba76d64
A fix for Bug#13337 "ps test fails if configure wo/ usc2"
2006-01-17 01:03:03 +03:00
konstantin@mysql.com
0a64381cee
Merge mysql.com:/opt/local/work/mysql-4.1-12734
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-14 19:12:07 +03:00
konstantin@mysql.com
48d48bc936
A fix and a test case for Bug#12734 " prepared statement may
...
return incorrect result set for a select SQL request"
2006-01-14 04:55:07 +03:00
sergefp@mysql.com
b8d762031f
add missing DROP TABLE [IF EXISTS] clauses
2005-12-26 10:16:36 +03:00
jimw@mysql.com
9df4951acb
Merge mysql.com:/home/jimw/my/mysql-5.0-14956
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:51:54 -08:00
konstantin@mysql.com
9fd6204ad1
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-11-25 13:57:13 +03:00
konstantin@mysql.com
f57dffe453
A fix and a test case for Bug#14410 "Crash in Enum or Set type in
...
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are
created in the statement memory root.
2005-11-25 13:25:31 +03:00
jimw@mysql.com
86beb208aa
Fix result of ROW_COUNT() after 'EXECUTE prepstmt'. (Bug #14956 )
2005-11-23 14:57:26 -08:00
andrey@lmy004.
1a46ea1057
fix for bug #12651 (item of a prepared query allocated on non-permanent
...
are thus dangling later)
2005-09-08 21:30:05 +02:00
bell@sanja.is.com.ua
352c7b9cbc
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-06 20:51:15 +03:00
gluh@eagle.intranet.mysql.r18.ru
a5bd5e9af2
Bug #6172 RAND(a) should only accept constant values as arguments(2nd version)
...
Argument of RAND function can be constant value only
2005-09-06 16:19:59 +05:00
monty@mysql.com
15d48525af
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
monty@mysql.com
3c12d0ae54
Added end marker for tests to make future merges easier
2005-07-28 03:22:47 +03: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
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
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
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
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
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
konstantin@mysql.com
bef558b7ee
- a fix for Bug#11458 "Prepared statement with subselects return random
...
data": remove the fix for another bug (8807) that
added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
to prevent their evaluation at prepare. As this bit hanged in
Item_subselect::used_tables_cache for ever, a constant subquery with
a placeholder was never evaluated as such, which caused wrong
choice of the execution plan for the statement.
- to fix Bug#8807 backport a better fix from 5.0
- post-review fixes.
2005-07-13 17:38:55 +04:00
msvensson@neptunus.(none)
88c96026af
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug10466
2005-06-27 13:12:10 +02:00
dlenev@mysql.com
e28264d29f
Manual merge of patch for bug#11060 "Server crashes on calling stored
...
procedure with INSERT SELECT UNION SELECT" aka "Server crashes on
re-execution of prepared INSERT ... SELECT with UNION" into 5.0 tree.
2005-06-20 16:58:02 +04:00
dlenev@brandersnatch.localdomain
d07843efd9
Fix for bug #11060 "Server crashes on re-execution of prepared
...
INSERT ... SELECT with UNION" (reviewed version).
Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.
2005-06-20 16:07:00 +04:00
msvensson@neptunus.(none)
6282d89b0a
bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.
...
- Print warning that says display width is not supported for datatype TIMESTAMP, if user tries to create a TIMESTAMP column with display width.
- Use display width for TIMESTAMP only in type_timestamp test to make sure warning is displayed correctly.
2005-06-20 12:09:00 +02:00
konstantin@mysql.com
9f379d7f05
Patch two (the final one) for Bug#7306 "the server side preparedStatement
...
error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.
2005-06-07 14:11:36 +04:00
monty@mysql.com
7d70579917
Fixed failing tests for not 32 bit intel machines
...
Fixed bug in mysql_stmt_fetch() when retrieving rows to return
2005-05-16 13:34:23 +03:00
konstantin@mysql.com
ca9aeb5707
Post merge fixes (merge of Bug#9777)
2005-05-05 16:31:18 +04:00
konstantin@mysql.com
753959cd88
Manual merge
2005-05-05 13:47:09 +04:00
konstantin@mysql.com
15dbab1c12
A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it
...
should return a non empty one"
(see comments for the changed files for details).
2005-05-05 12:55:09 +04:00
konstantin@mysql.com
92e4e1a3f8
Manual merge of Bug#9096
2005-05-03 19:32:29 +04:00
konstantin@mysql.com
3589e78fda
A fix and test case for Bug#9096 "select doesn't return all matched
...
records if prepared statements is used".
This fix changes equality evaluation method of basic constants from
by-name to by-value, thus effectively enabling use of parameter markers
in some optimizations (constants propagation, evaluation of possible
keys for query).
2005-05-03 12:47:27 +04:00
konstantin@mysql.com
ced4317774
Allow SQLCOM_CALL in prepared mode.
2005-04-13 12:36:15 -07:00
gluh@eagle.intranet.mysql.r18.ru
6c8624f6d5
Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement
...
restore original 'lex->query_tables' table list after
processing of information schema table
remove unnecessary operations
2005-04-05 16:09:56 +05:00
konstantin@mysql.com
fe2d63a060
Fixes for bug#8115 "Server Crash with prepared statement"
...
and bug#8849 "problem with insert statement with table alias's":
make equality propagation work in stored procedures and prepared
statements.
Equality propagation can change AND/OR structure of ON expressions,
so the fix is to provide each execution of PS/SP with it's own
copy of AND/OR tree. We have been doing that already for WHERE clauses,
now ON clauses are also copied.
2005-03-03 17:38:59 +03:00
ramil@mysql.com
de1153b5e6
manual merge
2005-03-03 14:29:37 +04:00