Commit graph

16514 commits

Author SHA1 Message Date
unknown
30d5989268 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-12-22 15:08:23 +01:00
unknown
f20ac5cab0 ndb: use Ndb_cluster_connection in test*
ndb/test/ndbapi/testBlobs.cpp:
  use Ndb_cluster_connection
ndb/test/ndbapi/testOIBasic.cpp:
  use Ndb_cluster_connection
2004-12-22 15:08:22 +01:00
unknown
7f1d19008f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-22 14:59:27 +01:00
unknown
17ec146c6c ndb - Fix bug in backward compatility code (for our test programs)
ndb/src/ndbapi/Ndbinit.cpp:
  Fix bug in backward compatility code (for our test programs)
2004-12-22 14:58:57 +01:00
unknown
dfaa184df6 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41


ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
2004-12-22 13:38:16 +01:00
unknown
2eb5ae4c3b ndb: bug#7340 fix
mysql-test/r/ndb_blob.result:
  bug#7340 fix
mysql-test/t/ndb_blob.test:
  bug#7340 fix
ndb/src/ndbapi/NdbConnection.cpp:
  bug#7340 fix
ndb/src/ndbapi/NdbOperationDefine.cpp:
  bug#7340 fix
2004-12-22 13:38:15 +01:00
unknown
cce8d0456d Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details
2004-12-22 16:02:27 +04:00
unknown
ef1971ecb1 ha_innodb.cc:
Add a comment that no InnoDB table lock is now acquired in LOCK TABLES if AUTOCOMMIT=1. This helps to avoid deadlocks when porting old MyISAM applications to InnoDB.


sql/ha_innodb.cc:
  Add a comment that no InnoDB table lock is now acquired in LOCK TABLES if AUTOCOMMIT=1. This helps to avoid deadlocks when porting old MyISAM applications to InnoDB.
2004-12-22 11:11:16 +02:00
unknown
6fa467666d Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
2004-12-22 11:09:09 +02:00
unknown
4e6fb94d86 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-22 10:09:08 +01:00
unknown
bb15aa8420 wl1292 - ndb autotest - adapt to changes in Logger
ndb/test/run-test/main.cpp:
  adapt to changes in Logger
2004-12-22 10:01:31 +01:00
unknown
e6dfed9f4c ha_innodb.cc:
If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily


sql/ha_innodb.cc:
  If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily
2004-12-22 11:01:25 +02:00
unknown
b7a3d9e84d added some debug printouts 2004-12-22 07:50:44 +01:00
unknown
a55892acce Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-12-22 07:23:21 +01:00
unknown
375d7e014b added configuration hostnames to SHM config struct
use configured hostnames for SHM transporter setup


ndb/include/transporter/TransporterDefinitions.hpp:
  added configuration hostnames to SHM config struct
ndb/src/common/mgmcommon/IPCConfig.cpp:
  added configuration hostnames to SHM config struct
ndb/src/common/transporter/TransporterRegistry.cpp:
  added configuration hostnames to SHM config struct
  use configured hostnames for SHM transporter setup
2004-12-22 07:20:01 +01:00
unknown
1548c6b765 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1


configure.in:
  SCCS merged
innobase/os/os0file.c:
  SCCS merged
2004-12-21 19:33:43 +02:00
unknown
ba9ca88912 main.cpp:
ifdef on version prior to 5.0


ndb/src/mgmsrv/main.cpp:
  ifdef on version prior to 5.0
2004-12-21 18:33:41 +01:00
unknown
fed35d922a os0file.c:
Put back accidentally removed undef and remove a debug def


innobase/os/os0file.c:
  Put back accidentally removed undef and remove a debug def
2004-12-21 18:33:53 +02:00
unknown
b0d26c2642 os0file.c:
Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform


innobase/os/os0file.c:
  Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform
2004-12-21 18:21:17 +02:00
unknown
b42f095780 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-12-21 15:58:18 +01:00
unknown
68d85f701a NdbApi.hpp:
NdbApi.hpp to include ndb_inti.h and ndb_cluster_connecion.hpp


ndb/include/ndbapi/NdbApi.hpp:
  NdbApi.hpp to include ndb_inti.h and ndb_cluster_connecion.hpp
