Commit graph

19936 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
unknown
c8510bf81b 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
unknown
f315e00e56 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
unknown
d505ee0790 merge 2005-02-12 15:17:41 +01:00
unknown
e03b7bd879 wl1292 - ndb autotest
Fix 4.1 memleak in Hugo


ndb/test/include/HugoOperations.hpp:
  Fix mem leak in Hugo
ndb/test/src/HugoTransactions.cpp:
  Fix mem leak in Hugo
2005-02-12 15:12:53 +01:00
unknown
66d5e4e888 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
unknown
3ca04269c9 wl1292 - ndb autotest
link to log if it exists, regardless of test result


ndb/test/run-test/make-html-reports.sh:
  link to log if it exists, regardless of test result
2005-02-12 15:05:33 +01:00
unknown
dd0f622416 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
2005-02-12 14:57:39 +01:00
unknown
0e9b1c1db5 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-02-11 20:59:19 +02:00
unknown
12e4d1c8db Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0
Build-tools/Do-compile:
  Auto merged
2005-02-11 13:00:17 +01:00
unknown
58de6bb98b After merge fix. 2005-02-11 12:53:43 +01:00
unknown
72750ad95a Merge
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/table.cc:
  SCCS merged
2005-02-11 11:59:35 +01:00
unknown
53596fa16f Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug8306
2005-02-11 10:51:17 +01:00
unknown
12df0887b1 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1
Build-tools/Do-compile:
  Auto merged
2005-02-11 10:40:10 +01:00
unknown
4b7e8a8e37 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


BitKeeper/etc/logging_ok:
  auto-union
extra/replace.c:
  Auto merged
2005-02-10 23:48:35 -08:00
unknown
d78bd41f55 select.result:
Adjusted results of the test case for bug #7520 for 4.1.


mysql-test/r/select.result:
  Adjusted results of the test case for bug #7520 for 4.1.
2005-02-10 23:47:57 -08:00
unknown
9387349ed2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 08:17:18 +01:00
unknown
28d3f08317 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 08:13:25 +01:00
unknown
7b5ef7cc0d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-11 08:10:46 +01:00
unknown
4f53f70f72 ndb - fix compiler warning (error using gcc-3.4.3)
ndb/test/ndbapi/bench/mainPopulate.cpp:
  compiler warning (error using gcc-3.4.3)
2005-02-11 08:09:47 +01:00
unknown
9a2b2033ce Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
2005-02-11 17:29:01 +11:00
unknown
85ee8a1847 return NDB_INVALID_SOCKET instead of -1 for Windows compatibility.
(Found in review by Tomas Ulin)
2005-02-11 17:23:06 +11:00
unknown
dca07cf034 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


BitKeeper/etc/logging_ok:
  auto-union
extra/replace.c:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/table.cc:
  Auto merged
2005-02-10 22:17:18 -08:00
unknown
9540945624 select.result, select.test:
Added a test case for bug #7520.
table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.


sql/table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.
mysql-test/t/select.test:
  Added a test case for bug #7520.
mysql-test/r/select.result:
  Added a test case for bug #7520.
2005-02-10 22:15:38 -08:00
unknown
dd5767356b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 06:46:05 +01:00
unknown
c0b4578db0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-11 06:44:20 +01:00
unknown
0a0b9309eb Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
2005-02-11 06:42:57 +01:00
unknown
d9de85b544 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-11 06:41:39 +01:00