Commit graph

559 commits

Author SHA1 Message Date
unknown
4161264789 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/item.h:
  Auto merged
2005-02-16 23:16:02 +01:00
unknown
fced35f74a ndb - fix new decimal type mysql vs. ndb
mysql-test/r/ndb_index_ordered.result:
  fix new decimal mysql vs. ndb
mysql-test/t/ndb_index_ordered.test:
  fix new decimal mysql vs. ndb
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix new decimal mysql vs. ndb
ndb/include/ndb_constants.h:
  fix new decimal mysql vs. ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  fix new decimal mysql vs. ndb
ndb/include/util/NdbSqlUtil.hpp:
  fix new decimal mysql vs. ndb
ndb/src/common/util/NdbSqlUtil.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionary.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix new decimal mysql vs. ndb
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix new decimal mysql vs. ndb
ndb/test/include/NdbSchemaOp.hpp:
  fix new decimal mysql vs. ndb
ndb/test/src/HugoCalculator.cpp:
  fix new decimal mysql vs. ndb
ndb/tools/restore/consumer.cpp:
  fix new decimal mysql vs. ndb
sql/ha_ndbcluster.cc:
  fix new decimal mysql vs. ndb
2005-02-16 21:19:42 +01:00
unknown
1acae43e43 Small fixes and added comments to condition pushdown to ndbcluster, after code review 2005-02-16 14:18:32 +01:00
unknown
0be9c0ef75 Merge
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
2005-02-16 13:14:21 +01:00
unknown
dbff1150c5 ndb - fix old decimal type mysql vs ndb
mysql-test/r/ndb_index_ordered.result:
  fix old decimal type mysql vs ndb (re-commit 3)
mysql-test/t/ndb_index_ordered.test:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/ndbapi/NdbDictionary.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/util/NdbSqlUtil.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/common/util/NdbSqlUtil.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionary.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/test/include/NdbSchemaOp.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/tools/restore/consumer.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
sql/ha_ndbcluster.cc:
  fix old decimal type mysql vs ndb (re-commit 3)
2005-02-16 12:45:59 +01:00
unknown
b744f5fbc1 No support for decimal type for columns yet 2005-02-14 07:09:33 +01:00
unknown
3f245d2d05 Added support for new decimal type in condition pushdown 2005-02-13 22:03:41 +01:00
unknown
118dc575f0 Merge 2005-02-11 22:33:52 +01:00
unknown
7185c070d0 Condition pushdown v.2 2005-02-11 22:05:24 +01:00
unknown
5a3b890e0d Fix core dump in ha_ndbcluster::print_results
sql/ha_ndbcluster.cc:
  Should not try to call a function on a NULL pointer
  Adjusted according to coding standard
2005-02-09 15:09:13 +01:00
unknown
5301150ec0 Updated style after review
sql/ha_ndbcluster.cc:
  removed trailing whitespace
  corrected assignments according to style guide
2005-02-09 11:14:02 +01:00
unknown
46ca7d1f63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-02-07 13:48:02 +01:00
unknown
61da5b4d25 Small changes after Tomas review
sql/ha_ndbcluster.cc:
  Added a pthread_exit before thread exists
sql/ha_ndbcluster.h:
  Changed storage of commit_count from uint to ulonglong
2005-02-07 13:46:13 +01:00
unknown
d6e96c55f0 Merge
sql/ha_ndbcluster.cc:
  SCCS merged
2005-02-07 10:13:07 +01:00
unknown
aa2ac91c97 ha_ndbcluster.cc:
corrected typo in previous changeset


sql/ha_ndbcluster.cc:
  corrected typo in previous changeset
2005-02-07 09:58:37 +01:00
unknown
1c44b9e831 Merge
sql/ha_ndbcluster.cc:
  merge
2005-02-07 08:54:35 +01:00
unknown
4fd3b1cf41 Corrected fragmentation calculation to take into account that LQH creates "2 fragments per fragment" in 4.1 and 5.0
+added some comments to ndb fragmentation calulation
2005-02-07 08:51:27 +01:00
unknown
74ad9e8f1e Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged
2005-02-04 17:32:18 +01:00
unknown
9e92b63a0b Updated after review.
sql/ha_ndbcluster.cc:
  Fixing spaces in parameter list.
