Commit graph

17668 commits

Author SHA1 Message Date
unknown
21f9f4f210 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-22 06:22:41 +01:00
unknown
a5108fc1d4 bug#7466 - ndb - bitfields of size 0 is unsupported
ndb/include/kernel/signaldata/CreateTable.hpp:
  Check array size in dict before creating table
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Check array size in dict before creating table
ndb/src/ndbapi/ndberror.c:
  Check array size in dict before creating table
2004-12-22 06:19:19 +01:00
unknown
1d32cbb198 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
2004-12-21 13:22:46 +01:00
unknown
b58224a54f Updated docs 2004-12-21 13:21:59 +01:00
unknown
0d50d6433e Merge jstephens@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb
2004-12-21 20:58:19 +10:00
unknown
54b1873084 Changes in config for generation of NDB API docs:
don't include header files or class private members;
do include class static members.


ndb/docs/doxygen/Doxyfile.mgmapi:
  Disable inclusion of headers.
  Enable inclusion of static members.
ndb/docs/doxygen/Doxyfile.ndbapi:
  Disable inclusion of headers.
  Enable inclusion of static members.
ndb/docs/doxygen/Doxyfile.ndb:
  Disable inclusion of headers.
  Disable inclusion of private members.
ndb/docs/doxygen/Doxyfile.odbc:
  Disable inclusion of headers.
  Disable inclusion of private members.
ndb/docs/doxygen/Doxyfile.test:
  Disable inclusion of headers.
  Disable inclusion of private members.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-21 20:52:52 +10:00
unknown
6436cab838 ndb - testTransactions
ndb/test/run-test/daily-basic-tests.txt:
  Run testTransactions on table explicitly to avoid unhandled error
2004-12-21 11:21:27 +01:00
unknown
569310001f ndb - testNdbApi -n UpdatesWithoutValues
ndb/test/ndbapi/testNdbApi.cpp:
  testNdbApi -n UpdatesWithoutValues
2004-12-21 09:36:27 +01:00
unknown
7b09b67d77 ndb - autotest fixes
ndb/test/src/HugoTransactions.cpp:
  Fix indexRead (range)
2004-12-21 08:59:40 +01:00
unknown
10ea49c718 ndb - testIndex -n NFNR3
ndb/test/ndbapi/testIndex.cpp:
  Use stop and wait to capture error during restart
ndb/test/src/UtilTransactions.cpp:
  Add extra check for readRowFromIndex failure due to loosing of locks
   in scan
2004-12-21 08:40:01 +01:00
unknown
b4c941bd7d ndb - autotest bug fixes
ndb/test/ndbapi/testDict.cpp:
  Drop table at end of testDict createTableWhenDbIsFull
2004-12-21 07:51:17 +01:00
unknown
de5ce11108 Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
into polly.local:/home/kaa/src/mysql-5.0


innobase/os/os0proc.c:
  Auto merged
2004-12-20 20:20:20 +03:00
unknown
19ee81dfb9 Fixed compilation for old Linux distributions that have no HugeTLB support 2004-12-20 20:17:36 +03:00
unknown
ca66733676 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2004-12-20 16:52:15 +01:00
unknown
eef88fade1 ndb: index tests
ndb/test/ndbapi/testOIBasic.cpp:
  test ordering, add hash indexes, fix result verification
mysql-test/ndb/ndb_range_bounds.pl:
  minor
mysql-test/r/ndb_index_ordered.result:
  minor
mysql-test/t/ndb_index_ordered.test:
  minor
2004-12-20 16:52:14 +01:00
unknown
b744b513bb Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-20 16:33:45 +01:00
unknown
28bbaf08a2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-20 16:32:34 +01:00
unknown
961f81c3eb ndb - More printout from testDict 2004-12-20 16:25:45 +01:00
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
fb69c85183 Changed mode of result files to -rw-rw-r--
mysql-test/r/federated.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext2.result:
  Change mode to -rw-rw-r--
mysql-test/r/grant2.result:
  Change mode to -rw-rw-r--
mysql-test/r/information_schema_inno.result:
  Change mode to -rw-rw-r--
mysql-test/r/innodb_handler.result:
  Change mode to -rw-rw-r--
mysql-test/r/insert_update.result:
  Change mode to -rw-rw-r--
mysql-test/r/repair.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_create_database.result:
  Change mode to -rw-rw-r--
mysql-test/r/type_bit.result:
  Change mode to -rw-rw-r--
2004-12-19 21:25:11 +02:00
unknown
ff0ecc0908 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


innobase/os/os0proc.c:
  Auto merged
2004-12-19 20:26:30 +02:00
unknown
0690410310 Merge with global tree
Fixed some found bugs in BIT fields
Added more test cases for BIT fields and varchar


include/my_base.h:
  Merge
  Added HA_BIT_PART for easier test in key.cc
