Commit graph

14257 commits

Author SHA1 Message Date
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
tomas@poseidon.(none)
ce98ccacad bug fix 2004-08-24 19:49:45 +00:00
vva@eagle.mysql.r18.ru
3d94446055 resurrect fix for
Bug   	segfault in cmd-line-utils/libedit/history.c:history_save() 
(bundled libedit)
2004-08-25 00:26:53 +05:00
tomas@poseidon.(none)
57c12e0fd3 enables case insensitivity in ndb config file 2004-08-24 19:07:09 +00:00
serg@serg.mylan
0dc5945b19 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 21:07:08 +02:00
konstantin@mysql.com
522a27069f Merge: manual resolve 2004-08-24 23:07:08 +04:00
tomas@poseidon.(none)
0483eb8139 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-clean
2004-08-24 19:07:08 +00: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
heikki@hundin.mysql.fi
852181a21e buf0rea.c:
Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.
2004-08-24 20:17:23 +03:00
joerg@mysql.com
b8c7b6b0ae All 'Makefile's must use '$(AR)' (not just 'ar') because the variable may contain options. 2004-08-24 19:05:42 +02:00
vva@eagle.mysql.r18.ru
908af8b05a added skipped file for libedit-2.6.7 2004-08-24 21:52:13 +05:00
serg@serg.mylan
54520d9780 automerged 2004-08-24 18:22:33 +02:00
serg@serg.mylan
8f254c1b7b followup 2004-08-24 18:20:27 +02:00
gluh@gluh.mysql.r18.ru
510cacbb77 Fix for bug : find_in_set is case insensitive even on binary operators(for 4.1) 2004-08-24 20:18:59 +04: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  libedit compile failure)
2004-08-24 20:41:41 +05:00
serg@serg.mylan
8f2d92c56a manually merged 2004-08-24 17:24:23 +02: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
serg@serg.mylan
a302f88eb9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 17:24:05 +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  --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
tomas@poseidon.(none)
aae0b7ed65 added alias MYSQLD for API
added choice of : or = in config file
set case insensitive section names
2004-08-24 14:41:48 +00:00
vva@eagle.mysql.r18.ru
f6a3f2cfad fixed :
Bug   	fails to compile with both gcc 3.3.3/icc8
Bug   	mysql couldn't be compiled using system readline (readline-4.3)
2004-08-24 19:23:23 +05:00
miguel@hegel.txg.br
2e238f7eff Fix warning VC++ and fix applied fisrt to source 4.1 2004-08-24 10:40:20 -03:00
gluh@gluh.mysql.r18.ru
219f4f9725 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
2004-08-24 17:40:19 +04:00
serg@serg.mylan
50ee43be43 BDB: Bug#4531: unique key prefix interacts poorly with utf8,
Bug#4594 column index make = failed for gbk
2004-08-24 15:32:57 +02:00
gluh@gluh.mysql.r18.ru
1786a388e4 Fix for bug : find_in_set is case insensitive even on binary operators(2nd version) 2004-08-24 17:29:08 +04: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
lenz@mysql.com
89fcb8ee41 - make sure to recreate all autoconf/automake-related files after
modifying configure.in for the commercial tarballs
 - added my-innodb-heavy-4G.cnf to the distribution
2004-08-24 13:51:28 +02: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
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)
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
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