Commit graph

17634 commits

Author SHA1 Message Date
unknown
c3a4fa1f40 ndb - Add partitioning tests to autotest
ndb/test/run-test/daily-basic-tests.txt:
  Add partitioning tests to autotest
2004-12-20 16:22:58 +01:00
unknown
1b6b43fb6d ndb - fix rare 4012 which was nodefailrep before disconnect
ndb/src/ndbapi/ClusterMgr.cpp:
  Update connect count if node_failrep reaches us before node disconnects
2004-12-20 16:17:14 +01:00
unknown
b15fdabb1a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-20 15:53:29 +01:00
unknown
310fb7815f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-20 15:49:09 +01:00
unknown
06881bec23 ndb - autotest fixes - always return -1 on failures
ndb/src/ndbapi/NdbConnection.cpp:
  Always return -1 on failures
ndb/src/ndbapi/Ndbif.cpp:
  Always return -1 on failures
2004-12-20 15:37:12 +01:00
unknown
d6b9e4c4d4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into shark.:/space/ndbdev/clone-mysql-5.0-ndb-daily-2004-12-20
2004-12-20 15:30:32 +01:00
unknown
5259a1cbce ndb: wl-1893: range scanning backwards, handler
mysql-test/ndb/ndb_range_bounds.pl:
  test ordered scan
mysql-test/r/ndb_index_ordered.result:
  test ordered scan
mysql-test/t/ndb_index_ordered.test:
  test ordered scan
sql/ha_ndbcluster.cc:
  wl-1893: range scanning backwards, handler
sql/ha_ndbcluster.h:
  wl-1893: range scanning backwards, handler
2004-12-20 15:12:42 +01:00
unknown
2dab2c1e66 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into shark.:/home/marty/MySQL/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
2004-12-20 14:02:42 +01:00
unknown
65af8100e6 ndb - Fix testNodeRestart -n CommittedRead
ndb/test/ndbapi/testNodeRestart.cpp:
  Fix testNodeRestart -n CommittedRead
2004-12-20 13:55:41 +01:00
unknown
050823dbb5 chmod a+x 2004-12-20 13:51:53 +01:00
unknown
e31004a393 .del-compile-amd64-max~55ce22d5200bf8da:
Delete: BUILD/compile-amd64-max


BitKeeper/deleted/.del-compile-amd64-max~55ce22d5200bf8da:
  Delete: BUILD/compile-amd64-max
2004-12-20 13:50:27 +01:00
unknown
21b7d1e0d1 chmod a+x 2004-12-20 13:48:56 +01:00
unknown
79269b6bc3 .del-compile-amd64-max~f3b2b8c5aefbeacb:
Delete: BUILD/compile-amd64-max


BitKeeper/deleted/.del-compile-amd64-max~f3b2b8c5aefbeacb:
  Delete: BUILD/compile-amd64-max
2004-12-20 13:48:08 +01:00
unknown
ce57eed7bb logging_ok:
Logging to logging@openlogging.org accepted
compile-amd64-max, compile-amd64-debug-max:
  new file


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-20 13:32:02 +01:00
unknown
e919f25d61 ndb - bug fixes for autotest
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix handling reading of more that MAX_MESSAGE_SIZE
ndb/src/ndbapi/Ndbif.cpp:
  Set theReturnStatus if failing before sending
ndb/test/ndbapi/testTimeout.cpp:
  remove invalid tests
ndb/test/run-test/daily-basic-tests.txt:
  remove invalid tests
2004-12-20 12:54:23 +01:00
unknown
b56b53145d compile IM in ndb-clone 2004-12-20 11:52:59 +01:00
unknown
8f382c252f merge
BitKeeper/etc/logging_ok:
  auto-union
2004-12-18 11:49:15 +01:00
unknown
632ad7c2d4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
2004-12-18 11:49:14 +01:00
unknown
e3f1d56252 Fix for bug #7213: information_schema: redundant non-standard TABLE_NAMES table 2004-12-18 13:49:13 +03:00
unknown
fb8758d654 Fix for bug #7210: information_schema: can't access when table-name = reserved word 2004-12-18 12:48:01 +03:00
unknown
491baa972a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0


