tomas@poseidon.ndb.mysql.com
e68194dcc0
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-06 15:23:35 +02:00
tomas@poseidon.ndb.mysql.com
b2ed2fd045
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-07-06 15:22:25 +02:00
tomas@poseidon.ndb.mysql.com
9944e41f6e
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-07-06 15:20:22 +02:00
tomas@poseidon.ndb.mysql.com
ec8771af69
backport of ndb DictCache fix
...
- don't invalidate tables that are in state RETRIEVING
2006-07-06 15:18:00 +02:00
jonas@perch.ndb.mysql.com
71d5a20d37
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-07-06 13:23:19 +02:00
dlenev@mysql.com
b429748fab
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/mysql-5.0-bg18437-3
2006-07-06 14:31:32 +04:00
jonas@perch.ndb.mysql.com
72bdce708c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-07-06 09:47:59 +02:00
jonas@perch.ndb.mysql.com
52a28cfa5b
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-07-06 09:41:25 +02:00
jonas@perch.ndb.mysql.com
f5ec695c18
ndb - revert bug fix for bug#20442
2006-07-06 09:38:18 +02:00
acurtis@xiphis.org
4eee50de16
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/p2-bug8706.3-merge-5.0
2006-07-05 17:26:16 -07:00
acurtis@xiphis.org
86132d5d8f
Bug#8706
...
"temporary table with data directory option fails"
myisam should not use user-specified table name when creating
temporary tables and use generated connection specific real name.
Test included.
2006-07-05 17:18:59 -07:00
tomas@poseidon.ndb.mysql.com
f413bc2fe8
ndbd: added missing jamEntry();
2006-07-05 20:24:12 +02:00
tomas@poseidon.ndb.mysql.com
aacb705613
Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
...
- updated error message to more correctly reflect the issue
2006-07-05 20:20:39 +02:00
joerg@mysql.com
c9dc1184fd
Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does).
2006-07-05 20:17:04 +02:00
tomas@poseidon.ndb.mysql.com
8b57568a5f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-05 16:40:24 +02:00
tomas@poseidon.ndb.mysql.com
a0ab5ae09f
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-05 16:34:34 +02:00
tomas@poseidon.ndb.mysql.com
04ae971576
Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
...
- remove some event code to get rid of some bugs
2006-07-05 16:26:08 +02:00
ingo@mysql.com
b21acbe089
After merge fix
2006-07-05 16:23:18 +02:00
ingo@mysql.com
4c00805951
Merge mysql.com:/home/mydev/mysql-4.1-bug19835
...
into mysql.com:/home/mydev/mysql-5.0-ateam
2006-07-05 11:24:50 +02:00
ingo@mysql.com
5025bf32b2
Merge mysql.com:/home/mydev/mysql-4.1-bug17877
...
into mysql.com:/home/mydev/mysql-5.0-ateam
2006-07-05 11:23:21 +02:00
ingo@mysql.com
a21071d912
Merge mysql.com:/home/mydev/mysql-4.1-bug14400
...
into mysql.com:/home/mydev/mysql-5.0-ateam
2006-07-05 11:20:10 +02:00
ingo@mysql.com
20a152d5c3
Merge mysql.com:/home/mydev/mysql-4.1-bug11824
...
into mysql.com:/home/mydev/mysql-5.0-ateam
2006-07-05 11:11:40 +02:00
joerg@mysql.com
dbc1ca22a0
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/bug20216-4.1
2006-07-05 10:42:49 +02:00
kroki@mysql.com
acf47bdc37
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20570
2006-07-05 12:04:04 +04:00
kroki@mysql.com
821b540f2e
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20570
2006-07-04 23:55:52 +04:00
konstantin@mysql.com
b99e11c8bd
A fix and a test case for Bug#17843 "Certain stored procedures fail to
...
run at startup"
The server returned an error when trying to execute init-file with a
stored procedure that could return multiple result sets to the client.
A stored procedure can return multiple result sets if it contains
PREPARE, SELECT, SHOW and similar statements.
The fix is to set client_capabilites|=CLIENT_MULTI_RESULTS in
sql_parse.cc:handle_bootstrap(). There is no "client" really, so
nothing is ever sent. This makes init-file feature behave consistently:
the prepared statements that can be called directly in the init-file
can be used in a stored procedure too.
Re-committed the patch originally submitted by Per-Erik after review.
2006-07-04 23:46:15 +04:00
ingo@mysql.com
40c103478d
Merge mysql.com:/home/mydev/mysql-4.0-bug14400
...
into mysql.com:/home/mydev/mysql-4.1-bug14400
2006-07-04 19:10:13 +02:00
knielsen@mysql.com
ff0041e8a6
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-07-04 19:10:08 +02:00
jonas@mc01.ndb.mysql.com
d0146162e5
ndb - ps_7ndb as discovered by pb
...
fix race in scan close
2006-07-04 16:54:07 +02:00
pekka@clam.ndb.mysql.com
0f8ec3a8e8
ndb - bug#20847 fix (4.1)
2006-07-04 15:11:11 +02:00
bar@mysql.com
3855520138
WL#2928 Date Translation NRE
...
(implemented by by Josh Chamas)
2006-07-04 17:40:40 +05:00
knielsen@mysql.com
7892dca173
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-07-04 14:10:53 +02:00
pekka@clam.ndb.mysql.com
225f070788
pekka - checkout:get (4.1)
2006-07-04 13:51:35 +02:00
jonas@perch.ndb.mysql.com
795eafbce3
Merge tomas@poseidon:mysql-5.0-main
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-07-04 12:47:08 +02:00
tomas@poseidon.ndb.mysql.com
0b2024ac88
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-04 12:47:07 +02:00
joerg@mysql.com
be5f48268c
When building RPMs, use the Perl script to run the tests, to automatically check SSL.
2006-07-04 12:30:08 +02:00
knielsen@rt.int.sifira.dk
7062993817
Merge mysqldev@production:my/mysql-5.0-release
...
into rt.int.sifira.dk:/usr/local/mysql/tmp-5.0
2006-07-04 12:08:58 +02:00
tomas@poseidon.ndb.mysql.com
1e4ccec835
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-release
2006-07-04 12:08:57 +02:00
tomas@poseidon.ndb.mysql.com
98874725e0
Bug #20784 Uninitialized memory in update on table with PK not on first column
...
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
2006-07-04 11:43:06 +02:00
jonas@perch.ndb.mysql.com
5e68b4ab68
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-07-04 09:56:27 +02:00
konstantin@mysql.com
e87278f468
auxilliary -> auxiliary
2006-07-04 02:07:41 +04:00
konstantin@mysql.com
1781eee60f
auxilliary -> auxiliary
2006-07-04 01:13:04 +04:00
tomas@poseidon.ndb.mysql.com
904100ee73
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-03 22:58:10 +02:00
tnurnberg@mysql.com
b3e368df19
Bug#20783: Valgrind uninitialised warning in test case ctype_uca
...
Two functions have different ideas of what a string should look like;
one of them reads memory it assumes the other one may have written.
And "if you assume ..."
We now use a more defensive variety of the assuming function, this fixes
a warning thrown by the valgrind tool.
2006-07-03 21:41:15 +02:00
kent@mysql.com
caa3fcf673
client.c:
...
Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
2006-07-03 20:08:38 +02:00
kent@mysql.com
4b6878e4b0
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2006-07-03 19:53:57 +02:00
kent@suse9-x86.mysql.com
7455f8a31f
mwldnlm, mwccnlm, mwasmnlm:
...
Use Perl for filtering, do more filtering
2006-07-03 16:44:17 +02:00
kent@suse9-x86.mysql.com
6b08a98644
Makefile.am:
...
Avoid duplicate symbol errors on Netware
mwldnlm, mwccnlm, mwasmnlm:
Filter garbage characters from output
2006-07-03 10:56:19 +02:00
gluh@mysql.com
d2b378d57f
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
2006-07-03 13:19:18 +05:00
kroki@mysql.com
dbdecef495
Bug#20570: CURRENT_USER() in a VIEW with SQL SECURITY DEFINER returns
...
invoker name
The bug was fixed similar to how context switch is handled in
Item_func_sp::execute_impl(): we store pointer to current
Name_resolution_context in Item_func_current_user class, and use
its Security_context in Item_func_current_user::fix_fields().
2006-07-02 14:35:45 +04:00