kaa@polly.local
e89fdaac73
5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1
2006-10-12 11:21:12 +04:00
kaa@polly.local
02ac635027
Merge polly.local:/tmp/maint/bug11655/my41-bug11655
...
into polly.local:/tmp/maint/bug11655/my50-bug11655
2006-10-11 14:16:30 +04:00
kaa@polly.local
609a3cd295
Fixes a number of problems with time/datetime <-> string conversion functions:
...
- bug #11655 "Wrong time is returning from nested selects - maximum time exists
- input and output TIME values were not validated properly in several conversion functions
- bug #20927 "sec_to_time treats big unsigned as signed"
- integer overflows were not checked in several functions. As a result, input values like 2^32 or 3600*2^32 were treated as 0
- BIGINT UNSIGNED values were treated as SIGNED in several functions
- in cases where both input string truncation and out-of-range TIME value occur, only 'truncated incorrect time value' warning was produced
2006-10-04 17:13:32 +04:00
thek@kpdesk.mysql.com
b4908ed35d
Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139
...
into kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
2006-09-19 12:41:15 +02:00
thek@kpdesk.mysql.com
66fa757e1f
Bug#21139 Handling of database differs in "embedded" , test lowercase_fs_off fails
...
- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test
2006-09-19 12:40:31 +02:00
cmiller@maint1.mysql.com
46b3997c51
mtr_cases.pl:
...
Provide a more extensible, easier-to-change way of reordering
test cases.
2006-09-01 21:53:23 +02:00
cmiller@maint1.mysql.com
53bb6a47cd
Bug #20908 : Crash if select @@""
...
Zero-length variables caused failures when using the length to look
up the name in a hash. Instead, signal that no zero-length name can
ever be found and that to encounter one is a syntax error.
2006-08-15 18:41:21 +02:00
kroki/tomash@moonlight.intranet
5c90b6f810
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-07-29 13:43:34 +04:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
bd47f4f3be
udf_example.c, udf.test, Makefile.am:
...
Converted "udf_example.cc" to C, avoids C++ runtime lib dependency (bug#21336)
2006-07-29 04:41:50 +02:00
tsmith@maint1.mysql.com
28df542a7a
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into maint1.mysql.com:/data/localhome/tsmith/bk/global-50
2006-07-28 17:40:33 +02:00
kroki/tomash@moonlight.intranet
053c9af65b
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main
2006-07-27 13:47:36 +04:00
tsmith/tim@siva.hindu.god
80465ab6af
Merge siva.hindu.god:/usr/home/tim/m/bk/global-41
...
into siva.hindu.god:/usr/home/tim/m/bk/global-50
2006-07-26 13:30:03 -06:00
joerg@trift2.
367dcdf853
"mysql-test-run.pl" must write a "Logging:" line for the evaluation of RPM build tests.
...
(Re-apply a patch from the general tree to the clone.)
2006-07-25 12:56:23 +02:00
msvensson@neptunus.(none)
d8151b6368
Bug#21218 Test "mysqlbinlog" fails to execute another program on Windows
...
- Send confusing output to /dev/null
2006-07-24 18:12:57 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
694d4999ef
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b16327
2006-07-23 14:17:01 +05:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
95197805e2
Merge bk://anubis/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/merge/mysql-5.0
2006-07-21 10:14:25 -07:00
tsmith@maint1.mysql.com
539ac78df2
Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24)
2006-07-21 09:53:12 +02:00
tsmith/tim@siva.hindu.god
17cc8acc91
Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes needed
2006-07-20 00:45:47 -06:00
kostja@bodhi.local
f22a4ce1a1
A fix and a test case for Bug#21002 "Derived table not selecting from a
...
"real" table fails in JOINs".
This is a regression caused by the fix for Bug 18444.
This fix removed the assignment of empty_c_string to table->db performed
in add_table_to_list, as neither me nor anyone else knew what it was
there for. Now we know it and it's covered with tests: the only case
when a table database name can be empty is when the table is a derived
table. The fix puts the assignment back but makes it a bit more explicit.
Additionally, finally drop sp.result.orig which was checked in by mistake.
2006-07-19 22:33:19 +04:00
tnurnberg@salvation.intern.azundris.com
36bf00709e
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0
2006-07-19 19:52:27 +02:00
tnurnberg@salvation.intern.azundris.com
56e1d96122
manual merge, part 2/2
2006-07-19 16:50:55 +02:00
tnurnberg@salvation.intern.azundris.com
199bb148fd
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
...
into salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge
2006-07-19 14:12:30 +02:00
tnurnberg@salvation.intern.azundris.com
b304cb6da8
Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER
...
REPLACE ... SELECT would require INSERT privileges on certain tables
when SELECT really suffices. Require INSERT only on target table.
2006-07-19 11:49:07 +02:00
patg@govinda.patg.net
71f5b4997a
"BUG #18764 : Delete conditions causing inconsistencies in Federated tables"
...
Post merge changes.
2006-07-18 18:41:36 -07:00
patg@govinda.patg.net
259f9bb0d7
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.0-bug18764.2
2006-07-18 17:21:50 -07:00
evgen@moonbone.local
b7a55b9b5c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-07-18 23:45:17 +04:00
evgen@moonbone.local
6dd8772bfc
Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-07-18 23:30:09 +04:00
evgen@moonbone.local
ed8eb31412
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-07-18 21:32:25 +04:00
evgen@moonbone.local
a8d230c672
Merge moonbone.local:/work/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-07-18 21:30:26 +04:00
jimw@rama.(none)
8b91a02728
Merge bk-internal:/home/bk/mysql-5.0-engines
...
into rama.(none):/home/jimw/my/mysql-5.0-17608
2006-07-18 10:25:04 -07:00
patg@govinda.patg.net
51d8bcf627
"BUG #18764 : Delete conditions causing inconsistencies in Federated tables"
...
Removed logic in ha_federated::write_row, which checks field query ids in the
loop which builds the query to run on the remote server.
2006-07-17 16:45:04 -07:00
igor@rurik.mysql.com
31a7bdfcf6
Post-merge fix.
2006-07-17 15:28:24 -07:00
iggy@rolltop.ignatz42.dyndns.org
ad12809f35
Bug# 20221- Dumping of multiple databases containing view(s) yields maleformed dumps.
2006-07-17 18:07:08 -04:00
igor@rurik.mysql.com
3d83d5aa03
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-07-17 13:24:43 -07:00
igor@olga.mysql.com
59e7a26177
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2006-07-17 11:41:27 -07:00
evgen@moonbone.local
b0b1fe3bd8
select.result, select.test:
...
Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.
2006-07-17 16:12:42 +04:00
evgen@moonbone.local
51a636293e
mysql.test, mysql.result:
...
Corrected the test case after fixing bug#10977
2006-07-17 14:22:21 +04:00
igor@rurik.mysql.com
21469f84ac
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-07-16 12:10:46 -07:00
evgen@moonbone.local
f1346cf8f6
Fixed bug#10977: No warning issued if a column name is truncated
...
When an alias is set to a column leading spaces are removed from the alias.
But when this is done on aliases set by user this can lead to confusion.
Now Item::set_name() method issues the warning if leading spaces were removed
from an alias set by user.
New warning message is added.
2006-07-16 00:45:38 +04:00
igor@rurik.mysql.com
38cd55a758
Fixed bug #20869 .
...
The bug caused a crash of the server if a subquery with
ORDER BY DESC used the range access method.
The bug happened because the method QUICK_SELECT_DESC::reset
was not reworked after MRR interface had been introduced.
2006-07-15 00:28:21 -07:00
igor@olga.mysql.com
4de3186ae1
Fixed bug #20519 .
...
The bug was due to a loss happened during a refactoring made
on May 30 2005 that modified the function JOIN::reinit.
As a result of it for any subquery the value of offset_limit_cnt
was not restored for the following executions. Yet the first
execution of the subquery made it equal to 0.
The fix restores this value in the function JOIN::reinit.
2006-07-14 19:28:58 -07:00
igreenhoe/greenman@anubis.greendragongames.com
20de038887
4.1 -> 5.0 merge
2006-07-14 13:30:23 -07:00
igreenhoe/greenman@anubis.greendragongames.com
9beb95f0ed
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/merge-4.1_2_5.0
2006-07-14 06:52:25 -07:00
igreenhoe/greenman@anubis.greendragongames.com
b170112cae
4.1 -> 5.0 merge fixes
2006-07-14 05:56:30 -07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0d15e5e340
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b15195
2006-07-14 16:58:51 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b57efe738a
--{skip-}merge option added which allows the user to disable merge engine and
...
to avoid the potential security problem.
(see bug #15195 : Security Breach with MERGE table)
2006-07-14 16:26:58 +05:00
tnurnberg@mysql.com/salvation.intern.azundris.com
00ec3973f7
Bug#21014: Segmentation fault of mysqldump on view
...
mysqldump did not select the correct database before trying to dump
views from it. this resulted in an empty result set, which in turn
startled mysql-dump into a core-dump. this only happened for views,
not for tables, and was only visible with multiple databases that
weren't by sheer luck in the order mysqldump required, anyway. this
fixes by selecting the correct database before dumping views; it also
catches the empty set-condition if it should occur for other reasons.
2006-07-14 12:50:00 +02:00
gkodinov/kgeorge@rakia.(none)
f04ea13511
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B17212-4.1-opt
2006-07-14 12:49:14 +03:00
gkodinov/kgeorge@macbook.gmz
a64f67bc4a
Merge macbook.gmz:/Users/kgeorge/mysql/work/B17212-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B17212-5.0-opt
2006-07-14 11:20:52 +03:00
igor@olga.mysql.com
52bee69edf
Correction for test tesults after pushing the fix for bug 19714.
2006-07-13 22:00:20 -07:00