rburnett@build.mysql.com
fbc1f946e9
my_handler.c:
...
Added (my_bool) cast to !(nextflag & SEARCH_PREFIX) code to correct MSVC warning about mismatched integral types
2004-08-24 17:24:05 +02:00
joreland@mysql.com
7e37b9fe9f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-24 17:24:04 +02:00
vva@eagle.mysql.r18.ru
2f448b65b8
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
2004-08-24 20:24:03 +05:00
vva@eagle.mysql.r18.ru
b076665030
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1
2004-08-24 20:18:39 +05:00
vva@eagle.mysql.r18.ru
ffacc77f22
more accurate processing of find_type result
...
(Bug #4998 --protocol doesn't reject bad values)
2004-08-24 20:13:31 +05:00
joreland@mysql.com
1c4cb230cd
Use "configured" socklen_t
...
Fix master printout
2004-08-24 15:08:52 +02:00
joreland@mysql.com
90e6e89212
Compile fix sol9x86
2004-08-24 14:48:07 +02:00
paul@kite-hub.kitebird.com
25266b845f
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-08-24 07:22:16 -05:00
sergefp@mysql.com
908ff0495d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-root-root
2004-08-24 15:29:10 +04:00
joreland@mysql.com
6f75b81b16
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-24 13:29:09 +02:00
hf@deer.(none)
d6c7a717bb
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 16:29:08 +05:00
joreland@mysql.com
88c55407aa
SCO unix compile fix
2004-08-24 13:29:08 +02:00
joreland@mysql.com
b06742ec7d
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-08-24 13:29:07 +02:00
hf@deer.(none)
3b4d7e0c6d
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 16:29:06 +05:00
dlenev@brandersnatch.localdomain
fb01750468
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-fix
2004-08-24 15:29:06 +04:00
hf@deer.(none)
b22a499d42
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.emb
2004-08-24 16:29:05 +05:00
tomas@poseidon.(none)
c5bf129e9c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 11:29:04 +00:00
tomas@poseidon.(none)
5a24844551
some more printouts to SHOW command
2004-08-24 11:28:19 +00:00
tomas@poseidon.(none)
b5304c816f
enabling stopping of ndb_mgmd
2004-08-24 10:44:42 +00:00
sergefp@mysql.com
d970586fef
Fix to compile with msvc: converted static const int Item_arena::* to enum members, undefine ERROR
2004-08-24 14:44:15 +04:00
hf@deer.(none)
cce03195dc
Merging fix
2004-08-24 15:03:44 +05:00
dlenev@brandersnatch.localdomain
577d9b6ff2
Fixed windows-specific warning about undeclared localtime_r() in my_time.c.
...
We have to include my_pthread.h since it is the place where localtime_r() is declared
on platforms where this function is missing.
2004-08-24 13:53:02 +04:00
joreland@mysql.com
2de4d1f517
bug#5014
...
detect change of #replicas + #nodes
2004-08-24 11:31:30 +02:00
hf@deer.(none)
31304a38e4
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 14:24:14 +05:00
hf@deer.(none)
e12064aa3a
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.5066
2004-08-24 14:22:47 +05:00
hf@deer.(none)
43a853dd4d
Merging
2004-08-24 12:58:21 +05:00
bell@sanja.is.com.ua
9d71f85121
subselect test split on two tests because gis extention can be absent
2004-08-24 10:15:39 +03:00
rburnett@build.mysql.com
95a51bca95
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-24 00:45:03 +02:00
monty@mysql.com
3808e4a5cf
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-24 01:09:24 +03:00
monty@mysql.com
7ff0cef3f1
Fixed uninitialized variable
...
Fixed error messages
2004-08-24 01:08:48 +03:00
rburnett@build.mysql.com
990c5857e5
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-23 22:01:16 +02:00
bell@sanja.is.com.ua
df0e1feb72
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:57:07 +03:00
paul@kite-hub.kitebird.com
c0e689c212
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-08-23 14:47:12 -05:00
bell@sanja.is.com.ua
3b65ce7489
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:32:38 +03:00
brian@avenger.(none)
32f2674a07
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into avenger.(none):/export/brian/mysql/4.1
2004-08-23 12:31:03 -07:00
bell@sanja.is.com.ua
6fcd27e9cd
after review fixes:
...
allowed parsing of table fields inside aggregate functions
added new tests of fields resolving in grouping
2004-08-23 22:31:01 +03:00
paul@kite-hub.kitebird.com
917aa465e2
mysqld.cc:
...
System variable names use underscores, not dashes.
Alphabetize variables in option struct for help message.
(will wait for okay to push)
2004-08-23 14:30:55 -05:00
brian@avenger.(none)
e4a2cdde47
Changing version information.
2004-08-23 12:28:28 -07:00
serg@serg.mylan
f68219f6df
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-23 21:25:25 +02:00
serg@serg.mylan
2f8be12b85
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-23 21:11:06 +02:00
lenz@mysql.com
871625c5d5
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-08-23 21:03:16 +02:00
lenz@mysql.com
0479919884
- removed mysql-test/t/flush_block_commit-master.opt as it collided
...
with the sleep value we use for the test suite run during the
release builds
2004-08-23 20:58:56 +02:00
mskold@mysql.com
9ad2448606
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-23 20:33:38 +02:00
rburnett@build.mysql.com
680aa3d69d
Bug #4629 Crash after SLAVE STOP, if the IO thread is in special state.
...
client.c:
Removed call to clear_slave_vio in end_server(). Removed header declaration of clear_slave_vio
slave.cc:
Removed clear_slave_vio function and added calls to thd->clear_active_vio before each call to end_server()
2004-08-23 18:55:12 +02:00
gluh@gluh.mysql.r18.ru
b1847f471c
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
2004-08-23 20:18:24 +04:00
gluh@gluh.mysql.r18.ru
7b17daf21e
Fix for bug #5134 : WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results(for 4.1 tree)
2004-08-23 20:17:14 +04:00
vva@eagle.mysql.r18.ru
237615bc53
fixed a Bug #4998 "--protocol doesn't reject bad values"
2004-08-23 20:55:09 +05:00
mskold@mysql.com
c644595dac
Fix for bug#5171
2004-08-23 17:24:03 +02:00
bar@mysql.com
1ffd4d6129
show_check.test, show_check.result:
...
Don't do this test for now: it fails on Mac OSX.
2004-08-23 20:12:40 +05:00
bar@mysql.com
0983295859
Bug#4594: column index make = failed for gbk, but like works
...
Fix for HEAP+HASH prefix keys.
2004-08-23 20:12:39 +05:00