Commit graph

55603 commits

Author SHA1 Message Date
Joerg Bruehe
dc9f15accc This is a backport from 5.1.32 into 5.1.31sp1.
The original fix was done by Davi Arnaut on 2009-02-03
All comments are copied from the original fix:


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 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 to 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).
2009-03-19 18:09:47 +01:00
Joerg Bruehe
85217cb303 This is a backport from 5.1.32 into 5.1.31sp1.
The original fix was done by Ramil Kalimullin on 2009-02-05
All comments are copied from the original fix:


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.
2009-03-19 17:37:58 +01:00
Joerg Bruehe
95163cec4f This is a backport of a fix applied in 5.1.32 into 5.1.31sp1
The original fix was done by Jonathan Perkin and committed by Georgi Kodinov
on 2009-02-10.
The same day, Georgi added a compilation fix which is already included here.


Original comment:
  Merge libedit 2.11 and related files,
  based on NetBSD CVS as of 2009/02/06 20:09:00.
2009-03-19 12:08:50 +01:00
Joerg Bruehe
d0e77a4045 This is a backport from 5.1.32 into 5.1.31sp1.
The original fix was done by Sergey Glukhov on 2009-02-04
All comments are copied from the original fix:


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.
2009-03-18 22:23:21 +01:00
Joerg Bruehe
37f64c1241 This is a backport from 5.1.32 into 5.1.31sp1.
The original fix was done by Gleb Shchepa on 2009-01-21
All comments are copied from the original fix:


Bug#42188: crash and/or memory corruption with user variables 
           in trigger

Interchangeable calls to the mysql_change_user client function 
and invocations of a trigger changing some user variable caused 
a memory corruption and a crash.

The mysql_change_user API call forces TDH::cleanup() on a server 
that frees user variable entries.
However it didn't reset Item_func_set_user_var::entry to NULL 
because Item_func_set_user_var::cleanup() was not overloaded.
So, Item_func_set_user_var::entry held a pointer to freed memory,
that caused a crash.

The Item_func_set_user_var::cleanup method has been overloaded
to cleanup the Item_func_set_user_var::entry field.
2009-03-18 15:48:07 +01:00
Joerg Bruehe
7dd62b165f This is a backport from 5.1.32 into 5.1.31sp1.
The original fix was done by Georgi Kodinov on 2009-01-28
All comments are copied from the original fix:


Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"

Re-generated the PKI files needed.
Removed the ones that are not needed.
Updated the tests to reference the correct SSL subject.
2009-03-18 13:36:23 +01:00
MySQL Build Team
47844077fd Incorrect test if "--short-product-tag=" was given or not 2009-01-19 17:48:05 +01:00
MySQL Build Team
4915050033 Fixed typo 2009-01-17 09:29:40 +01:00
MySQL Build Team
004a1396b6 Auto-merge 2009-01-16 15:04:11 +01:00
MySQL Build Team
5681ceda02 Cherry-pick fix for bug#40386, "Not flushing query cache after truncate", out of 5.1-bugteam branch.
This fix is r3114 from innodb-5.1-ss3603.
2009-01-15 21:16:18 +01:00
MySQL Build Team
951d045231 Added option "--short-product-tag=<string>" to "make_binary_distribution.sh",
to enable product name and server suffix to differ.
2009-01-15 20:09:58 +01:00
Georgi Kodinov
c5acb1258c merge 5.0-bugteam-> 5.1-bugteam 2009-01-15 07:31:47 +02:00
Georgi Kodinov
1233360cc2 merge 5.0-main to 5.0-bugteam 2009-01-15 06:35:18 +02:00
MySQL Build Team
d535a2b92e Oops, bumped version too high. Drop it back down from 5.0.78 to 5.0.77. 2009-01-15 00:14:07 +01:00
Ramil Kalimullin
2dba01b2fa bug#33094: Error in upgrading from 5.0 to 5.1 when table contains triggers
Post-fix test failure: fixed mysqlcheck.test on Windows platforms.
2009-01-15 00:54:25 +04:00
timothy.smith@sun.com
10408c632d Raise version number after cloning 5.0.76 2009-01-14 20:16:10 +01:00
Chad MILLER
efb10b6b20 Merge from bugteam trunk. 2009-01-14 10:56:37 -05:00
Ramil Kalimullin
347762946e Fix for
bug#33094: Error in upgrading from 5.0 to 5.1 when table contains
triggers
and
#41385: Crash when attempting to repair a #mysql50# upgraded table
with triggers.

