guilhem@mysql.com
980d1b658e
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 10:59:37 +01:00
monty@mysql.com
2204baa5a3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-14 00:10:03 +02:00
monty@mysql.com
7c457a1bd7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-13 20:09:41 +02:00
jimw@mysql.com
7e1f47022c
Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:24:07 -08:00
jimw@mysql.com
d63dc891c1
Add test cases to verify that SHOW CREATE TABLE always outputs the
...
key algorithm for keys where they were explicitly specified.
2005-01-13 18:22:35 +01:00
jimw@mysql.com
7639e5afaf
Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-13 09:07:21 -08:00
guilhem@mysql.com
a02601ecc5
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-13 15:35:36 +01:00
bar@mysql.com
e3d6e6736b
bug#7284: strnxfrm returns different results for equal strings
2005-01-13 18:12:04 +04:00
jani@ua141d10.elisa.omakaista.fi
9cea2457ec
Fixed a problem with a test. Time could be 0 or 1 seconds, depending
...
on whether running with or without valgrind.
2005-01-13 15:04:57 +02:00
jimw@mysql.com
51781b0bfc
Fix conversion of floating point values to character fields when the
...
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774 )
2005-01-13 00:41:45 +01:00
guilhem@mysql.com
4c105693d7
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-12 22:23:00 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
3e3e140e3d
Minor clean up.
2005-01-12 22:55:10 +02:00
guilhem@mysql.com
44ce4b43ef
Fix for BUG#7793 "mysqlbinlog produces incorrect queries":
...
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
2005-01-12 19:42:46 +01:00
jani@ua141d10.elisa.omakaista.fi
fd79354273
Fixed Bug#2813, "analyse does not quot string values in enams from string".
2005-01-11 19:40:33 +02:00
monty@mysql.com
f4274fe9be
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-11 19:35:00 +02:00
bar@mysql.com
2bd854c859
Bug #7730 Server crash using soundex on an utf8 table
...
Don't use my_tolower: it works only for 8bit charsets.
2005-01-11 19:58:53 +04:00
joreland@mysql.com
6c69e3d2b3
bug#7798 - ndb - range scan with invalid table version could cause node failure
2005-01-11 13:30:11 +01:00
guilhem@mysql.com
b9926d71c0
A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE).
2005-01-10 15:13:33 +01:00
monty@mysql.com
56fb6f31ba
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-10 15:28:17 +02:00
pekka@mysql.com
50c3a883b2
ndb - wl-1442 fix Time ordering
2005-01-08 19:28:44 +01:00
pekka@mysql.com
0462ccfe3c
ndb - wl-1442 fix Date ordering
2005-01-08 16:57:51 +01:00
pekka@mysql.com
3e37933c7f
ndb - wl-1442 bug#7725 datetime ordering
2005-01-08 13:59:57 +01:00
jimw@mysql.com
c2eb3bf9f6
Correctly truncate integers inserted into field and double columns
...
with a number of decimals specified. (Bug #7361 )
2005-01-07 17:44:18 +01:00
jimw@mysql.com
f520e72c72
Skip client_test when testing embedded server
2005-01-07 04:53:05 +01:00
monty@mysql.com
d35d4eab91
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-03 21:14:20 +02:00
serg@sergbook.mysql.com
203cc19e48
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2004-12-31 18:00:49 +01:00
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01:00
monty@mysql.com
78da7196ad
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-12-31 12:05:43 +02:00
monty@mysql.com
1bd22faa05
Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
...
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
2004-12-31 12:04:35 +02:00
dlenev@mysql.com
4ef7ac5c09
Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.
2004-12-30 21:37:32 +03:00
dlenev@mysql.com
2600fb3bdf
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg7297
2004-12-30 21:18:45 +03:00
dlenev@mysql.com
2878395ab1
Fix for bug #7515 "from_unixtime(0) now returns NULL instead of
...
the Epoch". (With after review fixes).
2004-12-30 21:18:10 +03:00
dlenev@mysql.com
e0280694cd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2004-12-30 20:41:29 +03:00
sergefp@mysql.com
27e0f12ff1
Fix func_concat.result: allow -0.00 to be converted to string both with and without leading minus
2004-12-30 14:56:31 +03:00
dlenev@brandersnatch.localdomain
d70bd3f8fb
Fix for bug #6914 "Problems using time()/date() output in expressions".
...
When we cast datetime value to DATE (TIME) type we should throw away its
time (date) part. This was not done properly if CAST() function was used
in datetime expressions.
2004-12-30 13:39:01 +03:00
timour@mysql.com
1613bf2731
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2004-12-28 13:22:39 +02:00
timour@mysql.com
064c73490b
Fix for BUG#7455.
...
The fix checks if the trim string argument is NULL. If so, the standard
mandates that the function result must be also NULL.
2004-12-28 11:57:56 +02:00
lars@mysql.com
967fac4ef6
WL#2319 V2: Exclude tables from dump
...
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped
2004-12-27 19:10:30 +01:00
timour@mysql.com
fbc96c79a1
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2004-12-27 14:06:28 +02:00
timour@mysql.com
5eab756a63
Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0.
2004-12-27 14:05:35 +02:00
igor@rurik.mysql.com
8f602f2af8
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-12-26 02:08:23 -08:00
igor@rurik.mysql.com
04974868a1
subselect.result, subselect.test:
...
Added a couple of new test cases for bug #7351 .
2004-12-26 02:04:40 -08:00
igor@rurik.mysql.com
d3fa245363
subselect.result, subselect.test:
...
Added test cases for bug #7351 .
item_cmpfunc.cc:
Fixed bug #7351 : incorrect result for a query with a
subquery returning empty set.
If in the predicate v IN (SELECT a FROM t WHERE cond)
v is null, then the result of the predicate is either
INKNOWN or FALSE. It is FALSE if the subquery returns
an empty set.
item_subselect.cc:
Fixed bug #7351 : incorrect result for a query with a
subquery returning empty set.
The problem was due to not a quite legal transformation
for 'IN' subqueries. A subquery containing a predicate
of the form
v IN (SELECT a FROM t WHERE cond)
was transformed into
EXISTS(SELECT a FROM t WHERE cond AND (a=v OR a IS NULL)).
Yet, this transformation is valid only if v is not null.
If v is null, then, in the case when
(SELECT a FROM t WHERE cond) returns an empty set the value
of the predicate is FALSE, otherwise the result of the
predicate is INKNOWN.
The fix resolves this problem by changing the result
of the transformation to
EXISTS(SELECT a FROM t WHERE cond AND (v IS NULL OR (a=v OR a IS NULL)))
in the case when v is nullable.
The new transformation prevents applying the lookup
optimization for IN subqueries. To make it still
applicable we have to introduce guarded access methods.
2004-12-25 19:17:57 -08:00
Sinisa@sinisa.nasamreza.org
f385e79ad4
4.0 -> 4.1 merge
2004-12-24 23:07:10 +02:00
dlenev@mysql.com
71da86aa11
Manual merge of changes making GRANTs, which change SSL attributes and/or
...
user limits to behave well on 5.0 tables, into 4.1 tree.
2004-12-23 22:16:43 +03:00
Sinisa@sinisa.nasamreza.org
d110146252
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-12-23 21:11:31 +02:00
Sinisa@sinisa.nasamreza.org
3c5a325897
Fix for a bug #7495
2004-12-23 21:08:54 +02:00
dlenev@mysql.com
caade862ae
Make GRANTs, which change SSL attributes and/or user limits,
...
to behave well on 5.0 tables (well now you can't use tables from 4.1
and 5.0 with 4.0 because former use utf8, but still it is nice to have
similar code in acl_init() and replace_user_table()).
This also will make such GRANTs working in 5.0 (they are broken now).
2004-12-23 21:59:36 +03:00
bar@mysql.com
b236841890
Take charsets from the source directory rather than
...
from the install directory.
2004-12-23 13:52:25 +04:00
Sinisa@sinisa.nasamreza.org
e409ebf143
A fix for the bug #7495
2004-12-22 21:31:17 +02:00