mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45846 commits 2791 branches 343 tags 1.7 GiB
Commit graph

45846 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
aff7711827 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-26 21:33:07 +02:00
unknown
4bd99ef371 correction of result file 2007-04-26 21:32:02 +02:00
unknown
291c619dec Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-26 13:59:57 +02:00
unknown
45f4dfe721 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-26 13:56:32 +02:00
unknown
7e42f6b430 remove compiler warning 2007-04-26 13:56:09 +02:00
unknown
da719b3dab Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/test/src/NDBT_Table.cpp:
  manual merge
 2007-04-26 13:50:04 +02:00
unknown
10d2d90063 Bug #27205 Occational 899 if delete+insert during LCP 
- put page of deleted row last in list
 2007-04-26 13:41:33 +02:00
unknown
3854e64310 WL#1190 preparatory work needed for compatability with future online add column 
sql/ha_ndbcluster.cc:
  WL#1190 preparatory work needed for compatability with future online add column
  - make forcing of var part reference into ndb storage default, may be overridden by table setting ROW_FORMAT=FIXED
mysql-test/r/ndb_row_format.result:
  New BitKeeper file ``mysql-test/r/ndb_row_format.result''
mysql-test/t/ndb_row_format.test:
  New BitKeeper file ``mysql-test/t/ndb_row_format.test''
 2007-04-26 13:36:51 +02:00
unknown
b2ca0304c7 Bug #24667 After ALTER TABLE operation ndb_dd table becomes regular ndb 2007-04-26 13:12:43 +02:00
unknown
6932b4d747 ndb: force varpart part I, allow setting of flag in dictionary 2007-04-26 08:34:38 +02:00
unknown
9eb496dabe Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
 2007-04-25 23:49:37 +02:00
unknown
55403ffb54 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  merge
storage/ndb/test/tools/Makefile.am:
  merge
 2007-04-25 23:48:31 +02:00
unknown
42f70eb71e Add --symbolic-links=1 for partition_not_windows-master.opt. 
mysql-test/t/partition_not_windows-master.opt:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/t/partition_not_windows-master.opt
mysql-test/t/partition_not_windows.test:
  Tweak comments to be more meaningful
 2007-04-25 22:55:19 +02:00
unknown
59978185cb ndb - 
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
 2007-04-25 22:50:35 +02:00
unknown
a8fef66872 Merge bk-internal:/home/bk/mysql-5.1-telco-gca 
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  SCCS merged
 2007-04-25 20:45:48 +02:00
unknown
58e28f65a4 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-04-25 20:29:28 +02:00
unknown
4573d03411 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-04-25 20:23:05 +02:00
unknown
47c0b4ca62 Fix for valgrind errors in test: require symlink support for partition_not_windows.test 
mysql-test/include/have_symlink.inc:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/include/have_symlink.inc
 2007-04-25 20:21:55 +02:00
unknown
7f48dfa007 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/test/tools/Makefile.am:
  merge
 2007-04-25 18:02:40 +02:00
unknown
b6c30e12a4 After-merge fixes. 2007-04-25 15:48:12 +02:00
unknown
f488c925e6 Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Manual merge.
storage/ndb/test/ndbapi/testBasic.cpp:
  Manual merge.
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Manual merge.
 2007-04-25 15:40:13 +02:00
unknown
e291f4dd85 Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2007-04-25 15:32:44 +02:00
unknown
ebaf770737 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged
 2007-04-25 15:29:50 +02:00
unknown
7716cf2c93 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
 2007-04-25 15:28:56 +02:00
unknown
868a229ca4 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.cc:
  Auto merged
 2007-04-25 15:25:56 +02:00
unknown
0443044eb2 ndb: added some retry sleep to not get busy loops 2007-04-25 15:25:23 +02:00
unknown
9a9ff15012 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  SCCS merged
 2007-04-25 15:24:17 +02:00
unknown
10b5227bb0 Bug #28093 ndb: retry sleep in get table stats 30s instead of 30ms 2007-04-25 15:21:38 +02:00
unknown
88a10dbaf3 Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca-bug28073 
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
 2007-04-25 15:21:05 +02:00
unknown
4ea948c5c9 Merge ymer.(none):/usr/local/mysql/mysql-5.0-telco-gca 
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Manual merge.
 2007-04-25 15:18:34 +02:00
unknown
830feaf49d Merge bk-internal:/home/bk/mysql-5.1-new-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
 2007-04-25 15:06:03 +02:00
