igor@rurik.mysql.com
da6c4bd5b1
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-05-31 06:00:41 -07:00
konstantin@mysql.com
e315f903d0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-7306-new
2005-05-30 20:56:11 +04:00
konstantin@mysql.com
2d6a70c42a
Preparatory (and the most problematic) patch for Bug#7306
...
"the server side preparedStatement error for LIMIT placeholder",
which moves all uses of LIMIT clause from PREPARE to OPTIMIZE
and later steps.
After-review fixes.
2005-05-30 20:54:37 +04:00
igor@rurik.mysql.com
f987085aa4
Manual post merge
2005-05-30 05:47:50 -07:00
igor@rurik.mysql.com
e8a6fa4278
sql_select.cc:
...
Post-review modifications for the fix of bug #7894 .
2005-05-30 05:25:12 -07:00
igor@rurik.mysql.com
10cc5a46df
olap.result, olap.test:
...
Added test cases for bug #7894 .
sql_select.cc:
Fixed bug #7894 : GROUP BY queries with ROLLUP returned
wrong results for expressions containing group by columns.
The fix ensured correct results by replacement of all
occurrences of group by fields in non-aggregate expressions
for corresponding ref objects and preventing creation of
fields in temporary tables for expression containing group
by fields.
2005-05-30 03:01:51 -07:00
evgen@moonbone.local
329d974df7
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/mysql-5.0-bug-9593
2005-05-30 03:34:20 +04:00
evgen@moonbone.local
077086cd96
Fix bug #9593 "The combination of COUNT, DISTINCT and CONCAT seems to lock the
...
server"
Bug appears only on Windows platform. Freeing memory in
TMP_TABLE_PARAM::cleanup() allocated by new Copy_fields[0] in
setup_copy_fields() results in memory destruction. In test IF used instead
of CONCAT because IF have more stable crash.
2005-05-30 03:32:50 +04:00
msvensson@neptunus.(none)
697cfe7f07
Merge from 4.1
2005-05-26 21:01:55 +02:00
sergefp@mysql.com
59db44382b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2
2005-05-26 21:01:53 +02:00
msvensson@neptunus.(none)
83d430353e
Add ifdefs to control when "#pragma implementation" should be used
...
Added some more ifdefs for "#pragma interface"
2005-05-26 12:09:14 +02:00
monty@mysql.com
5f8f947f34
Cleanup's during review
...
Added ASSERT() to detect wrongly packed fields
2005-05-25 18:33:32 +03:00
mskold@mysql.com
82490f1492
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-23 07:26:55 +02:00
igor@rurik.mysql.com
01fcf04d95
sql_select.cc:
...
Added missing comment for fix of #10561 .
2005-05-21 08:39:35 -07:00
igor@rurik.mysql.com
fdb6c661a3
range.result, range.test:
...
Added test cases for optimization request #10561 .
opt_range.cc, sql_select.cc:
Fixed bug #10561 : an optimization request to allow
range analysis for NOT IN and NOT BETWEEN.
2005-05-21 06:11:44 -07:00
monty@mysql.com
9c45c28d11
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-05-20 16:16:22 +03:00
monty@mysql.com
0b75f6e37b
compatibility issues
...
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00
bell@sanja.is.com.ua
77735f2f35
do not try to use equal field from outer query as field of local join (BUG#6384)
2005-05-20 16:01:41 +03:00
jimw@mysql.com
3f6aad900c
Resolve merge from 4.1
2005-05-18 11:06:34 -07:00
konstantin@mysql.com
8b302cbb99
A draft comment for mysql_select. Feel free to moderate and improve.
2005-05-18 19:35:20 +04:00
mskold@mysql.com
e3b0643098
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-18 14:34:42 +02:00
igor@rurik.mysql.com
80aa0062db
olap.result, olap.test:
...
Added test cases for bug #7914 .
sql_select.cc:
Fixed bug #7914 : rollup over expresssions such as sum(a)+1.
2005-05-18 05:15:48 -07:00
sergefp@mysql.com
b6179919f3
Change Last_query_cost status variable from global to thread-local.
2005-05-18 05:39:10 +02:00
monty@mysql.com
7d70579917
Fixed failing tests for not 32 bit intel machines
...
Fixed bug in mysql_stmt_fetch() when retrieving rows to return
2005-05-16 13:34:23 +03:00
konstantin@mysql.com
7ca3f018e7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/media/sda1/mysql/mysql-5.0-9478
2005-05-12 11:17:38 +04:00
konstantin@mysql.com
d0e24153b9
A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"
...
(crash on attempt to re-execute a statement with an open cursor) +
post-review fixes.
2005-05-12 11:16:12 +04:00
igor@rurik.mysql.com
3351233349
Manual merge
2005-05-10 16:41:47 -07:00
igor@rurik.mysql.com
9d4b228b61
Many files:
...
Fixed bug #8528 .
Representation for single-table views was made similar to
representation for multi-table views.
view.test:
Added test case for bug #8528 .
view.result:
Added test case for bug #8528 . Fixed other test cases.
2005-05-10 16:31:13 -07:00
mskold@mysql.com
145f7b2983
Fix for Bug #9246 Condition pushdown and left join, wrong result
2005-05-09 18:56:29 +02:00
mskold@mysql.com
66f881a8f6
Removed call to cond_push for empty cond
2005-05-08 22:42:40 +02:00
mskold@mysql.com
a785052d7d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-07 22:44:49 +02:00
mskold@mysql.com
1eaa54a4d8
Removed double cond_push
2005-05-07 22:41:30 +02:00
jimw@mysql.com
80933d9f95
Merge
2005-05-07 08:25:58 -07:00
jimw@mysql.com
ef183de687
Merge mysql.com:/home/jimw/my/mysql-4.1-8497
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-07 01:00:24 -07:00
monty@mishka.local
015cd1cd21
merge
2005-05-06 13:51:58 +03:00
monty@mishka.local
a9f6aab4c9
Fixes while reviewing new code
...
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03:00
bar@mysql.com
b93385de8f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/root/mysql-5.0
2005-05-06 11:48:54 +05:00
bar@noter.(none)
153b928c10
Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci
...
We cannot propagate constants with tricky collations.
2005-05-05 21:13:57 +05:00
holyfoot@hf-ibm.(none)
2c8e9df232
A lot of fixes to Precision math
...
Mostly about precision/decimals of the results of the operations
2005-05-05 20:06:49 +05:00
sergefp@mysql.com
e9838c7c70
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-test-valgrind
2005-05-03 10:23:10 +04:00
serg@serg.mylan
530b6ba541
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-01 23:10:55 +02:00
monty@mysql.com
28a5491d3d
Merge with 4.1
2005-04-30 09:46:08 +03:00
konstantin@mysql.com
6040b0abf6
A fix and a test case for Bug#9520 "SELECT DISTINCT crashes server
...
with cursor". The patch refactors do_select/sub_select
functions, which implement the nested loop algorithm, and reuses them to
fetch rows for cursors as well.
Pushing with view.test failing (--ps-protocol).
2005-04-30 09:54:35 +04:00
monty@mysql.com
aa84afb983
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-30 03:45:12 +03:00
evgen@moonbone.local
b11705a2b0
Fix bug #9703 "Error 1032 with GROUP BY query and large tables"
...
Reset old error if tmp table was successfully created.
Test data is large and can be found in bug report along with test query.
2005-04-29 21:19:39 +04:00
sergefp@mysql.com
a7a1d4dc1e
Fix for BUG#10244:
...
Make get_quick_select_for_ref() accept estimated # records as parameter and
set QUICK_RANGE_SELECT::records, as this value is used to allocate buffers
in Multi-Range Read.
2005-04-29 01:16:32 +04:00
serg@serg.mylan
e7b2de98ee
be sure to call top_level_item() on the new Item_cond_and,
...
that merges ON and WHERE (BUG#10162)
2005-04-27 01:32:44 +02:00
monty@mysql.com
972f86f1ee
Cleanups during review
2005-04-26 23:24:59 +03:00
igor@rurik.mysql.com
ca35e36310
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-04-20 16:39:31 -07:00
igor@rurik.mysql.com
20250dc497
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-04-20 15:08:22 -07:00