istruewing@chilla.local
4c57e823bd
Merge chilla.local:/home/mydev/mysql-4.1-bug24607
...
into chilla.local:/home/mydev/mysql-5.0-bug24607
2007-01-18 11:35:54 +01:00
kroki/tomash@moonlight.home
ec21b828f0
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug24404
2007-01-18 13:06:10 +03:00
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
df@kahlann.erinye.com
9885afeef4
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2007-01-18 10:42:06 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5c42e68388
after merge fix.
2007-01-18 10:51:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
e8968822dc
Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
...
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-18 09:39:47 +04:00
igor@olga.mysql.com
c1927e9a70
Fixed bug #25580 : incorrect stored representations of views in cases
...
when they contain the '!' operator.
Added an implementation for the method Item_func_not::print.
The method encloses any NOT expression into extra parentheses to avoid
incorrect stored representations of views that use the '!' operators.
Without this change when a view was created that contained
the expression !0*5 its stored representation contained not this
expression but rather the expression not(0)*5 .
The operator '!' is of a higher precedence than '*', while NOT is
of a lower precedence than '*'. That's why the expression !0*5
is interpreted as not(0)*5, while the expression not(0)*5 is interpreted
as not((0)*5) unless sql_mode is set to HIGH_NOT_PRECEDENCE.
Now we translate !0*5 into (not(0))*5.
2007-01-17 20:13:45 -08:00
tsmith@siva.hindu.god
2ae081e041
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-17 17:43:26 -07:00
tsmith@siva.hindu.god
8f5fdfe730
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
2007-01-17 16:44:10 -07:00
tsmith@siva.hindu.god
d6d7385a18
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-17 16:40:41 -07:00
tsmith@siva.hindu.god
018acedba7
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-17 16:40:17 -07:00
tsmith@siva.hindu.god
fa927d7e05
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-17 16:38:49 -07:00
jonas@perch.ndb.mysql.com
d8de8d624b
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-01-17 21:18:49 +01:00
jonas@perch.ndb.mysql.com
3af9db7975
ndb - bug#25686
...
add support for doing mlockall before mallc instead of after
(recommit in 5.0)
2007-01-17 21:15:13 +01:00
joerg@trift2.
4da7643924
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-01-17 20:56:01 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
044bb38433
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-01-17 19:43:46 +01:00
cmiller@zippy.cornsilk.net
c9a0cccc23
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-17 13:34:36 -05:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b25079d61a
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-01-17 19:30:05 +01:00
cmiller@zippy.cornsilk.net
940e722788
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-17 13:30:01 -05:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bbaf32754f
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-01-17 19:28:55 +01:00
cmiller@zippy.cornsilk.net
8a746fc0d2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
2007-01-17 13:24:20 -05:00
cmiller@zippy.cornsilk.net
332f9ff8b4
Bug#23721: compile fails: check-cpu mishandles cpu flags with \
...
hyphen in it (like ds-cpl).
convert illegal chars in cpu flags to '_' for variable assignment
2007-01-17 13:22:50 -05:00
kostja@bodhi.local
15c9d8a6c9
Disable symlinks under valgrind builds (again), with a comment.
2007-01-17 20:46:09 +03:00
istruewing@chilla.local
568106c297
Merge chilla.local:/home/mydev/mysql-4.1--team
...
into chilla.local:/home/mydev/mysql-4.1-bug24607
2007-01-17 14:52:36 +01:00
kostja@bodhi.local
a9590803fc
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max
2007-01-17 16:00:33 +03:00
msvensson@pilot.mysql.com
d18e98929c
Merge 192.168.0.10:mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-17 13:57:45 +01:00
kostja@bodhi.local
6399db740e
Fix a failure of lowercase_tables2 test on powermacg5, introduced
...
by the patch for Bug#4968
2007-01-17 15:46:30 +03:00
msvensson@neptunus.(none)
c4a86761b0
Replace the --exec in a while loop that causes 3400 executions of cygwin/bash on
...
windows with a small perl script that does exactly the same.
2007-01-17 13:43:03 +01:00
kostja@bodhi.local
175438819a
Fix a ps.test failure in 5.0-runtime tree.
2007-01-17 14:24:54 +03:00
msvensson@pilot.mysql.com
92d60d9bab
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-engines
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-engines
2007-01-17 12:24:43 +01:00
msvensson@pilot.mysql.com
543bc0165f
Bug#21122 SHOW CREATE TABLE: directory output only sometimes
...
Bug #25000 myisam.test fails on 'pb-valgrind-*' Valgrind
- Move tests that need symlink to symlink.test
2007-01-17 12:22:00 +01:00
msvensson@pilot.mysql.com
3b8695911c
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-17 12:14:34 +01:00
msvensson@pilot.mysql.com
248c768230
Cset exclude: msvensson@pilot.mysql.com|ChangeSet|20070117102733|42618
2007-01-17 12:12:24 +01:00
msvensson@pilot.mysql.com
51292deb36
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-17 11:53:00 +01:00
msvensson@pilot.mysql.com
29be5ce836
Bug#25505 Myisam library compiler error on Windows
2007-01-17 11:51:52 +01:00
msvensson@pilot.mysql.com
55ed38e533
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060825084614|09755
2007-01-17 11:27:33 +01:00
msvensson@pilot.mysql.com
8154355a07
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-01-17 11:13:03 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
b1fdb7bce4
Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release
...
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build
2007-01-17 10:42:57 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
2fed34d7ea
ha_ndbcluster.cc:
...
Bug #25668 - corrected patch after test failures
2007-01-17 10:41:52 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
6a83d18c28
Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release
...
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build
2007-01-17 10:07:45 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
1d6fe0ffaa
ha_ndbcluster.cc:
...
Bug #25668 ndb: mysqld may core if cluster disconnected
-- pTrans may be NULL, remove not needed usage of handler::ndb_err
2007-01-17 10:06:50 +01:00
svoj@mysql.com/june.mysql.com
ba6537ea8b
Merge mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.0-engines
2007-01-17 12:59:54 +04:00
df@kahlann.erinye.com
27f6578f6b
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2007-01-17 09:07:12 +01:00
joerg@trift2.
88bc918be6
myisam/mi_packrec.c
...
Fix a compile error: Macro "DBUG_ENTER" must not follow an executable statement.
2007-01-16 20:01:17 +01:00
kostja@bodhi.local
76dfe0bc08
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-01-16 21:31:59 +03:00
kostja@bodhi.local
51a2f5153f
A fix for the broken 4.1-runtime tree.
2007-01-16 21:23:52 +03:00
msvensson@neptunus.(none)
77b0123882
Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-16 17:53:45 +01:00
msvensson@neptunus.(none)
c36a5390e4
Update xid's as an effect of not closing the prepared statements all the time
2007-01-16 17:52:17 +01:00
msvensson@neptunus.(none)
ae03f5d382
Don't reuse prepared statements if running with reconnect enabled
2007-01-16 17:47:41 +01:00
svoj@mysql.com/june.mysql.com
c606e30f35
BUG#24855 - Crash mysqld 4.1.21 with corrupted tables
...
Accessing fixed record format table with crashed key definition results
in server/myisamchk segmentation fault.
This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.
2007-01-16 18:05:37 +04:00