kroki/tomash@moonlight.home
6e771358ce
Bug#24404: strange bug with view+permission+prepared statement.
...
The problem was that if a prepared statement accessed a view, the
access to the tables listed in the query after that view was done in
the security context of the view.
The bug was in the assigning of the security context to the tables
belonging to a view: we traversed the list of all query tables
instead. It didn't show up in the normal (non-prepared) statements
because of the different order of the steps of checking privileges
and descending into a view for normal and prepared statements.
The solution is to traverse the list and stop once the last table
belonging to the view was processed.
2007-01-18 12:48:17 +03:00
malff/marcsql@weblab.(none)
7696592b09
minor cleanup
2006-12-11 18:52:24 -07:00
malff/marcsql@weblab.(none)
996fa0dfbb
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-19194
2006-12-11 17:15:08 -07:00
malff/marcsql@weblab.(none)
506c2a722f
Bug#19194 (Right recursion in parser for CASE causes excessive stack usage,
...
limitation)
Bug#24854 (Mixing Searched Case with Simple Case inside Stored Procedure
crashes Mysqld)
Implemented code review (19194) comments
2006-12-11 16:59:02 -07:00
petr/cps@outpost.site
80fe32d526
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into outpost.site:/home/cps/mysql/trees/5.0-runtime-19044
2006-12-04 19:54:50 +03:00
petr/cps@outpost.site
2bc1898bc6
Fix Bug #19044 IM aborts on exit
...
On windows IM aborted on assert once one
stoppped it. The reason is that we didn't
close the sockets on windows and therefore,
the listener thread wasn't able to finish.
This happened because we used close() call
for it. While on windows one should use
closesocket().
On other platfroms we have appropriate defines
for closesocket(), so this is the function which
should be used.
2006-12-04 19:48:49 +03:00
anozdrin/alik@booka.
a9e1563fa4
Use standard shell instead of BASH.
2006-12-04 14:05:27 +03:00
kostja@bodhi.local
87a87bc04b
A fix and a test case for Bug#24179 "select b into $var" fails with
...
--cursor_protocol": fix a misleading error message in case of
SELECT .. INTO.
2006-12-01 13:25:06 +03:00
kostja@bodhi.local
4d418e6c43
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-30 02:05:40 +03:00
kostja@bodhi.local
726c43cc00
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-30 02:04:43 +03:00
kostja@bodhi.local
605404ec68
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-30 02:00:39 +03:00
kostja@bodhi.local
c6c172e40c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-30 01:58:57 +03:00
kroki/tomash@moonlight.intranet
3881fa9e66
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637
2006-11-29 18:54:01 +03:00
kent@mysql.com/kent-amd64.(none)
b67ff612d3
Merge mysql.com:/home/kent/bk/mysql-4.1-build
...
into mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-29 14:25:30 +01:00
kroki/tomash@moonlight.intranet
50e3b32170
BUG#20637: "load data concurrent infile" locks the table
...
Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
inside a stored routine and MySQL is compiled with Query Cache support
(this is not in the manual).
The problem was that the condition test of "we are inside stored routine"
was reversed, thus CONCURRENT _worked only_ from stored routine. The
solution is to use proper condition test.
No test case is provided because the test case would require a large
amount of input, and it's hard to tell is SELECT is really blocked or
just slow (subject to race).
2006-11-29 15:51:53 +03:00
df@kahlann.erinye.com
343e779571
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2006-11-29 10:35:15 +01:00
df@kahlann.erinye.com
756f104591
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-11-29 10:33:23 +01:00
df@kahlann.erinye.com
c134b8c332
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-11-29 10:22:43 +01:00
df@kahlann.erinye.com
1c46f7d841
minor fix
2006-11-29 10:21:59 +01:00
kostja@bodhi.local
644639fcbd
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-29 11:19:55 +03:00
kostja@bodhi.local
5fea0724bc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-29 02:44:12 +03:00
kostja@bodhi.local
bf3fbb44ae
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-29 02:39:17 +03:00
joerg@trift2.
3406fcea39
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into trift2.:/MySQL/M50/push-5.0
2006-11-28 18:45:10 +01:00
joerg@trift2.
3680ba8706
Merge trift2.:/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-11-28 18:39:17 +01:00
joerg@trift2.
648e86e108
netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain wrong - drop it.
2006-11-28 18:36:53 +01:00
kent@mysql.com/kent-amd64.(none)
de6eb0afb2
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-28 18:11:21 +01:00
kent@mysql.com/kent-amd64.(none)
d3f73f27fa
Makefile.am:
...
Handle the case "sql_yacc.cc" is pregenerated or not, and that the
case where the source and build tree is the same or not.
2006-11-28 18:08:30 +01:00
kent@mysql.com/kent-amd64.(none)
d9e0763cba
Merge mysql.com:/home/kent/bk/mysql-4.1-build
...
into mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-28 18:07:50 +01:00
kent@mysql.com/kent-amd64.(none)
08e0e06eab
Makefile.am:
...
If using \$(srcdir)/mysql.info in action, use same in rule.
2006-11-28 18:04:10 +01:00
joerg@trift2.
dd97e53171
Merge trift2.:/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-11-28 13:03:32 +01:00
kent@mysql.com/kent-amd64.(none)
ae605ec9d8
Merge mysql.com:/home/kent/bk/mysql-4.1-build
...
into mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-28 00:42:41 +01:00
kent@mysql.com/kent-amd64.(none)
029dbbc2b2
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/mysql-5.0-merge
2006-11-27 21:45:16 +01:00
kent@mysql.com/kent-amd64.(none)
12c3e410d4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/mysql-4.1-merge
2006-11-27 21:38:53 +01:00
kent@mysql.com/kent-amd64.(none)
5fcb7a4ef1
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into mysql.com:/home/kent/bk/mysql-5.0
2006-11-27 21:21:00 +01:00
kent@mysql.com/kent-amd64.(none)
1b61612f86
ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:
...
Reenabled build outside source tree
2006-11-27 21:15:25 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c48c8e9015
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/build/mysql-5.0-build
2006-11-27 19:09:21 +01:00
kent@mysql.com/kent-amd64.(none)
27ead71f12
Merge mysql.com:/home/kent/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/mysql-5.0
2006-11-27 19:06:24 +01:00
kent@mysql.com/kent-amd64.(none)
b7e107bf2d
Makefile.am:
...
BSD compatibility
2006-11-27 19:04:57 +01:00
kent@mysql.com/kent-amd64.(none)
cbe9d22927
Merge mysql.com:/home/kent/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/mysql-5.0
2006-11-27 18:47:07 +01:00
kent@mysql.com/kent-amd64.(none)
6c85ba399d
gen_rec.awk:
...
Fix undefined behaviour.
Many files:
Reenabled build outside ource tree
2006-11-27 18:29:50 +01:00
gkodinov@dl145s.mysql.com
e74c9add47
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-11-27 16:25:52 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
9d328d7d62
mysql-test-run.pl:
...
Removed "use diagnostics", reduces Perl speed significantly. Can be
enabled with "perl -Mdiagnostics mysql-test-run.pl".
mtr_report.pl:
Don't try output "skipped" comment if there is none (bug#24471)
2006-11-24 18:26:53 +01:00
df@kahlann.erinye.com
728357200c
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-11-24 15:36:51 +01:00
df@kahlann.erinye.com
34cedd8d77
fixes for mtr_unique.pl
2006-11-24 15:36:04 +01:00
anozdrin/alik@booka.
ea47e05f3c
Fix for BUG##24415: Instance manager test im_daemon_life_cycle
...
fails randomly.
The problem was that the test case used command line tool (mysql)
without specifying connect_timeout argument. In some cases,
this lead to hanging of the test case.
The fix is to specify --connect_timeout=1 when starting mysql.
Also, the patch contains polishing and various cleanups to simplify
analyzing of the problems further.
The patch affects only test suite, no server codebase has been
touched.
2006-11-23 22:55:36 +03:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
35cfb3876d
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2006-11-23 20:08:12 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f1ec3372be
Many files:
...
Adjuster project files to reflect move of "mySTL" directory
2006-11-23 20:04:18 +01:00
monty@mysql.com/nosik.monty.fi
501333f694
Added option --mtr-build-thread to mysql-test-run.pl
...
Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
Added connect timeout to test to make im_daemon_life_cycle more predictable
2006-11-23 18:39:10 +02:00
monty@mysql.com/nosik.monty.fi
fb9bb62b1e
Added some missing DBUG_RETURN
...
Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()
2006-11-23 16:41:21 +02:00
msvensson@neptunus.(none)
bc59087a9a
Add define for my_getpagesize to 8192(reworked in 5.0)
2006-11-23 12:06:04 +01:00