igor@olga.mysql.com
459f3cf18a
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-23 17:04:01 -08:00
igor@olga.mysql.com
20279c1a7b
Post-merge fix.
2007-01-23 10:11:53 -08:00
igor@olga.mysql.com
ed3c1741d4
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-23 09:56:06 -08:00
gluh@mysql.com/eagle.(none)
e34b0056f2
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-01-23 14:08:58 +04:00
igor@olga.mysql.com
9659c11b6e
Fixed bug #25637 : LEFT JOIN with BOOLEAN FULLTEXT loses left table matches.
...
The bug is actually a duplicate of the bug 14708.
Down-ported the fix for 14708 from 5.0.
Merged the test case for bug 14708 from 5.0.
2007-01-22 14:23:53 -08:00
evgen@moonbone.local
884713fb08
sql_select.cc:
...
Code cleanup after fix for bug#23417.
2007-01-22 23:04:14 +03:00
evgen@moonbone.local
4e0760067a
sql_prepare.cc:
...
Post fix for bug#25123.
2007-01-22 22:08:51 +03:00
evgen@moonbone.local
e921ac7afc
Bug#25123: ON DUPLICATE KEY clause allows fields not from the insert table.
...
When inserting into a join-based view the update fields from the ON DUPLICATE
KEY UPDATE wasn't checked to be from the table being inserted into and were
silently ignored.
The new check_view_single_update() function is added to check that
insert/update fields are being from the same single table of the view.
2007-01-22 15:14:38 +03:00
igor@olga.mysql.com
b8d55cc449
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25580
2007-01-19 11:36:42 -08:00
evgen@moonbone.local
4282753626
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/25172-bug-5.0-opt-mysql
2007-01-19 19:36:41 +00:00
iggy@recycle.(none)
205f7a0583
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-19 13:20:52 -05:00
iggy@recycle.(none)
d3e6cb6b3b
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Corrected compiler warnings and performance problems with new
dynstr_append_os_quoted function.
2007-01-19 13:09:48 -05:00
igor@olga.mysql.com
ee67d30be8
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25580
2007-01-19 09:09:54 -08:00
igor@olga.mysql.com
f346abb5ea
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25580
2007-01-19 08:00:29 -08:00
evgen@moonbone.local
d7d5db64ec
Bug#25172: Not checked buffer size leads to a server crash.
...
After fix for bug#21798 JOIN stores the pointer to the buffer for sorting
fields. It is used while sorting for grouping and for ordering. If ORDER BY
clause has more elements then the GROUP BY clause then a memory overrun occurs.
Now the length of the ORDER BY list is always passed to the
make_unireg_sortorder() function and it allocates buffer big enough to be
used for bigger list.
2007-01-19 18:34:09 +03:00
cmiller@zippy.cornsilk.net
20faa77a5f
Rearrange disable_warnings to enclose the warning emitters properly.
2007-01-19 10:33:07 -05:00
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
msvensson@pilot.mysql.com
b1a9115d88
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-19 11:11:34 +01:00
msvensson@pilot.mysql.com
2c60829f3b
Bug #15518 Reusing a stmt that has failed during prepare does not clear error
...
- Additional patch removing check for mysql_errno on already closed
mysql1
2007-01-19 11:07:20 +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
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
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
dac5bb3819
Makefile.am: Fix previous bad merge. Re-enable the test-ps target.
2007-01-18 13:15:16 -07:00
tsmith@siva.hindu.god
f3d321a2af
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 10:37:45 -07:00
tsmith@siva.hindu.god
5817465426
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
2007-01-18 10:36:46 -07:00
tsmith@siva.hindu.god
02ddf3d04c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:33:28 -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
iggy@recycle.(none)
294af0a42e
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-18 11:46:29 -05:00
iggy@recycle.(none)
ef5f757ac2
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Create space safe strings for system() calls in mysql_upgrade.exe
2007-01-18 11:38:05 -05:00
tsmith@siva.hindu.god
eec44018b2
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
2007-01-18 09:32:41 -07:00
tsmith@siva.hindu.god
d4aa9f0c62
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
2007-01-18 09:21:27 -07:00
tsmith@siva.hindu.god
2dc96063b4
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-18 09:20:25 -07:00
tsmith@siva.hindu.god
e39a4e6006
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
2007-01-18 08:55:33 -07:00
tsmith@siva.hindu.god
4b3840612e
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-18 08:52:45 -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
joerg/mysqldev@mysql.com/production.mysql.com
c3ab6de255
Raise version number after cloning 4.0.29
2007-01-18 16:41:32 +01: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
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@mysql.com/myoffice.izhnet.ru
c57442d6d8
after merge fix.
2007-01-18 15:28:45 +04: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