igor@rurik.mysql.com
230fe0d77e
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-28 12:04:46 -07:00
igor@rurik.mysql.com
2310050488
opt_range.cc:
...
Fixed a compilation error.
2005-06-28 12:00:38 -07:00
konstantin@mysql.com
f7fd222384
Fixed comments.
2005-06-28 22:49:14 +04:00
bell@sanja.is.com.ua
0e30eea141
fixed substring() length calculation in case of constant negative argument (BUG#10269)
2005-06-28 21:45:11 +03:00
igor@rurik.mysql.com
89cabf04ba
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-28 10:40:29 -07:00
konstantin@mysql.com
8b0cee88f0
A fix and a test case for Bug#10736 "mysql_stmt_attr_set
...
CURSOR_TYPE_READ_ONLY select within select".
The bug was caused by the reset of thd->mem_root to thd->main_mem_root in
Item_subselect::exec, which in turn triggered too early free_root() for
data which was needed on subsequent fetches from a cursor.
This reset also caused a memory leak in stored procedures, as
subsequent executions of instructions containing a subselect
were allocating memory in thd->main_mem_root, which is not freed
until the end of the entire SP, instead of the per-call mem_root,
which is freed in the end of execution of the instruction.
2005-06-28 20:52:15 +04:00
igor@rurik.mysql.com
451faae3c9
range.result, range.test:
...
Added a test case for bug #10031 .
opt_range.cc:
Fixed bug #10031 : range condition was not used with
views. Range analyzer did not take into account that
view columns were always referred through Item_ref.
2005-06-28 07:27:00 -07:00
igor@rurik.mysql.com
1776464568
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-28 05:33:40 -07:00
monty@mysql.com
10c4678def
Move reset of insert_values to ensure it's done also during error conditions
...
This fixed a failure of insert_update.test on some platforms
2005-06-28 15:06:16 +03:00
igor@rurik.mysql.com
04e6f472dd
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-06-28 03:24:06 -07:00
igor@rurik.mysql.com
42bb0eaf9f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-28 03:20:00 -07:00
igor@rurik.mysql.com
be1478f6f9
group_by.result, group_by.test:
...
Added a test case for bug #11414 .
sql_select.cc:
Fixed bug #11414 : crash on Windows with some simple
GROUP BY queries.
It happened to an allocation of an array containing
0 Copy_field elements in setup_copy_fields.
The bug had been already fixed in 5.0.
2005-06-28 03:18:37 -07:00
kent@mysql.com
b3a00568fb
opt_range.cc:
...
Added missing `;' to DBUG_RETURN()
2005-06-28 04:33:06 +02:00
bell@sanja.is.com.ua
b49b5805eb
abort storing query to query cache if warnings appeared (BUG#9414)
2005-06-28 00:52:21 +03:00
jimw@mysql.com
3dd28e98e6
Fix typo in --default-store-engine help. (Bug #11534 )
2005-06-27 10:49:40 -07:00
monty@mishka.local
7398252d02
Portability fixes
...
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
2005-06-27 20:31:00 +03:00
monty@mishka.local
6db013ef86
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-06-27 16:47:44 +03:00
monty@mishka.local
83f90e060e
Better bug fix for:
...
#9728 'Decreased functionality in "on duplicate key update
#8147 'a column proclaimed ambigous in INSERT ... SELECT .. ON DUPLICATE'
This ensures fields are uniquely qualified and also that one can't update other tables in the ON DUPLICATE KEY UPDATE part
2005-06-27 16:46:41 +03:00
msvensson@neptunus.(none)
dee0be6eed
Simpler impl.
2005-06-27 14:26:07 +02:00
msvensson@neptunus.(none)
88c96026af
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug10466
2005-06-27 13:12:10 +02:00
msvensson@neptunus.(none)
dcb4789dcb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 12:26:24 +02:00
konstantin@mysql.com
526af17380
Fix the broken test suite in -debug build.
2005-06-27 14:10:56 +04:00
msvensson@neptunus.(none)
eb41ba25e3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 10:53:08 +02:00
msvensson@neptunus.(none)
13a02cfad2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-27 09:53:11 +02:00
igor@rurik.mysql.com
7994f27c43
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-25 05:45:50 -07:00
konstantin@mysql.com
9b2d517b79
Free unused JOINs early even if using subqueries.
2005-06-25 00:27:40 +04:00
konstantin@mysql.com
153861fa50
Remove an unrelevant assert.
2005-06-24 23:29:00 +04:00
konstantin@mysql.com
aa300fa71b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-join_free2push
2005-06-24 22:48:46 +04:00
konstantin@mysql.com
56a37f8e07
- don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().
...
The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
method JOIN::cleanup().
2005-06-24 22:48:12 +04:00
ingo@mysql.com
1c33fbc4c1
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
...
Bug#10568 - Function 'LAST_DAY(date)' does not return NULL for invalid argument.
Manual merge.
2005-06-24 19:47:18 +02:00
evgen@moonbone.local
182c0ca5b7
Merge
2005-06-24 21:47:17 +04:00
evgen@moonbone.local
3415fae789
Fix bug#11325 Wrong date comparison in views
...
Wrong comparing method were choosen which results in false comparison.
Make Item_bool_func2::fix_length_and_dec() to get type and field from
real_item() to make REF_ITEM pass the check.
2005-06-24 20:16:52 +04:00
ingo@mysql.com
2dcf451b81
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
...
Moved the key statistics update to info().
The table is not locked in open(). This made wrong stats possible.
No test case for the test suite.
This happens only with heavy concurrency.
A test script is added to the bug report.
2005-06-24 17:47:09 +02:00
ramil@mysql.com
b0e6db14c5
backport for #10568 : Function 'LAST_DAY(date)' does not return NULL for invalid argument.
2005-06-24 14:04:48 +05:00
igor@rurik.mysql.com
6f09af1d95
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-24 01:26:35 -07:00
igor@rurik.mysql.com
c3aa161c28
field.cc:
...
Correction after manula merge.
2005-06-24 01:21:18 -07:00
jimw@mysql.com
3ccb90c085
Make status of NO_BACKSLASH_ESCAPES mode known to the client so
...
it can use it to switch to only quoting apostrophes by doubling
them when it is in effect. (Bug #10214 )
2005-06-23 18:29:56 -07:00
bell@sanja.is.com.ua
f1d3f0811d
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-06-24 00:25:28 +03:00
bell@sanja.is.com.ua
3c5286c3e2
fixed encrypt() print (BUG#7024)
2005-06-24 00:24:11 +03:00
timour@mysql.com
9d1f292840
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/timka/mysql/src/5.0-virgin
2005-06-23 23:26:49 +03:00
bell@sanja.is.com.ua
a771b57172
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-06-23 21:45:53 +03:00
igor@rurik.mysql.com
abe8ec4be2
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-23 11:22:32 -07:00
igor@rurik.mysql.com
268110b34b
Manual merge
2005-06-23 11:22:30 -07:00
konstantin@mysql.com
1e84070459
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-sp_instr
2005-06-23 22:22:30 +04:00
sergefp@mysql.com
2942b06a2c
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-23 19:41:42 +02:00
bell@sanja.is.com.ua
28a93877ca
temporary tables of subquery in the from clause just skipped during processing QC tables (BUG#11522)
2005-06-23 20:06:35 +03:00
msvensson@neptunus.(none)
84e5118931
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-23 19:06:35 +02:00
timour@mysql.com
1994b8b8ea
Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/timka/mysql/src/4.1-virgin
2005-06-23 20:06:35 +03:00
igor@rurik.mysql.com
1c348f48a9
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
2005-06-23 10:06:35 -07:00
sergefp@mysql.com
009e2457d9
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug10151
2005-06-23 19:06:34 +02:00