mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
44555 commits 2774 branches 343 tags 1.6 GiB
Commit graph

44555 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
e3d3f3028f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-03-28 22:31:10 +02:00
unknown
ceffe745ae Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


mysql-test/mysql-test-run.pl:
  Auto merged
 2007-03-27 18:44:02 +02:00
unknown
0e6256921c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-27 18:12:33 +02:00
unknown
143151229f Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1


mysql-test/t/query_cache_sql_prepare.test:
  Auto merged
 2007-03-27 12:06:13 +02:00
unknown
e33f3709c8 Making sure thar archive is inited for info AUTO call. 
storage/archive/ha_archive.cc:
  Adding init for HA_STATUS_AUTO call
 2007-03-26 22:50:08 -07:00
unknown
ac8c78bbca Merge piggy:/home/brian/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/pread-archive-5.1


storage/archive/ha_archive.cc:
  Auto merged
 2007-03-26 17:31:52 -07:00
unknown
ba63bc6841 Centralized init logic for starting a scan. 
storage/archive/ha_archive.cc:
  Removed multiple execution logic
 2007-03-26 17:15:31 -07:00
unknown
aaef396b5a Adjusting locks for concurrency issue (not found, but suspect). 
storage/archive/ha_archive.cc:
  Adjusted lock positions to handle possible concurrency condition
 2007-03-26 16:45:17 -07:00
unknown
2dab445783 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-26 21:14:28 +02:00
unknown
7734122613 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-26 21:13:46 +02:00
unknown
cdbe7302d7 correction of manual merge 2007-03-26 21:10:34 +02:00
unknown
b339b30c55 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-26 21:02:14 +02:00
unknown
cba5f9d95d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/test/src/NDBT_Table.cpp:
  manual merge
 2007-03-26 20:57:10 +02:00
unknown
d24dab182f correct medium int printout 
correct cit printout
    correct bit store retrieve


ndb/include/ndbapi/NdbRecAttr.hpp:
  correct medium int printout
ndb/src/ndbapi/NdbRecAttr.cpp:
  correct cit printout
sql/ha_ndbcluster.cc:
  correct bit store retrieve
 2007-03-26 17:57:00 +02:00
unknown
05a352bb99 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-26 14:49:24 +02:00
unknown
e3f3c6f0b6 Bug #26986 BIT(33) for ndb is broken on solaris. 
- always store lsw first in ndb
 2007-03-26 14:48:52 +02:00
unknown
f28a7a0674 Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
 2007-03-26 12:50:40 +02:00
unknown
8866750e6c Merge zim.(none):/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/slap-5.1


client/mysqlslap.c:
  Auto merged
 2007-03-26 02:29:09 -07:00
unknown
1517e2c456 Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded). 
Kinda obvious that this was going to come up ;)


client/client_priv.h:
  New options
client/mysqlslap.c:
  Added option for pre/post run
mysql-test/r/mysqlslap.result:
  Updated tests
mysql-test/t/mysqlslap.test:
  Updated test
 2007-03-26 02:24:49 -07:00
unknown
df4d3039c3 remove warning 2007-03-26 10:39:11 +02:00
unknown
0234a14e75 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
 2007-03-26 10:11:57 +02:00
unknown
73ad31953e Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
 2007-03-26 10:11:15 +02:00
unknown
dbe5fadea0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/tools/restore/Restore.cpp:
  manual merge
 2007-03-26 10:01:43 +02:00
unknown
d37fc3ce1f Bug #26900 ndb_restore printout option does not give structured data 
- set sizes for data
 2007-03-26 09:58:01 +02:00
unknown
e02aa04721 New comments, additional init for rebuild options. 
storage/archive/ha_archive.cc:
  New comments, added specific init for rebuild options.
 2007-03-25 11:38:49 -07:00
unknown
e97d02121c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2007-03-25 16:44:44 +02:00
unknown
9f9a4556df Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2007-03-25 16:44:06 +02:00
unknown
2e845944bd Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
 2007-03-25 15:06:19 +02:00