unknown
13547d83d3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-25 15:02:53 +02:00
unknown
dd92e29320 After-merge fixes. 2007-04-25 15:02:23 +02:00
unknown
a959459c68 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-25 15:01:53 +02:00
unknown
ca532914fd BUG#28073: Infinite loop in lock queue. 
In a certain code path the NDBD could loop infinitely in the lock queue.


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix infinite loop.
storage/ndb/test/include/HugoOperations.hpp:
  Add optional hinting of TC for new transactions.
storage/ndb/test/ndbapi/testBasic.cpp:
  Add test case.
storage/ndb/test/run-test/daily-basic-tests.txt:
  Add test case.
storage/ndb/test/src/HugoOperations.cpp:
  Add optional hinting of TC for new transactions.
 2007-04-25 14:38:05 +02:00
unknown
604c12b466 thread_registry.cc: 
Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed


server-tools/instance-manager/thread_registry.cc:
  Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed
 2007-04-25 12:08:12 +02:00
unknown
2399e1c994 BUG#27495: Missing implementation of NdbTransaction::executeAsynch(). 
NdbTransaction::executeAsynch() was not implemented. Add implementation.


ndb/include/ndbapi/NdbTransaction.hpp:
  executeAsynch() should probably allow setting forceSend.
ndb/src/ndbapi/NdbTransaction.cpp:
  Add missing implementation of executeAsynch().
ndb/test/ndbapi/testNdbApi.cpp:
  Add test case.
ndb/test/run-test/daily-basic-tests.txt:
  Add new test.
 2007-04-25 09:23:28 +02:00
unknown
f90fc07114 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2007-04-24 13:45:28 -07:00
unknown
2c5d704d52 Bug #24228 ndb_size.pl requires non-standard HTML::Template module 
Bug #24227  	ndb_size.pl should report default values instead of < default for config params
Bug #24229  	ndb_size.pl doesn't compute Index usage correctly

Big ndb_size.pl update


BitKeeper/deleted/.del-ndb_size.tmpl:
  Delete: storage/ndb/tools/ndb_size.tmpl
storage/ndb/tools/Makefile.am:
  ndb_size.tmpl no longer required
storage/ndb/tools/ndb_size.pl:
  total revamp.
  
  remove use of template, improve functionality.
 2007-04-24 13:43:13 -07:00
unknown
006d9d6578 - Resolved conflict between fixes for bugs 25141 and 26074. 
- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test


mysql-test/r/windows.result:
  - Removed duplicate results.
mysql-test/t/windows.test:
  - Removed InnoDB requirement. 
  - Removed duplicate test case.
sql/ha_partition.cc:
  - Reverted changes from bug 26074 because it conflicts with bug 25141.
 2007-04-24 16:07:52 -04:00
unknown
742c70b0a0 - Removing mistake. 
BitKeeper/deleted/.del-partition.inc:
  Delete: mysql-test/include/partition.inc
 2007-04-24 14:26:49 -04:00
unknown
551f7b1ff7 Cset exclude: iggy@alf.|ChangeSet|20070330021852|19466 
BitKeeper/deleted/.del-partition_not_windows.test:
  Exclude
BitKeeper/deleted/.del-partition_windows.result:
  Exclude
BitKeeper/deleted/.del-partition_windows.test:
  Exclude
mysql-test/include/partition.inc:
  Exclude
sql/sql_table.cc:
  Exclude
 2007-04-24 13:51:59 -04:00
unknown
b6a83383e3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-24 19:24:13 +02:00
unknown
ea71308435 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
 2007-04-24 19:24:07 +02:00
unknown
95559f36c1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


BitKeeper/etc/ignore:
  auto-union
 2007-04-24 19:23:36 +02:00
unknown
d23ebf579f Merge alf.:D:/src/mysql-5.1-maint 
into  alf.:D:/src/mysql-5.1-maint_pt
 2007-04-24 12:50:28 -04:00
unknown
da059fcb96 Minor fixes. 
scripts/CMakeLists.txt:
  Fix broken bk native builds.
sql/log_event_old.cc:
  Fix for failing DBUG builds.
 2007-04-24 12:41:08 -04:00
unknown
6e7e60776e Added missing backslash 2007-04-24 17:42:16 +02:00
unknown
794cc8d9ed Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
 2007-04-24 15:11:22 +02:00
unknown
5d60d2ee09 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.h:
  Auto merged
 2007-04-24 14:29:35 +02:00