Commit graph

20030 commits

Author SHA1 Message Date
unknown
c4590730a6 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-16 09:58:34 +01:00
unknown
caadae10e1 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
unknown
fcd7c70ebb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2005-02-15 15:17:23 +01:00
unknown
265bc98407 MgmtSrvr.cpp:
small bugfix "ERROR Message: failed"


ndb/src/mgmsrv/MgmtSrvr.cpp:
  small bugfix "ERROR Message: failed"
2005-02-15 15:09:23 +01:00
unknown
77212351c6 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
unknown
c0a3bf06e0 added info to dump state 8004
added debug printouts
    changed mem allocation handling in event api
   split single and parallell event operation testing


ndb/src/kernel/blocks/suma/Suma.cpp:
  added info to dump state 8004
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  changed mem allocation handling in event api
ndb/test/ndbapi/test_event.cpp:
  split single and parallell event operation testing
2005-02-15 14:18:17 +01:00
unknown
16e60651bf Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-15 12:06:29 +01:00
unknown
e537c5e147 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
2005-02-15 11:38:00 +01:00
unknown
a975cbfdd9 fixes in connect_client thread. g_eventLogger usage, correct condition on calling connect on Transporter
ndb/src/common/transporter/TransporterRegistry.cpp:
  Only check that we have a port number before attempting a transporter connect
2005-02-15 19:15:31 +11:00
unknown
0cc89c6b5f In connect_clients thread:
- don't wait an extra 400ms before retrying a transporter connect if the port is dynamic


ndb/src/common/transporter/TransporterRegistry.cpp:
  Don't wait extra time before retrying
2005-02-15 18:47:31 +11:00
unknown
2188ae0d07 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
unknown
9deea70292 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.


ndb/include/mgmapi/mgmapi.h:
  Add prototype for ndb_mgm_is_connected
ndb/src/common/transporter/TransporterRegistry.cpp:
  start_clients_thread:
  - don't get port if we don't have to
  - Reconnect to mgm server if m_mgm_handle is disconnected
ndb/src/mgmapi/mgmapi.cpp:
  add ndb_mgm_is_connected
2005-02-15 18:30:44 +11:00
unknown
841a9c3885 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
unknown
f0f2343c6b Manual merge 2005-02-14 19:00:38 -08:00
unknown
0547087a6f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-14 22:30:01 +01:00
unknown
40ffce74eb Merge mysql.com:/home/psergey/mysql-4.1-bug8218
into mysql.com:/home/psergey/mysql-5.0-bug8218


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-14 23:47:31 +03:00
unknown
4173610bd2 Remove redundant DROP TABLE from test case 2005-02-14 23:45:48 +03:00
unknown
c042d67c90 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
unknown
11eb4ab708 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
unknown
48bc6ab2ce Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


mysql-test/mysql-test-run.pl:
  Auto merged
2005-02-14 17:35:14 +01:00
unknown
3800536a83 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
unknown
cc2843e2fa Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/k/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
2005-02-14 17:23:12 +02:00
unknown
28bb6893e9 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
2005-02-14 17:23:11 +02:00
unknown
b6a09ac0fa Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
Can't repeat information_schema test failure
Fix for lowercase_table3 only


mysql-test/r/lowercase_table3.result:
  Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
mysql-test/t/lowercase_table3.test:
  Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
sql/ha_innodb.cc:
  Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
2005-02-14 18:23:10 +03:00
unknown
2ad1624371 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
unknown
88bab66ffa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-14 15:54:37 +01:00
unknown
114487dd08 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


ndb/src/kernel/vm/Configuration.cpp:
  make sure we destroy the iterator before reusing the variable
ndb/src/mgmsrv/MgmtSrvr.cpp:
  make sure that the "conections are up to date" when exiting from MgmtSrvr::transporter_connect()
ndb/src/ndbapi/ClusterMgr.cpp:
  Make sure that the node itself is set in the m_connected_nodes when connected
2005-02-14 15:51:44 +01:00
unknown
c1085da6f8 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


sql/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
unknown
93fd45904a InnoDB: Small improvements to earlier patch (fix Bug #7350 better),
suggested in review by Heikki.


innobase/include/data0type.h:
  Improve comment of dtype_struct.
innobase/include/data0type.ic:
  Rename innobase_get_mb_cset() to innobase_get_cset_width().
  dtype_get_fixed_size(): Add an extra integrity check for
  type->prtype, type->mbminlen and type->mbmaxlen.
sql/ha_innodb.cc:
  Rename innobase_get_mb_cset() to innobase_get_cset_width()
2005-02-14 15:54:08 +02:00
unknown
802f0bb0c7 Removal of a not needed statement 2005-02-14 14:20:43 +01:00
unknown
513655cede Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-14 13:00:52 +01:00
unknown
c24523c87f corrected error in checking get() return value from config iterator 2005-02-14 11:29:46 +01:00
unknown
0fbd1d8f95 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


ndb/src/common/transporter/TransporterRegistry.cpp:
  removed warning
ndb/src/mgmapi/mgmapi.cpp:
  mgmapi to return connected port and interface _only_ if it is actually connected
ndb/src/mgmsrv/MgmtSrvr.cpp:
  use m_cofigMutex when configuration is accessed
  use c++ iteration interface everywhere
ndb/src/mgmsrv/Services.cpp:
  use NDB_INVALID_SOCKET everywhere
2005-02-14 11:15:00 +01:00
unknown
943c267709 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
unknown
efdfda4616 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/handler.h:
  Auto merged
2005-02-14 09:22:14 +01:00
unknown
6d2a507343 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
unknown
a0f6d69b91 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
2005-02-14 19:05:54 +11:00
unknown
96227c27cc connect_ndb_mgmd stilled some more mem leaks 2005-02-14 09:05:53 +01:00
unknown
8ca755591c fixed memory-leak in case of connect failure 2005-02-14 08:50:16 +01:00
unknown
1a7d87e33d 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
unknown
3794371069 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
unknown
9f2240b479 wl1292 - ndb autotest
fix log reports


ndb/test/run-test/make-html-reports.sh:
  fix log reports
2005-02-14 08:28:47 +01:00
unknown
0e25e70971 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl5


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
2005-02-14 18:19:11 +11:00
unknown
1df41ff584 Transporter holds a signed port number so the check for a dynamic port in
connect_client thread will work more than just first-time.


ndb/src/common/transporter/Transporter.cpp:
  m_r_port is now m_s_port a SIGNED port. <0 is dynamic
ndb/src/common/transporter/Transporter.hpp:
  m_r_port is now m_s_port, a SIGNED port number (<0 is dynamic).
  
  We give the socket client a positive port though.
ndb/src/common/transporter/TransporterRegistry.cpp:
  Transporter now holds SIGNED port number (<0 dynamic)
2005-02-14 18:09:06 +11:00
unknown
b744f5fbc1 No support for decimal type for columns yet 2005-02-14 07:09:33 +01:00
unknown
3f245d2d05 Added support for new decimal type in condition pushdown 2005-02-13 22:03:41 +01:00
unknown
602d9a0329 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


innobase/row/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
unknown
f37290b960 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
unknown
faf5f25494 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
unknown
a0d5302e17 Fix for bug 8416 (bigint test fails on PPC)
strings/decimal.c:
  <0 doesn't work properly on PPC in that case.
2005-02-13 01:36:35 +04:00