mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43117 commits 2793 branches 343 tags 1.7 GiB
Commit graph

43117 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@poseidon.mysql.com
8a146f8461 corrected manual merge 2007-02-14 20:17:14 +07:00
istruewing@chilla.local
a44354e203 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-14 13:40:56 +01:00
istruewing@chilla.local
3e8c0c4eb9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-14 13:39:59 +01:00
istruewing@chilla.local
f9e9bd9a0c Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-14 12:03:47 +01:00
istruewing@chilla.local
aba12aca0f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-14 12:02:58 +01:00
stewart@willster.(none)
dcb2c39aa7 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge
 2007-02-14 21:44:28 +11:00
tomas@poseidon.mysql.com
1903368270 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-14 15:39:04 +07:00
tomas@poseidon.mysql.com
92f9a37dc1 ndb_config_4_node.ini, ndb_config_1_node.ini: 
new file
 2007-02-14 15:33:48 +07:00
tomas@poseidon.mysql.com
91c36268c7 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-14 15:31:00 +07:00
tomas@poseidon.mysql.com
f92d3b3ab5 backport some mysql-test ndbcluster things from 5.1 
remove compiler warning EventLogger.cpp
    Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
     - partial fix
     - object map to handle failed realloc
 2007-02-14 15:26:06 +07:00
tomas@poseidon.mysql.com
b7c3aeae2c Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-14 15:18:15 +07:00
tomas@poseidon.mysql.com
120eaec17c Bug #21033 Error 0 in readAutoIncrementValue() 
- do not call function if table has no autoincrement
 2007-02-14 15:16:26 +07:00
stewart@willster.(none)
6aba20c2d6 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge
 2007-02-14 17:10:38 +11:00
stewart@willster.(none)
143f3e7964 BUG#20121 missing err msg for ENOSPC 
getting BACKUP_FRAGMENT_REF in LQH from BACKUP would bail on
ndbrequire(false) instead of having good error message.

Can re-use error code from BACKUP as it's a FsRef error code,
which is NDBD_EXIT... except when it isn't.
 2007-02-14 16:49:40 +11:00
stewart@willster.(none)
6358a0f48c Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
 2007-02-14 16:37:40 +11:00
stewart@willster.(none)
7ed1f6ac01 BUG#26358 remove unused and non-working SET_VAR_REQ/CONF signals 
remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing

Remove the dead SET_VAR_REQ,REF,CONF signals.

They:
a) don't currently work
b) will cause confusion with future mgmd updates for
   signal interface to configuration things (e.g. port numbers)
 2007-02-14 16:03:25 +11:00
tomas@poseidon.mysql.com
e865b5950f Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-14 11:55:31 +07:00
stewart@willster.(none)
e1b75c1784 BUG#26357 remove unused GSN_STATISTICS_REQ and CONF 
remove GSN_STATISTICS_REQ and CONF

These are unused and have been since BK import. not needed.
 2007-02-14 15:55:08 +11:00
stewart@willster.(none)
5c756c1822 BUG#26356 uninitialised data sent from TAMPER_ORD to DIHNDBTAMPER 
Don't send uninit data in TAMPER_ORD to DIHNDBTAMPER

Even though this data is unused from the CMVMI (mgmd) signal,
we shouldn't be doing stuff with uninited data.
 2007-02-14 15:51:16 +11:00
stewart@willster.(none)
2fb873f371 BUG#26355 FIXME: use constant for max loglevel in ndb_mgmd 2007-02-14 15:47:34 +11:00
stewart@willster.(none)
02c847eb03 BUG#26353 remove GET_CONFIG_BACKWARDS_COMPAT from ndb_mgmd 
there is backwards compatibility for GET CONFIG style configuration requests in
ndb_mgmd. None of the ndbd versions that use this couldn't possibly connect to a
5.0 or 5.1 cluster. remove the backwards compat

remove it
 2007-02-14 15:35:29 +11:00
stewart@willster.(none)
faec3f4fb1 BUG#26352 unused ndb_mgm_rep_command in mgmapi.cpp 2007-02-14 15:28:04 +11:00
tomas@poseidon.mysql.com
f45ac96b2a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-14 11:24:35 +07:00
stewart@willster.(none)
2805c8352a WL#3704 mgmapi timeouts (and cleanups) 
indicate units in SocketOutputStream timeout

