mariadb

Tree: cc2e929ac4

Author	SHA1	Message	Date
unknown	25939026a7	Fixed compile warnings introduced by the patch for bug #29131 .	18 years ago
unknown	b52ab3bda5	Merge polly.(none):/home/kaa/src/opt/bug29131/my50-bug29131 into polly.(none):/home/kaa/src/opt/mysql-5.0-opt mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged	18 years ago
unknown	5568084835	Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into gleb.loc:/home/uchum/work/bk/5.0-opt	18 years ago
unknown	d8f35d1dc7	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B30715-merged-5.0-opt	18 years ago
unknown	46b03c598d	Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31663 into gleb.loc:/home/uchum/work/bk/5.0-opt sql/sql_class.cc: Auto merged	18 years ago
unknown	ca126a9990	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/misc/mysql/31662/50-31662 sql/sql_base.cc: Auto merged	18 years ago
unknown	0e700e1eeb	Bug#31662: 'null' is shown as type of fields for view with bad definer, breaks mysqldump SHOW FIELDS FROM a view with no valid definer was possible (since fix for Bug#26817), but gave NULL as a field-type. This led to mysqldump-ing of such views being successful, but loading such a dump with the client failing. Patch allows SHOW FIELDS to give data-type of field in underlying table. mysql-test/r/information_schema_db.result: Fix test results: SHOW FIELDS FROM a view with no valid DEFINER gives us the field-type of the underlying table now rather than NULL. sql/sql_base.cc: In the case of SHOW FIELDS FROM <view>, do not require a valid DEFINER for determining underlying data-type like we usually do. This is needed for mysqldump.	18 years ago
unknown	0724eb88e2	protect bug31473 from regressing into 5.0	18 years ago
unknown	392ade806c	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build	18 years ago
unknown	80241b44a8	add new trigger to prevent certain naming clashes BitKeeper/triggers/pre-commit.check-case.pl: catch duplicate file names, ignoring capitalisation, mostly to avoid changesets where a deleted file foobar and a deleted file FooBar break a tree on case insensitive file systems	18 years ago
unknown	6eced1b857	Fix for bug #29131 : SHOW VARIABLES reports variable 'log' but SET doesn't recognize it This is a 5.0 version of the patch, it will be null-merged to 5.1 Problem: 'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up in SHOW VARIABLES, but could not be used in expressions like "select @@log". Also, using them in the SET statement produced an incorrect "unknown system variable" error. Solution: Make 'log' and 'log_slow_queries' read-only dynamic variables to make them available for use in expressions, and produce a correct error about the variable being read-only when used in the SET statement. mysql-test/r/variables.result: Added a test case for bug #29131. mysql-test/t/variables.test: Added a test case for bug #29131. sql/mysql_priv.h: Changed the type of opt_log and opt_slow_log to my_bool to align with the interfaces in set_var.cc sql/mysqld.cc: Changed the type of opt_log and opt_slow_log to my_bool to align with the interfaces in set_var.cc sql/set_var.cc: Made 'log' and 'log_slow_queries' to be read-only dynamic system variable, i.e. available for use in expressions with the @@var syntax. sql/set_var.h: Added a new system variable class representing a read-only boolean variable.	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	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	04ff9d4da0	Fixed bug #27695 : View should not be allowed to have empty or all space column names. The parser has been modified to check VIEW column names with the check_column_name function and to report an error on empty and all space column names (same as for TABLE column names). sql/sql_yacc.yy: Fixed bug #27695. The parser has been modified to check VIEW column aliases with the check_column_name function and to report an error on empty columns and all space columns (same as for TABLE column names). mysql-test/t/select.test: Updated test case for bug #27695. mysql-test/r/select.result: Updated test case for bug #27695.	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	e66f7e1d36	Merge magare.gmz:/home/kgeorge/mysql/work/B30715-5.0-opt into magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.0-opt	18 years ago
unknown	e2433cbcaa	Bug #30715 : Assertion failed: item_field->field->real_maybe_null(), file .\opt_sum.cc, line The optimizer pre-calculates the MIN/MAX values for queries like SELECT MIN(kp_k) WHERE kp_1 = const AND ... AND kp_k-1 = const when there is a key over kp_1...kp_k In doing so it was not checking correctly nullability and there was a superfluous assert(). Fixed by making sure that the field can be null before checking and taking out the wrong assert(). . Introduced a correct check for nullability The MIN(field) can return NULL when all the row values in the group are NULL-able or if there were no rows. Fixed the assertion to reflect the case when there are no rows. mysql-test/r/func_group.result: Bug #30715: test case mysql-test/t/func_group.test: Bug #30715: test case sql/opt_sum.cc: Bug #30715: correct nullability check for MIN/MAX pre-calculation over index.	18 years ago
unknown	6a8e10d2ce	Post-merge fixes	18 years ago
unknown	4ea9a3d5cd	Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/psergey/mysql-5.0-bug31450 sql/item.cc: Auto merged mysql-test/r/type_decimal.result: Post-merge fixes mysql-test/t/type_decimal.test: Post-merge fixes	18 years ago
unknown	53dac1ee1a	BUG#31450: Query causes error 1048 - Let Item::save_in_field() call set_field_to_null_with_conversions() for decimal type, like this is done for the other item result types. mysql-test/r/type_decimal.result: BUG#31450: Query causes error 1048: testcase mysql-test/t/type_decimal.test: BUG#31450: Query causes error 1048: testcase	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	6044965c4f	Patch for BUG#30736: Row Size Too Large Error Creating a Table and Inserting Data. The problem was that under some circumstances Field class was not properly initialized before calling create_length_to_internal_length() function, which led to assert failure. The fix is to do the proper initialization. The user-visible problem was that under some circumstances CREATE TABLE ... SELECT statement crashed the server or led to wrong error message (wrong results). mysql-test/r/select.result: Update result file. mysql-test/t/select.test: Add a test case for BUG#30736: Row Size Too Large Error Creating a Table and Inserting Data. sql/sql_table.cc: Move sql_field->decimals initialization before sql_field->create_length_to_internal_length() call.	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	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	22e972ffeb	Bug#31669 Buffer overflow in mysql_change_user() The problem is that when copying the supplied username and database, no bounds checking is performed on the fixed-length buffer. A sufficiently large (> 512) user string can easily cause stack corruption. Since this API can be used from PHP and other programs, this is a serious problem. The solution is to increase the buffer size to the accepted size in similar functions and perform bounds checking when copying the username and database. libmysql/libmysql.c: Increase the buffer size and perform bounds checking when copying the supplied arguments. tests/mysql_client_test.c: Add test case for Bug#31669	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	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	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	bcc627846d	Fixed bug #31663 : if the FIELDS TERMINATED BY string in the SELECT INTO OUTFILE clause starts with a special character (one of n, t, r, b, 0, Z or N) and ENCLOSED BY is empty, every occurrence of this character within a field value is duplicated. Duplication has been avoided. New warning message has been added: "First character of the FIELDS TERMINATED string is ambiguous; please use non-optional and non-empty FIELDS ENCLOSED BY". mysql-test/r/outfile_loaddata.result: BitKeeper file /home/uchum/work/bk/5.0-opt-31663/mysql-test/r/outfile_loaddata.result Added test case for bug #31663. mysql-test/t/outfile_loaddata.test: BitKeeper file /home/uchum/work/bk/5.0-opt-31663/mysql-test/t/outfile_loaddata.test Added test case for bug #31663. sql/sql_class.h: Fixed bug #31663. The select_export::is_ambiguous_field_term field has been added. This field is true if select_export::field_sep_char contains the first char of the FIELDS TERMINATED BY (ENCLOSED BY is empty), and items can contain this character. The select_export::field_term_char field has been added (first char of the FIELDS TERMINATED BY string or INT_MAX). sql/sql_class.cc: Fixed bug #31663. The select_export::prepare method has been modified to calculate a value of the select_export::is_ambiguous_field_term field and to warn if this value is true. The select_export::send_data method has been modified to avoid escaping or duplication of the field_set_char if is_ambiguous_field_term is true. sql/share/errmsg.txt: Fixed bug #31663. The ER_AMBIGUOUS_FIELD_TERM warning has been added.	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	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	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
unknown	31634a38e8	Merge mysql.com:/home/gluh/MySQL/Merge/4.1 into mysql.com:/home/gluh/MySQL/Merge/4.1-opt	18 years ago
unknown	933bf86954	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt sql/field.cc: Auto merged sql/sql_yacc.yy: Auto merged	18 years ago
unknown	849bcf941f	Bug #28687 : Search fails on '0000-00-00' date after sql_mode change When doing indexed search the server constructs a key image for faster comparison to the stored keys. While doing that it must not perform (and stop if they fail) the additional date checks that can be turned on by the SQL mode because there already may be values in the table that don't comply with the error checks. Fixed by ignoring these SQL mode bits while making the key image. mysql-test/r/type_date.result: Bug #28687: test case mysql-test/t/type_date.test: Bug #28687: test case sql/item.cc: Bug #28687: no invalid date warnings	18 years ago
unknown	bbce18c303	Fix for bug #31742 : delete from ... order by function call that causes an error, asserts server In case of a fatal error during filesort in find_all_keys() the error was returned without the necessary handler uninitialization. Fixed by changing the code so that handler uninitialization is performed before returning the error. mysql-test/r/delete.result: Added a test case for bug #31742. mysql-test/t/delete.test: Added a test case for bug #31742. sql/filesort.cc: In case of a fatal error in find_all_keys() do not return before doing the necessary handler uninitialization steps.	18 years ago
unknown	004691e0ed	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0	18 years ago
unknown	578c238600	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/home/hf/work/30638/my50-30638	18 years ago
unknown	dda586282d	Merge mysql.com:/home/hf/work/29801/my50-29801 into mysql.com:/home/hf/work/30638/my50-30638	18 years ago
unknown	e763badfe3	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/scratch/tnurnberg/31588/50-31588	18 years ago
unknown	fb434504cc	Merge polly.(none):/home/kaa/src/opt/bug28550/my50-bug28550 into polly.(none):/home/kaa/src/opt/mysql-5.0-opt	18 years ago

... 2 3 4 5 6 ...

38186 Commits (cc2e929ac4b787220118f6d4dc4a72b796bf4ea0) All Branches Search

38186 Commits (cc2e929ac4b787220118f6d4dc4a72b796bf4ea0)

All Branches