iggy@mysql.com
f6658356c6
Bug#20328 mysql client: dumb about trailing spaces on help command.
2006-06-29 17:06:28 -04:00
monty@hasky.mysql.fi
0b00ae6bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-29 23:41:33 +03:00
kroki@mysql.com
21e1655f4d
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20230
2006-06-30 00:24:47 +04:00
kroki@mysql.com
1bcf6b1d09
Bug#20230: routine_definition is not null
...
SHOW CREATE PROCEDURE and SHOW CREATE FUNCTION are fixed as well as
INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME.
2006-06-30 00:21:55 +04:00
cmiller@zippy.(none)
244bdc96c3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
2006-06-29 13:49:40 -04:00
joerg@mysql.com
6f6b966d16
Test "federated" failed because the log contains fixed port numbers.
...
Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".
2006-06-29 17:00:48 +02:00
ingo@mysql.com
e29cc5d5b7
Merge mysql.com:/home/mydev/mysql-5.0--main
...
into mysql.com:/home/mydev/mysql-5.0-bug11824
2006-06-29 16:53:05 +02:00
konstantin@mysql.com
7ca3749f59
Merge mysql.com:/opt/local/work/tmp_merge
...
into mysql.com:/opt/local/work/mysql-5.0-merge
2006-06-29 18:34:49 +04: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
lars@dl145k.mysql.com
f3d8d60259
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-29 14:24:02 +02: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
ingo@mysql.com
02c8e6b000
Fixed yet another forgotten port number replacement.
2006-06-29 14:03:53 +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
ingo@mysql.com
35a92af077
Merge mysql.com:/home/mydev/mysql-5.0--main
...
into mysql.com:/home/mydev/mysql-5.0-bug11824
2006-06-29 13:43:56 +02: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
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
andrey@lmy004.
4d22fd1acf
fix for bug#16394 "Events: Crash if schedule contains SELECT"
...
Parsing of CREATE/ALTER EVENT statement was crashing because of early
initialization done during parsing, instead in the after parsing phase.
Moreover, we don't want SUBqueries in CREATE/ALTER EVENT therefore we
disable them, though it is possible to make them work. It can be emulated
inside SP with a cursor and SP variable (CREATE/ALTER EVENT can still
accept variables as values).
2006-06-29 11:53:51 +02:00
kroki@mysql.com
621a86ce82
Replace all numeric error code with symbolic names in trigger.test.
2006-06-29 13:45:43 +04:00
tomas@poseidon.ndb.mysql.com
0d22cc662b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-29 10:48:31 +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
ingo@mysql.com
968ba3c226
Merge mysql.com:/home/mydev/mysql-4.1-bug17877
...
into mysql.com:/home/mydev/mysql-5.0-bug11824
2006-06-29 10:26:24 +02:00
ingo@mysql.com
366cf25f4c
Merge mysql.com:/home/mydev/mysql-5.0-amerge
...
into mysql.com:/home/mydev/mysql-5.0-bug11824
2006-06-29 10:18:29 +02:00
monty@mysql.com
3f22bc07c6
Fixed failing test rpl_ndb_auto_inc.test
...
Mark events_stress.test as 'big' as it's very slow on some machines
2006-06-29 03:24:33 +03:00
andrey@lmy004.
3c793e23ee
WL#3337 (Events new architecture)
...
This cut No 7 should finish the part of fixing the parsing of the events :
- Event_timed is no more used during parsing. Less problems because it has
a mutex. Event_parse_data class is used during parsing. It is suited only
for this purpose. It's pretty lightweight
- Late checking of data from parsing is being performed. This should solve
the problems of nested events in SP or other events (for the situation
of no nested bodies). Before if an ALTER EVENT was in a SP, then when the
SP was compiled, and not executed, the actual init_xxx methods of Event_timed
were called, which is wrong.
- It could be a side effect of using a specialized class, but test events_stress is
now 25% quicker.
Cut No8 will start splitting Event_scheduler into 2 parts, the QUEUE will be moved
to Event_queue.
2006-06-29 00:42:25 +02:00
monty@narttu.mysql.fi
7b0f8635ae
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-29 00:09:53 +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
jimw@mysql.com
afef612bd6
Merge bk-internal:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/jimw/my/mysql-5.0-16494
2006-06-28 12:26:21 -07: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
acurtis@xiphis.org
48e17abe0f
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-engines.sync
2006-06-28 10:31:03 -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
monty@narttu.mysql.fi
91c3e28d77
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-28 20:03:46 +03:00
igreenhoe@mysql.com
d2e8235372
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/greenman/workspace-mysql/mysql/pending/bug-5.0-18979
2006-06-28 08:36:01 -07:00
evgen@moonbone.local
82369c4e65
Manual merge
2006-06-28 19:34:04 +04:00
tomas@poseidon.ndb.mysql.com
63c72dc02b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-28 17:12:18 +02:00
lars@dl145k.mysql.com
d4f7943594
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-28 16:44:54 +02: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
andrey@lmy004.
f92454082a
Merge
2006-06-28 15:54:09 +02:00
lars@mysql.com
c75584d8d9
Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
2006-06-28 15:27:25 +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
ingo@mysql.com
d8499f2d8f
Bug#17877 - Corrupted spatial index
...
CHECK TABLE could complain about a fully intact spatial index.
A wrong comparison operator was used for table checking.
The result was that it checked for non-matching spatial keys.
This succeeded if at least two different keys were present,
but failed if only the matching key was present.
I fixed the key comparison.
2006-06-28 14:27:37 +02: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
monty@mysql.com
31fdcd3be0
Added purecov comment for new, not executed code for my recent changeset
...
(Found by dgcov)
2006-06-28 14:03:08 +03:00