rename timeout in SocketOutputStream to reflect units (ms)

In 5.0 as well as is safe cleanup patch that will help with merging.
 2007-02-14 15:22:03 +11:00
tomas@poseidon.mysql.com
bfdb8af26d Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-02-14 11:17:35 +07:00
tomas@poseidon.mysql.com
1254253640 make sure some printouts in ndbd out file is done with g_eventLogger 2007-02-14 11:16:10 +07:00
tomas@poseidon.mysql.com
0a4505199c Bug#26293 cluster mgmt node sometimes doesn't receive events from all nodes on restart 
- signals where sometimes sent too early when setting up subscriptions
 2007-02-14 11:05:38 +07:00
igor@olga.mysql.com
d36e264cc5 Post-merge fix 2007-02-13 19:59:46 -08:00
tomas@poseidon.mysql.com
18d227b1b0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-14 10:18:02 +07:00
igor@olga.mysql.com
a68e2d0172 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-02-13 16:09:38 -08:00
igor@olga.mysql.com
452c134d3f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-02-13 16:08:01 -08:00
ibabaev@bk-internal.mysql.com
0df74eae05 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-02-14 00:58:54 +01:00
igor@olga.mysql.com
c84ee7079c Post-merge fix 2007-02-13 15:49:42 -08:00
cmiller@zippy.cornsilk.net
4862fbd593 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-02-13 18:01:24 -05:00
ibabaev@bk-internal.mysql.com
266300142e Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-02-13 23:35:06 +01:00
cmiller@zippy.cornsilk.net
2f1b34a581 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my50-bug25807 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my51-bug25807
 2007-02-13 17:21:50 -05:00
cmiller@zippy.cornsilk.net
9e9dd4327c Bug#25807: LOAD DATA INFILE does not work with Pipes 
Showstopper and regression against 5.0.24.

Previously, we ignored seek() errors (see Bug#22828) and let seek()s
against pipes fail.  Now, since we check that a seek didn't fail,
and return without reading, this bug popped up.

This restores the behavior for file-ish objects that could never be 
seek()ed.
 2007-02-13 16:35:29 -05:00
igor@olga.mysql.com
a196ccafe6 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-02-13 13:31:23 -08:00
igor@olga.mysql.com
273d016aad Post-merge fix. 2007-02-13 13:15:23 -08:00
jonas@eel.(none)
0657f1b58d Merge localhost:/home/jonas/src/51-work 
into  eel.(none):/home/jonas/src/51-work
 2007-02-13 22:03:44 +01:00
ibabaev@bk-internal.mysql.com
cf9aca84b3 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
 2007-02-13 21:25:22 +01:00
istruewing@chilla.local
5f235d9dc2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-bug25460
 2007-02-13 18:59:12 +01:00
istruewing@chilla.local
4b179a97b8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug25460-old
 2007-02-13 17:21:12 +01:00
cmiller@zippy.cornsilk.net
11e8f48734 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2007-02-13 10:54:04 -05:00
cmiller@zippy.cornsilk.net
ae27eeea58 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/tmpmerge
 2007-02-13 10:50:44 -05:00
istruewing@chilla.local
1b35f19223 Bug#25460 - High concurrency MyISAM access causes severe mysqld crash. 
Under high load it was possible that memory mapping was started on a table
while other threads were working with the table.

I fixed the start of memory mapping so that it is done at the first table
open or when the requesting thread is using the table exclusively only.
 2007-02-13 16:33:32 +01:00
df@kahlann.erinye.com
b22c89d36b .del-README.txt-renamed: 
Rename: BitKeeper/deleted/.del-README.txt -> BitKeeper/deleted/.del-README.txt-renamed
 2007-02-13 16:31:24 +01:00
cmiller@zippy.cornsilk.net
094277c1bf Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-02-13 10:23:32 -05:00
cmiller@zippy.cornsilk.net
6473de8db1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-02-13 10:02:00 -05:00
ndbdev@ndbmaster.mysql.com
3685960425 adopt to changes in load_defaults 2007-02-13 14:32:07 +01:00