bell@sanja.is.com.ua
4554b1f263
fixed union types merging and table related metadata (BUG#8824)
2005-03-23 08:36:48 +02:00
monty@mysql.com
f849ac68a5
Fixed newly introduced bug in ROLLUP
2005-03-22 02:36:31 +02:00
monty@mysql.com
d8b078e423
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-21 23:46:11 +02:00
monty@mysql.com
a1ab786091
Cleanups during review of code
...
Fixed newly introduced bug in rollup
2005-03-21 23:41:28 +02:00
dlenev@mysql.com
ea8adbff36
Manual merge of csets from -build tree into main 5.0 tree.
2005-03-21 11:39:47 +03:00
igor@rurik.mysql.com
df12e29955
func_group.test, func_group.result:
...
Added a test case for bug #9210 .
sql_select.cc:
Fixed bug #9210 .
The function calc_group_buffer did not cover the case
when the GROUP BY expression was decimal.
Slightly optimized the other code.
2005-03-19 23:12:50 -08:00
jimw@mysql.com
ee2b4ec959
Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
...
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826 )
2005-03-18 16:12:25 -08:00
igor@rurik.mysql.com
d53423383b
Manual merge
2005-03-17 21:47:46 -08:00
igor@rurik.mysql.com
6f5fbaad59
olap.test:
...
Added a test case for bug #8617 .
sql_select.cc:
Fixed bug #8617 .
Queries with ROLLUP and LIMIT n returned more than n rows
if SQL_CALC_FOUND_ROWS was used.
2005-03-17 20:18:19 -08:00
jimw@mysql.com
dcd336d79d
Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254 )
2005-03-17 17:22:40 -08:00
gluh@gluh.mysql.r18.ru
edb4dd5366
after merge fix
2005-03-17 18:44:24 +03:00
gluh@gluh.mysql.r18.ru
b435d6e862
Merge 4.1 -> 5.0
2005-03-17 16:51:07 +03:00
igor@rurik.mysql.com
45ba13889d
olap.result, olap.test:
...
Added a test for bug #8615 .
sql_select.cc:
Fixed bug #8615 .
This fix only removed the cause of the reported crash.
It does not resolve other problems of rollup queries
with DISTINCT. They were fixed in the previous patch
for bug 8616.
2005-03-16 15:55:04 -08:00
monty@mysql.com
594ef41b2d
Cleanup during reviews
...
Removed some optional arguments
Fixed portability problem in federated tests
2005-03-16 16:11:01 +02:00
igor@rurik.mysql.com
ce6c390c39
olap.result, olap.test:
...
Added a test case for bug #8616 .
item.h:
Fixed bug #8616 .
Added class Item_null_result used in rollup processing.
sql_select.h, sql_select.cc:
Fixed bug #8616 .
Added JOIN::rollup_write_data to cover rollup queries
with DISTINCT. Modified other rollup methods.
2005-03-15 22:50:54 -08:00
monty@mysql.com
05acaf060c
Merge with global tree
2005-03-15 16:21:08 +02:00
mskold@mysql.com
f2db341abe
Removed unnecessary current_thd
2005-03-14 15:53:44 +01:00
mskold@mysql.com
7092c7dec2
WL#2353 EXPLAIN support for condition pushdown
2005-03-14 15:26:10 +01:00
konstantin@mysql.com
22915b3ad5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/media/sda1/mysql/mysql-5.0-926
2005-03-13 23:53:30 +03:00
konstantin@mysql.com
983c75f05e
WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) and
...
implementation of AVG(DISTINCT) which utilizes the approach with Fields.
The patch implemented in October is portede to the up-to-date tree
containing DECIMAL type.
Tests for AVG(DISTINCT) (although there is not much to test provided
that SUM(DISTINCT) works), cleanups for COUNT(DISTINCT) and GROUP_CONCAT()
will follow in another changeset.
2005-03-13 23:50:43 +03:00
serg@serg.mylan
956682de1a
merged
2005-03-09 14:09:06 +01:00
serg@serg.mylan
9272081ebb
BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
...
for fulltext searches too
2005-03-08 19:45:55 +01:00
monty@mysql.com
03a2302202
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-04 10:48:32 +02:00
konstantin@mysql.com
fe2d63a060
Fixes for bug#8115 "Server Crash with prepared statement"
...
and bug#8849 "problem with insert statement with table alias's":
make equality propagation work in stored procedures and prepared
statements.
Equality propagation can change AND/OR structure of ON expressions,
so the fix is to provide each execution of PS/SP with it's own
copy of AND/OR tree. We have been doing that already for WHERE clauses,
now ON clauses are also copied.
2005-03-03 17:38:59 +03:00
jimw@mysql.com
ac69a4a22c
Make sure that the filename for temporary tables is built with fn_format()
...
so that extra slashes are handled in tmpdir. (Bug #8497 )
2005-03-01 19:05:48 -08:00
monty@mysql.com
f4d22c9bbf
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-01 23:57:20 +02:00
monty@mysql.com
e654497ae7
Removed some usage of current_thd
2005-03-01 23:56:13 +02:00
jani@ua141d10.elisa.omakaista.fi
111e1cb29d
Fix for Bug#5615 and merge from 4.1
2005-03-01 22:19:19 +02:00
jani@ua141d10.elisa.omakaista.fi
62b9fc5da6
Merge
2005-03-01 14:50:59 +02:00
ramil@mysql.com
c862c11aab
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b6089
2005-03-01 14:19:32 +04:00
ramil@mysql.com
8f90906961
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b6089
2005-03-01 12:31:05 +04:00
ramil@mysql.com
4225b8e8ff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b5615
2005-03-01 12:20:55 +04:00
sergefp@mysql.com
a6ad8a4d0f
Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::error to -1 to cause
...
the error to be sent to the client.
2005-02-28 20:21:21 +03:00
ramil@mysql.com
c896fcb483
merging
2005-02-28 19:59:38 +04:00
monty@mysql.com
72b692e11f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-28 16:22:26 +02:00
ramil@mysql.com
883ff0cc81
merging
2005-02-28 18:11:18 +04:00
monty@mysql.com
3839e443a4
merge with 4.1
2005-02-28 12:18:39 +02:00
monty@mysql.com
253bfcf783
Fixed wrong memory references found by purify
...
(No really critical errors found, but a few possible wrong results)
2005-02-28 11:59:46 +02:00
mskold@mysql.com
b9aa67bc76
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-26 16:15:36 +01:00
monty@mysql.com
7e5f74f8f2
Merge with global tree
2005-02-25 17:12:06 +02:00
monty@mysql.com
0a6b7aedb2
Remove compiler warnings and remove not used variables
...
(Found during build process)
2005-02-25 16:53:22 +02:00
mskold@mysql.com
4e6a4dfa13
Merge
2005-02-24 14:48:12 +01:00
bar@mysql.com
29e513d2a7
sql_select.cc:
...
Redundant "Item::" was removed.
2005-02-24 12:05:08 +04:00
joreland@mysql.com
2952f73c16
merge
2005-02-24 06:24:46 +01:00
mskold@mysql.com
07cdc9e334
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-23 20:08:21 +01:00
bell@52.0.168.192.in-addr.arpa
25e87cd6f7
Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
...
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 19:22:52 +02:00
mskold@mysql.com
fcc37a0787
Fixes for condition pushdown to storage engine based on comments from code review
2005-02-23 15:51:26 +01:00
gluh@gluh.mysql.r18.ru
3e9bf3af34
Fix for bug #7217 : information_schema: columns are varbinary() instead of timestamp &
...
bug #7215 : information_schema: columns are longtext instead of varchar
2005-02-23 15:15:36 +03:00
mskold@mysql.com
b3d3f73753
Merge
2005-02-21 16:13:29 +01:00
bell@51.0.168.192.in-addr.arpa
a11369b999
Merge
2005-02-20 18:49:27 +02:00