2005-02-04 15:08:08 +01:00
unknown
58fd4d94ce ha_ndbcluster.cc:
fixed change in struct in 4.1->5.0 merge


sql/ha_ndbcluster.cc:
  fixed change in struct in 4.1->5.0 merge
2005-02-04 14:33:08 +01:00
unknown
24250e33be resolved merge conflict
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_yacc.yy:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-02-04 14:27:09 +01:00
unknown
48e2d22404 added test to trigger drifferent fragmentations in ndb
corrected documentation on fragmentation
    set "fragmentation medium" to mean 2 fragments per node instead of 1
    set default fragmentation to small instead of medium
    bug#8284 adjust fragmentation to max_rows


mysql-test/r/ndb_basic.result:
  added test to trigger drifferent fragmentations in ndb
mysql-test/t/ndb_basic.test:
  added test to trigger drifferent fragmentations in ndb
ndb/include/ndbapi/NdbDictionary.hpp:
  corrected documentation on fragmentation
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  set "fragmentation medium" to mean 2 fragments per node instead of 1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  set default fragmentation to small instead of medium
sql/ha_ndbcluster.cc:
  bug#8284 adjust fragmentation to max_rows
2005-02-04 14:25:08 +01:00
unknown
03bc599706 Merge of query cache from 4.1 to 5.0
mysql-test/r/ndb_cache.result:
  Added 'order by' to select's
mysql-test/r/ndb_cache2.result:
  Added 'order by' to select's
mysql-test/t/ndb_cache.test:
  Added 'order by' to select's
mysql-test/t/ndb_cache2.test:
  Added 'order by' to select's
sql/ha_innodb.h:
  Changed function name
sql/ha_ndbcluster.cc:
  Merge from query cache from 4.1 to 5.0
  Added better comments
  ndb_get_table_statistics had changed, so there where some adaptions to make
sql/ha_ndbcluster.h:
  Changed name of function
sql/handler.h:
  Changed name of function
sql/sql_cache.cc:
  Changed name of function
2005-02-04 10:56:53 +01:00
unknown
2b0a3dbe9e Merged "query cache for ndb" to 5.0
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/ha_innodb.h:
  Hand merged
sql/ha_ndbcluster.cc:
  Merge with gathering of stats
sql/sql_cache.cc:
  Use new table def cache
sql/table.h:
  table.h had been cleaned up
2005-02-03 09:33:48 +01:00
unknown
38e395aa32 WL#2269 Enable query cache for NDB
- Added a thread that fetches commit_count for open tables. This
will mean that NDB will not have to be contacted for every use of a cached query. 


sql/ha_ndbcluster.cc:
  Added a thread that periodically will fetch commit_count 
  for open tables and store that value in share. 
  The commit count value is then used when query cache 
  asks if a cached query can be used. 
  The thread activation interval is regulated by the 
  config variable ndb_cache_check_time, it's default value is 0
  which means that NDB is contacted every time a cached query is reused.
sql/ha_ndbcluster.h:
  Added commit_count to share
  Added ndb_cache_check_time
sql/mysqld.cc:
  Added config variable ndb_cache_check_time
sql/set_var.cc:
  Added config variable ndb_cache_check_time
2005-02-01 15:43:08 +01:00
unknown
af97b55308 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-01 10:05:22 +01:00
unknown
763dfd7b10 Merge
mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  merge
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/include/util/NdbSqlUtil.hpp:
  merge
ndb/src/common/util/NdbSqlUtil.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
ndb/src/ndbapi/NdbRecAttr.cpp:
  merge
2005-01-27 18:41:23 +01:00
unknown
1ed40339e2 ndb - make YEAR and TIMESTAMP into ndb types
mysql-test/r/ndb_index_ordered.result:
  make YEAR and TIMESTAMP into ndb types
mysql-test/t/ndb_index_ordered.test:
  make YEAR and TIMESTAMP into ndb types
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/ndbapi/NdbDictionary.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/include/util/NdbSqlUtil.hpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/common/util/NdbSqlUtil.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionary.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbRecAttr.cpp:
  make YEAR and TIMESTAMP into ndb types
