jonas@perch.ndb.mysql.com
a45f572dc8
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-06-29 16:22:20 +02:00
jonas@perch.ndb.mysql.com
f4a095a399
ndb - autotest
...
Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))
2006-06-29 16:20:18 +02:00
konstantin@mysql.com
3010430ddf
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 18:17:37 +04:00
gluh@eagle.intranet.mysql.r18.ru
a230166f28
Fix for bug#13934 Silent truncation of table comments
...
Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols
Table 'comment' is changed from char* to LEX_STRING
2006-06-29 18:39:34 +05:00
lars@mysql.com
f24851ee71
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
2006-06-29 15:15:21 +02:00
konstantin@mysql.com
2d9d740dbe
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 16:44:21 +04:00
konstantin@mysql.com
1cb6eb00a5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 16:43:23 +04:00
konstantin@mysql.com
5154bc6c47
A post-merge fix.
2006-06-29 16:31:08 +04:00
stewart@mysql.com
e343c0e214
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
2006-06-29 22:30:51 +10:00
lars@mysql.com
0e45d26993
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-29 14:14:08 +02:00
lars@mysql.com
0707d4753f
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
2006-06-29 14:03:41 +02:00
stewart@mysql.com
4e59b43512
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2006-06-29 22:00:50 +10:00
gluh@eagle.intranet.mysql.r18.ru
f9214221fc
Bug#19671 mysql_list_fields returns incorrect table name for VIEWs
...
After view onening real view db name and table name are placed
into table_list->view_db & table_list->view_name.
Item_field class does not handle these names properly during
intialization of Send_field.
The fix is to use new class 'Item_ident_for_show'
which sets correct view db name and table name for Send_field.
2006-06-29 16:52:46 +05:00
konstantin@mysql.com
06c2f1a2aa
Merge mysql.com:/opt/local/work/mysql-5.0-release
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 15:25:03 +04:00
jonas@perch.ndb.mysql.com
c6d9b5c551
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
2006-06-29 13:25:02 +02:00
tomas@poseidon.ndb.mysql.com
48de09a4dd
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 13:25:01 +02:00
tomas@poseidon.ndb.mysql.com
6df1090e80
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 13:03:09 +02:00
tomas@poseidon.ndb.mysql.com
0822e24679
fixed too small requestInfo in signal
...
+ adopted signal to be as close as possible to 5.1...
2006-06-29 13:01:54 +02:00
gluh@eagle.intranet.mysql.r18.ru
9901efea1f
Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
...
user name is calculated on function execution stage instead of parse stage
2006-06-29 15:50:44 +05:00
kroki@mysql.com
621a86ce82
Replace all numeric error code with symbolic names in trigger.test.
2006-06-29 13:45:43 +04:00
jonas@perch.ndb.mysql.com
f9822e7f6d
ndb - build
...
Fix compile error for forte
2006-06-29 11:39:07 +02:00
knielsen@mysql.com
c5abf0c700
Merge knielsen@knielsen.mysql.internal:/usr/local/mysql/tmp-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-06-29 10:38:50 +02:00
knielsen@mysql.com
86268a54df
Fix test files to work with non-standard ports (MTR_BUILD_THREAD).
2006-06-29 10:35:16 +02:00
knielsen@mysql.com
dad0d8caca
Fix test files to work with non-standard ports (MTR_BUILD_THREAD).
2006-06-29 10:03:26 +02:00
gkodinov@mysql.com
3447374939
Merge mysql.com:/home/kgeorge/mysql/4.1/warnings
...
into mysql.com:/home/kgeorge/mysql/5.0/warnings
2006-06-29 10:46:30 +03:00
gkodinov@mysql.com
9dbb09182b
Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean
...
into mysql.com:/home/kgeorge/mysql/4.1/warnings
2006-06-29 10:36:08 +03:00
kroki@mysql.com
9c3805c9bb
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug10946
2006-06-28 23:54:18 +04:00
kroki@mysql.com
3e2e20ecfb
Bug#10946: Confusing error messeges in the case of duplicate trigger definition
...
It was hard to distinguish case, when one was unable to create trigger
on the table because trigger with same action time and event already
existed for this table, from the case, when one tried to create trigger
with name which was already occupied by some other trigger, since in
both these cases we emitted ER_TRG_ALREADY_EXISTS error and message.
Now we emit ER_NOT_SUPPORTED_YET error with appropriate additional
message in the first case. There is no sense in introducing separate
error for this situation since we plan to get rid of this limitation
eventually.
2006-06-28 23:50:50 +04:00
konstantin@mysql.com
55d148c5c2
A fix for Bug#19022 "Memory bug when switching db during trigger execution".
...
No test case as the bug is in an existing test case (rpl_trigger.test
when it is run under valgrind).
The warning was caused by memory corruption in replication slave: thd->db
was pointing at a stack address that was previously used by
sp_head::execute()::old_db. This happened because mysql_change_db
behaved differently in replication slave and did not make a copy of the
argument to assign to thd->db.
The solution is to always free the old value of thd->db and allocate a new
copy, regardless whether we're running in a replication slave or not.
2006-06-28 23:47:45 +04:00
patg@govinda.patg.net
18d264a1ea
BUG #19773
...
Pushbuild fixes to result file, test, and header file for federated.
2006-06-28 12:18:21 -07:00
jimw@mysql.com
9bcb24b65e
Merge bk-internal:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/jimw/my/mysql-5.0-18005
2006-06-28 10:55:27 -07:00
patg@govinda.patg.net
87e88fe76b
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.0-engines-bug19773
2006-06-28 10:11:43 -07:00
acurtis@xiphis.org
f242546e85
Merge xiphis.org:/home/antony/work2/p4-bug12096.2
...
into xiphis.org:/home/antony/work2/p4-bug12096.2-merge
2006-06-28 09:54:40 -07:00
lars@mysql.com
6036c30b57
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-28 16:18:57 +02:00
gkodinov@mysql.com
96ceb6c234
gcc 4.1 linux warning fixes backported from 5.0.
2006-06-28 16:28:29 +03:00
knielsen@mysql.com
10abc3e244
BUG#20739.
...
In the Windows build files, the "Max nt" configuration for some reason
had the mysql_client_test project disabled. Enable it.
2006-06-28 15:15:49 +02:00
lars@mysql.com
38501d8804
Disabled test case for Windows (BUG#20753)
2006-06-28 15:07:41 +02:00
gkodinov@mysql.com
2cda7f5d80
4.1->5.0 merge for bug #16458
2006-06-28 15:53:54 +03:00
stewart@mysql.com
11c38b0f9e
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/merge
2006-06-28 22:25:41 +10:00
knielsen@mysql.com
e8df7d43a5
BUG#20739
...
Improved definition of mysys configuration for -nt builds.
2006-06-28 14:25:17 +02:00
stewart@mysql.com
30b08617fc
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/merge
2006-06-28 22:21:42 +10:00
stewart@mysql.com
bfda9249a2
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/merge
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/merge
2006-06-28 21:54:04 +10:00
stewart@mysql.com
3d01caa9c1
BUG#19894 Data nodes fail during loading data if NoOfFragmentLogFiles=1
...
change default minimum to 3
bug is *very* timing dependent, unable to reproduce here, but theoretically possible.
2006-06-28 21:52:24 +10:00
tnurnberg@mysql.com
69820afce0
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/tnurnberg/mysql-5.0
2006-06-28 13:37:13 +02:00
jonas@perch.ndb.mysql.com
6a87a5cd82
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-06-28 13:01:36 +02:00
tnurnberg@mysql.com
a956e9d638
Merge mysql.com:/home/tnurnberg/work/mysql-5.0-maint-19857
...
into mysql.com:/home/tnurnberg/mysql-5.0
2006-06-28 12:43:04 +02:00
tnurnberg@mysql.com
763752ef2e
Bug#19857: When a user with CREATE ROUTINE priv creates a routine it results in NULL p/w
...
sp_grant_privileges(), the function that GRANTs EXECUTE + ALTER privs on a SP,
did so creating a user-entry with not password; mysql_routine_grant() would then
write that "change" to the user-table.
2006-06-28 12:40:17 +02:00
knielsen@mysql.com
529a2d1291
BUG#20739: __NT__ not probably defined for mysys project.
...
Make sure for the mysys project that __NT__ is defined in *nt solution
configurations (but not in other configurations).
2006-06-28 12:30:14 +02:00
aivanov@mysql.com
c18a4e36f4
Adding __NT__ to Max Win32 configuration.
2006-06-28 14:30:13 +04:00
jonas@perch.ndb.mysql.com
0ff6b66425
ndb - bug#20442
...
force close of scan (of outstanding scan_frag)
2006-06-28 11:27:37 +02:00