2004-12-21 15:57:36 +01:00
unknown
2ba7c517a4 Bug#7302: UCS2 data in ENUM field get truncated when new column is added 2004-12-21 17:12:27 +04:00
unknown
c6b6977b9e Bug#6481 - storage_engine system variable allows nonsensical value
Check that the requested storage engine is enabled.
2004-12-21 11:09:48 +00:00
unknown
5c185dfd5f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-12-21 11:39:22 +01:00
unknown
78e8e7949e added ndb_init.h to distribution
added missing copyright text
    moved ndb_init things to separate header file
    removed ndb_global include
    documented cluster connection class
    moved internal constants to NdbImpl.hpp class
    changed wait_until_ready behaviour somewhat


ndb/config/type_ndbapitest.mk.am:
  corrected -I flag
ndb/include/Makefile.am:
  added ndb_init.h to distribution
ndb/include/ndb_global.h.in:
  added copyright text
  moved ndb_init things to separate header file
ndb/include/ndbapi/NdbBlob.hpp:
  moved error codes and internal constants to NdbBlobImpl.hpp
ndb/include/ndbapi/NdbReceiver.hpp:
  removed ndb_global include
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  documented cluster connection class
  changed wait_until_ready behaviour somewhat
ndb/src/ndbapi/Ndb.cpp:
  documented cluster connection class
  changed wait_until_ready behaviour somewhat
ndb/src/ndbapi/NdbBlob.cpp:
  moved internal constants to NdbImpl.hpp class
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  moved internal constants to NdbImpl.hpp class
ndb/src/ndbapi/NdbOperationInt.cpp:
  changed includes
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  changed wait_until_ready behaviour somewhat
ndb/test/ndbapi/testBlobs.cpp:
  use impl class to get constants
2004-12-21 10:37:12 +01:00
unknown
f20c53148a Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 12:33:17 +04:00
unknown
ca756fa5a5 Tabs removed 2004-12-21 12:31:38 +04:00
unknown
7a3ad6eb84 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7281
2004-12-21 11:43:25 +04:00
unknown
8dcb172642 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7281


sql/item_func.cc:
  Auto merged
2004-12-21 10:51:11 +04:00
unknown
5c79810a6d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 10:31:09 +04:00
unknown
b277c36a61 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean


libmysqld/lib_sql.cc:
  Auto merged
2004-12-21 10:26:01 +04:00
unknown
fee2e57b67 Fix to perform correctly with charsets in embedded server
BitKeeper/deleted/.del-ctype_recoding.result.es~45c6fe567949af:
  Delete: mysql-test/r/ctype_recoding.result.es
BitKeeper/deleted/.del-func_test.result.es~4de135264090aa14:
  Delete: mysql-test/r/func_test.result.es
BitKeeper/deleted/.del-ps_2myisam.result.es~5132bde9c07c41e8:
  Delete: mysql-test/r/ps_2myisam.result.es
BitKeeper/deleted/.del-ps_3innodb.result.es~a3613f0e86132472:
  Delete: mysql-test/r/ps_3innodb.result.es
BitKeeper/deleted/.del-ps_4heap.result.es~956ae2c46b66b6ed:
  Delete: mysql-test/r/ps_4heap.result.es
BitKeeper/deleted/.del-ps_5merge.result.es~6093a834fec21efe:
  Delete: mysql-test/r/ps_5merge.result.es
BitKeeper/deleted/.del-ps_6bdb.result.es~57b94c3756e3d093:
  Delete: mysql-test/r/ps_6bdb.result.es
libmysqld/lib_sql.cc:
  Charset conversion implemented
mysql-test/r/query_cache.result.es:
  correct test result provided
tests/client_test.c:
  now it works
2004-12-21 10:05:58 +04:00
unknown
7f6cc1df6e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-order-bug
2004-12-21 03:02:38 +03:00
unknown
b4f4c5bd1c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug6825
2004-12-21 02:32:30 +03:00
unknown
9cee9f6969 configure.in:
Increment from 4.0.23 to 4.0.24


configure.in:
  Increment from 4.0.23 to 4.0.24
2004-12-20 15:12:13 -06:00
unknown
05862273cb automatically configure with shared memory transporter for ndb if functions are available 2004-12-20 16:19:22 +01:00
unknown
8c01aba776 added config parameter Group on connection
moved NdbWaiter, m_ndb_cluster_connection, to impl class
    moved node selection things to cluster connection
    moved all private things to impl class
    added opts for shared memory and node selection
    changed opts handling somewhat; introduced enum for options and common handling of option variables
    added checks for transporter support
    automatic addition of shared mem transporters
    moved wait_until_ready code to cluster connection
    added control of usage of new node selection method


