thek@adventure.(none)
1317079fd0
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269
...
into adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
2007-08-21 13:44:01 +02:00
thek@adventure.(none)
acfe3fc924
Bug#30269 Query cache eats memory
...
Although the query cache doesn't support retrieval of statements containing
column level access control, it was still possible to cache such statements
thus wasting memory.
This patch extends the access control check on the target tables to avoid
caching a statement with column level restrictions.
Views are excepted and can be cached but only retrieved by super user account.
2007-08-21 13:43:09 +02:00
gshchepa/uchum@gleb.loc
9de070f36b
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-08-21 16:38:29 +05:00
gshchepa/uchum@gleb.loc
4c144f6349
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-21 16:31:30 +05:00
gshchepa/uchum@gleb.loc
be6ee4314e
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-08-21 16:16:50 +05:00
gshchepa/uchum@gleb.loc
d1b4cee88f
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-21 16:14:46 +05:00
gluh@eagle.(none)
4ae4934856
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-08-21 16:01:47 +05:00
malff/marcsql@weblab.(none)
c76cd081d8
Fixed 5.0 -> 5.1 merge
2007-08-20 17:50:42 -06:00
malff/marcsql@weblab.(none)
a01da34f72
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-08-20 16:13:54 -06:00
brian@piggy.tangent.org
0ffc10463a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into piggy.tangent.org:/home/mysql/trees/mysql-5.1-arch
2007-08-20 13:25:53 -07:00
baker@bk-internal.mysql.com
9977898bd7
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-08-20 22:25:52 +02:00
brian@piggy.tangent.org
e00b72de19
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into piggy.tangent.org:/home/mysql/trees/mysql-5.1-arch
2007-08-20 13:18:40 -07:00
brian@piggy.tangent.org
bd0bcb70f5
Extending tests for detach (found a memory issue in it, this fixes that and now tests it).
2007-08-20 13:03:50 -07:00
malff/marcsql@weblab.(none)
1c27dd1d67
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-08-20 11:13:31 -06:00
malff/marcsql@weblab.(none)
8d507c5897
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-08-20 10:45:16 -06:00
msvensson@pilot.(none)
0b8d2a92b1
Merge 192.168.0.7:mysql/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-20 15:15:44 +02:00
msvensson@shellback.(none)
cbecd2007e
Make it possible to pass mysql-test-run.pl test cases to run
...
also on the <suite>.<testname> format
2007-08-20 15:12:14 +02:00
msvensson@pilot.(none)
346e565981
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-20 13:48:46 +02:00
msvensson@pilot.(none)
6d00495cbb
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-20 13:48:27 +02:00
msvensson@pilot.(none)
2b8218d334
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-20 13:48:04 +02:00
msvensson@pilot.(none)
d2fdcd908a
Merge pilot.(none):/data/msvensson/mysql/work/my51-work
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-20 13:47:31 +02:00
msvensson@pilot.(none)
f773863767
Merge pilot.(none):/data/msvensson/mysql/work/my50-work
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-20 13:46:57 +02:00
msvensson@pilot.(none)
0b80907150
Only install second master db if using second master
2007-08-20 13:46:42 +02:00
msvensson@pilot.(none)
cd7fdee0f7
Merge pilot.(none):/data/msvensson/mysql/work/my50-work
...
into pilot.(none):/data/msvensson/mysql/work/my51-work
2007-08-20 13:45:32 +02:00
lzhou/zhl@dev3-63.(none)
804684c292
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug29674
2007-08-20 10:59:14 +00:00
lzhou/zhl@dev3-63.(none)
d48067537b
BUG#29674 add install data of the new test case in makefile.am
2007-08-20 10:47:09 +00:00
gluh@eagle.(none)
6dda1f8be1
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-08-20 11:25:45 +05:00
gluh@mysql.com/eagle.(none)
7a8fd4107d
Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements
...
added SUPER_ACL check for I_S.TRIGGERS
2007-08-20 11:23:08 +05:00
tsmith@ramayana.hindu.god
76d173fa9d
Bug #29307 : status.test fails with different Table_locks_immediate
...
Finish premature patch which was accidentally pushed; remove debugging
info and correct the test.
2007-08-18 02:28:08 -06:00
tsmith@ramayana.hindu.god
a7b5c540ba
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-18 00:36:18 -06:00
tsmith@ramayana.hindu.god
88444351c2
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-18 00:35:41 -06:00
tsmith@ramayana.hindu.god
c23b736ed3
Bug #29307 : status.test fails with different Table_locks_immediate
...
When using --log --log-output=table, we increment Table_locks_immediate
with every query. The wait_condition.inc runs a query a variable number
of times, depending on server load, etc. This is a problem, when the
test is checking the Table_locks_immediate value.
Fix is to adjust the Table_locks_immediate value based on how many times
the wait_condition query was executed.
2007-08-17 19:29:08 -06:00
thek@adventure.(none)
4b6c103f09
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-08-17 17:34:18 +02:00
thek@adventure.(none)
35533f9d8f
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-08-17 17:27:41 +02:00
thek@adventure.(none)
c12feca450
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-08-17 17:26:38 +02:00
thek@adventure.(none)
5d5519edde
Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269
...
into adventure.(none):/home/thek/Development/cpp/bug30269/my51-bug30269
2007-08-17 16:59:20 +02:00
thek@adventure.(none)
a4248c2dd3
Bug #30269 Query cache eats memory
...
Although the query cache doesn't support retrieval of statements containing
column level access control, it was still possible to cache such statements
thus wasting memory.
This patch extends the access control check on the target tables to avoid
caching a statement with column level restrictions.
2007-08-17 16:55:20 +02:00
davi@moksha.local
a63738db6c
Bug#25856 (HANDLER table OPEN in one connection lock DROP TABLE in another one)
...
mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.
This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).
2007-08-17 11:34:12 -03:00
evgen@moonbone.local
9a83ddda69
Bug#30245: A wrong type of a BIT field is reported when grouped by it.
...
HEAP tables can't index BIT fields. Due to this when grouping by such fields is
needed they are converted to a fields of the LONG type when temporary table
is being created. But a side effect of this is that a wrong type of BIT
fields is returned to a client.
Now the JOIN::prepare and the create_distinct_group functions are create
additional hidden copy of BIT fields to preserve original fields untouched.
New hidden fields are used for grouping instead.
2007-08-17 18:30:41 +04:00
igor@olga.mysql.com
3d44204e84
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396
2007-08-16 21:04:28 -07:00
gni@dev3-221.dev.cn.tlan
ed539e10f2
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240
2007-08-17 11:44:51 +08:00
gni@dev3-221.dev.cn.tlan
badda4b7b6
BUG#22240 Add a test case into ndb_restore_compat
2007-08-17 11:41:32 +08:00
igor@olga.mysql.com
37f3a92a42
Post-merge fix.
2007-08-16 19:27:44 -07:00
igor@olga.mysql.com
ff3f6e806b
Merge olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug30396
2007-08-16 17:22:50 -07:00
antony@pcg5ppc.xiphis.org
edbe12ac02
Bug#30359
...
"Test federated_bug_25714 issues non-existing shell command"
Problem caused by missing '$' symbol in eval statement causing it
to always attempt to run test even if the test was not compiled.
2007-08-16 14:00:35 -07:00
jbruehe/mysqldev@mysql.com/production.mysql.com
7f21134826
Merge bk-internal:/home/bk/mysql-5.1-marvel
...
into mysql.com:/data0/mysqldev/my/build-200708161639-5.1.21-beta/mysql-5.1-release
2007-08-16 21:56:47 +02:00
jbruehe/mysqldev@mysql.com/production.mysql.com
2d4efab366
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mysql.com:/data0/mysqldev/my/mysql-5.1-30367
2007-08-16 18:21:47 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
aba3a3b49d
Post-merge fix of error number
2007-08-16 17:26:32 +02:00
monty@mysql.com/narttu.mysql.fi
9b6b53f0d0
Fixed errors found by pushbuild:
...
Fixed failing func_misc test for embedded server
Added casts to avoid compiler warnings
Removed Table_locks_immediate as it's depending on log file cacheing
Changed type of get_time() to avoid warnings
Removed testing if purger master logs succeded as this is not deterministic
2007-08-16 16:47:31 +03:00
mhansson@dl145s.mysql.com
4fdadd620d
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/mhansson/my50-bug28570
2007-08-16 14:13:07 +02:00