Problem:
1. trigger code didn't assume a table name may have
a "#mysql50#" prefix, that may lead to a failing ASSERT().
2. "ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME" failed
for databases with "#mysql50#" prefix if any trigger.
3. mysqlcheck --fix-table-name didn't use UTF8 as a default
character set that resulted in (parsing) errors for tables with
non-latin symbols in their names and definitions of triggers.

Fix:
1. properly handle table/database names with "#mysql50#" prefix.
2. handle --default-character-set mysqlcheck option;
if mysqlcheck is launched with --fix-table-name or --fix-db-name
set default character set to UTF8 if no --default-character-set
option given.

Note: if given --fix-table-name or --fix-db-name option,
without --default-character-set mysqlcheck option
default character set is UTF8.
2009-01-14 18:50:51 +04:00
He Zhenxing
2c1cf1a0ed Auto merge 2009-01-14 17:32:25 +08:00
He Zhenxing
9904550760 BUG#41986 Replication slave does not pick up proper AUTO_INCREMENT value for Innodb tables
The next number (AUTO_INCREMENT) field of the table for write
rows events are not initialized, and cause some engines (innodb)
not correctly update the tables's auto_increment value.

This patch fixed this problem by honor next number fields if present.
2009-01-14 16:27:32 +08:00
Chad MILLER
05fb260b0c Merge fix for bug 38364. 2009-01-13 10:50:22 -05:00
Matthias Leich
33d2ae1512 Merge into actual tree 2009-01-13 16:42:37 +01:00
Davi Arnaut
49888167cc Auto-merge from upstream 5.1-bugteam 2009-01-13 13:06:31 -02:00
Matthias Leich
50ad9d1fca Merge of fix for bug
41776 type_date.test may fail if run around midnight.
into GCA tree.
2009-01-13 15:04:28 +01:00
Matthias Leich
f557d37762 Merge of fix for bug
41111 events_bugs fails sporadically on pushbuild
into GCA tree
2009-01-13 14:39:04 +01:00
Matthias Leich
e0fdeaa222 Merge of fix for bug
41932 funcs_1: is_collation_character_set_applicability path too long for tar
into GCA tree
2009-01-13 14:26:24 +01:00
Matthias Leich
d657438ea0 Fix for Bug#40377 sporadic pushbuild failure in log_state: result mismatch
+ add workaround for bug 38124
+ messages into the protocol when sessions are switched
+ replace error numbers by error names
+ reset of system variables to initial values per subtest
+ remove a file created by this test
+ minor improvements in structure and formatting
2009-01-13 14:09:24 +01:00
Patrick Crews
4e550c9d89 Bug#41888: Test binlog.binlog_database causing binlog_innodb to fail on Pushbuild.
Added cleanup of status variables to the end of binlog_database.
Re-recorded .result file to account for cleanup statement.
NOTE:  binlog.binlog_innodb also has had an FLUSH STATUS; statement added to it as well, but
adding this cleanup as a preventative measure.
2009-01-12 18:45:35 -05:00
Chad MILLER
e3716a3dc0 Bug#38364: gen_lex_hash segmentation fault in debug build
Bug#36428: MY_MUTEX_INIT_FAST is used before initialization

On some thread implementations, we need a fake mutex attri-
bute as a placeholder, which we define as a global variable,
"my_fast_mutexattr".  Well. that must be initialized before 
used in any mutexes, and the ordering of initializations in 
the API function  my_init()  was wrong.

