Commit graph

16057 commits

Author SHA1 Message Date
heikki@hundin.mysql.fi
ccec75f9af Many files:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
2004-11-26 00:12:50 +02:00
tomas@poseidon.ndb.mysql.com
a3d2aaf99f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-25 21:32:04 +00:00
tomas@poseidon.ndb.mysql.com
106f124eec moved default setting to config.ini to MgmtSrvr
only try to connect to other ndb_mgmd if connect_string explicitly given or config_file not given
2004-11-25 21:29:59 +00:00
mats@mysql.com
4ac392fa45 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/bkroot/mysql-4.1
2004-11-25 13:35:53 +01:00
ram@gw.mysql.r18.ru
886d54bb37 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
2004-11-25 16:18:48 +04:00
bar@mysql.com
3d6e811ed5 table.cc:
Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
2004-11-25 16:18:47 +04:00
ram@gw.mysql.r18.ru
511eb626bf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
2004-11-25 16:18:46 +04:00
serg@serg.mylan
895376998f Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-25 13:18:46 +01:00
tomas@poseidon.ndb.mysql.com
870c718b03 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-25 12:18:45 +00:00
tomas@poseidon.ndb.mysql.com
5a09289bd1 ndb/src/common/logger/LogHandler.cpp
changed so that error is returned if format is wrong in logger param parsing
ndb/src/common/logger/Logger.cpp
    some debuf printout added
ndb/src/mgmsrv/InitConfigFileParser.cpp
    rewrote parsing on parseNameValuePair, was buggy
2004-11-25 12:14:15 +00:00
mats@mysql.com
9ffb3fd39c Merge 2004-11-25 12:23:41 +01:00
joreland@mysql.com
5d70a4895f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-25 10:40:56 +01:00
joreland@mysql.com
64bc875228 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-25 10:39:34 +01:00
joreland@mysql.com
a9e5e7de88 bug#6775 - ndb - fix bug introduced by bug fix 2004-11-25 10:38:46 +01:00
mats@mysql.com
fe0911e95e Merge mysql.com:/space/bkroot/mysql-4.0
into mysql.com:/space/bk/b6148-mysql-4.0
2004-11-25 09:38:52 +01:00
mats@mysql.com
c06cae0f55 Fix for Bug#6148. Only rewind read position in binary log when the
slave SQL thread is started.
2004-11-25 09:26:45 +01:00
serg@serg.mylan
e80bd82e83 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 23:47:14 +01:00
serg@serg.mylan
e8203e437a bug#6784
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
2004-11-24 23:16:16 +01:00
heikki@hundin.mysql.fi
bd6ccd46fc configure.in:
Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
2004-11-24 19:41:38 +02:00
tomas@poseidon.ndb.mysql.com
c22266886c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-24 17:41:37 +00:00
tomas@poseidon.ndb.mysql.com
489b411640 added explanation of error code 4335 2004-11-24 17:40:40 +00:00
bar@mysql.com
0f79f61480 Bug#6787 LIKE not working properly with _ and utf8 data 2004-11-24 20:09:54 +04:00
joreland@mysql.com
de031d0e5a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 17:09:53 +01:00
serg@serg.mylan
582d10b510 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-24 17:09:53 +01:00
tomas@poseidon.ndb.mysql.com
f43408b819 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-24 16:09:52 +00:00
tomas@poseidon.ndb.mysql.com
7b601bd984 also backup needs triggers 2004-11-24 16:04:11 +00:00
tomas@poseidon.ndb.mysql.com
ebc7c9cb99 calculation of noOfTriggers 2004-11-24 15:51:59 +00:00
joreland@mysql.com
6f458bddac Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 16:47:08 +01:00
joreland@mysql.com
dfe4e29a4c bug#6775 - ndb
Queue scan on real fragment.
  Index fragment for range scans
  Table fragment for table scans
2004-11-24 16:36:18 +01:00
joerg@mysql.com
c356b37b0c Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1 2004-11-24 15:29:35 +01:00
joerg@mysql.com
cf722bc3f5 Ensure consistent sources up to 5.0 where a C++ problem occurs. 2004-11-24 15:24:23 +01:00
tomas@poseidon.ndb.mysql.com
003b28d04f added mgmapi/mgmapi_config_parameters.h, mgmapi/mgmapi_config_parameters_debug.h
to distribution
2004-11-24 13:59:03 +00:00
joreland@mysql.com
31a1d668e6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 13:21:41 +01:00
joerg@mysql.com
48db510b40 Merged 4.0 change into 4.1 2004-11-24 13:04:13 +01:00
joreland@mysql.com
5ac41f60e3 merge error 2004-11-24 12:33:09 +01:00
joreland@mysql.com
fab3038dff Merge mysql.com:/home/jonas/src/wl2077
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 11:59:06 +01:00
joreland@mysql.com
482a446b49 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077
2004-11-24 11:05:05 +01:00
joreland@mysql.com
98c60c3932 ndb - 4.1.8 is not online software upgradable with 4.1.7 (due to close scan optimizations) 2004-11-24 11:03:54 +01:00
serg@serg.mylan
cd463b5202 harmless "buffer overflow" fixed 2004-11-24 11:01:54 +01:00
joreland@mysql.com
c50c0691b9 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077
2004-11-24 10:52:21 +01:00
bar@mysql.com
16113e812a uca-dump.c:
Use less wide spaces on the primary level,
  to avoid big diff for ctype-uca.c.
2004-11-24 13:28:48 +04:00
joreland@mysql.com
97a2d6ebff ndb - Add testcase to autotest 2004-11-24 09:39:05 +01:00
joreland@mysql.com
0978d3028d ndb - debug printout 2004-11-24 09:36:49 +01:00
joerg@mysql.com
134aa0b97b Change "Do-compile" to make automatic build log analysis easier and
to run the standard tests with "--force" (default, can be switched off).
2004-11-23 17:18:41 +01:00
serg@serg.mylan
1bcb1b9d45 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-23 15:35:50 +01:00
serg@serg.mylan
48e7c9abc6 use FT_MAX_WORD_LEN_FOR_SORT instead of HA_FT_MAXBYTELEN when calculating
preferred key block length for ft index
2004-11-23 15:03:16 +01:00
wax@kishkin.ru
f88cf92657 Delete: mysql-test/mysql_test_run.c 2004-11-23 18:05:13 +05:00
wax@mysql.com
332269903b Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1bug
2004-11-23 17:58:46 +05:00
wax@kishkin.ru
cfb82e9ef7 rename event_connect_request to smem_event_connect_request 2004-11-23 17:55:07 +05:00
pekka@mysql.com
ee54423a02 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-23 13:09:28 +01:00