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

50629 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
bec59619ce correct result file 2007-10-30 14:52:12 +01:00
unknown
145403fd35 correct manual merge 2007-10-30 14:04:41 +01:00
unknown
c84d4b2139 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/suite/rpl/r/rpl_bug31076.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
mysql-test/suite/rpl/t/rpl_bug31076.test:
  manual merge
 2007-10-30 11:28:19 +01:00
unknown
7d9c59b7be Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-29 12:38:32 +04:00
unknown
4ce44da3d5 correct unused code 2007-10-26 11:43:05 +02:00
unknown
c70da572c4 commit of WL#3686 test case already in 5.1 to get regression testing, no code committed 
mysql-test/suite/ndb/r/ndb_update_no_read.result:
  New BitKeeper file ``mysql-test/suite/ndb/r/ndb_update_no_read.result''
mysql-test/suite/ndb/t/ndb_update_no_read.test:
  New BitKeeper file ``mysql-test/suite/ndb/t/ndb_update_no_read.test''
 2007-10-26 11:42:33 +02:00
unknown
a71a829a72 Mimic a rename which Daniel already did in 6.0, 
to get rid of a name clash among *deleted* files on case-insignificant file systems.


BitKeeper/deleted/.del-changelog-bleh:
  Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh
 2007-10-25 13:17:44 +02:00
unknown
1ebb7098c8 Merge loke.(none):/home/knielsen/devel/mysql-5.0-ndb 
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb


storage/ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge.
 2007-10-25 11:00:36 +02:00
unknown
e9b98a5de7 Merge loke.(none):/home/knielsen/devel/bug31810 
into  loke.(none):/home/knielsen/devel/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
 2007-10-25 10:54:23 +02:00
unknown
6825b79b41 Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca 
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb


storage/ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  SCCS merged
 2007-10-25 10:48:42 +02:00
unknown
29186ecd8d Merge loke.(none):/home/knielsen/devel/bug31761 
into  loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca


storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
storage/ndb/include/kernel/AttributeHeader.hpp:
  manual merge.
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  manual merge.
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  manual merge.
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  manual merge.
 2007-10-25 09:27:15 +02:00
unknown
fd1730f4fe Merge loke.(none):/home/knielsen/devel/bug31761 
into  loke.(none):/home/knielsen/devel/mysql-5.0-ndb


ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  SCCS merged
 2007-10-25 08:45:27 +02:00
unknown
34279339dc BUG#31810: Potential infinite loop with autoincrement failures in ndb 
Fix extra semicolon causing if-statement to be disabled.


sql/ha_ndbcluster.cc:
  Fix extra semicolon causing if-statement to be disabled.
 2007-10-25 08:40:42 +02:00
unknown
0786567905 BUG#31761: Code for cluster is not safe for strict-alias optimization in new gcc 
Fix problem with AttributeHeader::init() seen with gcc 4.2.1.

Using the same object as both Uint32 and class AttributeHeader violates
strict aliasing rule.


ndb/include/kernel/AttributeHeader.hpp:
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Fix problem with AttributeHeader::init() seen with gcc 4.2.1.
  
  Using the same object as both Uint32 and class AttributeHeader violates
  strict aliasing rule.
 2007-10-25 07:57:18 +02:00
unknown
9cae2b7984 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-10-24 22:27:28 +02:00
unknown
e68fd8cd70 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-10-24 14:10:36 +02:00
unknown
3e208eb61f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-10-24 14:07:33 +02:00
unknown
f78be6c8e9 result fix 2007-10-24 12:49:58 +05:00
unknown
b987945db6 result fix 2007-10-23 20:12:50 +05:00
unknown
e085211d4d Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  after merge fix
 2007-10-23 20:11:39 +05:00
unknown
fa0e1d6b6b Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-10-23 20:09:36 +05:00
unknown
985e4a6437 after merge fix 2007-10-23 19:28:47 +05:00
unknown
95a8bb20fb Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/client_priv.h:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/query_cache.result:
  manual merge
mysql-test/include/mix1.inc:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/query_cache.test:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge
 2007-10-23 19:08:21 +05:00
unknown
8479eb1db7 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge
 2007-10-23 18:51:43 +05:00