Now, put my_thread_global_init(), which initializes the attri-
butes that mutexes require.
2009-01-12 14:48:02 -05:00
Georgi Kodinov
b180a10233 Fixed a warning in sql_profile.cc 2009-01-12 18:17:15 +02:00
Georgi Kodinov
ba506ca6b7 merged 41453 to 5.1-bugteam 2009-01-12 17:52:46 +02:00
Davi Arnaut
a13eda38ae Post-merge fix for bug 37016: Update test case for row-based logging. 2009-01-12 10:48:33 -02:00
Tatiana A. Nurnberg
a7d03bf4ed Bug#31177: Server variables can't be set to their current values
Bounds-checks and blocksize corrections were applied to user-input,
but constants in the server were trusted implicitly. If these values
did not actually meet the requirements, the user could not set change
a variable, then set it back to the (wonky) factory default or maximum
by explicitly specifying it (SET <var>=<value> vs SET <var>=DEFAULT).

Now checks also apply to the server's presets. Wonky values and maxima
get corrected at startup. Consequently all non-offsetted values the user
sees are valid, and users can set the variable to that exact value if
they so desire.
2009-01-12 06:32:49 +01:00
Tatiana A. Nurnberg
2048bd7117 auto-merge 2009-01-09 23:06:07 +01:00
Tatiana A. Nurnberg
d58db1c2b0 auto-merge 2009-01-09 22:26:51 +01:00
Georgi Kodinov
15010d7410 merged 5.0-bugteam -> 5.1-bugteam 2009-01-09 20:35:02 +02:00
Georgi Kodinov
06b3e7e21d fixed a compile warning 2009-01-09 20:30:55 +02:00
Georgi Kodinov
18526afc07 merged 41437 to 5.1-bugteam 2009-01-09 19:51:52 +02:00
Tatiana A. Nurnberg
bbb6d2d00d auto-merge 2009-01-09 16:49:03 +01:00
Tatiana A. Nurnberg
108f8d75a1 auto-merge 2009-01-09 16:48:02 +01:00
Georgi Kodinov
054bdbb43a merged 41437 to 5.0-bugteam 2009-01-09 17:08:42 +02:00
Matthias Leich
c6d81f8467 1. Fix for Bug#41111 events_bugs fails sporadically on pushbuild
2. Avoid bad effects of bug 41925 Warning 1366 Incorrect string value:
                                  ...  for column processlist.info
3. Add poll routines which ensure that subtests meet stable scenarios.
   This does not change the sense of the subtests.
2009-01-09 15:10:03 +01:00
Tatiana A. Nurnberg
1d15df432e auto-merge 2009-01-09 14:22:15 +01:00
Mattias Jonsson
2314183806 merge 2009-01-09 14:21:29 +01:00
Mattias Jonsson
b43b8c2479 Bug#40972: Partition pruning can lead to crash for bad dates
post push fix, added test found a valgrind warning
2009-01-09 14:18:08 +01:00
Sven Sandberg
a24862ed46 BUG#41924: high-level replication functions are not commented
Adding comments to some of the high-level functions in replication.
2009-01-09 13:49:24 +01:00
Georgi Kodinov
53ba196e11 Bug #41543: Assertion `m_status == DA_ERROR' failed in Diagnostics_area::sql_errno
No need to mask the error code returned by getting the next row to end of file when
doing filesort.
2009-01-09 14:04:47 +02:00
Georgi Kodinov
7c3ae51647 Bug #41437: Value stored in 'case' lacks charset, causes segfault
When substituting system constant functions with a constant result
the server was not expecting that the function may return NULL.
Fixed by checking for NULL and returning Item_null (in the relevant
collation) if the result of the system constant function was NULL.
2009-01-09 13:50:18 +02:00
Sven Sandberg
b727dab9fd Merged fix of BUG#41961 in 5.1-bugteam with recent changes in 5.1-bugteam 2009-01-09 11:37:08 +01:00
Sven Sandberg
7fc48e2227 merge fix of BUG#41961 in 5.1-bugteam with recent changes in 5.1-bugteam 2009-01-09 11:35:26 +01:00