Commit graph

52127 commits

Author SHA1 Message Date
unknown
24e10360d4 DBU_TRUE and DBU_FALSE => TRUE/FALSE 2008-01-17 15:47:55 +01:00
unknown
29baec8ae3 Remove "#pragma once" it's already done by "#ifndef DBUTIL_HPP" 2008-01-17 15:42:50 +01:00
unknown
12855ff253 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2008-01-11 09:43:29 +01:00
unknown
b64f9dbe15 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2008-01-11 09:31:55 +01:00
unknown
e984956385 ndb - bug#33793
dont assume that page is "all empty"
  only as gci is acked, as release_gci might not have processed it yet


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  dont assume that page is "all empty"
  only as gci is acked, as release_gci might not have processed it yet
storage/ndb/test/ndbapi/test_event.cpp:
  testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase
2008-01-11 09:20:16 +01:00
unknown
ed6d97c866 Makefile.am:
Updated to build NdbRepStress


storage/ndb/test/ndbapi/Makefile.am:
  Updated to build NdbRepStress
2008-01-10 19:07:24 +01:00
unknown
2f2206840d Makefile.am:
Updated for name chance on dbutil


storage/ndb/test/src/Makefile.am:
  Updated for name chance on dbutil
2008-01-10 18:59:44 +01:00
unknown
44ccc30b03 NdbRepStress.cpp:
More code improvments


storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp:
  More code improvments
2008-01-09 19:01:31 +01:00
unknown
5e85c850ac DbUtil.hpp, DbUtil.cpp, NdbRepStress.cpp:
More code improvments


storage/ndb/test/include/DbUtil.hpp:
  More code improvments
storage/ndb/test/src/DbUtil.cpp:
  More code improvments
storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp:
  More code improvments
2008-01-09 18:54:32 +01:00
unknown
0f5cf86410 NdbRepStress.cpp:
Updated with suggestions from Magnus and other fixes and adjustments I found along the way
DbUtil.hpp, DbUtil.cpp:
  fixes and adjustments I found along the way


storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp:
  Updated with suggestions from Magnus and other fixes and adjustments I found along the way
storage/ndb/test/src/DbUtil.cpp:
  fixes and adjustments I found along the way
storage/ndb/test/include/DbUtil.hpp:
  fixes and adjustments I found along the way
2008-01-08 23:34:30 +01:00
unknown
e3eadd61e6 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/data0/jebs_clones/mysql-5.1-new-ndb
2008-01-08 23:26:45 +01:00
unknown
d4045eedd8 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
2008-01-08 13:25:54 +01:00
unknown
d2f7c2f9b9 ndb - bug#33739
page need to refetched after timeslice
2008-01-08 13:23:35 +01:00
unknown
78d0a794f4 correct result file 2008-01-04 16:49:39 +01:00
unknown
7514f5f699 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
2008-01-04 15:33:50 +01:00
unknown
6074712beb Bug#32648 Test failure between NDB Cluster and other engines
mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test:
  Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test -> mysql-test/suite/ndb_team/t/rpl_ndb_extraColMaster.test
mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result:
  Rename: mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result -> mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb-master.opt:
  Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt -> mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb-master.opt
mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test:
  Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test -> mysql-test/suite/ndb_team/t/rpl_ndb_mix_innodb.test
mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result:
  Rename: mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result -> mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test:
  Rename: mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test -> mysql-test/suite/ndb_team/t/rpl_ndb_dd_advance.test
mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result:
  Rename: mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result -> mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result
2008-01-04 15:33:01 +01:00
unknown
3ca5566036 ndb - dict
remove dead code


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  remove dead code
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  remove dead code
2008-01-04 11:34:23 +01:00
unknown
ecaeffade1 DbUtil.cpp:
Rename: storage/ndb/test/src/dbutil.cpp -> storage/ndb/test/src/DbUtil.cpp
DbUtil.hpp, DbUtil.cpp:
  Many changes based off a review from Magnus
DbUtil.hpp:
  Rename: storage/ndb/test/include/dbutil.hpp -> storage/ndb/test/include/DbUtil.hpp


storage/ndb/test/src/DbUtil.cpp:
  Many changes based off a review from Magnus
storage/ndb/test/include/DbUtil.hpp:
  Many changes based off a review from Magnus
2007-12-20 21:06:52 +01:00
unknown
d687f1b45d Bug #33375 all_set corrupted on table object
- make sure to reset the read and write sets
2007-12-19 18:42:49 +01:00
unknown
0dd7855602 Merge bk-internal:/home/bk/mysql-5.1-new-ndb
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb-bug33061
2007-12-18 16:00:31 +01:00
unknown
c7dc182db9 Bug #33061: ORDER BY DESC becomes ASC in NDB partition pruning to one partition
When partition pruning resulted in an ordered index scan spanning only
one partition, any descending flag for the scan was wrongly discarded,
turning ORDER BY DESC into ORDER BY ASC, and similar problems.

