lars@mysql.com
681c8717ae
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
2006-03-10 17:31:06 +01:00
anozdrin@mysql.com
bceb52b34e
Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree
...
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
2006-03-10 14:48:18 +03:00
evgen@moonbone.local
c5493b6316
Fixed bug#13575: SP funcs in select with distinct/group and order by can
...
produce wrong data
By default Item_sp_func::val_str() returns string from it's result_field
internal buffer. When grouping is present Item_copy_string is used to
store SP function result, but it doesn't additionally buffer the result.
When the next record is read, internal buffer is overwritten, due to
this Item_copy_string::val_str() will have wrong data. Thus producing
weird query result.
The Item_func_sp::val_str() now makes a copy of returned value to prevent
occasional corruption.
2006-03-10 13:53:00 +03:00
msvensson@neptunus.(none)
ebb3f2c348
Merge neptunus.(none):/home/msvensson/mysql/bug10656/my51-bug10656
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-09 13:12:20 +01:00
msvensson@neptunus.(none)
e28000c201
Merge neptunus.(none):/home/msvensson/mysql/bug10656/my50-bug10656
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-03-09 13:11:40 +01:00
msvensson@neptunus.(none)
64003dae21
Merge neptunus.(none):/home/msvensson/mysql/bug10656/my50-bug10656
...
into neptunus.(none):/home/msvensson/mysql/bug10656/my51-bug10656
2006-03-09 12:55:56 +01:00
msvensson@neptunus.(none)
a7b954447f
Bug#10656 Stored Procedure - Create index and Truncate table command error
...
-Add test case
Move testcase that needs innodb from sp.test => sp_trans.test
2006-03-09 12:08:23 +01:00
mats@mysql.com
8d10f7b7a1
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/w3023-mysql-5.1-new
2006-03-07 10:00:13 +01:00
pem@mysql.com
a065843799
Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-06 19:46:17 +01:00
kent@mysql.com
dfae81d014
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-06 12:15:26 +01:00
pem@mysql.com
2b6f510350
Merge mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0-runtime
...
into mysql.com:/extern/mysql/5.0/bug16887/mysql-5.0
2006-03-03 19:18:17 +01:00
pem@mysql.com
015ab71a50
Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
...
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 12:03:27 +01:00
ramil@mysql.com
1a07140515
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b17615
2006-03-03 09:35:25 +04:00
pem@mysql.com
d85e929547
Fixed BUG#17476: Stored procedure not returning data when it is called first
...
time per connection
Removed const_string() method from Item_string (it was only used in one
place, in a bad way). Defer possible SP variable, and access data directly
instead, in date_format item.
2006-03-02 14:54:04 +01:00
ramil@mysql.com
72da0c6091
Fix for bug #17615 : invalid handling of function results in UPDATE...SET statement.
2006-03-02 15:05:55 +04:00
mats@mysql.com
1e66bc0d16
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/w3023-mysql-5.1-new
2006-02-28 10:06:58 +01:00
monty@mysql.com
1e2e9e2856
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-02-25 21:54:34 +02:00
monty@mysql.com
82b77cdd90
Fixes to embedded server to be able to run tests with it
...
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
mats@mysql.com
13a61982a9
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/home/bk/w3023-mysql-5.1-new
2006-02-24 16:31:38 +01:00
mats@mysql.com
101edab125
WL#3023 (RBR: Use locks in a statement-like manner):
...
Adaptions to make it work with NDB.
2006-02-24 16:19:55 +01:00
msvensson@neptunus.(none)
71ef9102c1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-23 10:45:39 +01:00
msvensson@neptunus.(none)
8d78cd3e3c
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 10:41:37 +01:00
konstantin@mysql.com
a27e32b565
Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-22 14:04:24 +03:00
msvensson@neptunus.(none)
8e760bc6cc
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 10:37:10 +01:00
msvensson@neptunus.(none)
40fe710394
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
konstantin@mysql.com
b58345d8c4
A new error message for deprecated statements.
...
Fixes failing sp.test
2006-02-20 22:51:32 +03:00
msvensson@neptunus.(none)
01cd7a05c7
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
2006-02-17 12:16:36 +01:00
msvensson@neptunus.(none)
340598a3ba
Use the tmp dir of MYSQLTEST_VARDIR
2006-02-16 22:10:25 +01:00
pem@mysql.com
f5035faf51
Additional tests for nested handlers added to sp.test.
...
A follow-up to BUG#15011 (already fixed).
2006-02-15 17:28:34 +01:00
pem@mysql.com
cfba31dd46
Fixed BUG#16887: Cursor causes server segfault
...
The problem was a code generation bug: cpop instructions were not generated
when using ITERATE back to an outer block from a context with a declared
cursor; this would make it push a new cursor without popping in-between,
eventually overrunning the cursor stack with a crash as the result.
Fixed the calculation of how many cursors to pop (in sp_pcontext.cc:
diff_cursors()), and also corrected diff_cursors() and diff_handlers()
to when doing a "leave"; don't include the last context we're leaving
(we are then jumping to the appropriate pop instructions).
2006-02-15 12:11:29 +01:00
konstantin@mysql.com
e1f807af26
Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 13:35:59 +03:00
konstantin@mysql.com
365404a048
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 14:05:19 +03:00
pem@mysql.com
2d340a875c
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug16568/mysql-5.0
2006-02-06 14:09:14 +01:00
konstantin@mysql.com
9f0bb47f87
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 23:27:06 +03:00
konstantin@mysql.com
065f8066d5
Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 12:03:35 +03:00
konstantin@mysql.com
781cc33d6d
Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge2
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-01 18:56:29 +03:00
pem@mysql.com
ff4e2892b7
Fixed on BUG#16568: Continue handler with simple CASE not working correctly
...
After trying multiple inheritance (to messy and hard make it work) and
sublassing jump_if_not (worked, but ugly), decided to on this solution
instead:
Inserting an abstract sp_instr_opt_meta class as parent for all instructions
with destinations makes it possible to handle a continuation pointer for
sp_instr_set_case_expr too.
Note: No special test case; the fix is captured by the changed behaviour of
bug14643_2, and bug14498_4 (formerly disabled), in sp.test.
2006-01-26 17:26:25 +01:00
pem@mysql.com
998f0c0aa3
Fixed BUGS#15011: error handler for mysql errno in nested block not activated
...
For nested sql errno handlers (unlike sqlexception and other), we didn't stop
searching when the innermost handler was found - now make sure we do.
2006-01-25 17:19:54 +01:00
pem@mysql.com
2c6ea2d2df
Fix of fix for BUG#15866. (Actually change the fib() call in sp.test)
2006-01-20 08:32:22 +01:00
pem@mysql.com
28f3989c8a
Fixed BUG#15866: Thread stack limit insufficient for recursive call "fib(20)"
...
Lowered the parameter to 10, and also renamed non-standard table names to t3.
2006-01-19 17:55:54 +01:00
holyfoot@mysql.com
53a379d041
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
2006-01-19 18:05:57 +04:00
pem@mysql.com
7817b99857
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15231/mysql-5.0
2006-01-17 12:44:51 +01:00
pem@mysql.com
5863337b8f
Post-merge fixes (BUG#14498)
2006-01-16 17:55:22 +01:00
pem@mysql.com
559a243686
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-16 15:37:25 +01:00
evgen@moonbone.local
7f0aa55e36
Manually merged
2006-01-16 16:57:15 +03:00
dlenev@mysql.com
f9ea947bdc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
2006-01-13 01:56:57 +03:00
dlenev@mysql.com
d14e701446
Fix for bug #12198 "Temporary table aliasing does not work inside stored
...
functions".
We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.
2006-01-13 01:51:56 +03:00
holyfoot@deer.(none)
e8697cf428
Big patch to make embedded-server working in 5.x
...
Now it supports queries returning several results
(particularly important with the SP)
2006-01-04 14:20:28 +04:00
lars@mysql.com
ad126d90e0
WL#1012: All changes as one single changeset.
...
This includes both code and test cases.
2005-12-22 06:39:02 +01:00
pem@mysql.com
1d83ff5b98
Added bug synopsis in comment for sp.test case BUG#15231.
2005-12-13 13:22:15 +01:00