unknown
f50049883b Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/bk/mysql-5.1-arch
 2007-03-23 19:05:48 -07:00
unknown
89f5507389 Added delayed open of file descriptors to cut down on issues surrounding large collections of partitions being open by many threads. 
storage/archive/azlib.h:
  Adjusted the buffer down to something reasonable :)
storage/archive/ha_archive.cc:
  Upgraded file descriptors to not be opened until needed.
storage/archive/ha_archive.h:
  New methods for delayed open
 2007-03-23 18:51:56 -07:00
unknown
4d3291e62c 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


storage/ndb/include/util/OutputStream.hpp:
  Auto merged
 2007-03-23 21:50:57 +01:00
unknown
27fc5de41a rpl_ndb_sync.result, ndb_partition_key.result: 
test case


mysql-test/r/ndb_partition_key.result:
  test case
mysql-test/r/rpl_ndb_sync.result:
  test case
 2007-03-23 21:49:49 +01:00
unknown
e36d66da80 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


mysql-test/mysql-test-run.pl:
  Auto merged
 2007-03-23 20:25:36 +01:00
unknown
9bfc06771d mysql-test/t/query_cache_sql_prepare.test : Prevent this test from running in "embedded". 
mysql-test/t/query_cache_sql_prepare.test:
  Prevent this test from running in "embedded", it needs two connections.
 2007-03-23 17:31:10 +01:00
unknown
0c65ef99e2 result file updates, message format changes 2007-03-23 17:22:52 +01:00
unknown
14a3a61ad9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


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/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
mysql-test/r/ndb_single_user.result:
  manual merge
mysql-test/t/disabled.def:
  manual merge
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
 2007-03-23 17:17:44 +01:00
unknown
7dc5c00453 enabled and extended single user test 2007-03-23 17:14:38 +01:00
unknown
8503077e6d BUG#27254: Single User Mode.Mysql hangs if it tries delete a ndb table 
sql/ha_ndbcluster.cc:
  set single user mode on ndb schema table
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  dbug print
 2007-03-23 17:12:06 +01:00
unknown
378b47a30d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2007-03-23 17:09:10 +01:00
unknown
cdb16d2fc8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2007-03-23 17:08:33 +01:00
unknown
1404365643 Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes 
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  abort on timeout if in single user mode
 2007-03-23 17:07:33 +01:00
unknown
a96a0cd68a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  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/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
 2007-03-23 14:17:08 +01:00
unknown
cee179c10b correction of merge 2007-03-23 14:16:31 +01:00
unknown
06083cdc03 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
 2007-03-23 14:09:30 +01:00
unknown
4b1ff9070c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user


storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
storage/ndb/include/ndb_constants.h:
  manual merge
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/test/src/NDBT_Table.cpp:
  manual merge
 2007-03-23 14:06:00 +01:00
unknown
a80c9cced4 Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes 
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  add single user mode field in table definition
ndb/include/ndb_constants.h:
  new constants for single usermode option of tables
ndb/include/ndbapi/NdbDictionary.hpp:
  add single user mode field in table definition
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  add single user mode field in table definition
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  add single user mode field in table definition
  send this infor to TC
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  add single user mode field in table definition
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  single user table mode on table object
  merge some flags from uint8 to bits
  get allow transaction to also check single user mode
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  single user table mode on table object
  merge some flags from uint8 to bits
  get allow transaction to also check single user mode
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  set single user mode flag on system tables to make them always updatable
ndb/src/ndbapi/NdbDictionary.cpp:
  get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  get/set functions for single user mode on tables
ndb/test/src/NDBT_Table.cpp:
  print single user mode
 2007-03-23 13:52:03 +01:00
unknown
201af2d8bd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
 2007-03-23 13:10:58 +01:00
unknown
a79e08a6e1 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
 2007-03-23 15:51:21 +04:00
unknown
a4b16a27c2 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_class.cc:
  Auto merged
 2007-03-23 11:31:14 +01:00
unknown
8e1d4f7256 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0


sql/sql_class.cc:
  Auto merged
 2007-03-23 11:13:15 +01:00