ndb/include/mgmapi/mgmapi_config_parameters.h:
  added config parameter Group on connection
ndb/include/ndbapi/Ndb.hpp:
  moved NdbWaiter, m_ndb_cluster_connection, to impl class
  moved node selection things to cluster connection
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  moved all private things to impl class
ndb/include/util/ndb_opts.h:
  added opts for shared memory and node selection
ndb/src/kernel/vm/Configuration.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/src/mgmclient/main.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/src/mgmsrv/ConfigInfo.cpp:
  added checks for transporter support
  automatic addition of shared mem transporters
ndb/src/mgmsrv/MgmtSrvr.cpp:
  in alloc node id first choose connection with specified hostname
ndb/src/mgmsrv/main.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/src/ndbapi/DictCache.hpp:
  added include file
ndb/src/ndbapi/Ndb.cpp:
  enabled using new node selection method
  moved wait_until_ready code to cluster connection
  moved node selection (hint) to cluster connection
  removed start transaction dgroup
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  removed and added inclusde files
ndb/src/ndbapi/NdbImpl.hpp:
  moved things from Ndb into Impl class
  moved waiter things to new file NdbWaiter.hpp
ndb/src/ndbapi/NdbScanOperation.cpp:
  ndbwaiter is no in impl class
ndb/src/ndbapi/Ndbif.cpp:
  ndbwaiter is no in impl class
ndb/src/ndbapi/Ndbinit.cpp:
  moved some Ndb things into impl class
ndb/src/ndbapi/TransporterFacade.hpp:
  changed friend declaration
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  moved node selection things to cluster connection
  moved things from cluster connection to cluster connection impl class
ndb/test/ndbapi/testNdbApi.cpp:
  removed start transaction dgroup
ndb/tools/delete_all.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/desc.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/drop_index.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/drop_tab.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/listTables.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/restore/restore_main.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/select_all.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/select_count.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
ndb/tools/waiter.cpp:
  changed opts handling somewhat; introduced enum for options and common handling of option variables
sql/ha_ndbcluster.cc:
  added control of usage of new node selection method
sql/mysqld.cc:
  added control of usage of new node selection method
2004-12-20 12:36:14 +01:00
unknown
f06f816100 A fix (bug #7281: RAND(RAND) crashes server). 2004-12-20 13:47:38 +04:00
unknown
6cbcd3423a Fix assertion failure in client_test when linked with the embedded
library: stmt_update_metadata (used when we update max_length
in mysql_stmt_store_result) needs valid row->length.


libmysqld/lib_sql.cc:
  row->length is asserted to be valid in stmt_update_metadata
2004-12-19 20:28:52 +03:00
unknown
b824756c00 mysql.cc:
Fix up mysql help messages.


client/mysql.cc:
  Fix up mysql help messages.
2004-12-18 14:30:00 -06:00
unknown
d8432ada2c fill_help_tables.sh:
Convert @samp{c} to 'c', not c.


scripts/fill_help_tables.sh:
  Convert @samp{c} to 'c', not c.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-18 14:22:20 -06:00
unknown
8e1d38a6c6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-12-18 18:31:49 +01:00
unknown
b1eb45210b Fix test results 2004-12-18 15:15:41 +00:00
unknown
02453262bc Merge Bug#7391 from 4.0
mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Merge from 4.0
2004-12-18 15:12:10 +00:00
unknown
4e8e1ef30d Merge 2004-12-18 15:00:50 +01:00
unknown
047f790471 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug7391.4
2004-12-18 11:59:10 +00:00
unknown
63e4725503 Fix test 2004-12-18 11:57:17 +00:00
unknown
2ca011d460 Simplify code during review 2004-12-18 13:45:19 +02:00
unknown
c892bc8bea my-innodb-heavy-4G.cnf.sh:
I fixed the typos in the transaction-isolation comments.
  I fixed the spelling mistakes in the comment.  It had tripped up a support 
  customer as they couldn't start the server with transaction-isolation=
  read-commited


support-files/my-innodb-heavy-4G.cnf.sh:
  I fixed the typos in the transaction-isolation comments.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-17 22:25:35 -05:00
unknown
c6be66530a Remove bogus lines 2004-12-18 02:34:11 +00:00