msvensson@neptunus.(none)
5d825d4f04
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-07 10:55:22 +02:00
sergefp@mysql.com
83b5f1a338
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug12941
2005-09-07 12:13:12 +04:00
sergefp@mysql.com
99870f616d
Fix for BUG#12941: in create_tmp_field(), if the passed item is an Item_ref, put newly
...
created item into item->result_field, not *(item->ref)->result_field.
2005-09-07 11:50:41 +04:00
msvensson@neptunus.(none)
4f4b6f1e76
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-07 09:39:38 +02:00
bell@sanja.is.com.ua
e3ce1a6171
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
2005-09-07 00:19:59 +03:00
eric@mysql.com
289bdcffa9
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/eric/bktmp/mysql-5.0
2005-09-06 11:04:36 -07: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
anozdrin@mysql.com
b291090612
Fix for Bug#12953 "Stored procedures: crash if OPTIMIZE TABLE in function"
...
OPTIMIZE TABLE statement is forbidden from usage in stored procedures/functions.
NOTE: OPTIMIZE TABLE statement can be useful in stored procedures. The idea is
that the user/administrator can create a stored procedure for admin
tasks (optimizing, backing up, etc). This procedure can be scheduled to run
automatically (by mean of internal cron (WL#1034)). So, once we can make this
statement work, it is worth doing it.
2005-09-06 21:43:06 +04:00
msvensson@neptunus.(none)
3e2f0d16b4
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-06 18:08:21 +02: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
msvensson@neptunus.(none)
9c1c075da1
Detect comment with command using extra delimiter
2005-09-06 12:33:36 +02:00
msvensson@neptunus.(none)
9a7b8e10e9
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-06 10:30:29 +02:00
msvensson@neptunus.(none)
fb9be4e990
Merge bk-internal:/home/bk/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-06 10:19:20 +02:00
msvensson@neptunus.(none)
4c2ddda8b9
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-06 09:44:25 +02:00
msvensson@neptunus.(none)
4cfd08d1ab
BUG#12959 mysqltest crashes if testcase passed with -x option
...
- Update test cases
2005-09-06 09:40:42 +02:00
ndbdev@dl145c.mysql.com
86344c4a83
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-06 09:21:23 +02:00
ndbdev@dl145c.mysql.com
f40c1576b0
Merge
2005-09-06 09:20:15 +02:00
ndbdev@dl145b.mysql.com
c00a51504a
Merge
2005-09-06 09:01:17 +02:00
msvensson@neptunus.(none)
ef6d75d032
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-05 22:49:36 +02:00
msvensson@neptunus.(none)
466ea56376
BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
2005-09-05 22:40:13 +02:00
msvensson@neptunus.(none)
a329002a11
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-05 17:12:25 +02:00
msvensson@neptunus.(none)
acd68dbf41
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 17:03:25 +02:00
msvensson@neptunus.(none)
7f848c1784
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
2005-09-05 17:01:15 +02:00
msvensson@neptunus.(none)
ff1c50d990
Merge neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my51-bug12959
2005-09-05 16:52:26 +02:00
msvensson@neptunus.(none)
e21d8c50bf
Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959
...
into neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959
2005-09-05 16:51:31 +02:00
msvensson@neptunus.(none)
72228ea825
Bug#12959 mysqltest crashes if testcase passed with -x option
2005-09-05 16:50:32 +02:00
evgen@moonbone.local
7493f615d8
func_gconcat.test, func_gconcat.result:
...
Test case for bug #12859 group_concat in subquery cause incorrect not null.
2005-09-05 17:58:29 +04:00
msvensson@neptunus.(none)
6f8e870ca6
Remove extra ;
2005-09-05 12:33:25 +02:00
brian@zim.(none)
5166290d1c
Fix for a test case.
2005-09-02 18:12:02 -07:00
eric@mysql.com
5d00d56f17
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/eric/bktmp/mysql-5.0
2005-09-02 17:14:23 -07:00
konstantin@mysql.com
aac74557db
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kostja/mysql/mysql-5.0-dsql3
2005-09-03 03:25:59 +04:00
konstantin@mysql.com
38486e83c1
Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".
...
The idea of the patch is to separate statement processing logic,
such as parsing, validation of the parsed tree, execution and cleanup,
from global query processing logic, such as logging, resetting
priorities of a thread, resetting stored procedure cache, resetting
thread count of errors and warnings.
This makes PREPARE and EXECUTE behave similarly to the rest of SQL
statements and allows their use in stored procedures.
This patch contains a change in behaviour:
until recently for each SQL prepared statement command, 2 queries
were written to the general log, e.g.
[Query] prepare stmt from @stmt_text;
[Prepare] select * from t1 <-- contents of @stmt_text
The chagne was necessary to prevent [Prepare] commands from being written
to the general log when executing a stored procedure with Dynamic SQL.
We should consider whether the old behavior is preferrable and probably
restore it.
This patch refixes Bug#7115, Bug#10975 (partially), Bug#10605 (various bugs
in Dynamic SQL reported before it was disabled).
2005-09-03 03:13:18 +04:00
brian@zim.(none)
557c2d31e5
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/partition-5.1
2005-09-02 16:07:02 -07:00
jimw@mysql.com
0e323e566d
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-02 12:42:00 -07:00
eric@mysql.com
6e04afe8f9
delete row now pulls error message from remote server.
...
Added test cases with archive (where delete & update will always fail)
http://bugs.mysql.com/bug.php?id=12659
2005-09-02 11:40:21 -07:00
bell@sanja.is.com.ua
d67c683404
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-09-02 15:56:14 +03:00
lars@mysql.com
4a2d37926c
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2005-09-02 11:56:53 +02:00
msvensson@neptunus.(none)
95ad04a287
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-02 11:23:43 +02:00
msvensson@neptunus.(none)
375dc1531c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-02 11:21:59 +02:00
msvensson@neptunus.(none)
d2d1d01f76
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-02 11:19:46 +02:00
msvensson@neptunus.(none)
78f32604ac
mysqltest.test: Remove output from shells in result file
2005-09-02 11:14:47 +02:00
lars@mysql.com
198350d630
Merge mysql.com:/users/lthalmann/bk/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2005-09-02 11:01:00 +02:00
bar@mysql.com
98a5362c1e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12363
2005-09-02 12:01:19 +05:00
msvensson@neptunus.(none)
345dfef41f
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-09-02 08:59:59 +02:00
bell@sanja.is.com.ua
cb0d8ade1e
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-09-02 09:55:24 +03:00
bell@sanja.is.com.ua
2434c8af4b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-09-02 09:51:32 +03:00
bell@sanja.is.com.ua
da64c1eab3
postmerge changes
2005-09-02 09:50:17 +03:00
msvensson@neptunus.(none)
d0a78f4dcc
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-02 08:38:48 +02:00
bar@mysql.com
5e3eb3d21e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b12363
2005-09-02 11:19:43 +05:00
lars@mysql.com
9d8f51fe3a
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
2005-09-02 01:37:16 +02:00