ndb/test/include/NdbSchemaOp.hpp:
  make YEAR and TIMESTAMP into ndb types
sql/ha_ndbcluster.cc:
  make YEAR and TIMESTAMP into ndb types
2005-01-27 17:33:35 +01:00
unknown
e8ae338356 Merge
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  merge bug#8101 and setBound usage if id instead of name
2005-01-26 13:22:07 +01:00
unknown
d041ed2d8c Bug#8101 unique indexes which attribute are _not_ specified in the order of the table does not work 2005-01-26 11:31:46 +01:00
unknown
984e7d29b2 changed from using column names to column id in ndb setBound in ha_ndbcluster 2005-01-25 13:46:40 +01:00
unknown
5c52b71d48 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-21 08:43:41 +01:00
unknown
d69fcc2e05 ha_ndbcluster.cc:
read row size with wrong type


sql/ha_ndbcluster.cc:
  read row size with wrong type
2005-01-20 22:28:08 +01:00
unknown
e467388754 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-01-20 16:41:08 +01:00
unknown
48c669eecd Fix for Bug #7988 Bitfield test fails 2005-01-20 15:50:56 +01:00
unknown
7cbe4d19e4 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-19 07:37:42 +01:00
unknown
bfe74e6990 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


configure.in:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2005-01-19 07:34:57 +01:00
unknown
153160d1ff bug#7693 - ndb
when using shm transporter, set sigmask on each thread using pthread_sigmask


configure.in:
  Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
  1) Create thread wrapper function
  2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
  (un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
  cast pointer to UintPtr before printout
2005-01-19 07:23:20 +01:00
unknown
af3e6774d7 compile error: moved inline
compile warning: changed eq_range -> eq_r
2005-01-18 16:31:05 +01:00
unknown
78edb8a569 Merge
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-17 09:44:34 +01:00
unknown
e7f2dc6ba5 Added better printout for condition pushdown 2005-01-17 08:08:51 +01:00
unknown
d6747f963e Merge problem
FC3 fix


sql/ha_ndbcluster.cc:
  Fixed merge problem, that occured when m_ndb where removed. 
  Fix fo FC3 compile problem.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-14 14:33:26 +01:00
unknown
9d9d758208 added support for 'show status like 'Ndb%''
added number_of_replicas printout in show table status


mysql-test/r/ndb_alter_table.result:
  added number_of_replicas to show table status printout
mysql-test/r/ndb_autodiscover.result:
  added number_of_replicas to show table status printout
ndb/include/ndbapi/NdbDictionary.hpp:
  added get method for replica count
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  added get method of node id
ndb/src/ndbapi/NdbDictionary.cpp:
  added get method for replica count
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  added get method of node id
2005-01-14 12:32:33 +01:00
unknown
2f77a22a01 To get correct values in SHOW TABLE STATUS
Added pseudo column fragment memory
    changed ndb_get_table_statistics to take struct 
    and read row_size and fragment_memory


ndb/include/kernel/AttributeHeader.hpp:
  Added pseudo column fragment memory
ndb/include/ndbapi/NdbDictionary.hpp:
  Added pseudo column fragment memory
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Added pseudo column fragment memory
ndb/src/ndbapi/NdbDictionary.cpp:
  Added pseudo column fragment memory
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Added pseudo column fragment memory
sql/ha_ndbcluster.cc:
  changed ndb_get_table_statistics to take struct 
  and read row_size and fragment_memory
sql/ha_ndbcluster.h:
  partially implemented update_table_comment
2005-01-13 18:24:19 +01:00
unknown
48a98eb123 Merge
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-01-11 17:29:46 +01:00
unknown
df8b02f78e Condition pushdown, support for more types 2005-01-11 17:26:19 +01:00
unknown
6dbadfa12e merge 2005-01-11 17:02:30 +01:00
unknown
577b8e4e28 removed compiler warnings from ha_ndbcluster
sql/ha_ndbcluster.cc:
  removed compiler warnings
2005-01-11 17:00:31 +01:00
unknown
4ebb09797b Removed compiler warnings 2005-01-11 14:06:44 +01:00
unknown
6cfef07c05 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-09 15:41:54 +01:00