kostja@bodhi.(none)
ae1e1ca280
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-27430
2008-04-19 15:46:34 +04:00
kostja@bodhi.(none)
cae01871e7
Fix a Windows + embedded library build
2008-04-19 15:44:08 +04:00
kostja@bodhi.(none)
62c6ffd81f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-27430
2008-04-19 14:58:37 +04:00
kostja@bodhi.(none)
30296dcae4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-27430
...
into bodhi.(none):/opt/local/work/mysql-5.1-27430
2008-04-19 14:40:30 +04:00
kostja@bodhi.(none)
db70574976
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-27430
2008-04-19 14:37:20 +04:00
kostja@bodhi.(none)
78e4f40173
Attempt to fix a sporadic failure of innodb_mysql.test
2008-04-19 14:27:17 +04:00
mleich@five.local.lan
95ca54954b
Add tests + modifications according to review
2008-04-18 21:18:53 +02:00
kostja@bodhi.(none)
ce04207ad9
Fix broken --cursor-protocol (all tests).
2008-04-17 23:02:01 +04:00
mleich@five.local.lan
9e371dd2e5
Minor corrections within the script
2008-04-17 14:31:43 +02:00
kostja@bodhi.(none)
d42545fbc6
Fix create.test in --ps-protocol broken by the previous push.
2008-04-17 03:27:14 +04:00
kostja@bodhi.(none)
7289eccfbd
WL#4165 "Prepared statements: validation".
...
Add metadata validation to ~20 more SQL commands. Make sure that
these commands actually work in ps-protocol, since until now they
were enabled, but not carefully tested.
Fixes the ml003 bug found by Matthias during internal testing of the
patch.
2008-04-17 01:04:49 +04:00
thek@kpdesk.mysql.com
2e4da966a8
Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.0-merge
...
into kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge
2008-04-14 13:28:45 +02:00
thek@kpdesk.mysql.com
d92bc9eee4
Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.0
...
into kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.0-merge
2008-04-14 13:27:26 +02:00
thek@kpdesk.mysql.com
f932e51b45
Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1
...
into kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge
2008-04-14 12:58:53 +02:00
kostja@dipika.(none)
9533db5f5b
Fix pushbuild errors and warnings.
2008-04-08 21:49:31 +04:00
kostja@dipika.(none)
e4d011c603
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-04-08 20:32:29 +04:00
kostja@dipika.(none)
84de43cda6
Remove dead code.
2008-04-08 20:31:40 +04:00
kostja@dipika.(none)
d1f9376229
Tentative implementation of
...
WL#4165 Prepared statements: validation
WL#4166 Prepared statements: automatic re-prepare
Fixes
Bug#27430 Crash in subquery code when in PS and table DDL changed after PREPARE
Bug#27690 Re-execution of prepared statement after table was replaced with a view crashes
Bug#27420 A combination of PS and view operations cause error + assertion on shutdown
The basic idea of the patch is to keep track of table metadata between
prepared statement prepare and execute. If some table used in the statement
has changed, the prepared statement is re-prepared before execution.
See WL#4165 and WL#4166 contents and comments in the code for details
of the implementation.
2008-04-08 20:01:20 +04:00
thek@adventure.(none)
38effd5603
Merge error between two patches caused error out-of-bounds assignment.
2008-04-08 15:57:44 +02:00
thek@adventure.(none)
4f15839f66
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2008-04-08 09:20:53 +02:00
kostja@dipika.(none)
a9fff11f49
Fix a compilation warning (unused variable).
2008-04-07 23:57:47 +04:00
kostja@dipika.(none)
63944ed537
A fix for Bug#32724 "innodb_mysql.test fails randomly".
...
Enable back the disabled test case.
2008-04-07 15:42:32 +04:00
dlenev@mockturtle.local
44fe33f011
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-symlink
2008-04-07 13:46:56 +04:00
kostja@dipika.(none)
968b1a0810
Review and update WL#4165 and WL#4166 test coverage.
2008-04-07 13:35:42 +04:00
thek@adventure.(none)
27b6c17d94
Bug#34183 Missing DBUG_RETURN in alloc_root
...
DBUG_RETURN was missing form an exit path in 5.1 branch of alloc_root
2008-04-07 11:29:45 +02:00
dlenev@mockturtle.local
15fd42b7dd
Fix for bug #35733 "main.symlink.test fails".
...
The problem was that symlink.test failed due to debug assertions or
due to errors emitted for wrong statements (in non-debug builds)
if 6.0 version of server was run with --thread-handling=pool-of-threads
option.
The above problems were caused by that on the one hand code mi_create()
which handles case when error is returned relies on my_errno being set
to appropriate non-0 value, but on the other it has not done this
in case when error was emitted due to discovery that share for table
which we are going to create is already present in the list of open
shares. Running server with pool-of-threads option just exposed this
bug since in this scheduler mode my_errno is reset to 0 when connection
(THD) is reattached to the "real" thread.
This fix ensures that code in mi_create() properly sets my_errno in
the case described above.
Since original reason that caused this bug to be exposed in 6.0 tree
might also under very special conditions lead to incorrect behavior
of earlier versions of server (i.e. to errors emitted for wrong
statements) this patch is also being pushed into 5.1 tree.
No test case is present as this code is already covered by a test
case + pushbuild options combination in 6.0.
2008-04-07 12:59:57 +04:00
mkindahl@dl145h.mysql.com
013fd23675
Post-merge fixes.
2008-04-01 18:50:35 +02:00
thek@adventure.(none)
e392f406f5
Bug#26208 a typo (wrong variable name) in mysql_prepare_update function's source code?
...
This is a code clean up.
Removed redundant (and unused) TABLE_LIST variable intended as an IN-
parameter for setup_order.
2008-04-01 14:41:13 +02:00
mkindahl@dl145h.mysql.com
46af329848
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-04-01 12:36:20 +02:00
mkindahl@dl145h.mysql.com
edc7090a5a
Post-merge fixes.
2008-04-01 12:29:53 +02:00
mkindahl@dl145h.mysql.com
3f174f66e2
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-04-01 11:54:25 +02:00
thek@adventure.(none)
052d0426f4
Merge adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2008-04-01 11:21:09 +02:00
thek@adventure.(none)
1cc64d4eab
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2008-04-01 10:44:56 +02:00
mkindahl@dl145h.mysql.com
354f4d4cf6
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-04-01 08:45:24 +02:00
mkindahl@dl145h.mysql.com
fb9e8ed5e8
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-04-01 08:43:15 +02:00
kent/mysqldev@mysql.com/production.mysql.com
3cfd16da53
Raise version number after cloning 5.1.24-rc
2008-03-31 19:05:18 +02:00
mkindahl@dl145h.mysql.com
b9f860f3e6
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-03-31 16:34:52 +02:00
mkindahl@dl145h.mysql.com
6c8a0887cc
Removing race conditions from rpl_packet causing test to fail.
2008-03-31 16:32:45 +02:00
davi@endora.local
ad6d59e9b2
Merge mysql.com:/Users/davi/mysql/bugs/ps-cleanup-5.1
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-03-31 09:54:36 -03:00
gkodinov/kgeorge@magare.gmz
2d7104e0c0
merge 5.1-main to 5.1-bugteam
2008-03-31 14:13:42 +03:00
kostja@dipika.(none)
ad4113f72f
Remove some unused code.
2008-03-31 14:52:41 +04:00
gkodinov/kgeorge@magare.gmz
69b7c5fee9
Merge bk-internal:/home/bk/mysql-5.1-bugteam
...
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
2008-03-31 12:38:01 +03:00
mats@mats-laptop.(none)
8642b248f4
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
...
into mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl
2008-03-31 11:31:53 +02:00
mats@mats-laptop.(none)
540247f3e9
Updating commit.inc since the number of commits done for non-transactional
...
tables is not zero any more. For row-based logging, there is an extra commit
for sending rows changed by the statement to the binary log.
2008-03-31 11:29:03 +02:00
gkodinov/kgeorge@magare.gmz
0463ba57a5
Merge bk-internal:/home/bk/mysql-5.1
...
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
2008-03-31 11:57:18 +03:00
mkindahl@dl145h.mysql.com
5134d443a1
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-03-31 09:59:22 +02:00
mkindahl@dl145h.mysql.com
a7fe4abc55
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-03-31 09:57:29 +02:00
gkodinov/kgeorge@magare.gmz
dd17571b83
Merge bk-internal:/home/bk/mysql-5.1-build
...
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
2008-03-31 10:41:26 +03:00
gkodinov/kgeorge@magare.gmz
dd62320d0e
Merge bk-internal:/home/bk/mysql-5.1
...
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
2008-03-31 10:40:39 +03:00
iggy@amd64.(none)
6a272aecc8
Merge amd64.(none):/src/bug26243/my50-bug26243
...
into amd64.(none):/src/bug26243/my51-bug26243
2008-03-30 15:47:44 -04:00