anozdrin@mysql.com
1d3867faa5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-wl2818
2005-11-11 03:25:24 +03:00
anozdrin@mysql.com
3543f9d36c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-wl2818
2005-11-11 00:57:36 +03:00
brian@zim.(none)
44d54791ae
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-11-10 13:55:14 -08:00
anozdrin@mysql.com
f23f49ed57
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-wl2818
2005-11-10 22:48:00 +03:00
anozdrin@mysql.com
491e4f89f5
WL#2818 (Add creator to the trigger definition for privilege
...
checks on trigger activation)
2005-11-10 22:25:03 +03:00
bell@sanja.is.com.ua
8cedaeb971
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-11-10 21:16:56 +02:00
guilhem@mysql.com
28d23440c3
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0
2005-11-10 19:17:52 +01:00
bell@sanja.is.com.ua
148570fca1
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-11-10 19:38:00 +02:00
guilhem@mysql.com
dda1756789
Merge mysql.com:/home/mysql_src/mysql-5.0-release
...
into mysql.com:/home/mysql_src/mysql-5.0
2005-11-10 18:14:07 +01:00
guilhem@mysql.com
9e07979476
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/home/mysql_src/mysql-5.0-release
2005-11-10 17:53:09 +01:00
guilhem@mysql.com
ff46e54932
WL#2971 "change log-bin-trust-routine-creators=0 to apply only to functions".
...
Indeed now that stored procedures CALL is not binlogged, but instead the invoked substatements are,
the restrictions applied by log-bin-trust-routine-creators=0 are superfluous for procedures.
They still need to apply to functions where function calls are written to the binlog (for example as "DO myfunc(3)").
We rename the variable to log-bin-trust-function-creators but allow the old name until some future version (and issue a warning if old name is used).
2005-11-10 17:50:51 +01:00
brian@zim.(none)
47f9ada913
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-11-10 08:28:50 -08:00
brian@zim.(none)
510d0f24c8
Added handlerton flag to make storage engines invisable via flag.
2005-11-10 08:24:21 -08:00
holyfoot@mysql.com
71908dbc41
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.14268
2005-11-10 19:54:38 +04:00
ramil@mysql.com
6bc74f53a2
Fix for bug #14822 : Test "mysqldump" fails, "result" protocol seems wrong.
2005-11-10 18:58:33 +04:00
bell@sanja.is.com.ua
69c2076c03
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-11-10 16:49:30 +02:00
holyfoot@mysql.com
bbc26a63b2
merging
2005-11-10 16:32:49 +04:00
pem@mysql.com
b01e7393bf
Fixed BUG#14719: Views DEFINER grammar is incorrect
...
Corrected the syntax for the current_user() case.
(It's "definer = current_user[()]", not just "current_user[()]".)
2005-11-09 16:51:00 +01:00
sergefp@mysql.com
c914a03066
BUG#14480 post-fix: merge to 5.0
2005-11-09 14:47:58 +03:00
sergefp@mysql.com
c6a902f20c
Merge mysql.com:/home/psergey/mysql-4.1-nov08-push
...
into mysql.com:/home/psergey/mysql-5.0-oct08-push
2005-11-09 10:12:58 +03:00
sergefp@mysql.com
f12212f74e
BUG#14480: post-fix: use the default field value from CREATE list too.
2005-11-09 09:34:46 +03:00
sergefp@mysql.com
c5276ebcb0
Merge, will need post-merge fixes.
2005-11-08 11:22:51 +03:00
sergefp@mysql.com
41bc233699
Merge mysql.com:/home/psergey/mysql-4.1-bug13814
...
into mysql.com:/home/psergey/mysql-4.1-nov08-push
2005-11-08 05:36:25 +03:00
sergefp@mysql.com
5656740542
Merge mysql.com:/home/psergey/mysql-4.1-bug14480
...
into mysql.com:/home/psergey/mysql-4.1-nov08-push
2005-11-08 05:34:56 +03:00
petr@mysql.com
63554e10d8
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-11-08 04:04:36 +03:00
petr@mysql.com
0f373f9501
Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-11-08 01:27:15 +03:00
joerg@mysql.com
1bf2462119
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-11-07 23:02:33 +01:00
joerg@mysql.com
024d2b3595
mysql-test/r/connect.result + mysql-test/t/connect.test
...
Replace the full socket path name, not just a directory component. bug#14720
2005-11-07 22:30:44 +01:00
guilhem@mysql.com
ef415ceb14
Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)":
...
test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).
2005-11-07 16:18:46 +01:00
guilhem@mysql.com
517e51f1ed
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0
2005-11-07 13:04:27 +01:00
sergefp@mysql.com
edd094b194
BUG#14480, attempt2: In CREATE ... SELECT ..., don't count the same field twice
...
when calculating table->null_fields.
2005-11-07 09:23:43 +03:00
igor@rurik.mysql.com
60a4b4fb16
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-05 22:45:54 -08:00
igor@rurik.mysql.com
0960f5fedc
Post review fixes.
2005-11-05 22:41:36 -08:00
petr@mysql.com
038b300753
Fix Bug#14672 Bug in deletion
2005-11-06 02:11:12 +03:00
petr@mysql.com
a1f56ea5a6
Fix Bug#13894 Server crashes on update of CSV table
2005-11-05 15:08:15 +03:00
sergefp@mysql.com
33026e5237
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-05 05:46:41 +03:00
igor@rurik.mysql.com
84ad20364d
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-04 15:03:29 -08:00
bell@sanja.is.com.ua
4f42b35bba
avoiding of calling Item::val_* methods family with opt_range mem_root, because its life time is too short. (BUG#14342)
2005-11-04 13:16:46 +02:00
guilhem@mysql.com
cb1d21eeba
sql_parse.cc:
...
SCCS merged
2005-11-04 10:54:51 +01:00
monty@mysql.com
89fdc4f49e
DROP created procedures
...
(Caused sp-security to fail)
2005-11-04 10:02:43 +02:00
sergefp@mysql.com
7dfca7b9ff
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 22:35:18 +03:00
holyfoot@mysql.com
a8b38c1d5a
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 19:47:08 +04:00
sergefp@mysql.com
0cdaa61a8f
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 16:23:47 +03:00
sergefp@mysql.com
749d78fcd4
Merge mysql.com:/home/psergey/mysql-5.0-bug14026-r2
...
into mysql.com:/home/psergey/mysql-5.0-oct03-push
2005-11-03 16:21:21 +03:00
konstantin@mysql.com
d702915356
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-14210
2005-11-03 15:24:55 +03:00
holyfoot@mysql.com
bac54a7774
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 16:19:46 +04:00
holyfoot@deer.(none)
e529fdc5ee
Merging
2005-11-03 16:17:11 +04:00
konstantin@mysql.com
7e3f757f2d
A fix and a test case for Bug#14210 "Simple query with > operator on
...
large table gives server crash": make sure that when a MyISAM temporary
table is created for a cursor, it's created in its memory root,
not the memory root of the current query.
2005-11-03 14:20:13 +03:00
holyfoot@mysql.com
401d19f036
Merge mysql.com:/home/hf/work/mysql-4.1.14183
...
into mysql.com:/home/hf/work/mysql-5.0.9551
2005-11-03 14:58:36 +04:00
evgen@moonbone.local
55790f74bb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14093-bug-5.0-mysql
2005-11-03 13:55:08 +03:00