mariadb

Tree: e1d98e8d51

Author	SHA1	Message	Date
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	18 years ago
unknown	d0b68a1072	Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines into mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.1-engines include/my_sys.h: Use local. mysys/charset.c: Use local. sql/item_func.cc: Use local. mysql-test/r/ctype_ucs.result: SCCS merged mysql-test/t/ctype_ucs.test: SCCS merged	18 years ago
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.	18 years ago
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	18 years ago
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	18 years ago
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.	18 years ago
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	18 years ago
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.	18 years ago
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.	18 years ago
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	18 years ago
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	18 years ago
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	18 years ago
unknown	22b3670544	Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines include/my_sys.h: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysys/charset.c: Manual merge. sql/item_func.cc: Manual merge.	18 years ago
unknown	4fda18a3ec	Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines into mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines	18 years ago
unknown	660d66263b	BUG#31159 - fulltext search on ucs2 column crashes server ucs2 doesn't provide required by fulltext ctype array. Crash happens because fulltext attempts to use unitialized ctype array. Fixed by converting ucs2 fields to compatible utf8 analogue. include/my_sys.h: Added a function to find compatible character set with ctype array available. Currently used by fulltext search to find compatible substitute for ucs2 collations. mysql-test/r/ctype_ucs.result: A test case for BUG#31159. mysql-test/t/ctype_ucs.test: A test case for BUG#31159. mysys/charset.c: Added a function to find compatible character set with ctype array available. Currently used by fulltext search to find compatible substitute for ucs2 collations. sql/item_func.cc: Convert ucs2 fields to utf8. Fulltext requires ctype array, but ucs2 doesn't provide it.	18 years ago
unknown	f78be6c8e9	result fix	18 years ago
unknown	957d866506	Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-engines into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30878 mysql-test/r/partition.result: Auto merged mysql-test/t/partition.test: Auto merged sql/sql_partition.cc: Auto merged	18 years ago
unknown	2b5bcaabee	Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30695 into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30878 mysql-test/r/partition.result: SCCS merged mysql-test/t/partition.test: SCCS merged	18 years ago
unknown	fe784fac00	Bug #30695 : An apostrophe ' in the comment of the ADD PARTITION causes the Server to crash. Accessing partitioned table with an apostrophe in partition options like DATA DIRECTORY, INDEX DIRECTORY or COMMENT causes server crash. Partition options were saved in .frm file without escaping. When accessing such table it is not possible to properly restore partition information. Crashed because there was no check for partition info parser failure. Fixed by escaping quoted text in the partition info when writing it to the frm-file and added a check that it was able to parse the partition info before using it NOTE: If the comment is written by an earlier version of the server, the corrupted frm-file is not fixed, but left corrupted, you have to manually drop the table and recreate it. mysql-test/r/partition.result: bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes the Server to crash. testresult mysql-test/t/partition.test: bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes the Server to crash. testcase sql/sql_partition.cc: Bug #30695: An apostrophe ' in the comment of the ADD PARTITION causes the Server to crash. Crashes when there is an non escaped apostrophe in the partition options fixed by escaping quoted text before writing to the frm-file sql/table.cc: Bug #30695 An apostrophe ' in the comment of the ADD PARTITION causes the Server to crash problem was using a null poiter without check -> crash. added a check that the previus call succeded	18 years ago
unknown	b987945db6	result fix	18 years ago
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	18 years ago
unknown	fa0e1d6b6b	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt	18 years ago
unknown	985e4a6437	after merge fix	18 years ago
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	18 years ago
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	18 years ago
unknown	6e8919b00d	Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt into mysql.com:/home/gluh/MySQL/Merge/5.1-opt	18 years ago
unknown	c448d2ed5d	Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/hf/work/30638/my50-30638	18 years ago
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	18 years ago
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	18 years ago
unknown	21469c4022	Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt into polly.(none):/home/kaa/src/opt/mysql-5.1-opt	18 years ago
unknown	de3eb8fbdc	Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 into polly.(none):/home/kaa/src/opt/mysql-5.1-opt	18 years ago
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	18 years ago
unknown	2d4639c40b	Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 into polly.(none):/home/kaa/src/opt/mysql-5.0-opt	18 years ago
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	18 years ago
unknown	4e5c8bc7e0	type conversions fixed to get rid of warnings sql/ha_heap.cc: type conversion fix sql/opt_range.cc: type conversion fix	18 years ago
unknown	0fb0e7ac82	Merge mysql.com:/home/hf/work/30638/my50-30638 into mysql.com:/home/hf/work/30638/my51-30638	18 years ago
unknown	0c77be952e	Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into mysql.com:/home/hf/work/30638/my51-30638	18 years ago
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	18 years ago
unknown	6875b402f0	merge 5.0-opt -> 5.1-opt for bug 30825	18 years ago
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	18 years ago
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	18 years ago
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	18 years ago
unknown	084753af19	Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/hf/work/30638/my50-30638	18 years ago
unknown	8262c4f445	type conversion fixed to get rid of warnings sql/opt_range.cc: type conversion fixed	18 years ago
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	18 years ago
unknown	dafb98946b	merging	18 years ago
unknown	8a790dd155	Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/hf/work/30638/my50-30638	18 years ago
unknown	b249d2a718	Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt into mysql.com:/home/hf/work/30638/my51-30638	18 years ago
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	18 years ago
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	18 years ago

1 2 3 4 5 ...

50760 Commits (e1d98e8d51b3cd95d9ce4ac4afe56cd74ad4830b) All Branches Search

50760 Commits (e1d98e8d51b3cd95d9ce4ac4afe56cd74ad4830b)

All Branches