unknown
6e8919b00d Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-23 18:47:18 +05:00
unknown
c448d2ed5d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/30638/my50-30638
 2007-10-23 17:24:57 +05:00
unknown
72bd96aef3 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-23 16:24:56 +04:00
unknown
f102f6680f Merge mysql.com:/home/hf/work/30638/my50-30638 
into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
 2007-10-23 17:09:32 +05:00
unknown
21469c4022 Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-10-23 16:09:31 +04:00
unknown
de3eb8fbdc Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-10-23 16:07:03 +04:00
unknown
f7f8ca8bd7 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 15:04:40 +03:00
unknown
2d4639c40b Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-10-23 16:03:48 +04:00
unknown
619bb76ba7 Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550


sql/filesort.cc:
  SCCS merged
 2007-10-23 15:52:27 +04:00
unknown
4e5c8bc7e0 type conversions fixed to get rid of warnings 
sql/ha_heap.cc:
  type conversion fix
sql/opt_range.cc:
  type conversion fix
 2007-10-23 16:32:05 +05:00
unknown
0fb0e7ac82 Merge mysql.com:/home/hf/work/30638/my50-30638 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-23 16:28:52 +05:00
unknown
0c77be952e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-23 16:28:51 +05:00
unknown
09c8f3e606 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
 2007-10-23 14:28:50 +03:00
unknown
6875b402f0 merge 5.0-opt -> 5.1-opt for bug 30825 2007-10-23 14:26:57 +03:00
unknown
73d08e3aae Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 14:23:18 +03:00
unknown
707fd691b5 Merge mysql.com:/home/hf/work/30638/my50-30638 
into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  merging
 2007-10-23 16:21:51 +05:00
unknown
bfa5dd2f53 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
 2007-10-23 14:21:50 +03:00
unknown
084753af19 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/30638/my50-30638
 2007-10-23 15:35:52 +05:00
unknown
8262c4f445 type conversion fixed to get rid of warnings 
sql/opt_range.cc:
  type conversion fixed
 2007-10-23 15:34:10 +05:00
unknown
a9a50c7287 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
 2007-10-23 13:10:35 +03:00
unknown
dafb98946b merging 2007-10-23 14:31:59 +05:00
unknown
8a790dd155 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/30638/my50-30638
 2007-10-23 14:31:24 +05:00
unknown
b249d2a718 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/30638/my51-30638
 2007-10-23 14:30:22 +05:00
unknown
51fddf751c Merge mysql.com:/home/hf/work/30638/my50-30638 
into  mysql.com:/home/hf/work/30638/my51-30638


sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
sql/opt_range.cc:
  merging
sql/sql_map.cc:
  merging
storage/federated/ha_federated.cc:
  merging
storage/heap/ha_heap.cc:
  merging
 2007-10-23 14:29:20 +05:00
unknown
e1dc86b079 type conversions fixed to avoid warnings on Windows 
myisam/mi_write.c:
  type conversion fixed
myisam/sort.c:
  type conversion fixed
sql/ha_federated.cc:
  type conversion fixed
sql/ha_heap.cc:
  type conversion fixed
sql/ha_innodb.cc:
  type conversion fixed
sql/ha_myisam.cc:
  type conversion fixed
sql/opt_range.cc:
  type conversion fixed
sql/sql_map.cc:
  type conversion fixed
sql/sql_select.cc:
  type conversion fixed
sql/sql_update.cc:
  type conversion fixed
 2007-10-23 14:27:11 +05:00
unknown
c61548f18c ndb - bug#26450 
partial backport from 6.2 + add fix of bug


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  add prep_copy_frag
storage/ndb/include/kernel/signaldata/AccScan.hpp:
  add new argument specifying which page to scan to
storage/ndb/include/kernel/signaldata/CopyFrag.hpp:
  add new argument specifying which page to scan to
storage/ndb/include/ndb_version.h.in:
  add versioning checks for prep_copy_frag
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  add prep_copy_frag
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  add new to-step
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  add new to-step
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  add new to-step
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  add new to-step
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  add new to-step
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add new to-step
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  add new argument specifying which page to scan to
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  add utility to get max page used by fragment
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  add NR scan to > frag.noOfPages
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase
storage/ndb/test/src/NdbRestarts.cpp:
  add testcase
 2007-10-23 11:24:34 +02:00