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
1b106c1fe1
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 14:20:50 +04:00
tulin@build.mysql.com
c24b6aa125
Merge build.mysql.com:/users/tulin/mysql-5.0
...
into build.mysql.com:/users/tulin/mysql-5.0-ndb
2005-01-19 10:31:09 +01:00
tulin@build.mysql.com
cb995131fb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/tulin/mysql-5.0
2005-01-19 10:07:13 +01:00
tomas@poseidon.ndb.mysql.com
2776424102
added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run
2005-01-19 10:00:41 +01: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
bell@sanja.is.com.ua
1affa4df0f
fixed problem in resolving items of outer query in subqueries in view (BUG#6394)
2005-01-18 21:58:12 +02: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
efe6ea9363
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-18 22:30:28 +04: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
jani@ua141d10.elisa.omakaista.fi
04ee95729c
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-01-18 20:17:24 +02:00
jani@ua141d10.elisa.omakaista.fi
625ae2c5a0
Added possibility to use --error <name> instead of --error <number>
...
The old syntax works as well. WL#2356.
2005-01-18 20:16:21 +02: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
bell@sanja.is.com.ua
d3dc731371
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0
2005-01-18 12:48:11 +02:00
serg@serg.mylan
b53757ba91
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-18 11:45:41 +01:00
serg@serg.mylan
b4624288a7
myisam/ft_boolean_search.c
...
-trunc* bug - don't increase yweaks in this case
2005-01-18 11:27:38 +01: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
mskold@mysql.com
6bb027a97c
Merge
2005-01-17 09:44:34 +01: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
bell@sanja.is.com.ua
a7d0eaae7c
added replication of VIEW DDL commands (BUG#4838)
2005-01-17 01:18:08 +02:00
sergefp@mysql.com
6303ca7efa
Fixes in opt_range.cc: ROR plan choice code
...
* Removed unused parameters
* Fixed several cost calculation errors in ror_intersect_add
* Better code structure for ror_intersect_add and get_best_ror_intersect
2005-01-17 00:18:19 +03:00
guilhem@mysql.com
05793bb9b9
Merge
2005-01-16 21:39:21 +01:00
serg@serg.mylan
1034677f94
XA (not completely polished out yet)
2005-01-16 13:16:23 +01:00