sql/mysqld.cc:
  Auto merged
sql-common/client.c:
  Auto merged
2004-12-18 03:53:43 +03:00
unknown
d9b8e4b84c More work on truncations in libmysql: after-review fixes.
libmysql/libmysql.c:
  More post-review fixes for truncation patch:
  - use my_strtoll10
  - workaround for Intel FPU executive precision feature
  - one case when we didn't report possible truncation fixed.
strings/my_strtoll10.c:
  Fix a comment.
tests/client_test.c:
  One more test now passes
2004-12-18 03:42:28 +03:00
unknown
59b24f9f39 BUG#7384 IM fails to compile on Solaris.
Solaris doesn't define INADDR_NONE macro. This resulted in compilation
failure. (advanced fix)


include/my_net.h:
  Added INADDR_NONE define
sql-common/client.c:
  removed INADDR_NONE define as it is moved to my_net.h
sql/mysqld.cc:
  add my_net.h define and remove INADDR_NONE
2004-12-18 03:21:20 +03:00
unknown
b5fcf743a6 InnoDB: fix a compilation error due to missing typedef (Bug #7383)
rem0rec.ic:
  Replace (int16_t) with (signed short).


innobase/include/rem0rec.ic:
  Replace (int16_t) with (signed short).
2004-12-18 00:19:00 +02:00
unknown
a51e2428d6 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2004-12-17 23:17:26 +02:00
unknown
996352b73e Truncations patch: a post-review fix.
include/mysql.h:
  Adding an option for data truncations feature.
libmysql/libmysql.c:
  No 'smart' behaviour now for data truncations: they are always
  reported, unless switched off with 
  mysql_options(mysql, MYSQL_REPORT_DATA_TRUNCATION, (my_bool*) &(option=1));
sql-common/client.c:
  Add support for report-data-truncation variable in my.cnf
tests/client_test.c:
  A test for MYSQL_REPORT_DATA_TRUNCATION option.
2004-12-18 00:17:25 +03:00
unknown
e2916b3227 page0page.ic:
Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz


innobase/include/page0page.ic:
  Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz
2004-12-17 22:46:42 +02:00
unknown
91a7644533 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2004-12-17 18:41:53 +01:00
unknown
1577b63abf Merge mysql.com:/space/my/mysql-5.0
into mysql.com:/space/my/mysql-5.0-build
2004-12-17 18:33:53 +01:00
unknown
6ce4c255df Fixing compile-time failures in recently pushed code (aCC, Sun Studio)
(Bug#7381)


libmysql/libmysql.c:
  Fixing compile-time failures in recently pushed code (aCC)
tests/client_test.c:
  Fix a couple of -pedantic warnings.
2004-12-17 20:22:13 +03:00
unknown
fcd2732de8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2004-12-17 18:00:59 +01:00
unknown
b998933753 - typo fix 2004-12-17 18:00:05 +01:00
unknown
9d6298a7c5 - make sure to include sql/share/errmsg.txt into the source distribution
sql/share/Makefile.am:
  - make sure to include errmsg.txt into the source distribution
2004-12-17 17:46:46 +01:00
unknown
b5b1e87e75 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new
2004-12-17 18:58:44 +04:00
unknown
969cebfddc Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
into polly.local:/home/kaa/src/mysql-5.0


configure.in:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-12-17 17:31:16 +03:00
unknown
5177adccc7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.bit.new


sql/field.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
2004-12-17 18:07:05 +04:00
unknown
d7285006cf bit type 2004-12-17 18:06:05 +04:00
unknown
31c7faaca4 The BIT patch by ramil causes that the old data type BIT is no
longer available for most storage engines.
Therefore column c18 BIT is switched TINYINT .


mysql-test/include/ps_conv.inc:
  updated comment
mysql-test/include/ps_create.inc:
  replaced the data type bit with tinyint
mysql-test/r/ps_1general.result:
  updated results
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
mysql-test/r/ps_7ndb.result:
  updated results
mysql-test/t/ps_4heap.test:
  replaced the data type bit with tinyint
mysql-test/t/ps_5merge.test:
  replaced the data type bit with tinyint
2004-12-17 14:27:39 +01:00
unknown
eb7e9346e3 - added file innobase/include/trx0xa.h which was missing from the source
distribution when running "make dist"


innobase/include/Makefile.am:
  - added file trx0xa.h which was missing from the source distribution when
    running "make dist"
2004-12-17 14:06:12 +01:00
unknown
2bc1533738 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-17 11:33:09 +01:00
unknown
3863b25c77 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-17 11:22:27 +01:00
unknown
7099d8e625 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/tools/restore/consumer_restore.cpp:
  Auto merged
2004-12-17 11:21:08 +01:00
unknown
d9f5d2f328 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-17 12:42:53 +03:00
unknown
3ccd78c446 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-17 12:34:32 +03:00
unknown
b181f610e1 bug#7379 & bug#7346 - ndb_restore
ndb/tools/restore/consumer_restore.cpp:
  1) Fix bug when blobs and multiple databases bug#7379
  2) Fix bug #7346
