cmiller@zippy.cornsilk.net
85eb07ff98
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-19 08:56:33 -05:00
cmiller@zippy.cornsilk.net
a8ff939d83
The rpl tree added a test case, and another source added a warning,
...
and combined, they add a platform-specific warning. The warnings
are not the goal of the test, in any case.
2007-01-19 08:56:06 -05:00
istruewing@chilla.local
2a0ca5df8c
Merge chilla.local:/home/mydev/mysql-5.0-bug24607
...
into chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-19 13:08:09 +01:00
msvensson@pilot.mysql.com
a15a7d3791
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-engines
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-engines
2007-01-19 12:04:55 +01:00
msvensson@pilot.mysql.com
009324b12b
Use $MYSQLTESTVARDIR
2007-01-19 12:03:03 +01:00
igor@olga.mysql.com
3c814f2243
Fixed bug #25219 : crash for a query that contains an EXIST subquery with
...
UNION over correlated and uncorrelated SELECTS.
In such subqueries each uncorrelated SELECT should be considered as
uncacheable. Otherwise join_free is called for it and in many cases
it causes some problems.
2007-01-19 00:17:28 -08:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ce855aba98
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
2007-01-19 09:12:52 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
86322e269f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-19 08:56:03 +04:00
ramil/ram@myoffice.izhnet.ru
1b488c7fbe
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-19 08:54:10 +04:00
malff/marcsql@weblab.(none)
a0c1c61b1f
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-24562-merge
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-24562-merge
2007-01-18 18:43:11 -07:00
malff/marcsql@weblab.(none)
4064c89d24
Manual merge
2007-01-18 18:37:52 -07:00
malff/marcsql@weblab.(none)
cacaa52bd9
Merge weblab.(none):/home/marcsql/TREE/mysql-4.1-24562
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-24562-merge
2007-01-18 17:02:02 -07:00
malff/marcsql@weblab.(none)
436e1f591a
Bug#24562 (ALTER TABLE ... ORDER BY ... with complex expression asserts)
...
WL#3681 (ALTER TABLE ORDER BY)
Before this fix, the ALTER TABLE statement implemented an ORDER BY option
with the following characteristics :
1) The order by clause accepts a list of criteria, with optional ASC or
DESC keywords
2) Each criteria can be a general expression, involving operators,
native functions, stored functions, user defined functions, subselects ...
With this fix :
1) has been left unchanged, since it's a de-facto existing feature,
that was already present in the code base and partially covered in the test
suite. Code coverage for ASC and DESC was missing and has been improved.
2) has been changed to limit the kind of criteria that are permissible:
now only a column name is valid.
2007-01-18 16:53:49 -07:00
tsmith@siva.hindu.god
f4354a87d7
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 13:27:51 -07:00
tsmith@siva.hindu.god
f135f34ebc
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-18 13:26:48 -07:00
tsmith@siva.hindu.god
f5aab8b213
ndb_types.test: sleep a bit longer, to ensure that timestamp > @now
2007-01-18 13:26:26 -07:00
tsmith@siva.hindu.god
6b729ff2cd
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:30:39 -07:00
tsmith@siva.hindu.god
244b2004ee
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:06:36 -07:00
tsmith@siva.hindu.god
6fd02a439f
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
2007-01-18 09:53:30 -07:00
gkodinov/kgeorge@rakia.gmz
0d665bd545
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B25382-5.0-opt
2007-01-18 17:46:54 +02:00
tsmith@siva.hindu.god
94f7990ef8
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:41:52 -07:00
gkodinov/kgeorge@macbook.gmz
20d94f1105
Bug #25382 : Passing NULL to an UDF called from stored procedures
...
crashes server
Check for null value is reliable only after calling some of the
val_xxx() methods. If the val_xxx() method is not called
the null_value flag will be set only for certain types of NULL
values (like SQL constant NULLs for example).
This caused a crash while trying to dereference a NULL pointer
that is returned by val_str() for NULL values.
Fixed by swapping the order of val_xxx() and null_value check.
2007-01-18 17:33:38 +02:00
tsmith@siva.hindu.god
cc7afe2494
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c91d648b73
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
2007-01-18 17:17:03 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
6eba677517
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-18 17:10:00 +04:00
ramil/ram@myoffice.izhnet.ru
3760672ead
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-18 16:40:49 +04:00
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
ca77918d92
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug24404
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug24404
2007-01-18 13:08:00 +03: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
fbeadd43a5
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug24404
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug24404
2007-01-18 12:57:34 +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
ramil/ram@myoffice.izhnet.ru
a2303ea3fe
Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
...
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-18 11:13:13 +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
lars/lthalmann@dl145j.mysql.com
5810ca92c9
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-17 19:32:14 +01: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
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
baker@bk-internal.mysql.com
7acead9c68
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-17 17:11:53 +01: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
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
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
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
cmiller@zippy.cornsilk.net
eee98226e7
Disabled "plugin". Very minor memory leak keeping tree red.
2007-01-16 19:17:17 -05: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