5929f2101d
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-07 19:08:17 +02:00
bbe08e4a03
finally proper recursive descent for parsing expressions with MATCH ... AGAINST in add_ft_keys()
2003-07-07 19:02:58 +02:00
acece34bce
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-07-07 18:51:14 +03:00
5c836428eb
merge
2003-07-07 18:49:54 +03:00
6348e63f62
Optimisation if simple IN subselect with primary index
...
(SCRUM) (part of WL#818)
2003-07-07 18:40:19 +03:00
0aa4563e82
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
2003-07-07 15:01:47 +03:00
7ad5331768
merge
2003-07-07 10:30:52 +03:00
ebcc7b5a4f
Support for variables with components
...
Added framework to create/drop and manager buffers for multiple key caches
2003-07-06 19:09:57 +03:00
e386d0e126
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-07-06 18:01:39 +02:00
9c73d91d54
WL#912 (more user control on relay logs):
...
FLUSH LOGS now rotates relay logs,
and a new variable max_relay_log_size.
Plus a very small bit of code cleaning.
2003-07-06 17:59:54 +02:00
9b6083dbe7
fixed memory leak in group_concat function (BUG#796)
...
fixed test func_gconcat to be repeatable independent of presend tables and avoid removing user tables
2003-07-06 18:11:19 +03:00
ee9237e0d8
missing test case for DISTINCT .. LEFT ..
2003-07-05 16:29:11 +03:00
45e001f465
reduced using of slow current_thd/current_lex macro
...
initialization of item_thd moved to constructor (in any case we need thd in constructor)
initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757)
removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items
2003-07-05 03:03:31 +03:00
f9936c61f7
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
2003-07-05 00:10:51 +03:00
38a2ed6f8b
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-04 22:06:19 +02:00
de9ba3848c
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-04 18:12:59 +05:00
0c2041cfdf
New methods
...
Item_func::agg_arg_collations()
Item_func::arr_arg_collations_for_comparison()
to aggregate argument collations.
It helps to reuse a lot of code.
2003-07-04 18:12:23 +05:00
6a40b8e889
merge + order by (bug #515 ) temporary fix
...
properly fixed in 4.1
2003-07-04 14:42:57 +02:00
15346c8a66
fix and test case for the bug #787 : HANDLER without INDEX doesn't work with deleted rows
2003-07-04 17:15:16 +05:00
647dbdf611
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-04 13:13:17 +02:00
40b6d07439
handler should be used with constant expressions only (or rand)
2003-07-04 12:55:25 +02:00
2d350a1de0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-07-04 15:39:57 +05:00
4aac5d9938
enabling HA_READ_PREFIX_LAST_OR_PREV
2003-07-04 12:07:06 +02:00
2927f2a293
fix and test case for the bug #787 : HANDLER without INDEX doesn't work with deleted rows
2003-07-04 14:41:01 +05:00
3f4f339f15
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.739
2003-07-03 23:25:54 +05:00
fd4a1d4e54
Fix for #739
...
check for negative count in RPAD added
2003-07-03 23:24:23 +05:00
741c1fd9fe
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-07-03 21:04:34 +03:00
a2e2099aaf
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-07-03 19:23:29 +03:00
be22700954
Fix for UNIXWARE 7
...
Remove unaligned warnings on Ia64 from client library when using --host
Fix for replication when using many file descriptors
2003-07-03 19:23:06 +03:00
dbb95326b0
Proposed fix for #751
...
Fields in key_expr (mysql_ha_read) wasn't linked to tables.
Hmm. How did it work at all?
2003-07-03 20:57:51 +05:00
d1607a11fe
FIELD() now takes in account arguments collations
2003-07-03 19:24:38 +05:00
16bf8d7aae
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0
2003-07-03 19:02:11 +05:00
7df3fd08c1
Test case for #570 added
2003-07-03 19:01:01 +05:00
726fca05f7
Fix and test-case for the bug #775 : SELECT misses rows in indexed HEAP table columns.
2003-07-03 18:21:59 +05:00
07f94cb7cd
Row comparison now does compare field collations, e.g.
...
ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0
When a number is compared to a string, character sets and
collations are not aggregated. e.g. this returned error in 4.1.0:
SELECT 1=_latin2'1';
because character sets was aggregated, and 1 was considered as
a string of latin1 charset during this aggregation.
2003-07-03 17:00:01 +05:00
372de23532
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.717
2003-07-03 16:54:05 +05:00
eb7ab936bf
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0.628
2003-07-03 16:50:17 +05:00
6a9a3ec0eb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-07-03 14:49:36 +03:00
95d6b7a5ea
Testcase for #628
2003-07-03 16:48:47 +05:00
bc2f77f224
Fixed test case to be more portable
2003-07-03 14:48:47 +03:00
73fdf52fa2
merged
2003-07-03 11:59:57 +03:00
f259f379e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-07-03 11:56:30 +03:00
c21728f8c8
Cleaner implementation if INSERT ... SELECT with same tables
...
Tests cleanup (put drop database first in tests)
2003-07-03 11:55:36 +03:00
0cdf7f39af
Proposed bugfix for #717
...
Current table is placed into read_tables set of the current join_tab->select
so get_mm_parts function thinks that current table's record is read and
tries to calculate WHERE condition with the fields of the record.
Result of these calculations is unpredictable.
Looks funny - outcome of the SELECT depends on the queries executed before.
Anyway i think we should have testcase on this part of the code.
2003-07-03 10:42:13 +05:00
ace8a06323
I committed the same changeset in my tree yesterday, but broke the tree since,
...
so I commit again in a fresh tree.
Fix for bug#763 (Relay_log_space too big by 4 bytes),
plus comments and DBUG_PRINT, and we don't start replication
if --bootstrap.
2003-07-03 01:08:36 +02:00
7f4fe0b0f3
innodb.result, innodb.test:
...
Remove all nondeterministic tests from innodb.test; but I have to study why on 64 bits we get different estimates
2003-07-03 02:08:33 +03:00
b5b4f44a72
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-02 23:37:24 +02:00
dcd13cf264
bug #504 : in "datetime op int" comparison int wasn't converted to datetime
2003-07-02 17:12:50 +02:00
d2d220eabd
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-07-02 15:08:36 +03:00
1df6492c7d
Fix for a problem with :
...
CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;
2003-07-02 14:57:40 +03:00