Fixed by correctly passing descending flag in SCAN_TABREQ signal sent
to data nodes.


mysql-test/suite/ndb/r/ndb_partition_key.result:
  Test case.
mysql-test/suite/ndb/r/ndb_partition_range.result:
  Test case.
mysql-test/suite/ndb/t/ndb_partition_key.test:
  Test case.
mysql-test/suite/ndb/t/ndb_partition_range.test:
  Test case.
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Even if ordered scan not requested (no need to merge-sorts scans of
  each partition), we still need to honor the descending flag.
2007-12-18 13:40:35 +01:00
unknown
1f92b717b1 search for clone several step in the path name 2007-12-18 11:54:19 +01:00
unknown
fa0e5ac10c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
2007-12-18 07:29:31 +01:00
unknown
609de726dc Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-18 07:15:40 +01:00
unknown
6b5b44c677 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-18 07:13:59 +01:00
unknown
333af686bf Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-12-17 14:10:01 +01:00
unknown
4cb292504c Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


sql/sql_table.cc:
  Auto merged
2007-12-17 13:40:06 +01:00
unknown
adfd5ddcf5 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-12-17 13:36:17 +01:00
unknown
7213ca204d Try to fix assertion failures at slave shutdown when running
rpl_ndb tests on sapsrv1.


sql/ha_ndbcluster_binlog.cc:
  Try to fix assertion failures at slave shutdown when running
  rpl_ndb tests. If the binlog thread is killed, which happens during
  shutdown, open_tables returns error without setting an error
  in THD. Therefore one can't access thd->main_da.message() if thd->killed.
2007-12-15 22:24:01 +03:00
unknown
b867157935 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-12-15 17:05:39 +03:00
unknown
81dda2e701 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-12-15 17:00:18 +03:00
unknown
cb48c979e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-12-15 16:59:43 +03:00
unknown
ff1474765c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2007-12-15 09:23:49 +01:00
unknown
0143b695ea Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-12-15 09:20:41 +01:00
unknown
0a578711a2 WL#4165 (Prepared statements: validation)
Adding the tests cases alone for WL#4165, disabled


mysql-test/t/disabled.def:
  WL#4165 (Prepared statements: validation)
mysql-test/r/ps_ddl.result:
  WL#4165 (Prepared statements: validation)
mysql-test/t/ps_ddl.test:
  WL#4165 (Prepared statements: validation)
2007-12-14 17:46:24 -07:00
unknown
b003abdcec Bug#26811 Symbolic links don't work in Windows Vista
- Enable check for symbolic link files.


sql/sql_table.cc:
  Bug#26811 Symbolic links don't work in Windows Vista
  - On systems that support symbolic link files, make sure to check for them.
2007-12-14 15:49:51 -05:00
unknown
cfd4951d1f Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-14 18:05:15 +01:00
unknown
3c1b039dc8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1


configure.in:
  null merge
2007-12-14 18:03:44 +01:00
unknown
6a1046f6be Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-14 17:49:58 +01:00
unknown
73719769b7 Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1


BitKeeper/triggers/post-commit:
  Auto merged
2007-12-14 16:02:31 +00:00
unknown
bb9950a8d7 Raise version number after cloning 5.0.54 2007-12-14 16:58:12 +01:00
unknown
e1f1f659ca Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0
2007-12-14 15:46:19 +00:00
unknown
bc5bbe9a88 post-commit:
Rationalise setting $FROM.


BitKeeper/triggers/post-commit:
  Rationalise setting $FROM.
2007-12-14 15:43:54 +00:00
unknown
4d3cd0d7b8 Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
2007-12-14 16:45:17 +03:00
unknown
541ac20401 Merge station.:/mnt/raid/alik/MySQL/devel/5.1
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt


client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/emb_qcache.cc:
  Auto merged
libmysqld/emb_qcache.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/protocol.cc:
  SCCS merged
2007-12-14 16:30:22 +03:00
unknown
fe8df2a507 Merge station.:/mnt/raid/alik/MySQL/devel/5.0
into  station.:/mnt/raid/alik/MySQL/devel/5.0-rt
2007-12-14 15:57:36 +03:00
unknown
6c4500517d Bug #33237 NDB_MGM 'eat' 99% cpu utilization 2007-12-14 13:43:48 +01:00
unknown
8b8e8951e1 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b33192/51
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2007-12-14 04:26:06 -07:00
unknown
f1c19f4932 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/mysqld.cc:
  Auto merged
2007-12-14 08:20:07 +01:00
unknown
271bafb044 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/mysqld.cc:
  Auto merged
2007-12-14 06:55:44 +01:00