kostja@bodhi.(none)
7e119ec0d1
Use Internal_error_handler mechanism to silence ER_TOO_MANY_FIELDS
...
error in mysql_create_frm instead of
direct access to my_error() members.
This is a pre-requisite for the patch for Bug#12713.
2007-11-01 18:06:46 +03:00
malff@lambda.hsd1.co.comcast.net.
f0bfbe0ee1
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-01 08:33:54 -06:00
kostja@bodhi.(none)
6bd9f5c1cb
Use thd->is_error() instead of direct access to thd->net.report_error
...
in evaluate_join_record().
A minor cleanup required for the fix for Bug#12713.
2007-11-01 17:08:02 +03:00
istruewing@stella.local
fc888bc932
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-01 15:07:00 +01:00
istruewing@stella.local
1b165ef41f
Post-merge fix
2007-11-01 15:04:23 +01:00
istruewing@stella.local
382f62b10b
Bug#31909 - New gis.test creates warnings files
...
Comment sign of -- at line begin in test files lead to warnings
from mysqltest.
Changed -- to #.
2007-11-01 15:03:09 +01:00
kostja@bodhi.(none)
f60b890967
Fix a compilation warning.
2007-11-01 17:00:24 +03:00
malff@lambda.hsd1.co.comcast.net.
83e6066e50
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-01 06:41:50 -06:00
malff@lambda.hsd1.co.comcast.net.
5bcb976bc2
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-01 06:35:22 -06:00
svoj@mysql.com/june.mysql.com
f8c2f9d195
BUG#31950 - repair table hangs while processing multicolumn utf8
...
fulltext index
Having a table with broken multibyte characters may cause fulltext
parser dead-loop.
Since normally it is not possible to insert broken multibyte sequence
into a table, this problem may arise only if table is damaged.
Affected statements are:
- CHECK/REPAIR against damaged table with fulltext index;
- boolean mode phrase search against damaged table with or
without fulltext inex;
- boolean mode searches without index;
- nlq searches.
No test case for this fix. Affects 5.0 only.
2007-11-01 16:27:01 +04:00
kostja@bodhi.(none)
5fa9440ade
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc-2
2007-11-01 14:24:32 +03:00
tomas@whalegate.ndb.mysql.com
91b070b082
disable tests
2007-11-01 12:02:41 +01:00
tomas@whalegate.ndb.mysql.com
883abae508
Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-11-01 11:37:32 +01:00
tomas@whalegate.ndb.mysql.com
5f592bfc7d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-11-01 11:33:04 +01:00
tomas@whalegate.ndb.mysql.com
d8eb4cdcb5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/cge-5.1
2007-11-01 10:19:26 +01:00
knielsen@loke.(none)
5ef088a7af
Merge 10.102.0.1:/usr/local/mysql/mysql-5.0-ndb
...
into loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
2007-11-01 08:30:18 +01:00
knielsen@ymer.(none)
084849d917
Bug #31848 : Test failure: Cluster has problems on insert with auto-increment
...
Fix uninitialized variable causing failures for some interpreted update
operations on gcc 4.2.1.
2007-11-01 07:59:55 +01:00
kostja@bodhi.(none)
8423c7ef22
Another attempt to fix the Windows compilation failre.
2007-11-01 00:55:25 +03:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
480ee022ad
Adding dbutil to ndb test lib
2007-10-31 22:37:10 +01:00
kostja@bodhi.(none)
26326ed0b7
A fix for Bug#32007 select udf_function() doesn't return an error if error
...
during udf initialization. The bug is spotted while working on Bug 12713.
If a user-defined function was used in a SELECT statement, and an
error would occur during UDF initialization, this error would not terminate
execution of the SELECT, but rather would be converted to a warning.
The fix is to use a stack buffer to store the message from udf_init instead
of private my_error() buffer.
2007-11-01 00:31:57 +03:00
kostja@bodhi.(none)
c0bb7f8682
Remove net_printf_error(). Do not talk to network directly in
...
check_user()/check_connection()/check_for_max_user_connections().
This is a pre-requisite patch for the fix for Bug#12713 "Error in a stored
function called from a SELECT doesn't cause ROLLBACK of statem"
Implement review comments.
2007-11-01 00:10:58 +03:00
kostja@bodhi.(none)
21fffd89cf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc
2007-10-31 23:51:01 +03:00
kostja@bodhi.(none)
c26aef8fc6
Try to fix a Windows compilation warning.
2007-10-31 23:48:41 +03:00
davi@endora.
7ec50bd483
Merge endora.local:/Users/davi/mysql/bugs/31669-5.1
...
into endora.local:/Users/davi/mysql/mysql-5.1-runtime
2007-10-31 13:57:54 -02:00
davi@endora.local/endora
8620673f93
Post merge fix for bug 31669.
2007-10-31 13:54:53 -02:00
kostja@bodhi.(none)
3154b2bee4
Cleanup: rename select_send::status to select_send::is_result_set_started.
...
Add select_send::cleanup.
Fix a compilation warning.
Issues spotted while working on the fix for Bug#12713.
2007-10-31 18:33:13 +03:00
kostja@bodhi.(none)
fdcf20d733
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc
2007-10-31 17:30:46 +03:00
kostja@bodhi.(none)
96f8d086f8
Cleanup: use helper functions to set an error in MYSQL or MYSQL_STMT.
...
No functionality added or changed.
This is a pre-requisite for the fix for Bug#12713 Error in a stored
function called from a SELECT doesn't cause ROLLBACK of statem
Address post-review comments.
2007-10-31 17:16:53 +03:00
anozdrin/alik@station.
3284c99694
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt-bug31649
2007-10-31 15:54:02 +03:00
thek@adventure.(none)
95a74f6717
Merge adventure.(none):/home/thek/Development/cpp/bug31347/my50-bug31347
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-10-31 13:41:49 +01:00
thek@adventure.(none)
19f1330e69
Merge adventure.(none):/home/thek/Development/cpp/bug31347/my51-bug31347
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-10-31 13:22:19 +01:00
istruewing@stella.local
3707119e2e
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-10-31 13:14:02 +01:00
istruewing@stella.local
8b1679d769
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-10-31 13:13:20 +01:00
thek@adventure.(none)
5b603aa47a
Merge adventure.(none):/home/thek/Development/cpp/bug31347/my50-bug31347
...
into adventure.(none):/home/thek/Development/cpp/bug31347/my51-bug31347
2007-10-31 13:12:45 +01:00
istruewing@stella.local
4998e0d89c
Merge stella.local:/home2/mydev/mysql-4.1-axmrg
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-10-31 12:32:03 +01:00
istruewing@stella.local
cd49a77add
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-10-31 12:31:36 +01:00
thek@adventure.(none)
8549a8ea8f
Bug#31347 Increase in memory usage after many DROP USER statements
...
Dropping users causes huge increase in memory usage because field values were
allocated on the server memory root for temporary usage but never deallocated.
This patch changes the target memory root to be that of the thread handler
instead since this root is cleared between each statement.
2007-10-31 12:25:18 +01:00
kent@kent-amd64.(none)
b5e97b4b04
Merge mysql.com:/home/kent/bk/bug24809/mysql-5.0-build
...
into mysql.com:/home/kent/bk/bug24809/mysql-5.1-build
2007-10-31 10:52:18 +01:00
anozdrin/alik@station.
62d2ee935e
Fix for a BUG#31649: events.test fails: NULL "state" field of
...
SHOW PROCESSLIST.
The problem was a race condition: if the Event Scheduler was not
quick enough, the following scenario happens:
- The Event Scheduler picks up the created event;
- The event is executed;
- event_scheduler_thread->proc_info is set to NULL;
- The client issues SELECT FROM I_S.
The fix is to wait for the Event Scheduler to reach 'Waiting
for next activation' state.
2007-10-31 12:04:19 +03:00
anozdrin/alik@station.
4852cc7fc4
Fix result files after patch for BUG#31035.
2007-10-31 09:53:58 +03:00
davi@endora.local
cdf589c8b4
Merge endora.local:/Users/davi/mysql/bugs/31669-5.1
...
into endora.local:/Users/davi/mysql/mysql-5.1-runtime
2007-10-31 02:06:17 -02:00
davi@endora.local
53a048662a
Merge endora.local:/Users/davi/mysql/mysql-5.0-runtime
...
into endora.local:/Users/davi/mysql/bugs/31669-5.1
2007-10-31 02:04:04 -02:00
istruewing@stella.local
f380491231
Merge stella.local:/home2/mydev/mysql-4.1-amain
...
into stella.local:/home2/mydev/mysql-4.1-axmrg
2007-10-31 00:50:03 +01:00
davi@endora.local
f3e0d95f45
Merge endora.local:/Users/davi/mysql/bugs/30904-5.1
...
into endora.local:/Users/davi/mysql/mysql-5.1-runtime
2007-10-30 20:52:21 -02:00
davi@endora.local
756a86f06d
Bug#30904 SET PASSWORD statement is non-transactional
...
The SET PASSWORD statement is non-transactional (no explicit transaction
boundaries) in nature and hence is forbidden inside stored functions and
triggers, but it weren't being effectively forbidden.
The implemented fix is to issue a implicit commit with every SET PASSWORD
statement, effectively prohibiting these statements in stored functions
and triggers.
2007-10-30 20:51:04 -02:00
kent@mysql.com/kent-amd64.(none)
2f88dce6ff
Makefile.am:
...
Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
work around for problem with automake 1.10 (bug#24809)
2007-10-30 20:54:31 +01:00
kostja@bodhi.(none)
230604f33c
In ha_delete_table, use a standard mechanism to intercept the error message
...
and convert it to a warning instead of direct manipulation with the
thread error stack.
Fix a bug in handler::print_erorr when a garbled message was
printed for HA_ERR_NO_SUCH_TABLE.
This is a pre-requisite patch for the fix for Bug#12713 Error in a stored
function called from a SELECT doesn't cause ROLLBACK of statem
2007-10-30 22:35:14 +03:00
joerg@trift2.
37e47a080a
Minor Makefile fixes:
...
1) Add a new top level "Makefile.am" target "make embedded-test".
2) Fix a syntax error (bad merge) in "netware/Makefile.am".
2007-10-30 20:06:49 +01:00
kostja@bodhi.(none)
cd72fffa5f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc-2
2007-10-30 20:10:11 +03:00
kostja@bodhi.(none)
e4b353c40c
Use an inline getter method (thd->is_error()) to query if there is an error
...
in THD.
In future the error may be stored elsewhere (not in net.report_error) and
it's important to start using an opaque getter to simplify merges.
2007-10-30 20:08:16 +03:00