1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Commit Graph

19980 Commits

Author SHA1 Message Date
stewart@mysql.com
96b4d17368 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
2005-02-16 11:28:23 +11:00
tomas@poseidon.ndb.mysql.com
2196ef8d75 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-15 15:17:23 +01:00
tomas@poseidon.ndb.mysql.com
df3b674c34 MgmtSrvr.cpp:
small bugfix "ERROR Message: failed"
2005-02-15 15:09:23 +01:00
tomas@poseidon.ndb.mysql.com
451b54e5ea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
2005-02-15 14:31:52 +01:00
tomas@poseidon.ndb.mysql.com
d9ed81417b added info to dump state 8004
added debug printouts
    changed mem allocation handling in event api
   split single and parallell event operation testing
2005-02-15 14:18:17 +01:00
mskold@mysql.com
d32c3d6940 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-15 11:38:00 +01:00
stewart@mysql.com
00e121f4a6 fixes in connect_client thread. g_eventLogger usage, correct condition on calling connect on Transporter 2005-02-15 19:15:31 +11:00
stewart@mysql.com
d35395617b In connect_clients thread:
- don't wait an extra 400ms before retrying a transporter connect if the port is dynamic
2005-02-15 18:47:31 +11:00
joreland@mysql.com
85301e4c9c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-15 08:39:11 +01:00
stewart@mysql.com
6d12f23047 Don't ask mgm server for port to connect transporter to if we already have one; only ask if connect fails.
Reconnect to mgm server in connect_clients thread if m_mgm_handle is disconnected.
2005-02-15 18:30:44 +11:00
igor@rurik.mysql.com
889ffaaabc Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-02-14 20:44:07 -08:00
igor@rurik.mysql.com
e6b22e6f82 Manual merge 2005-02-14 19:00:38 -08:00
sergefp@mysql.com
919f2f2364 Merge mysql.com:/home/psergey/mysql-4.1-bug8218
into mysql.com:/home/psergey/mysql-5.0-bug8218
2005-02-14 23:47:31 +03:00
sergefp@mysql.com
021f9849ef Remove redundant DROP TABLE from test case 2005-02-14 23:45:48 +03:00
matthias@three.local.lan
24bd4aea52 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
2005-02-14 18:48:50 +01:00
tomas@poseidon.ndb.mysql.com
495cb18ac1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-14 18:48:49 +01:00
mskold@mysql.com
1dcbc45b43 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-14 17:35:14 +01:00
matthias@three.local.lan
d6c5089e92 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
2005-02-14 16:34:36 +01:00
marko@hundin.mysql.fi
e0e87d0c92 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/k/mysql-5.0
2005-02-14 17:23:12 +02:00
heikki@hundin.mysql.fi
01872c239d Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-02-14 17:23:11 +02:00
gluh@gluh.mysql.r18.ru
29510ce029 Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
Can't repeat information_schema test failure
Fix for lowercase_table3 only
2005-02-14 18:23:10 +03:00
tomas@poseidon.ndb.mysql.com
35de04dfac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-14 16:22:00 +01:00
tomas@poseidon.ndb.mysql.com
974683c00b make sure that the "conections are up to date" when exiting from MgmtSrvr::transporter_connect()
Make sure that the node itself is set in the m_connected_nodes when connected
2005-02-14 15:51:44 +01:00
heikki@hundin.mysql.fi
67392525e8 ha_innodb.cc:
Fix a glitch reported by Guilhem: release the memory allocated for innodb_internal_... if innobase_init() fails; cleanups: in ha_innodb, you should use the InnoDB formatting style for the source code
2005-02-14 16:00:15 +02:00
marko@hundin.mysql.fi
e868711319 InnoDB: Small improvements to earlier patch (fix Bug #7350 better),
suggested in review by Heikki.
2005-02-14 15:54:08 +02:00
mleich@mysql.com
cb56fcaa94 Removal of a not needed statement 2005-02-14 14:20:43 +01:00
tomas@poseidon.ndb.mysql.com
c9e5baccf5 corrected error in checking get() return value from config iterator 2005-02-14 11:29:46 +01:00
tomas@poseidon.ndb.mysql.com
05ad345db4 mgmapi to return connected port and interface _only_ if it is actually connected
use m_cofigMutex when configuration is accessed
   use c++ iteration interface everywhere in MgmtSrvr code
    use NDB_INVALID_SOCKET everywhere in Services.cpp
2005-02-14 11:15:00 +01:00
matthias@three.local.lan
e8bf23c16a Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-14 10:23:53 +01:00
joreland@mysql.com
08ade1e702 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-14 09:05:55 +01:00
stewart@mysql.com
e3a39c9e81 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
2005-02-14 19:05:54 +11:00
tomas@poseidon.ndb.mysql.com
dc5d31cb2a connect_ndb_mgmd stilled some more mem leaks 2005-02-14 09:05:53 +01:00
tomas@poseidon.ndb.mysql.com
72f029269c fixed memory-leak in case of connect failure 2005-02-14 08:50:16 +01:00
joreland@mysql.com
33ea89a3c7 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-14 08:30:52 +01:00
joreland@mysql.com
c5a43f983a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-14 08:29:43 +01:00
joreland@mysql.com
93a7878c15 wl1292 - ndb autotest
fix log reports
2005-02-14 08:28:47 +01:00
stewart@mysql.com
9baff80867 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl5
2005-02-14 18:19:11 +11:00
stewart@mysql.com
377ffd15ab Transporter holds a signed port number so the check for a dynamic port in
connect_client thread will work more than just first-time.
2005-02-14 18:09:06 +11:00
heikki@hundin.mysql.fi
71174327df row0mysql.c:
Fix memory corruption bug reported by Georg Richter: if one created a table whose primary key contained at least 2 column prefixes, that could corrupt the memory heap of prebuilt_t
2005-02-13 20:48:02 +02:00
kent@mysql.com
ba3f9acff6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-13 18:22:38 +01:00
hf@deer.(none)
958456caa3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-13 01:54:24 +04:00
hf@deer.(none)
5b3ea1ab89 Fix for bug 8416 (bigint test fails on PPC) 2005-02-13 01:36:35 +04:00
sergefp@mysql.com
c0c50efdef Fix for BUG#8218:
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List.
2005-02-12 22:58:54 +03:00
mskold@mysql.com
ba050ad331 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-12 15:30:45 +01:00
joreland@mysql.com
3ad4a475d6 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-12 15:20:55 +01:00
joreland@mysql.com
204c401031 merge 2005-02-12 15:17:41 +01:00
joreland@mysql.com
9b50ee3ada wl1292 - ndb autotest
Fix 4.1 memleak in Hugo
2005-02-12 15:12:53 +01:00
joreland@mysql.com
f5a07fd2cc Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-12 15:06:39 +01:00
joreland@mysql.com
7a08f3cc8c wl1292 - ndb autotest
link to log if it exists, regardless of test result
2005-02-12 15:05:33 +01:00
mskold@mysql.com
7760b1cad8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-12 14:57:39 +01:00