serg@sergbook.mysql.com
7135b559ab
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-30 18:24:06 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c81b4c01bf
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-30 16:07:49 +03:00
anozdrin@mysql.com
11fcbaf1e1
Merge mysql.com:/home/alik/MySQL/devel/5.0-rt
...
into mysql.com:/home/alik/MySQL/devel/5.0-tree
2006-05-30 13:22:49 +04:00
igor@rurik.mysql.com
6051e0f959
Fixed bug #17873 : confusing error message when IGNORE/USE/FORCE INDEX
...
refers to a column name.
2006-05-30 00:08:58 -07:00
gluh@eagle.intranet.mysql.r18.ru
ae72df07f2
Bug#17204 "second CALL to procedure crashes Server"
...
Bug#18282 "INFORMATION_SCHEMA.TABLES provides inconsistent info about invalid views"
This bug caused crashes or resulted in wrong data being returned
when one tried to obtain information from I_S tables about views
using stored functions.
It was caused by the fact that we were using LEX representing
statement which were doing select from I_S tables as active LEX
when contents of I_S table were built. So state of this LEX both
affected and was affected by open_tables() calls which happened
during this process. This resulted in wrong behavior and in
violations of some of invariants which caused crashes.
This fix tries to solve this problem by properly saving/resetting
and restoring part of LEX which affects and is affected by the
process of opening tables and views in get_all_tables() routine.
To simplify things we separated this part of LEX in a new class
and made LEX its descendant.
2006-05-30 10:45:23 +05:00
ngrishakin@mysql.com
89afd0225b
Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
2006-05-30 01:37:20 +02:00
ngrishakin@mysql.com
0763f5e7b4
removed partitions from ndb_dd_backuprestore test
2006-05-30 01:36:35 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
7dae459d70
BUG#17310: Archive error for drop database
2006-05-29 14:51:46 -04:00
andrey@lmy004.
35b6416fcf
Merge lmy004.:/work/mysql-5.1-new-vanilla
...
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 20:23:44 +02:00
msvensson@shellback.(none)
b30cbbe131
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint_from_5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 16:33:32 +02:00
msvensson@shellback.(none)
4693d06a49
Add missing drop table
2006-05-29 16:27:45 +02:00
msvensson@neptunus.(none)
10719727ff
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-29 15:43:00 +02:00
andrey@lmy004.
ea20259aac
Merge lmy004.:/work/mysql-5.1-new-vanilla
...
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 15:16:07 +02:00
msvensson@neptunus.(none)
076ddbf840
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-29 15:06:37 +02:00
msvensson@neptunus.(none)
3e2c08cc99
Update after merge to 5.0
2006-05-29 15:05:31 +02:00
andrey@lmy004.
2a6ffba67d
add missing events_grant test
2006-05-29 13:16:29 +02:00
msvensson@neptunus.(none)
20e0714176
Merge neptunus.(none):/home/msvensson/mysql/bug16297/my50-bug16297
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-29 13:16:17 +02:00
kroki@mysql.com
e87bc6e48c
Avoid race between master and slave.
2006-05-29 14:45:20 +04:00
andrey@lmy004.
b4752351f2
Fix for bug #17394 - Events namespace is wrong
2006-05-29 10:39:45 +02:00
msvensson@neptunus.(none)
91e4fd9ac9
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 09:06:06 +02:00
ramil@mysql.com
6b2ab800c9
manual merge
2006-05-29 11:17:38 +05:00
igor@rurik.mysql.com
cb4c6a0ded
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-05-28 14:23:28 -07:00
aelkin@mysql.com
6119b7136e
BUG#14157: utf8 encoding in binlog without set character_set_client
...
refining the test case to exclude problems with koi8r on some platforms.
2006-05-28 19:47:01 +03:00
serg@sergbook.mysql.com
71657322fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-28 14:54:28 +02:00
serg@sergbook.mysql.com
fe97dbb587
handlerton cleanup:
...
duplicate fields removed, st_mysql_storage_engine added to support
run-time handlerton initialization (no compiler warnings), handler API
is now tied to MySQL version, handlerton->plugin mapping added
(slot-based), dummy default_hton removed, plugin-type-specific
initialization generalized, built-in plugins are now initialized too,
--default-storage-engine no longer needs a list of storage engines
in handle_options().
mysql-test-run.pl bugfixes
2006-05-28 14:51:01 +02:00
igor@rurik.mysql.com
377b3e0306
Fixed bug #17873 : confusing error message when IGNORE/USE/FORCE INDEX
...
refers to a column name.
Added a new error message ER_INDEX_DOES_NOT_EXIST.
2006-05-27 23:57:33 -07:00
rburnett@bk-internal.mysql.com
f4aa434fbe
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-26 15:08:24 +02:00
kent@mysql.com
7175805cd4
Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release
...
into mysql.com:/data0/mysqldev/my/mysql-5.1-new
2006-05-26 13:17:09 +02:00
gkodinov@mysql.com
393d1b69e0
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kgeorge/mysql/5.0/clean
2006-05-26 12:13:48 +03:00
gkodinov@mysql.com
b6acee915a
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18681
2006-05-26 11:57:56 +03:00
gkodinov@mysql.com
7552d8d9ba
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18681
2006-05-26 11:51:30 +03:00
gkodinov@mysql.com
f0f9c740ed
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B14875
2006-05-26 11:51:11 +03:00
gkodinov@mysql.com
59837f7a5b
Bug #14875 : Bad view DEFINER makes SHOW CREATE VIEW fail
...
When reading a view definition from a .frm file it was
throwing a SQL error if the DEFINER user is not defined.
Changed it to a warning to match the (documented) case
when a view with undefined DEFINER user is created.
2006-05-26 11:49:39 +03:00
gkodinov@mysql.com
a21a2b5bcd
BUG#18681: View privileges are broken
...
The check for view security was lacking several points :
1. Check with the right set of permissions : for each table ref that
participates in a view there were the right credentials to use in it's
security_ctx member, but these weren't used for checking the credentials.
This makes hard enforcing the SQL SECURITY DEFINER|INVOKER property
consistently.
2. Because of the above the security checking for views was just ruled out
in explicit ways in several places.
3. The security was checked only for the columns of the tables that are
brought into the query from a view. So if there is no column reference
outside of the view definition it was not detecting the lack of access to
the tables in the view in SQL SECURITY INVOKER mode.
The fix below tries to fix the above 3 points.
2006-05-26 11:47:53 +03:00
jmiller@mysql.com
0bf4f53187
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-25 22:37:06 +02:00
jmiller@mysql.com
115bcca2d1
Removing ./r/rpl_ndb_dd_partitions.result & ./t/rpl_ndb_dd_partitions.test since NDB only will support key partitions and moving them to the test-extra tree for safe keeping
2006-05-25 22:36:03 +02:00
rburnett@bk-internal.mysql.com
61bd780166
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-25 17:47:26 +02:00
pekka@mysql.com
e929e28c7b
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-05-25 16:20:36 +02:00
gluh@eagle.intranet.mysql.r18.ru
31a54240e7
test fix
2006-05-25 19:20:35 +05:00
pekka@mysql.com
ae964cb4cc
Merge mysql.com:/space/pekka/ndb/version/my51
...
into mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-25 16:20:34 +02:00
gluh@mysql.com
023317d68a
after merge fix
2006-05-25 19:20:34 +05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
7f6afa8b2a
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
2006-05-25 10:20:33 -04:00
pekka@mysql.com
61057f6112
Merge mysql.com:/space/pekka/ndb/version/my50
...
into mysql.com:/space/pekka/ndb/version/my50-bug14509
2006-05-25 13:14:16 +02:00
pekka@mysql.com
da807a85b9
Merge mysql.com:/space/pekka/ndb/version/my50
...
into mysql.com:/space/pekka/ndb/version/my50-bug14509
2006-05-25 13:08:50 +02:00
pekka@mysql.com
7fcc77f49c
ndb - bug#14509 v5.1 part 2/2 : handler level
2006-05-25 12:13:47 +02:00
gkodinov@mysql.com
0336a34c7f
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kgeorge/mysql/5.0/clean
2006-05-25 13:12:57 +03:00
gkodinov@mysql.com
d50fcc8644
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18742-2
2006-05-25 12:21:42 +03:00
gkodinov@mysql.com
bda18671a1
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18742-2
2006-05-25 10:45:24 +03:00
gkodinov@mysql.com
486837b0fa
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B19700
2006-05-25 10:45:00 +03:00
gkodinov@mysql.com
d6b5a89044
Bug #19700 : subselect returning BIGINT always returned it as SIGNED
...
The unsigned flag in Item was not propagated through the single value subqueries.
This caused the result to be treated as signed.
2006-05-25 10:39:18 +03:00