ndb/tools/restore/consumer_restore.hpp:
  Moved tuple handle into callback object 
    instead of having separate array
  Declared m_transactions volatile
2004-12-17 10:27:58 +01:00
unknown
3465e155a2 ndb: wl-1893: range scanning backwards, ndb kernel
ndb/include/kernel/signaldata/AccScan.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/kernel/signaldata/ScanFrag.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/kernel/signaldata/ScanTab.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/include/ndbapi/NdbScanOperation.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/src/ndbapi/NdbScanOperation.cpp:
  wl-1893: range scanning backwards, ndb kernel
ndb/tools/select_all.cpp:
  wl-1893: range scanning backwards, ndb kernel
sql/ha_ndbcluster.cc:
  wl-1893: range scanning backwards, ndb kernel
2004-12-17 10:20:18 +01:00
unknown
e517bb0da3 Fix of test-suite failures which popped up after addition of federated
storage engine.


mysql-test/mysql-test-run.sh:
  We should skip starting of slave server only if test is BOTH 
  not replication related and not federated storage engine related.
mysql-test/r/ps_1general.result:
  Fixed test result after federated storage engine was added.
2004-12-17 12:19:31 +03:00
unknown
ad573e4b5c Fix for pekka's IM compilation failure at ndb.mysql.com
server-tools/instance-manager/mysql_connection.cc:
  move constructor to .cc file
server-tools/instance-manager/mysql_connection.h:
  move constructor to .cc file
2004-12-17 12:08:59 +03:00
unknown
755874c80f ndb: small fixes (error codes, debug stuff)
ndb/test/ndbapi/testDeadlock.cpp:
  for broken compilers
sql/ha_ndbcluster.cc:
  Use DBUG_PRINT since DBUG_FILE cannot be filtered out
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  missing DBUG_RETURN
ndb/include/kernel/signaldata/TupFrag.hpp:
  fix some error codes
ndb/include/kernel/signaldata/TuxMaint.hpp:
  fix some error codes
ndb/include/ndbapi/NdbBlob.hpp:
  fix some error codes
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  fix some error codes
ndb/src/ndbapi/ndberror.c:
  fix some error codes
2004-12-17 09:01:54 +01:00
unknown
0a53b531e3 WL# 2094 Federated Storage Handler, added fixes per suggestions by Bar and Antony
mysql-test/r/federated.result:
  new test results
mysql-test/t/federated.test:
  added order by, group by
sql/ha_federated.cc:
  - added 'scheme' to URL
  - added proper escaping
  - made sure &my_charset_bin is being used throughout handler
  - made sure create_table catches improper URL in comment upon table creation
sql/ha_federated.h:
  added scheme to share
2004-12-16 19:08:32 -08:00