Commit graph

14903 commits

Author SHA1 Message Date
unknown
300346fad3 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-21 09:53:16 +02:00
unknown
e9e48115b3 bug#5617
allow blank lines in Ndb.cfg files
2004-09-21 09:50:44 +02:00
unknown
19b92eecfc - Bumped up version number: 4.1.5 -> 4.1.6 (still keeping the "gamma"
label for now)
 - tagged ChangeSet 1.2015.1.10 as "mysql-4.1.5"


configure.in:
   - Bumped up version number: 4.1.5 -> 4.1.6 (still keeping the "gamma"
     label for now)
2004-09-21 08:58:44 +02:00
unknown
5ebab48437 Removed debug printout 2004-09-21 08:13:35 +02:00
unknown
ef1e278a20 wl1292
remove -e from atrt-mysql-test-run
2004-09-21 06:33:29 +02:00
unknown
764ea714f4 The major change for this changeset is the addition of code to handle:
OPTIMIZE TABLE <archive table>

This recompresses the table, thus removing any additional gzip headers caused by opening/closing or flushing the table.


mysql-test/r/archive.result:
  Added optimize test case for archive engine.
mysql-test/t/archive.test:
  Added test case for OPTIMIZE table <archive table>
sql/examples/ha_archive.cc:
  The big change was the addition of optimize() call to allow tables to be recompressed (so if you have been reading/writing/reading/writing and ending up with larger files then you should, this will solve it). Though adding this feature is going to make it a real headache to add row level locking. 
  Also fixed bug reported by JD where storage engine code was not functioning (this of course was because I didn't check for the propper return value for hash_init). Removed BROKEN_GZIP ifdef since there was no way to enable it.
sql/examples/ha_archive.h:
  Added optimize() method.
2004-09-21 03:33:22 +02:00
unknown
04844921b9 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-09-20 20:56:16 +02:00
unknown
76f06e4a4a fix updated signature 2004-09-20 20:50:48 +02:00
unknown
091e238cd3 suggested fix for bug 5591 adn corrct select count() with several clients 2004-09-20 15:52:19 +00:00
unknown
7df58b8cb3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


BitKeeper/etc/logging_ok:
  auto-union
2004-09-20 17:25:55 +02:00
unknown
40880be36a Fix event systable collation (binary) 2004-09-20 17:25:12 +02:00
unknown
fd4761dfac Patches to make it compile 2004-09-20 16:30:23 +02:00
unknown
dbf87bf899 Hand merge
acinclude.m4:
  Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2004-09-20 14:20:01 +02:00
unknown
a29a6637ca Merge msvensson@build.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql/mysql-4.1
2004-09-20 14:04:13 +02:00
unknown
73c82c81b2 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
2004-09-20 13:36:23 +02:00
unknown
90bcde83d2 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/GORDON/MySQL/mysql-4.1/src
2004-09-20 13:23:35 +02:00
unknown
5a53ee4fc9 These modifications were part of WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests.  

Make the result sets (order of rows) more predictable by using ORDER BY.


mysql-test/include/ps_modify.inc:
  Make the result sets more predictable by using ORDER BY
mysql-test/include/ps_modify1.inc:
  Make the result sets more predictable by using ORDER BY
mysql-test/r/ps_2myisam.result:
  updated results
mysql-test/r/ps_3innodb.result:
  updated results
mysql-test/r/ps_4heap.result:
  updated results
mysql-test/r/ps_5merge.result:
  updated results
mysql-test/r/ps_6bdb.result:
  updated results
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-09-20 13:10:47 +02:00
unknown
812a07490b Ues buf pointer in get_ndb_value
Merge fixes


mysql-test/r/ndb_insert.result:
  Correct test cases and result after merge
mysql-test/t/ndb_insert.test:
  Correct test cases and result after merge
sql/ha_ndbcluster.cc:
  Correct get_error_message after merge
  Use buf pointer in get_ndb_value
2004-09-20 12:40:53 +02:00
unknown
7c4eee90f0 bug#5659
uninit variable


ndb/src/kernel/vm/Configuration.cpp:
  init variable
2004-09-20 12:21:08 +02:00
unknown
48e56f47a6 Restored old shared memory buffer implementation (used by SCI and SHM).
Improved Default SCI config params
Added missing SCI libraries in ndb_mgm and atrt
Added max of 1024 signals per receive on transporter (to improve
real-time bahaviour and to ensure no job buffer explosion, still
some more work left on avoiding job buffer explosion in the general
case)


ndb/src/common/transporter/Packer.cpp:
  Fix for job buffer explosion and real-time behaviour also in
  high load scenarios.
ndb/src/common/transporter/SCI_Transporter.cpp:
  Restored old Shared memory buffer implementation.
  Changed condition slightly on when to send SCI buffer.
ndb/src/common/transporter/SCI_Transporter.hpp:
  Changed back to old shared memory implementation
ndb/src/common/transporter/SHM_Buffer.hpp:
  Changed back to old shared memory implementation
ndb/src/common/transporter/SHM_Transporter.cpp:
  Changed back to old shared memory implementation
ndb/src/common/transporter/SHM_Transporter.hpp:
  Changed back to old shared memory implementation
ndb/src/common/transporter/TransporterRegistry.cpp:
  Changed back to old shared memory implementation
ndb/src/kernel/vm/FastScheduler.hpp:
  Spelling error
ndb/src/mgmclient/Makefile.am:
  Missing SCI library
ndb/src/mgmsrv/ConfigInfo.cpp:
  Changed to more proper config parameters
ndb/test/run-test/Makefile.am:
  Added missing SCI library
2004-09-20 12:03:18 +02:00
unknown
96bf8030e1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-09-20 11:53:44 +02:00
unknown
7f1fcf6648 Dont log IAmNotMaster errors 2004-09-20 11:47:27 +02:00
unknown
c06c007818 Merged new ndb_insert.test and .result
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_insert.result:
  Merge new test cases
mysql-test/t/ndb_insert.test:
  Merge new test cases
2004-09-20 11:14:31 +02:00
unknown
8b79d2b502 Merge msvensson@build.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql/mysql-4.1
2004-09-20 10:48:20 +02:00
unknown
162bd361de bug#4590
Use ndb_mgm_listen_event to wait for backup messages


ndb/src/mgmclient/CommandInterpreter.cpp:
  Listen to backup event
  start backup
  wait until event related to backup arrives
ndb/src/mgmsrv/Services.cpp:
  Fix newline at end of reply
2004-09-20 09:24:25 +02:00
unknown
51eb463fef Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-09-19 17:36:34 +03:00
unknown
52683755d3 A fix and test case for bug#5510 "inserting Null in AutoIncrement primary
key Column Fails".


mysql-test/r/ps.result:
  Test results updated: a test case for Bug#5510 "inserting Null in 
  AutoIncrement primary key Column Fails".
mysql-test/r/ps_2myisam.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_3innodb.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_4heap.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_5merge.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_6bdb.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/t/ps.test:
  A test case for Bug#5510 "inserting Null in AutoIncrement primary key Column 
  Fails".
sql/item.cc:
  A fix for bug#5510 "inserting Null in AutoIncrement primary key Column 
  Fails": use proper Field API function for NULL placholeders.
2004-09-18 01:10:09 +04:00
unknown
580f12cc04 fixed error handling if creating derived table failed
single row subquery always can return NULL (no rows found) (BUG#5590)


mysql-test/r/subselect.result:
  maybe_null flag returning by subquwery for temporary table creation
mysql-test/t/subselect.test:
  maybe_null flag returning by subquwery for temporary table creation
sql/item.cc:
  storing maybe_null in type holder
sql/item_subselect.cc:
  single row subquery always can return NULL (no rows found)
sql/sql_derived.cc:
  fixed error handling if creating derived table failed
2004-09-17 19:08:46 +03:00
unknown
543e833688 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-09-17 18:31:19 +03:00
unknown
ef5c6152c3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-17 16:58:10 +02:00
unknown
4fe5b3152d Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-cc
2004-09-17 16:58:09 +02:00
unknown
095e10b011 Preparation for batching 2004-09-17 14:58:08 +00:00
unknown
32e8f2ac95 New mgmapi call - ndb_mtm_listen_event 2004-09-17 15:11:57 +02:00
unknown
cc499e6eac Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2004-09-17 14:18:55 +02:00
unknown
a7a6d09e9b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/space/pekka/ndb/version/my41-cc
2004-09-17 14:18:32 +02:00
unknown
e8c9a13769 Fix backup event 2004-09-17 14:18:28 +02:00
unknown
dbbe2e1875 replaced some "localhost" checks with try bind
removed some #id 0 code


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  replaced some "localhost" checks with try bind
ndb/src/mgmsrv/MgmtSrvr.cpp:
  removed some #id 0 code
2004-09-17 12:16:34 +00:00
unknown
72fedd9494 ndb charsets (wl-1732) final part: use strxfrm + strcoll
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  oops
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  jamEntry
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  jamEntry
mysql-test/r/ndb_index.result:
  ndb charsets: minimal fix to make test pass
mysql-test/t/ndb_index.test:
  ndb charsets: minimal fix to make test pass
2004-09-17 14:09:21 +02:00
unknown
f177c76fb2 Do not try use fields examples is expression and fiend used or SET/ENUM field used in types merging procedure (BUG#5618)
mysql-test/r/union.result:
  merging ENUM and SET fields in one UNION
mysql-test/t/union.test:
  merging ENUM and SET fields in one UNION
2004-09-17 13:23:57 +03:00
unknown
3323469dbd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2004-09-17 12:06:23 +02:00
unknown
e44bcce123 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2004-09-17 10:06:22 +00:00
unknown
034bbee322 made tryBind static
using tryBind instead to determine if we're "config host" is "local"


ndb/include/util/SocketServer.hpp:
  made tryBind static
ndb/src/common/util/SocketServer.cpp:
  made tryBind static
ndb/src/mgmsrv/MgmtSrvr.cpp:
  using tryBind instead to determine if we're "config host" is "local"
2004-09-17 10:05:42 +00:00
unknown
f53bc339ff Added EventReport for backup
ndb/src/mgmsrv/MgmtSrvr.cpp:
  removed useless code
ndb/src/mgmsrv/MgmtSrvr.hpp:
  removed useless code
2004-09-17 10:32:22 +02:00
unknown
08ffa2988d Moved event category match functionality into mgmapi
Removed grep introduced bogus mgm call


BitKeeper/deleted/.del-LogLevel.cpp~314a6bada2df40a8:
  Delete: ndb/src/common/debugger/LogLevel.cpp
ndb/include/debugger/EventLogger.hpp:
  Removed match functionality and put into mgmapi
ndb/include/kernel/LogLevel.hpp:
  Update LogLevel
ndb/include/mgmapi/mgmapi_config_parameters.h:
  fix parameter
ndb/src/common/debugger/EventLogger.cpp:
  Removed match functionality and put into mgmapi
ndb/src/common/debugger/Makefile.am:
  removed LogLevel.cpp
ndb/src/cw/cpcd/APIService.cpp:
  compiler warning
ndb/src/cw/cpcd/CPCD.cpp:
  compiler warning
ndb/src/cw/cpcd/CPCD.hpp:
  compiler warning
ndb/src/cw/cpcd/main.cpp:
  compiler warning
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Changed name of config parameter
ndb/src/kernel/vm/Configuration.cpp:
  Changed name of config parameter
2004-09-17 08:28:22 +02:00
unknown
3bfae53bab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged
2004-09-17 00:14:40 +00:00
unknown
254d4e87d0 corrected mistake in counting 2004-09-17 00:12:03 +00:00
unknown
1c24e57922 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-09-16 23:36:48 +00:00
unknown
9956b20790 removed different CFG_ defined for connection host names
added support for setting up multiple interfaces
correct connect address for mgmt server
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
changed automatic allocation of ports somewhat


ndb/include/mgmapi/mgmapi_config_parameters.h:
  removed different CFG_ defined for connection host names
ndb/include/transporter/TransporterRegistry.hpp:
  added support for setting up multiple interfaces
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  removed different CFG_ defined for connection host names
ndb/src/common/mgmcommon/IPCConfig.cpp:
  added support for setting up multiple interfaces
ndb/src/common/portlib/NdbTCP.cpp:
  added debug printouts
ndb/src/common/transporter/TransporterRegistry.cpp:
  added support for setting up multiple interfaces
ndb/src/common/util/SocketServer.cpp:
  added my_thread init to enable debug printouts
ndb/src/mgmclient/CommandInterpreter.cpp:
  shortened lines
ndb/src/mgmsrv/ConfigInfo.cpp:
  removed different CFG_ defined for connection host names
  changed automatic allocation of ports somewhat
ndb/src/mgmsrv/MgmtSrvr.cpp:
  correct connect address for mgmt server
ndb/src/mgmsrv/Services.cpp:
  shoretened lines
ndb/src/mgmsrv/main.cpp:
  bug, -l flag would be interpreted as connectstring
  added flag to remove all node id checks
2004-09-16 23:36:13 +00:00
unknown
ca65afeb72 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-09-16 13:53:22 -07:00
unknown
1de03e7b54 Fix error handling in atrt-mysqltest-run 2004-09-16 22:15:51 +02:00