mariadb

Tree: 20e5719574

Author	SHA1	Message	Date
Vladislav Vaintroub	20e5719574	Bug#42709: safe_process_win.cc does not print correct system error messages. Fix: use FormatMessage() to output system errors , not strerror()	17 years ago
Sergey Glukhov	4d0557a2e6	Bug#42610 Dynamic plugin broken in 5.1.31 added ignore-builtin-innodb option which disabled initialization of builtin InnoDB plugin mysql-test/r/innodb_ignore_builtin.result: test case mysql-test/t/innodb_ignore_builtin-master.opt: test case mysql-test/t/innodb_ignore_builtin.test: test case sql/mysql_priv.h: added ignore-builtin-innodb option which disabled initialization of builtin InnoDB plugin sql/mysqld.cc: added ignore-builtin-innodb option which disabled initialization of builtin InnoDB plugin sql/set_var.cc: added ignore-builtin-innodb option which disabled initialization of builtin InnoDB plugin sql/sql_plugin.cc: added ignore-builtin-innodb option which disabled initialization of builtin InnoDB plugin	17 years ago
Vladislav Vaintroub	461cad77b4	Bug#42427 : MTR v2 fails with "can't write to /tmp/mysql-test-ports.sem" on Windows - /tmp directory is not guaranteed to exist on Windows. Use the value of environment variable TEMP here	17 years ago
Timothy Smith	3ba87c3700	Auto-merge up from 5.0	17 years ago
Timothy Smith	af193ed97e	Auto-merge 5.1-build -> 5.1-bugteam	17 years ago
Timothy Smith	6c6fc0978e	Auto-merge 5.0-build -> 5.0-bugteam	17 years ago
Joerg Bruehe	dc52558218	Merge main 5.0 -> 5.0-build	17 years ago
unknown	9169711b3c	Raise version number after cloning 5.0.78	17 years ago
Joerg Bruehe	8bf1b12590	Merge main 5.0 into 5.0-build	17 years ago
Joerg Bruehe	c27539b6b8	Final merge of 5.0.72sp1 into 5.0-build This involves just the tag, no file changes - they were all present before.	17 years ago
Timothy Smith	80b443f348	Auto merge fix for Bug 42525 from 5.0-bugteam	17 years ago
Tatiana A. Nurnberg	0eca4824c3	auto-merge	17 years ago
Tatiana A. Nurnberg	d66dc23065	Bug#42525: TIMEDIFF function In 37553 we declared longlong results for class Item_str_timefunc as per comments/docs, but didn't add a method for that. And the default just wasn't good enough for some cases. Changeset adds dedicated val_int() to class. mysql-test/r/func_sapdb.result: More tests for casts of TIME() / TIMEDIFF() with negative results. mysql-test/t/func_sapdb.test: More tests for casts of TIME() / TIMEDIFF() with negative results. sql/item_timefunc.h: Since we claim to provide longlong results, we should have a suitable function to provide them (the default won't do). This one matches the val_real() variant.	17 years ago
Timothy Smith	41ce20ad7f	Auto merge from main 5.0	17 years ago
Magnus Svensson	0ea110d858	Bug#42366 server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT - remove the disbling of all ssl_* tests now when certs are fixed.	17 years ago
Timothy Smith	44ee0c107d	Handle renamed nwbootstrap -> nwbuild	17 years ago
Georgi Kodinov	5b1277ec7f	merged 5.0-main -> 5.0-bugteam	17 years ago
Magnus Svensson	0b439b3070	Merge	17 years ago
Davi Arnaut	ec849b19bd	Bug#42524: Function pthread_setschedprio() is defined but seems broken on i5/OS PASE The problem is that MySQL use of pthread_setschedprio is not supported by i5/OS and the default system behavior for unsupported calls is to emit a SIGILL signal which causes the server to abort. The solution is to treat the pthread_setschedprio as inexistent when compiling binaries for i5/OS. This also does not invalidate the fix for bug 38477 as the only supported dispatch class is SCHED_OTHER (which is passed to pthread_setschedparam). configure.in: Skip pthread_setschedprio check on i5/OS.	17 years ago
Alexey Kopytov	e27f65369f	Merge from team tree.	17 years ago
Alexey Kopytov	a8c98eb953	Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.	17 years ago
Alexey Kopytov	b30239bc1a	Temporarily reverted patch for bug #41868 as it was causing problems in PB.	17 years ago
Magnus Svensson	aca7ca6bba	Bug#42641 mtr.pl fails to run within JobObject - Allow the new process to break away from any job that this process is part of so that it can be assigned to the new JobObject we just created. This is safe since the new JobObject is created with the JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE flag, making sure it will be terminated when the last handle to it is closed(which is owned by this process).	17 years ago
unknown	5a4e3eaa7a	Merge from mysql-5.1.31-release	17 years ago
Gleb Shchepa	798f19e463	after-after-push testcase update (bug #39265 )	17 years ago
Matthias Leich	09387431c1	Fix for Bug#42602 main.status: random failures + minor improvements	17 years ago
Gleb Shchepa	a7435ddf49	after-push test update (bug #39265 )	17 years ago
Alexey Kopytov	4cd0e2fac4	Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.	17 years ago
Alexey Kopytov	759b626d11	Merge to team tree.	17 years ago
Alexey Kopytov	20cdcaa3d5	Merge from team tree.	17 years ago
Gleb Shchepa	b9d02d4669	Bug #39265 : fix for the bug 33699 should be reverted Documented behaviour was broken by the patch for bug 33699 that actually is not a bug. This fix reverts patch for bug 33699 and reverts the UPDATE of NOT NULL field with NULL query to old behavior. mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: Bug #39265: fix for the bug 33699 should be reverted mysql-test/include/ps_modify.inc: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/auto_increment.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/csv_not_null.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/null.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/ps_2myisam.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/ps_3innodb.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/ps_4heap.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/ps_5merge.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/r/warnings.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/suite/ndb/r/ps_7ndb.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result: Bug #39265: fix for the bug 33699 should be reverted mysql-test/suite/rpl/t/rpl_err_ignoredtable.test: Bug #39265: fix for the bug 33699 should be reverted mysql-test/t/auto_increment.test: Bug #39265: fix for the bug 33699 should be reverted mysql-test/t/csv_not_null.test: Bug #39265: fix for the bug 33699 should be reverted mysql-test/t/null.test: Bug #39265: fix for the bug 33699 should be reverted mysql-test/t/warnings.test: Bug #39265: fix for the bug 33699 should be reverted sql/sql_update.cc: Bug #39265: fix for the bug 33699 should be reverted	17 years ago
Gleb Shchepa	ea15ebbbd4	automerge 5.0-bugteam --> 5.1-bugteam (bug 42037)	17 years ago
Gleb Shchepa	061bf717e0	Bug #42037 : Queries containing a subquery with DISTINCT and ORDER BY could cause a server crash Dependent subqueries like SELECT COUNT() FROM t1, t2 WHERE t2.b IN (SELECT DISTINCT t2.b FROM t2 WHERE t2.b = t1.a) caused a memory leak proportional to the number of outer rows. The make_simple_join() function has been modified to JOIN class method to store join_tab_reexec and table_reexec values in the parent join only (make_simple_join of tmp_join may access these values via 'this' pointer of the parent JOIN). NOTE: this patch doesn't include standard test case (this is "out of memory" bug). See bug #42037 page for test cases. sql/sql_select.cc: Bug #42037: Queries containing a subquery with DISTINCT and ORDER BY could cause a server crash The make_simple_join() function has been modified to JOIN class method to store join_tab_reexec and table_reexec values in the parent join only. sql/sql_select.h: Bug #42037: Queries containing a subquery with DISTINCT and ORDER BY could cause a server crash 1. The make_simple_join() function has been modified to JOIN class method. 2. Type of JOIN::table_reexec field has been changed from TABLE* to TABLE *table_reexec[1]: this field always was NULL or a pointer to one-element array of pointers, so a pointer to a pointer has been replaced with one pointer and unnecessary memory allocation has been eliminated.	17 years ago
Ramil Kalimullin	31d908d70b	Fix for bug#42014: Crash, name_const with collate Problem: some queries using NAME_CONST(.. COLLATE ...) lead to server crash due to failed type cast. Fix: return the underlying item's type in case of NAME_CONST(.. COLLATE ...) to avoid wrong casting. mysql-test/r/func_misc.result: Fix for bug#42014: Crash, name_const with coll - test result. mysql-test/t/func_misc.test: Fix for bug#42014: Crash, name_const with coll - test case. sql/item.cc: Fix for bug#42014: Crash, name_const with coll - in case of NAME_CONST('name', 'value' COLLATE collation) Item_name_const::type() returns type of 'value' argument to awoid wrong type casting of the Item_name_const items.	17 years ago
Alexey Botchkov	aa964b7913	merging	17 years ago
Ramil Kalimullin	9ee53cbcc0	Auto-merge	17 years ago
Alexey Botchkov	9036f1aa97	Bug#37995 Error message truncation in test "innodb" in embedded mode. code backported from 6.0 per-file messages: include/my_global.h Remove SC_MAXWIDTH. This is unused and irrelevant nowadays. include/my_sys.h Remove errbuf declaration and unused definitions. mysys/my_error.c Remove errbuf definition and move and adjust ERRMSGSIZE. mysys/my_init.c Declare buffer on the stack and use my_snprintf. mysys/safemalloc.c Use size explicitly. It's more than enough for the message at hand. sql/sql_error.cc Use size explicitly. It's more than enough for the message at hand. sql/sql_parse.cc Declare buffer on the stack. Use my_snprintf as it will result in less stack space being used than by a system provided sprintf -- this allows us to put the buffer on the stack without causing much trouble. Also, the use of errbuff here was not thread-safe as the function can be entered concurrently from multiple threads. sql/sql_table.cc Use MYSQL_ERRMSG_SIZE. Extra space is not needed as my_snprintf will nul terminate strings. storage/myisam/ha_myisam.cc Use MYSQL_ERRMSG_SIZE. sql/share/errmsg.txt Error message truncation in test "innodb" in embedded mode filename in the error message can safely take up to 210 symbols.	17 years ago
Chad MILLER	dc0f210a79	Merge from team tree.	17 years ago
Chad MILLER	078e413e88	Merge from 5.0-bugteam.	17 years ago
Alfranio Correia	0f57761141	auto-merge for BUG#42445.	17 years ago
Chad MILLER	243b2639cc	Merge from bug tree.	17 years ago
Matthias Leich	4c67bc0c76	Merge 5.0 -> 5.1, null merge necause everything is already in place	17 years ago
Matthias Leich	6f19c0fc46	Merge last changesets into tree, no conflicts	17 years ago
Sergey Vojtovich	aa13a4b95e	Merge 5.0-bugteam -> 5.1-bugteam.	17 years ago
Matthias Leich	7957622bfd	Automatic merge, no conflicts	17 years ago
Magnus Svensson	1177405381	Merge	17 years ago
Matthias Leich	2df0beee02	Merge last changesets, no conflicts	17 years ago
Staale Smedseng	dc3dcf4ffa	merge from upstream 5.1-bugteam	17 years ago
Sergey Vojtovich	97bd763544	BUG#32047 - 'Spurious' errors while opening MERGE tables Accessing well defined MERGE table may return an error stating that the merge table is incorrectly defined. This happens if MERGE child tables were accessed before and we failed to open another incorrectly defined MERGE table in this connection. myrg_open() internally used my_errno as a variable for determining failure, and thus could be tricked into a wrong decision by other uses of my_errno. With this fix we use function local boolean flag instead of my_errno to determine failure. myisammrg/myrg_open.c: There are two requirement for accessing/setting my_errno variable, which were not followed by myrg_open(): - it must be checked immediately after a function returned an error. There must be no calls to other functions that may change it's value between. - my_errno value must be set right before a function is going to return an error. There must be no calls to other functions that may change it's value between (that's why we have these tricks with save_errno at the bottom of myrg_open()). myrg_open() internally used my_errno as a variable for determining failure, and thus could be tricked into a wrong decision by other uses of my_errno. mysql-test/r/merge.result: A test case for BUG#32047. mysql-test/t/merge.test: A test case for BUG#32047.	17 years ago
Sergey Glukhov	1d09ec6208	Bug#42495 updatexml: Assertion failed: xpath->context, file .\item_xmlfunc.cc, line 2507 Problem: RelativeLocationPath can appear only after a node-set expression in the third and the fourth branches of this rule: PathExpr :: = LocationPath \| FilterExpr \| FilterExpr '/' RelativeLocationPath \| FilterExpr '//' RelativeLocationPath XPatch code didn't check the type of FilterExpr and crashed. Fix: If FilterExpr is a scalar expression (variable reference, literal, number, scalar function call) return error. mysql-test/r/xml.result: test result mysql-test/t/xml.test: test case sql/item_xmlfunc.cc: Problem: RelativeLocationPath can appear only after a node-set expression in the third and the fourth branches of this rule: PathExpr :: = LocationPath \| FilterExpr \| FilterExpr '/' RelativeLocationPath \| FilterExpr '//' RelativeLocationPath XPatch code didn't check the type of FilterExpr and crashed. Fix: If FilterExpr is a scalar expression (variable reference, literal, number, scalar function call) return error.	17 years ago

1 2 3 4 5 ...

56344 Commits (20e5719574a4fa6ce1bc514646d24d3ea63c47cf) All Branches Search

56344 Commits (20e5719574a4fa6ce1bc514646d24d3ea63c47cf)

All Branches