konstantin@mysql.com
a603cdb72d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/media/sda1/mysql/mysql-4.1-5034
2004-08-25 00:37:02 +04:00
vva@eagle.mysql.r18.ru
f4c23c12ba
committed skipped file
2004-08-25 01:37:01 +05:00
konstantin@mysql.com
985fb24513
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/media/sda1/mysql/mysql-4.1-5034
2004-08-25 00:02:08 +04:00
vva@eagle.mysql.r18.ru
0e52a45838
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear
2004-08-25 01:02:07 +05:00
vva@eagle.mysql.r18.ru
3d94446055
resurrect fix for
...
Bug #4696 segfault in cmd-line-utils/libedit/history.c:history_save()
(bundled libedit)
2004-08-25 00:26:53 +05:00
konstantin@mysql.com
522a27069f
Merge: manual resolve
2004-08-24 23:07:08 +04:00
vva@eagle.mysql.r18.ru
06affe9b5b
fixed AC_DEFINE(HAVE_HIST_ENTRY) in acinclude.m4
2004-08-25 00:07:07 +05:00
vva@eagle.mysql.r18.ru
b20161b841
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear_v2
2004-08-24 23:38:31 +05:00
vva@eagle.mysql.r18.ru
24b7ad8229
fixed AC_DEFINE's for libedit-2.6.7
2004-08-24 23:32:58 +05:00
vva@eagle.mysql.r18.ru
908af8b05a
added skipped file for libedit-2.6.7
2004-08-24 21:52:13 +05:00
konstantin@mysql.com
ae18dc3ec8
Fix for Bug#5034 "prepared "select 1 into @arg15", second
...
execute crashes server": we were deleting lex->result
after each execute, but prepared statements assumed that
it's left intact.
The fix adds cleanup() method to select_result hierarchy,
so that result objects can be reused.
Plus we now need to delete result objects more wisely.
2004-08-24 20:17:11 +04:00
vva@eagle.mysql.r18.ru
3988677b15
added skipped macro for new libedit-2.6.7 in configure.in
2004-08-24 21:01:11 +05:00
vva@eagle.mysql.r18.ru
3e6d1022d6
upgrade to libedit-2.6.7
...
(fixed Bug #4462 libedit compile failure)
2004-08-24 20:41:41 +05:00
rburnett@build.mysql.com
56c807b2e0
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into build.mysql.com:/users/rburnett/mysql41
2004-08-24 17:24:06 +02:00
monty@mysql.com
46588eeb7a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-24 18:24:05 +03:00
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
monty@mysql.com
c44d4debfa
Portablity fixes & simple optimizations
2004-08-24 18:00:45 +03:00
vva@eagle.mysql.r18.ru
f6a3f2cfad
fixed :
...
Bug #3937 fails to compile with both gcc 3.3.3/icc8
Bug #4728 mysql couldn't be compiled using system readline (readline-4.3)
2004-08-24 19:23:23 +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