innobase/os/os0proc.c:
  Fixed typo
myisam/mi_dbug.c:
  Add printing of BIT types when debugging
mysql-test/r/show_check.result:
  Set 'Avg_row_length' to # as this value is different between 32 and 64 bit machines
mysql-test/r/type_bit.result:
  More tests
mysql-test/r/type_varchar.result:
  More tests
mysql-test/t/show_check.test:
  Set 'Avg_row_length' to # as this value is different between 32 and 64 bit machines
mysql-test/t/type_bit.test:
  More tests
mysql-test/t/type_varchar.test:
  More tests
sql/field.cc:
  Added Field::val_int_as_str() to get better logging of bit fields
  Merged new_key_field with move_field() to fix some problems with bit fields
  Fixed some bugs with bit fields
sql/field.h:
  Added Field::val_int_as_str() to get better logging of bit fields
  Merged new_key_field with move_field() to fix some problems with bit fields
  Fixed some bugs with bit fields
sql/ha_myisam.cc:
  Fixed problem with unintialized memory (not critical)
sql/key.cc:
  Fix so that 'key_cmp_if_same' works with bit fields.
sql/opt_range.cc:
  Move declarations first in function
  Nice printing of bit fields in debug log
sql/sql_prepare.cc:
  Fixed old merge error (not critical)
sql/sql_select.cc:
  Use new interface to new_key_field
sql/sql_select.h:
  Use new interface to new_key_fields()
  This fixes a bug with BIT fields where the upper bit of the data was not stored in the key buffer
sql/structs.h:
  Extend key_part_flag to be able to add HA_BIT_PART to it
sql/table.cc:
  Mark BIT key parts with HA_BIT_PART to make test in key.cc simpler
2004-12-19 20:25:19 +02:00
unknown
bf01c52920 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0
2004-12-19 13:39:28 +03:00
unknown
699f55e70c Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
into polly.local:/home/kaa/src/mysql-5.0
2004-12-19 13:00:03 +03:00
unknown
2929563fe2 Fixed cut&paste bug that broke compilation with compile-pentium-valgrind-max 2004-12-19 12:57:34 +03:00
unknown
0e25a6f090 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0
2004-12-19 12:52:18 +03:00
unknown
5bc79c0c83 Small cleanup of derived tables handling.
We should not call free_tmp_table() for derived table in 
mysql_derived_filling(), since by this moment this table is already
registered in THD::derived_tables list and thus free_tmp_table() will
be called for it automatically in close_thread_tables().


sql/sql_derived.cc:
  We should not call free_tmp_table() for derived table in 
  mysql_derived_filling(), since by this moment this table is already
  registered in THD::derived_tables list and thus free_tmp_table() will
  be called for it automatically in close_thread_tables().
2004-12-19 12:51:40 +03:00
unknown
2aa5d92537 fix for Bug#7386 - IM fails to compile on alpha with Compaq C++ compiler
server-tools/instance-manager/mysql_connection.cc:
  use enum value instead of extern const in array definition
server-tools/instance-manager/priv.cc:
  added a comment to remind of enum value in mysql_connection.cc
2004-12-19 03:07:05 +03:00
unknown
67f5704d99 trx0roll.c:
Put a sensible value of thread id and process no to a background rollback transaction


innobase/trx/trx0roll.c:
  Put a sensible value of thread id and process no to a background rollback transaction
2004-12-18 19:52:43 +02:00
unknown
8b936635b0 trx0roll.c:
Fix the rollback progress printout in crash recovery


innobase/trx/trx0roll.c:
  Fix the rollback progress printout in crash recovery
2004-12-18 18:44:03 +02:00
unknown
8da9faaafc trx0roll.c:
Print progress of background rollback of transactions with more than 1000 undo log entries
srv0start.c, trx0roll.c, log0recv.c, trx0roll.h:
  Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly


innobase/include/trx0roll.h:
  Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
innobase/log/log0recv.c:
  Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
innobase/srv/srv0start.c:
  Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
innobase/trx/trx0roll.c:
  Print progress of background rollback of transactions with more than 1000 undo log entries
2004-12-18 18:20:23 +02:00
unknown
b2474e7ac1 rem0rec.ic:
Do not use short int in rem0rec.ic, since its size is not fixed in ANSI C; improve comments of the relative offset field in a record; use mach_read_from_2() to read the relative offset field to save CPU time, if the compiler does not optimize a more complex access function


innobase/include/rem0rec.ic:
  Do not use short int in rem0rec.ic, since its size is not fixed in ANSI C; improve comments of the relative offset field in a record; use mach_read_from_2() to read the relative offset field to save CPU time, if the compiler does not optimize a more complex access function
2004-12-18 13:04:34 +02: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
3fa699ef04 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2004-12-18 12:49:14 +02:00