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
joreland@mysql.com
b3a6628599
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-21 08:41:39 +01:00
tomas@poseidon.ndb.mysql.com
72dc9ff915
moved START_AND_EXIT check so it can actually be used
...
fix as not to overwrite previoulsy set flags in configure
2005-01-21 08:41:38 +01: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
joreland@mysql.com
abd6afa9af
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-20 20:51:20 +01:00
tomas@poseidon.ndb.mysql.com
39c9f50ac9
mysql-test-run.sh:
...
skip ndbcluster start failure if --force given
2005-01-20 20:27:17 +01:00
joreland@mysql.com
de2bbb3018
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-20 19:54:17 +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
kent@mysql.com
7885d70b88
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-20 14:16:29 +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
kent@mysql.com
f4cdb433c6
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-20 12:40:42 +01: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
c1b92f6a90
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-19 16:20:25 +03: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
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
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