Commit graph

56981 commits

Author SHA1 Message Date
Joerg Bruehe
f318c6849b Merge the 5.1.31sp1 release back into the mainline.
True to our way of doing QSP versions, this doesn't include any new changes
but just backports of some important bug fixes that were also contained
in version 5.1.32.
2009-04-11 11:46:14 +02:00
Timothy Smith
78fa1a6626 auto-merge 2009-04-02 02:37:20 -06:00
Alexander Nozdrin
641d706b0e Patch for Bug#38741: main.innodb_mysql crashes randomly (2).
It was a test case problem: one 'reap' statement was forgotten.
2009-04-02 12:21:51 +04:00
Timothy Smith
a43bab0a8b merge -5.0 into -5.1 (minor conflicts resolved) 2009-04-01 23:19:04 -06:00
Timothy Smith
f675006950 auto-merge -build into -bugteam 2009-04-01 22:02:46 -06:00
Timothy Smith
b70852c2f2 auto-merge -build into -bugteam 2009-04-01 22:02:04 -06:00
Ignacio Galarza
de4e921643 Bug#29248 - MyISAMchk & MyISAMpack failing with * wildcard on Windows platform
- Link against setargv.obj for wild-card expansion.
2009-04-01 12:06:29 -04:00
Ignacio Galarza
f6b6bced56 Bug#29248 - MyISAMchk & MyISAMpack failing with * wildcard on Windows platform
- Link against setargv.obj for wild-card expansion.
2009-04-01 12:03:45 -04:00
Bernt M. Johnsen
d40ee2190c Bug 43355 merged from 5.1 gca 2009-04-01 14:45:04 +02:00
Bernt M. Johnsen
31984d5ac6 bookkeeping 2009-04-01 14:42:43 +02:00
Bernt M. Johnsen
a2d56e0d72 bookkeeping 2009-04-01 14:41:46 +02:00
Bernt M. Johnsen
e1f4b5c1c3 Bug 43355 merged from 5.1 gca 2009-04-01 14:39:36 +02:00
Daniel Fischer
c0da0b0b4c merge 2009-04-01 14:19:42 +02:00
Gleb Shchepa
9ef91d7546 null-merge 5.0-bugteam --> 5.1-bugteam (backport of bug 37348 fix to 5.0) 2009-04-01 16:10:03 +05:00
Gleb Shchepa
323609688b Backport bug #37348 fix 5.1 --> 5.0.
Original commentary:

Bug #37348: Crash in or immediately after JOIN::make_sum_func_list
            
The optimizer pulls up aggregate functions which should be aggregated in
an outer select. At some point it may substitute such a function for a field
in the temporary table. The setup_copy_fields function doesn't take this
into account and may overrun the copy_field buffer.
            
Fixed by filtering out the fields referenced through the specialized
reference for aggregates (Item_aggregate_ref).
Added an assertion to make sure bugs that cause similar discrepancy 
don't go undetected.
2009-04-01 16:02:26 +05:00
Georgi Kodinov
2b183bb11e auto merge 2009-04-01 13:03:53 +03:00
Georgi Kodinov
d145d40fbf auto merge 2009-04-01 13:00:21 +03:00
Georgi Kodinov
dccbde7a11 merged 5.1-main -> 5.1-bugteam 2009-04-01 12:57:34 +03:00
Georgi Kodinov
4e19677aa7 merged 5.0-main -> 5.0-bugteam 2009-04-01 12:50:27 +03:00
Bernt M. Johnsen
8046c576a2 Bug 43355 Prepared for commit on 5.1 gca 2009-04-01 10:58:55 +02:00
Sergey Glukhov
c08ceffded Bug#43183 ExctractValue() brings result list in missorder
The problem is that XML functions(items) do not reset null_value
before their execution and further item excution may use
null_value value of the previous result.
The fix is to reset null_value.
2009-04-01 13:40:33 +05:00
Ramil Kalimullin
a26f8d91aa Fix for bug#42944: partition not pruned correctly
Problem: we don't prune a LESS THAN partition if MAXVALUE is given and
given value is equal to a LESS THAN value.

