mariadb

Tree: cebb6727b3

Author	SHA1	Message	Date
unknown	cebb6727b3	Bug #26461 : Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) The bool data type was redefined to BOOL (4 bytes on windows). Removed the #define and fixed some of the warnings that were uncovered by this. Note that the fix also disables 2 warnings : 4800 : 'type' : forcing value to bool 'true' or 'false' (performance warning) 4805: 'operation' : unsafe mix of type 'type' and type 'type' in operation These warnings will be handled in a separate bug, as they are performance related or bogus. Fixed to int the return type of functions that return more than 2 distinct values. CMakeLists.txt: Bug #26461: disable the C4800 and C4805 warnings temporarily include/config-win.h: Bug #26461: - no need for this define for Windows. - windows C++ compilers have a bool type include/my_global.h: Bug #26461: removed bool_defined (no longer needed) sql/handler.h: Bug #26461: bool functions must return boolean values sql/mysql_priv.h: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/procedure.h: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_acl.cc: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_acl.h: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_analyse.cc: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_analyse.h: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_base.cc: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_db.cc: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_delete.cc: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_load.cc: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_parse.cc: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_prepare.cc: Bug #26461: fixed return type of functions that return more than 2 distinct values. sql/sql_update.cc: Bug #26461: fixed return type of functions that return more than 2 distinct values.	18 years ago
unknown	f20fe94b55	Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures Disable test case for bug 29948, which is causing sporadically failures in other tests inside mysql_client_test. tests/mysql_client_test.c: Disable test case.	18 years ago
unknown	615db68d85	Re-enabled the test for mysql_insert_id() after merging from main.	18 years ago
unknown	66507ba8c2	Merge kaamos.(none):/data/src/opt/mysql-4.1-opt into kaamos.(none):/data/src/opt/mysql-5.0-opt	18 years ago
unknown	09f8a4af63	Merge kaamos.(none):/data/src/mysql-5.0 into kaamos.(none):/data/src/opt/mysql-5.0-opt client/mysql.cc: Auto merged sql/filesort.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/view.result: Manual merge. mysql-test/t/view.test: Manual merge. scripts/mysql_config.sh: Manual merge.	18 years ago
unknown	6dfe411c39	Merge kaamos.(none):/data/src/mysql-4.1 into kaamos.(none):/data/src/opt/mysql-4.1-opt	18 years ago
unknown	0abcb8ca5e	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/misc/mysql/34749/50-34749 mysql-test/r/func_misc.result: Auto merged mysql-test/t/func_misc.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged	18 years ago
unknown	9ddecde483	Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/misc/mysql/29645/50-29645	18 years ago
unknown	319cd7e494	Merge kaamos.(none):/data/src/opt/bug34889/my50 into kaamos.(none):/data/src/opt/mysql-5.0-opt	18 years ago
unknown	a104844dda	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B34909-5.0-opt	18 years ago
unknown	99c0b5e10f	Bug #34909 : mysqldump returns a 0 status on error when using --master-data No error code was returned by mysqldump if it detects that binary logging is not enabled on the server. Fixed by returning error code. client/mysqldump.c: Bug #34909: add error code mysql-test/r/mysqldump-no-binlog.result: Bug #34909: test case mysql-test/t/mysqldump-no-binlog-master.opt: Bug #34909: test case mysql-test/t/mysqldump-no-binlog.test: Bug #34909: test case	18 years ago
unknown	8b5189c3ac	Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/psergey/mysql-5.0-bug34945	18 years ago
unknown	0c1dd98ec8	Fix for bug #34889 : mysql_client_test::test_mysql_insert_id test fails sporadically Under some circumstances, the mysql_insert_id() value after SELECT ... INSERT could return a wrong value. This could happen when the last SELECT ... INSERT did not involve an AUTO_INCREMENT column, but the value of mysql_insert_id() was changed by some previous statements. Fixed by checking the value of thd->insert_id_used in select_insert::send_eof() and returning 0 for mysql_insert_id() if it is not set. sql/sql_insert.cc: Do not return thd->last_insert_id unconditionally in select_insert::send_eof(). First check if thd->insert_id_used is non-zero, and return 0 otherwise. tests/mysql_client_test.c: Added a test case for bug #34889.	18 years ago
unknown	4d09306dd1	Raise the version number after cloning 5.0.58	18 years ago
unknown	cd9f2d1c28	BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql" - Apply Eric Bergen's patch: in join_read_always_key(), move ha_index_init() call to before the late NULLs filtering code. - Backport function comments from 6.0. mysql-test/r/null_key.result: BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql" - Testcase mysql-test/t/null_key.test: BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql" - Testcase sql/sql_select.cc: BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql" - Apply Eric Bergen's patch: in join_read_always_key(), move ha_index_init() call to before the late NULLs filtering code. - Backport function comments from 6.0	18 years ago
unknown	64bdb0bdf2	Merge kaamos.(none):/data/src/opt/bug31781/my50 into kaamos.(none):/data/src/opt/mysql-5.0-opt	18 years ago
unknown	162eadbe68	Fix for bug #31781 : multi-table UPDATE with temp-pool enabled fails with errno 17 my_create() did not perform any checks for the case when a file is successfully created by a call to open(), but the call to my_register_filename() later fails because the number of open files has exceeded the my_open_files limit. This can happen on platforms which do not have getrlimit(), and hence we do not know the real limit for open files. In such a case an error was returned to a caller although the file has actually been created. Since callers assume my_create() to return an error only when it failed to create a file, they did not perform any cleanups, leaving an 'orphaned' file on the file system. Fixed by adding a check for the above case to my_create() and ensuring the newly created file is deleted before returning an error. Creating a deterministic test case in the test suite is impossible, because the exact steps required to reproduce the above situation depend on the platform and/or environment (OS per-user limits, queries executed by previous tests, startup parameters). The patch was manually tested on Windows using examples posted in the bug report. mysys/my_create.c: Ensure that, if the call to my_register_filename() in my_create() failed, but the previous open() called succeeded, the newly created file is deleted before returning an error.	18 years ago
unknown	2cb35cd680	test case fix	18 years ago
unknown	72f6ffe3b0	Merge host.loc:/home/uchum/work/5.0-opt-34830 into host.loc:/home/uchum/work/5.0-opt	18 years ago
unknown	4e7c4ab929	wrong merge fix	18 years ago
unknown	4460f5a5b1	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt mysql-test/t/symlink.test: Auto merged mysql-test/r/symlink.result: after merge fix	18 years ago
unknown	be59a0ea7f	test fix mysql-test/r/symlink.result: result fix	18 years ago
unknown	d276cd9059	Fixed bug #34830 : mixed table and field names in Item_ref and Item_direct_ref constructor calls. Order of ref->field_name and ref->table_name arguments is of Item_ref and Item_direct_ref in the fix_inner_refs function is inverted. sql/sql_select.cc: Fixed bug #34830: mixed table and field names in Item_ref and Item_direct_ref constructor calls. Order of ref->field_name and ref->table_name arguments is of Item_ref and Item_direct_ref in the fix_inner_refs function is inverted. See definitions: Item_ref(Name_resolution_context context_arg, Item item, const char table_name_arg, const char field_name_arg, bool alias_name_used_arg= FALSE) and Item_direct_ref(Name_resolution_context context_arg, Item *item, const char table_name_arg, const char *field_name_arg, bool alias_name_used_arg= FALSE)	18 years ago
unknown	fa9e35b48d	after merge fix	18 years ago
unknown	8bdb243fd7	Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt into mysql.com:/home/gluh/MySQL/Merge/5.0-opt sql/mysql_priv.h: Auto merged mysql-test/r/symlink.result: manual merge mysql-test/t/symlink.test: manual merge sql/mysqld.cc: manual merge sql/sql_parse.cc: manual merge	18 years ago
unknown	ab60425901	Bug#32167 another privilege bypass with DATA/INDEX DIRECORY(ver 4.1,5.0) added new function test_if_data_home_dir() which checks that path does not contain mysql data home directory. Using of mysql data home directory in DATA DIRECTORY & INDEX DIRECTORY is disallowed. mysql-test/r/symlink.result: test result mysql-test/t/symlink.test: test case sql/mysql_priv.h: new variable mysql_unpacked_real_data_home sql/mysqld.cc: new variable mysql_unpacked_real_data_home sql/sql_parse.cc: added new function test_if_data_home_dir() which checks that path does not contain mysql data home directory. Using of mysql data home directory in DATA DIRECTORY & INDEX DIRECTORY is disallowed.	18 years ago
unknown	8b77945615	Post-merge fix for Bug 33851. The initialization order of members must match the order which they were declared in the class definition. sql/item.cc: Fix initialization order, parameter was the last one declared.	18 years ago
unknown	7f572871ad	Merge host.loc:/home/uchum/work/PP/5.0-opt-34620 into host.loc:/home/uchum/work/5.0-opt	18 years ago
unknown	d40ca16156	Fixed bug #34620 : item_row.cc:50: Item_row::illegal_method_call(const char*): Assertion `0' failed If ROW item is a part of an expression that also has aggregate function calls (COUNT/SUM/AVG...), a "splitting" with an Item::split_sum_func2 function is applied to that ROW item. Current implementation of Item::split_sum_func2 replaces this Item_row with a newly created Item_aggregate_ref reference to it. Then the row cache tries to work with the Item_aggregate_ref object as with the Item_row object: row cache calls row-emulation methods such as cols and element_index. Item_aggregate_ref (like it's parent Item_ref) inherits dummy implementations of those methods from the hierarchy root Item, and call to them leads to failed assertions and wrong data output. Row-emulation virtual functions (cols, element_index, addr, check_cols, null_inside and bring_value) of Item_ref have been overloaded to forward calls to an underlying item reference. mysql-test/r/row.result: Added test case for bug #34620. mysql-test/t/row.test: Added test case for bug #34620. sql/item.h: Fixed bug #34620. Row-emulation virtual functions (cols, element_index, addr, check_cols, null_inside and bring_value) of Item_ref have been overloaded to forward calls to an underlying item reference.	18 years ago
unknown	1164e2bc7a	Bug#33851 Passing UNSIGNED param to EXECUTE returns ERROR 1210 The problem is that passing anything other than a integer to a limit clause in a prepared statement would fail. This limitation was introduced to avoid replication problems (e.g: replicating the statement with a string argument would cause a parse failure in the slave). The solution is to convert arguments to the limit clause to a integer value and use this converted value when persisting the query to the log. mysql-test/r/limit.result: Update test case result. mysql-test/r/ps.result: Add test case result for Bug#33851 mysql-test/r/rpl_user_variables.result: Test case result for replication of prepared statement with limit clause. mysql-test/t/limit.test: Test parameters to limit clause. mysql-test/t/ps.test: Add test case for Bug#33851 mysql-test/t/rpl_user_variables.test: Test replication of a parameter which value is converted. sql/item.cc: Convert value to integer if it's a parameter to a limit clause. sql/item.h: Flag signal that item is a parameter to a limit clause. sql/item_func.cc: Const member functions, object is not mutated. sql/sql_class.h: Const member functions, object is not mutated. sql/sql_yacc.yy: Flag that item is a parameter to a limit clause.	18 years ago
unknown	56e6b531d2	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B34747-5.0-opt	18 years ago
unknown	a0eec8abbb	Bug#34749: Server crash when using NAME_CONST() with an aggregate function NAME_CONST('whatever', -1) * MAX(whatever) bombed since -1 was not seen as constant, but as FUNCTION_UNARY_MINUS(constant) while we are at the same time pretending it was a basic const item. This confused the aggregate handlers in exciting ways. We now make NAME_CONST() behave more consistently. mysql-test/r/func_misc.result: show that a combination of NAME_CONST('x', -y) and an aggregate no longer crashes the server. mysql-test/t/func_misc.test: show that a combination of NAME_CONST('x', -y) and an aggregate no longer crashes the server. sql/ha_ndbcluster_cond.cc: tell cluster about "new" function type NEG_FUNC. (this was previous identified as UNKNOWN_FUNC, so we just handle it the same way, that's all.) sql/ha_ndbcluster_cond.h: tell cluster about "new" function type NEG_FUNC. (this was previous identified as UNKNOWN_FUNC, so we just handle it the same way, that's all.) sql/item.cc: make NAME_CONST() transparent in that type() of -constant is that of constant, not that of unary minus (id est, FUNC_ITEM). sql/item.h: Move constructor to item.cc sql/item_func.h: Revert Bug#30832; we can apply the magic more narrowly (just for NAME_CONST() rather than all Item_func_neg). Introduce new function type "NEG_FUNC."	18 years ago
unknown	f28612eae2	Bug #34747 : crash in debug assertion check after derived table Was a double-free of the Unique member of Item_func_group_concat. This was not causing a crash because the Unique is a descendent of Sql_alloc. Fixed to free the Unique only if it was allocated for the instance of Item_func_group_concat it was referenced from mysql-test/r/func_gconcat.result: Bug #34747: test case mysql-test/t/func_gconcat.test: Bug #34747: test case sql/item_sum.cc: Bug #34747: free the Unique only if it was allocated for this instance of Item_func_group_concat	18 years ago
unknown	b43f8f695c	Eliminate compilation warning.	18 years ago
unknown	e78d896c3f	Bug#34889 mysql_client_test::test_mysql_insert_id test fails sporadically Disable the test case. tests/mysql_client_test.c: Disable test case.	18 years ago
unknown	7ca90d539f	Merge kaamos.(none):/data/src/opt/bug33834/my50-bug33834 into kaamos.(none):/data/src/opt/mysql-5.0-opt	18 years ago
unknown	c8885dfb73	Fixed test suite failures with --ps-protocol introduced in PB by the patch for bug #33834.	18 years ago
unknown	87007702fe	Merge bk@192.168.21.1:mysql-5.0-opt into mysql.com:/home/hf/work/25097/my50-25097 libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged sql/log.cc: Auto merged	18 years ago
unknown	a4b0a2cf67	Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. There was no way to return an error from the client library if no MYSQL connections was established. So here i added variables to store that king of errors and made functions like mysql_error(NULL) to return these. client/mysql.cc: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. Show the error message on std_error include/sql_common.h: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. cant_connect_sqlstate constant declared libmysql/libmysql.c: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. mysql_sqlstate(NULL) returns 'unknown_sqlstate' libmysqld/lib_sql.cc: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. EMBEDDED_SERVER version of the vprint_msg_to_log() implemented sql-common/client.c: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. mysql_server_last_errno and mysql_server_last_error introduced to store errors not related to particular connections. mysql_error(NULL) and mysql_errno(NULL) now returns these mysql_server_last_error and errno respectively sql/log.cc: Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. EMBEDDED_LIBRARY implementation of the vprint_msg_to_log() moved to lib_sql.cc	18 years ago
unknown	a86e504f59	Merge quad.:/mnt/raid/alik/MySQL/devel/5.0 into quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged mysql-test/r/view.result: Auto merged	18 years ago
unknown	25620347fc	Merge kaamos.(none):/data/src/opt/bug33834/my50-bug33834 into kaamos.(none):/data/src/opt/mysql-5.0-opt sql/sql_yacc.yy: Auto merged	18 years ago
unknown	24039016f0	Fix memory leaks (valgrind)	18 years ago
unknown	4f3eab5804	Fix for bug #33834 : FRAC_SECOND: Applicability not clear in documentation While the manual mentions FRAC_SECOND only for the TIMESTAMPADD() function, it was also possible to use FRAC_SECOND with DATE_ADD(), DATE_SUB() and +/- INTERVAL. Fixed the parser to match the manual, i.e. using FRAC_SECOND for anything other than TIMESTAMPADD()/TIMESTAMPDIFF() now produces a syntax error. Additionally, the patch allows MICROSECOND to be used in TIMESTAMPADD/ TIMESTAMPDIFF and marks FRAC_SECOND as deprecated. mysql-test/r/func_time.result: Added a test case for bug #33834. mysql-test/t/func_time.test: Added a test case for bug #33834. sql/sql_yacc.yy: Reject FRAC_SECOND for anything other than TIMESTAMPADD() or TIMESTAMPDIFF(). Allow MICROSECOND to be used with TIMESTAMPADD()/TIMESTAMPDIFF(). Warn about FRAC_SECOND being a deprecated unit.	18 years ago
unknown	1eb99d3fd4	Bug#29645: Link failure when using the embedded server mysql_config --cflags gave a flag that forced the HP/UX C++ compiler into C-mode; as a result, C++ sources could not be compiled correctly. We now filter out the offending flag (like we do for Sun) so that --cflags will work for both C and C++. scripts/mysql_config.sh: Add -AC99 (for HP/UX) to the list of flags we need to remove from "mysql_config --cflags" so they work for C and C++ both.	18 years ago
unknown	862c4750cd	Merge ramayana.hindu.god:/home/tsmith/m/bk/b28460/50 into ramayana.hindu.god:/home/tsmith/m/bk/build/50 scripts/mysqlhotcopy.sh: Auto merged	18 years ago
unknown	62ba88327f	Merge kaamos.(none):/data/src/opt/bug33049/my50-bug33790 into kaamos.(none):/data/src/opt/mysql-5.0-opt	18 years ago
unknown	1bee6a3c7c	Merge trift2.:/MySQL/M50/mysql-5.0 into trift2.:/MySQL/M50/push-5.0 ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: Auto merged	18 years ago
unknown	4368dcdc2d	Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into magare.gmz:/home/kgeorge/mysql/autopush/B30604-5.0-opt	18 years ago
unknown	d702cb12b2	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt into mysql.com:/home/gluh/MySQL/mysql-5.0-opt	18 years ago
unknown	012aab7d8b	Fix for bug #33049 : Assert while running test-as3ap test(mysql-bench suite) Under some circumstances a combination of aggregate functions and GROUP BY in a SELECT query over a VIEW could lead to incorrect calculation of the result type of the aggregate function. This in turn could result in incorrect results, or assertion failures on debug builds. Fixed by changing the logic in Item_sum_hybrid::fix_fields() so that the argument's item is dereferenced before calling its type() method. mysql-test/r/view.result: Added a test case for bug #33049. mysql-test/t/view.test: Added a test case for bug #33049. sql/item_sum.cc: When calculating the result type of an aggregate function, dereference the argument's item before calling its type() method.	18 years ago

1 2 3 4 5 ...

38852 Commits (cebb6727b3c8593283f81182d06c45ca69cc0304) All Branches Search

38852 Commits (cebb6727b3c8593283f81182d06c45ca69cc0304)

All Branches