Commit graph

28252 commits

Author SHA1 Message Date
timour@mysql.com
13260ea8f3 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-14662
2005-11-11 12:10:19 +02:00
andrey@lmy004.
bc684697a6 unneeded files 2005-11-11 10:54:01 +01:00
timour@mysql.com
99257a935e Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-14662
2005-11-11 11:41:21 +02:00
timour@mysql.com
225e94fb75 Fix for BUG#14662: view column in ORDER BY considered ambiguous if SELECT contains
the same column as an aliased and as a non-aliased column.

The problem was that Item_direct_view_ref::eq() was first comparing view columns
by name, and in this case the name of one of them is different since it is aliased.
2005-11-11 11:40:35 +02:00
gluh@eagle.intranet.mysql.r18.ru
7803d80aa4 Fix for bug#13818 SHOW CREATE VIEW / TABLE and information_schema.views fail
for invalid view
 Permit SHOW CREATE VIEW, SHOW CREATE TABLE, and retrieval of metadata from
 information_schema for invalid views
2005-11-11 13:39:46 +04:00
anozdrin@mysql.com
b13dd4ff72 Manual merge. 2005-11-11 03:28:35 +03:00
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
brian@zim.(none)
8ca332d38e Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/show-5.1-new
2005-11-10 15:42:56 -08:00
brian@zim.(none)
31cdb3dd7d Show engines has been extended to now report if an engine has transactions, XA, or savepoints. 2005-11-10 15:40:00 -08: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
bell@sanja.is.com.ua
32dc644e66 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:57:04 +02: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
jimw@mysql.com
3506e1e58b Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-10 11:24:57 -08:00
jimw@mysql.com
56a56a789a Merge mysql.com:/home/jimw/my/mysql-4.1-14469
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-10 11:23:52 -08:00
jimw@mysql.com
9d670ddbf4 Merge mysql.com:/home/jimw/my/mysql-5.0-12570
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-10 11:22:13 -08: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
brian@grrr.local
6375e03ca8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into grrr.local:/Users/brian/mysql/mysql-5.1-new
2005-11-10 19:52:08 +02:00
brian@grrr.local
9807162144 Added "SHOW AUTHORS" code 2005-11-10 19:43:17 +02: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
guilhem@mysql.com
27a6670747 Merge mysql.com:/home/mysql_src/mysql-4.1-gca
into  mysql.com:/home/mysql_src/mysql-4.1
2005-11-10 15:14:17 +01:00
guilhem@mysql.com
1379dd180f Merge mysql.com:/home/mysql_src/mysql-4.1-gca
into  mysql.com:/home/mysql_src/mysql-5.0-release
2005-11-10 15:13:12 +01:00
guilhem@mysql.com
2df7d97281 Declaring some class members public for BUG#12377:
"Item_date_add_interval needs to have the int_type member as Public".
As explained in the bug report, this change is is to help http://search.cpan.org/~philips/DBIx-MyParse-0.20/
So please keep those members public.
2005-11-10 15:12:22 +01:00
konstantin@mysql.com
0d4dbfd1b7 Fix a comment. 2005-11-10 17:05:19 +03:00
joerg@mysql.com
74c57a6dc9 Provide a default "minimum thread stack size" PTHREAD_STACK_MIN where it is missing.
(Currently, affects only BSD with Linuxthreads)
2005-11-10 14:24:54 +01:00
holyfoot@mysql.com
bbc26a63b2 merging 2005-11-10 16:32:49 +04:00
pem@mysql.com
2636f3cc6f Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug14719/mysql-5.0
2005-11-10 12:26:43 +01:00
tomas@poseidon.ndb.mysql.com
400aa16353 corrected compile error 2005-11-10 09:24:27 +01:00
tomas@poseidon.ndb.mysql.com
d20c1230d8 stilled memleak in ndb Gci_container 2005-11-09 23:08:53 +01:00
konstantin@mysql.com
b318ed1768 A fix and a test case for Bug#13488 "Left outer join query incorrectly
gives MYSQL_DATA_TRUNCATED"
2005-11-09 20:31:01 +03: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
joerg@mysql.com
c669c38769 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-11-09 14:14:30 +01:00
joerg@mysql.com
1aa66c59c0 Raise the version number to 5.0.17. 2005-11-09 14:12:44 +01:00
sergefp@mysql.com
ea689d3867 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-nov08-push
2005-11-09 15:31:43 +03:00
sergefp@mysql.com
c914a03066 BUG#14480 post-fix: merge to 5.0 2005-11-09 14:47:58 +03:00
joerg@mysql.com
4015635bcd Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-11-09 12:45:34 +01:00
sergefp@mysql.com
628264f160 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-nov08-push
2005-11-09 14:33:55 +03:00
joerg@mysql.com
fc52847260 Merge mysql.com:/M50/bug6584 into mysql.com:/M50/mysql-5.0 2005-11-09 12:16:37 +01:00
kent@mysql.com
eb9113482a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-11-09 12:00:57 +02:00
joerg@mysql.com
ee3cd794f8 Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1 2005-11-09 09:24:16 +01:00