bar@mysql.com
ecd8252e56
merge bug##7943: Wrong prefix lengths reported on UTF-8 columns
2005-01-21 16:55:17 +04:00
bar@mysql.com
2f6e0864ad
Bug#7943: Wrong prefix lengths reported on UTF-8 columns
...
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
2005-01-21 16:49:20 +04:00
ram@gw.mysql.r18.ru
84f0b1eeee
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
2005-01-21 12:10:19 +04:00
tomas@poseidon.ndb.mysql.com
b1877967d1
ndb_autodiscover.result, ndb_autodiscover.test:
...
removed this since it easily gives errors if previous tests fail
2005-01-20 21:26:58 +01:00
tomas@poseidon.ndb.mysql.com
86197400bc
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-01-20 15:37:27 +01:00
tomas@poseidon.ndb.mysql.com
dd6958eb20
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-20 15:21:00 +01:00
tomas@poseidon.ndb.mysql.com
ac53ecce1c
added variable NDB_MGM to be able to run the management client in tests
...
added testcase for Bug#8035
added option to wait for not-started
Bug#8035
2005-01-20 13:45:42 +01:00
bar@mysql.com
6b5c7c7290
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-20 16:08:27 +04:00
bar@mysql.com
ca48cfbfcc
item_cmpfunc.cc:
...
Bug#7834 Illegal mix of collations in IN operator
IN was the first function supporting
character set convertion.
agg_arg_charsets() was written afterwards,
which is more flexible.
Now IN just reuses this function.
2005-01-20 15:38:56 +04:00
ram@gw.mysql.r18.ru
dfe8132fb4
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
2005-01-20 14:22:02 +04:00
joreland@mysql.com
bca4f68773
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-20 10:13:45 +01:00
sergefp@mysql.com
a5a99cf7a9
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
2005-01-20 11:57:30 +03:00
ram@gw.mysql.r18.ru
c397751373
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
2005-01-20 12:56:18 +04:00
sergefp@mysql.com
9a7a47c21c
Merge mysql.com:/dbdata/psergey/mysql-4.1-bug7885
...
into mysql.com:/dbdata/psergey/mysql-5.0-bug7885
2005-01-19 23:11:50 +03:00
sergefp@mysql.com
b1c3e43060
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
2005-01-19 23:02:28 +03:00
tulin@build.mysql.com
16f77ce996
Merge build.mysql.com:/users/tulin/mysql-5.0
...
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-19 14:20:28 +01:00
gluh@gluh.mysql.r18.ru
994c1fd4d8
View field names should be case insensitive
2005-01-19 16:19:10 +03:00
ram@gw.mysql.r18.ru
f131e5a925
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
2005-01-19 12:05:59 +04:00
ram@gw.mysql.r18.ru
c24c023e8c
A fix (bug #6999 : Traditional: Wrong SQLSTATE returned for string truncation).
2005-01-19 12:04:35 +04:00
joreland@mysql.com
2af06e0b32
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-19 07:37:42 +01:00
jimw@mysql.com
20552486e5
Fix test results from merge, and fix the symlink test which had an
...
out-of-sync test and result.
2005-01-18 15:05:16 -08:00
jimw@mysql.com
1edf7279ef
Merge from 4.1.
2005-01-18 13:59:55 -08:00
jimw@mysql.com
06f60f6d65
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-18 13:34:22 -08:00
Sinisa@sinisa.nasamreza.org
a2e0ecbf03
after merge fixes
2005-01-18 23:34:15 +02:00
Sinisa@sinisa.nasamreza.org
08639a88b2
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-01-18 23:29:47 +02:00
Sinisa@sinisa.nasamreza.org
477047401c
fixing wrong value for "examined rows" when UNION's are used.
2005-01-18 23:13:29 +02:00
jimw@mysql.com
1ffa2a3dc4
Update type_float test results after merge.
2005-01-18 13:12:40 -08:00
sergefp@mysql.com
48d7fe1671
Fix for valgrind failures in get_mm_tree.
2005-01-18 23:50:42 +03:00
jimw@mysql.com
2fac8bd044
Merge changed tests
2005-01-18 12:25:56 -08:00
dlenev@mysql.com
001aa1096f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-18 21:52:15 +03:00
bar@mysql.com
4438d2d569
ps_7ndb.result, ps_6bdb.result:
...
after merge clean-up
2005-01-18 22:29:21 +04:00
dlenev@mysql.com
af878017b2
Merge mysql.com:/home/dlenev/src/mysql-4.1-merges
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-18 21:27:09 +03:00
bar@mysql.com
05204a9b3c
After-merge clean-up
2005-01-18 22:12:33 +04:00
bar@mysql.com
f93bfe06b3
merge
2005-01-18 21:38:40 +04:00
sergefp@mysql.com
a55f4a5da4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
2005-01-18 19:49:00 +03:00
dlenev@brandersnatch.localdomain
0787a97b1c
Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
...
prefix", which roots were fixed in 4.0 tree.
2005-01-18 17:45:49 +03:00
gluh@gluh.mysql.r18.ru
c965dc34cd
Fix for bug #7981 : SHOW GLOBAL STATUS crashes server
2005-01-18 17:37:45 +03:00
sergefp@mysql.com
b1d55200b1
Fix for BUG#7885
2005-01-18 17:26:05 +03:00
sergefp@mysql.com
d89166cd34
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
2005-01-18 16:46:26 +03:00
bar@mysql.com
8cfe729678
1. Item now uses my_charset_bin by default,
...
not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.
2005-01-18 17:41:06 +04:00
bar@mysql.com
b2dbddc39d
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-18 10:45:09 +04:00
bar@mysql.com
8f23e90232
#7874 : CONCAT() gives wrong results mixing latin1 field and utf8 string literals
...
We should not overwrite res if it is returned from a const item.
2005-01-18 10:42:29 +04:00
monty@mysql.com
9ad75d8c75
After merge fixes
2005-01-18 05:07:22 +02:00
monty@mysql.com
502ba93b38
Merge with global tree
2005-01-18 04:03:26 +02:00
jimw@mysql.com
a35c324358
Fix over-optimization that could result in an unsigned double field being
...
set to a negative value. (Bug #7700 )
2005-01-17 16:13:56 -08:00
timour@mysql.com
bb77b2e55f
Fix for BUG#7331 merged manually from 4.1.
2005-01-17 17:19:33 +02:00
timour@mysql.com
06fce173c0
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
2005-01-17 12:41:59 +02:00
bar@deer.(none)
2933cd3d35
user_var.result:
...
after merge fix
2005-01-17 13:58:16 +04:00
bar@deer.(none)
3b7eb23e6b
func_str.result:
...
after merge fix
2005-01-17 13:23:56 +04:00
bar@mysql.com
e7e5e8b1e7
user_var.result, func_str.result, item_strfunc.cc:
...
bug#7839 ncorrect collation for char(ascii('a'))
2005-01-17 10:38:35 +04:00