monty@mysql.com
775f17667b
Merge with 4.1
2005-06-07 00:31:53 +03:00
monty@mysql.com
b46f2ecf2f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-06-06 19:43:07 +03:00
lenz@mysql.com
80fbb13e97
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-06-06 18:03:16 +02:00
monty@mysql.com
8c1c166487
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-06-06 18:31:38 +03:00
lenz@mysql.com
13afa9129b
Some Windows compile improvements:
...
- removed some unreferenced variables
- fixed the libmysql project file by removing a duplicate file reference (merge error)
2005-06-06 15:23:04 +02:00
igor@rurik.mysql.com
6ee824705e
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-06 06:15:09 -07:00
igor@rurik.mysql.com
f2405d71eb
sp.test, sp.result:
...
Added a test case for bug #6866 .
sql_select.cc:
Fixed bug #6866 .
Bug was due to the fact that on_expr was not backed up
for the second execution of the stored procedure.
2005-06-06 06:05:11 -07:00
serg@serg.mylan
6a5349028c
a compiler must see '#pragma implementation' *before*
...
'#pragma interface' (that comes with the #include'd header file)
2005-06-05 19:38:52 +02:00
monty@mysql.com
4b7882dc73
merge
2005-06-05 17:19:50 +03:00
monty@mysql.com
25a2c4a71e
Cleanup during review
...
Simple optimization for 2 argument usage to function of variable arguments
Fix stack overrun when using 1+1+1+1+1+1+1+....
Update crash-me results for 5.0
Don't call post_open if pre_open() fails (optimization)
2005-06-05 17:01:20 +03:00
monty@mysql.com
29fd1f2fd9
Move USE_PRAGMA_IMPLEMENTATION to proper place
...
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
2005-06-03 23:46:03 +03:00
mskold@mysql.com
6720cb7d69
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-02 20:55:32 +02:00
mskold@mysql.com
9cebe281bb
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-02 17:06:51 +02:00
mskold@mysql.com
565e3ef640
Added update_used_tables to add_found_match_trig_cond, to make valgrind happy
2005-06-02 16:56:08 +02:00
mskold@mysql.com
ca679df824
Modified handling of guarded predicates at condition pushdown to storage engine, to make valgrind happy
2005-06-02 14:48:19 +02:00
serg@serg.mylan
f3a95357fe
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-02 11:02:01 +02:00
brian@zim.(none)
113a99626d
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
2005-06-01 21:56:30 -07:00
brian@zim.(none)
efb5ed5bab
Merge
2005-06-01 18:48:29 -07:00
kent@mysql.com
bd48eed988
tztime.cc:
...
Set #pragma implementation" earlier
Many files:
Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
2005-06-02 02:43:32 +02:00
brian@zim.(none)
ba9b9f8993
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
2005-06-01 17:34:10 -07:00
serg@serg.mylan
34df99ab82
more than 64 indexes per table. bugfixes. bug#10995
2005-06-01 18:33:16 +02:00
monty@mysql.com
a69f432115
Code cleanups during code reviews
...
Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge
2005-06-01 16:35:09 +03:00
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