Fix: prune partitions in such cases.
2009-04-01 10:34:59 +05:00
Ignacio Galarza
f64596ab77 Bug#29248 MyISAMchk & MyISAMpack failing with * wildcard on Windows platform 2009-03-31 18:17:42 -04:00
Ignacio Galarza
50fe4a3747 Bug#29248 - MyISAMchk & MyISAMpack failing with * wildcard on Windows platform
- Link against setargv.obj for wild-card expansion.
2009-03-31 17:48:45 -04:00
Daniel Fischer
b075f36280 Bug#34521, removed a bunch of deprecated options from template my.cnf files.
Merged from 5.0 version of this patch:
- Removed entire isamchk section. Support for ISAM tables was removed in 5.0.
- Replaced key_buffer with key_buffer_size (correct spelling).
- Removed skip-bdb, as BDB is no longer included in 5.0 and above.
- Removed commented-out bdb_cache_size and bdb_max_lock for the same reason.
- Removed commented-out innodb_log_arch_dir, deprecated in 5.0.24.
- Removed myisam_max_extra_sort_file_size, deprecated in 5.0.6. 
- Removed log_long_format, deprecated in 4.1.
- Replaced default_table_type with default-storage-engine.
New in 5.1:
- Replaced table_cache with table_open_cache.
- Removed skip-federated, should have been in 5.0 only.
- Replaced log_slow_queries with slow_query_log, deprecated in 5.1.29.
2009-03-31 16:04:01 +02:00
Staale Smedseng
cf208ac55a Bug #39852 bug in mysql_setpermission
mysql_setpermission is modified to honor the $db 
variable as suggested when doing a REVOKE ALL for 
menu option 7.
2009-03-31 12:59:22 +02:00
Daniel Fischer
94a7e115db Bug#34521, removed a bunch of deprecated options from template my.cnf files:
- Removed entire isamchk section. Support for ISAM tables was removed in 5.0.
- Replaced key_buffer with key_buffer_size (correct spelling).
- Removed skip-bdb, as BDB is no longer included in 5.0 and above.
- Removed commented-out bdb_cache_size and bdb_max_lock for the same reason.
- Removed commented-out innodb_log_arch_dir, deprecated in 5.0.24.
- Removed myisam_max_extra_sort_file_size, deprecated in 5.0.6. 
- Removed log_long_format, deprecated in 4.1.
- Replaced default_table_type with default-storage-engine.
2009-03-31 11:54:48 +02:00
Bernt M. Johnsen
a8b1394c80 Bug 43355 Prepared for commit on 5.0 gca 2009-03-31 10:38:33 +02:00
Matthias Leich
839279d0e6 AUtomatic merge, no conflicts, no modifications of files 2009-03-30 16:21:30 +02:00
Matthias Leich
bb604da6dd merge of fix for bug 43383 into actual tree 2009-03-30 16:12:27 +02:00
Joerg Bruehe
a62103aa94 Merge a polishing of an old bug fix,
more for completeness than for relevance.

Also, update copyright notices.
2009-03-30 16:09:37 +02:00
Joerg Bruehe
5142e83303 Merge the main tree into 5.0-build 2009-03-30 15:42:04 +02:00
Matthias Leich
594c617f5d Merge of fix for bug 43383 into actual tree 2009-03-30 15:36:10 +02:00
Jonathan Perkin
22f240348d Raise version number after cloning 5.1.34 2009-03-30 13:27:23 +02:00
Matthias Leich
350a77563a Merge 5.0 -> 5.1 of fix for bug 43383
+ disable the funcs_1.charset_collation_* tests which are broken because
  of bug 38346, 40209, 40545, 40618
2009-03-30 12:03:25 +02:00
Kristofer Pettersson
598b11a31f Automerge 2009-03-30 10:44:17 +02:00
Kristofer Pettersson
137f1e1ed6 Bug#40127 Multiple table DELETE IGNORE hangs on foreign key constraint violation
on 5.0            
The server crashes on an assert in net_end_statement indicating that the
Diagnostics area wasn't set properly during execution.
This happened on a multi table DELETE operation using the IGNORE keyword.
The keyword is suppose to allow for execution to continue on a best effort
despite some non-fatal errors. Instead execution stopped and no client
response was sent which would have led to a protocol error if it hadn't been
for the assert.
This patch corrects this issue by checking for the existence of an IGNORE
option before setting an error state during row-by-row delete iteration.
2009-03-27 17:08:14 +01:00
Georgi Kodinov
c5306b2154 merged tree name change 2009-03-27 16:34:48 +02:00
Georgi Kodinov
14d905f9f4 tree name changed 2009-03-27 16:29:56 +02:00
Georgi Kodinov
5f61b2d551 null-merged 5.0 specific compilation warning 2009-03-27 16:27:35 +02:00
Georgi Kodinov
5bc77b8b61 fixed a compilation warning 2009-03-27 16:25:16 +02:00
Staale Smedseng
d186014c04 Merge from 5.0-bugteam 2009-03-27 14:11:52 +01:00
Staale Smedseng
4575326317 Merge from 5.1-bugteam 2009-03-27 14:10:28 +01:00
Alexey Kopytov
7b0069087f Automerge. 2009-03-27 16:00:20 +03:00
Alexey Kopytov
3952372adb Automerge. 2009-03-27 15:59:09 +03:00
Alexey Kopytov
a37e43118d Automerge. 2009-03-27 15:58:34 +03:00
Staale Smedseng
70fdfcb6a2 Merge from 5.0-bugteam 2009-03-27 13:55:14 +01:00
Georgi Kodinov
124d5e730c auto-merge 2009-03-27 14:15:50 +02:00
Georgi Kodinov
1b74eac6cb disabled a failing test suite due to bug #42311 2009-03-27 14:12:33 +02:00
Tatiana A. Nurnberg
5d0564ea48 auto-merge 2009-03-27 12:40:53 +01:00