1
1
------------------------------------------------------------
3
tags: clone-5.1.54-build
4
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
5
branch nick: merge-5.1-security
6
timestamp: Thu 2010-11-25 18:38:01 +0200
8
merge 5.1 to 5.1-security
9
------------------------------------------------------------
10
revno: 3461.1.14 [merge]
11
author: karen.langford@oracle.com
12
committer: MySQL Build Team<build@mysql.com>
13
branch nick: mysql-5.1
14
timestamp: Thu 2010-11-18 16:35:31 +0100
16
Merge from mysql-5.1.53-release
17
------------------------------------------------------------
19
committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
20
branch nick: mysql-5.1-security
21
timestamp: Wed 2010-11-24 16:14:43 +0300
23
Merge from mysql-5.0-security.
24
------------------------------------------------------------
26
committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
27
branch nick: mysql-5.0-security
28
timestamp: Wed 2010-11-24 16:12:23 +0300
30
A follow-up for Bug#58339 (Replace Server GPL README file).
31
Fix formatting issues in README file.
32
------------------------------------------------------------
34
committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
35
branch nick: mysql-5.1-security
36
timestamp: Wed 2010-11-24 13:50:32 +0300
38
Empty merge from mysql-5.0-security.
39
------------------------------------------------------------
40
revno: 1810.3996.7 [merge]
41
committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
42
branch nick: mysql-5.0-security
43
timestamp: Wed 2010-11-24 13:40:32 +0300
45
Merge from mysql-5.0-bugteam.
46
------------------------------------------------------------
47
revno: 1810.3996.6 [merge]
48
committer: Ramil Kalimullin <ramil@mysql.com>
49
branch nick: mysql-5.0-security
50
timestamp: Tue 2010-11-23 15:26:07 +0300
52
Auto-merge with mysql-5.0-bugteam.
53
------------------------------------------------------------
55
committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
56
branch nick: mysql-5.1-security
57
timestamp: Wed 2010-11-24 13:43:31 +0300
59
Merge from mysql-5.1-bugteam.
60
------------------------------------------------------------
61
revno: 3452.20.21 [merge]
62
committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
63
branch nick: mysql-5.1-bugteam
64
timestamp: Wed 2010-11-24 13:07:37 +0300
66
Merge from mysql-5.0-bugteam.
67
------------------------------------------------------------
69
committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
70
branch nick: mysql-5.0-bugteam
71
timestamp: Wed 2010-11-24 12:53:39 +0300
73
A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all
74
EXCEPTIONS-CLIENT from all the places.
75
------------------------------------------------------------
77
committer: Ramil Kalimullin <ramil@mysql.com>
78
branch nick: mysql-5.1-security
79
timestamp: Tue 2010-11-23 16:35:40 +0300
81
binlog.binlog_row_failure_mixing_engines test disabled.
83
------------------------------------------------------------
85
committer: Ramil Kalimullin <ramil@mysql.com>
86
branch nick: mysql-5.1-security
87
timestamp: Tue 2010-11-23 16:08:10 +0300
89
Auto-merge with mysql-5.1-bugteam.
90
------------------------------------------------------------
92
committer: Sergey Glukhov <sergey.glukhov@oracle.com>
93
branch nick: mysql-5.1-bugteam
94
timestamp: Tue 2010-11-23 13:18:47 +0300
96
Bug#56862 Execution of a query that uses index merge returns a wrong result
97
In case of low memory sort buffer QUICK_INDEX_MERGE_SELECT creates
98
temporary file where is stores row ids which meet QUICK_SELECT ranges
99
except of clustered pk range, clustered range is processed separately.
100
In init_read_record we check if temporary file is used and choose
101
appropriate record access method. It does not take into account that
102
temporary file contains partial result in case of QUICK_INDEX_MERGE_SELECT
103
with clustered pk range.
104
The fix is always to use rr_quick if QUICK_INDEX_MERGE_SELECT
105
with clustered pk range is used.
106
------------------------------------------------------------
107
revno: 3452.20.19 [merge]
108
committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
109
branch nick: mysql-5.1-bugteam
110
timestamp: Mon 2010-11-22 16:32:59 +0300
112
Merge from mysql-5.0-bugteam.
113
------------------------------------------------------------
115
committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
116
branch nick: mysql-5.0-bugteam
117
timestamp: Mon 2010-11-22 16:27:49 +0300
119
Patch for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file).
120
------------------------------------------------------------
122
committer: Alexander Nozdrin <alexander.nozdrin@oracle.com>
123
branch nick: mysql-5.0-bugteam
124
timestamp: Mon 2010-11-22 16:25:50 +0300
126
Patch for Bug#58339 (Replace Server GPL README file).
127
------------------------------------------------------------
129
committer: Guilhem Bichot <guilhem@mysql.com>
130
branch nick: mysql-5.1-bugteam
131
timestamp: Mon 2010-11-22 09:57:59 +0100
133
Fix for Bug#56138 "valgrind errors about overlapping memory when double-assigning same variable",
134
and related small fixes.
135
------------------------------------------------------------
137
committer: Gleb Shchepa <gleb.shchepa@oracle.com>
138
branch nick: mysql-5.1-security
139
timestamp: Tue 2010-11-23 00:34:22 +0300
141
empty upmerge after backport of bug 55568
142
5.0-security --> 5.1-security
143
------------------------------------------------------------
145
committer: Gleb Shchepa <gleb.shchepa@oracle.com>
146
branch nick: mysql-5.0-security
147
timestamp: Tue 2010-11-23 00:29:47 +0300
149
backport: Bug #55568 from 5.1-security to 5.0-security
151
> revision-id: alexey.kopytov@sun.com-20100824103548-ikm79qlfrvggyj9h
152
> parent: sunny.bains@oracle.com-20100816001222-xqc447tr6jwh8c53
153
> committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
154
> branch nick: 5.1-security
155
> timestamp: Tue 2010-08-24 14:35:48 +0400
157
> Bug #55568: user variable assignments crash server when used
160
> The server could crash after materializing a derived table
161
> which requires a temporary table for grouping.
163
> When destroying the temporary table used to execute a query for
164
> a derived table, JOIN::destroy() did not clean up Item_fields
165
> pointing to fields in the temporary table. This led to
166
> dereferencing a dangling pointer when printing out the items
167
> tree later in the outer SELECT.
169
> The solution is an addendum to the patch for bug37362: in
170
> addition to cleaning up items in tmp_all_fields3, do the same
171
> for items in tmp_all_fields1, since now we have an example
172
> where this is necessary.
173
------------------------------------------------------------
175
committer: Ramil Kalimullin <ramil@mysql.com>
176
branch nick: mysql-5.1-security
177
timestamp: Mon 2010-11-22 12:21:10 +0300
179
Manual-merge from mysql-5.1-bugteam.
180
------------------------------------------------------------
182
committer: Davi Arnaut <davi.arnaut@oracle.com>
183
branch nick: mysql-5.1-bugteam
184
timestamp: Sat 2010-11-20 12:29:51 -0200
186
Bug#57994: Compiler flag change build error : my_redel.c
188
Although ICC identifies itself as GCC, even in version numbers,
189
it does not support the stpcpy built-in.
190
------------------------------------------------------------
192
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
193
branch nick: B50021-5.1-bugteam
194
timestamp: Thu 2010-11-18 18:02:37 +0200
196
Bug #50021: Windows standard configuration files are showing Linux
199
1. Changed the default value for socket on Windows to the windows
201
2. Removed hard-coded trailing slashes from innodb_data_home_dir
202
and innodb_log_group_name_dir.
203
3. Added extra backslashes to the innodb directory example
204
4. Made the tempdir platform "dependent"
205
5. Fixed the comments in the .ini files
206
6. Removed the tmpdir from the templates and the scripts
207
------------------------------------------------------------
208
revno: 3452.20.15 [merge]
209
committer: Bjorn Munch <bjorn.munch@oracle.com>
210
branch nick: merge-51
211
timestamp: Fri 2010-11-19 10:29:08 +0100
214
------------------------------------------------------------
216
committer: Bjorn Munch <bjorn.munch@oracle.com>
217
branch nick: notspc-51
218
timestamp: Wed 2010-11-17 16:05:52 +0100
220
Bug #58257 mysqltest: in if(), ! $var with space is always false
221
Evaluation would start with the space and thus ignore the $
222
Added while() to skip past white space
223
------------------------------------------------------------
225
committer: Bjorn Munch <bjorn.munch@oracle.com>
226
branch nick: rekeval-51
227
timestamp: Mon 2010-11-15 14:23:02 +0100
229
Bug #58087 mysqltest re-evaluates 'let' expressions infinitely
230
Results from query is sent for evaluation
231
Break recursion by asking for ` to be ignored
232
------------------------------------------------------------
233
revno: 2728.17.178 [merge]
234
committer: Bjorn Munch <bjorn.munch@oracle.com>
236
timestamp: Sun 2010-11-14 12:23:51 +0100
238
merge from 5.1 up to rev 3471
239
------------------------------------------------------------
240
revno: 3452.20.14 [merge]
241
committer: Vasil Dimov <vasil.dimov@oracle.com>
242
branch nick: mysql-5.1-bugteam
243
timestamp: Thu 2010-11-18 16:04:53 +0200
245
Merge mysql-5.1-bugteam from bk-internal into my local repo
246
------------------------------------------------------------
248
committer: Alexander Barkov <bar@mysql.com>
249
branch nick: mysql-5.1-bugteam.b57279
250
timestamp: Thu 2010-11-18 16:11:18 +0300
252
Bug#57279 updatexml dies with: Assertion failed: str_arg[length] == 0
254
Problem: crash in Item_float constructor on DBUG_ASSERT due
255
to not null-terminated string parameter.
257
Fix: making Item_float::Item_float non-null-termintated parameter safe:
258
- Using temporary buffer when generating error
261
@ mysql-test/r/xml.result
262
@ mysql-test/t/xml.test
264
------------------------------------------------------------
265
revno: 3452.20.13 [merge]
266
committer: Vasil Dimov <vasil.dimov@oracle.com>
267
branch nick: mysql-5.1-bugteam
268
timestamp: Thu 2010-11-18 15:45:36 +0200
270
Merge mysql-5.1-innodb -> mysql-5.1-bugteam
271
------------------------------------------------------------
273
committer: Marko M?kel? <marko.makela@oracle.com>
274
branch nick: 5.1-innodb
275
timestamp: Thu 2010-11-11 15:12:39 +0200
277
Fix a debug assertion failure in the Bug#57802 fix.
279
thr_local_create(): Initialize local->slot_no to ULINT_UNDEFINED.
280
thr_local_validate(): Allow local->slot_no to be ULINT_UNDEFINED.
281
------------------------------------------------------------
283
committer: Vasil Dimov <vasil.dimov@oracle.com>
284
branch nick: mysql-5.1-innodb
285
timestamp: Thu 2010-11-11 13:11:52 +0200
287
Remove unused parameter has_dict_mutex of dict_update_statistics_low()
289
Also delete dict_update_statistics() and rename dict_update_statistics_low()
290
to dict_update_statistics() because the only thing that distinguished those
291
two functions was the removed parameter.
292
------------------------------------------------------------
294
committer: Marko M?kel? <marko.makela@oracle.com>
295
branch nick: 5.1-innodb
296
timestamp: Thu 2010-11-11 11:55:35 +0200
298
Bug#57802 Empty ASSERTION parameter passed to the HASH_SEARCH macro
300
thr_local_validate(), i_s_locks_row_validate(): New validate
301
functions, used in UNIV_DEBUG code for checking the state of internal
303
------------------------------------------------------------
305
committer: Marko M?kel? <marko.makela@oracle.com>
306
branch nick: 5.1-innodb
307
timestamp: Thu 2010-11-11 11:39:09 +0200
309
Declarations and code do not mix in C90, not even within UNIV_DEBUG.
310
------------------------------------------------------------
312
committer: Jimmy Yang <jimmy.yang@oracle.com>
313
branch nick: mysql-5.1-innodb
314
timestamp: Wed 2010-11-10 21:32:12 -0800
316
Fix Bug #48026 Log start and end of InnoDB buffer pool initialization
319
rb://513 approved by Sunny Bains
320
------------------------------------------------------------
322
committer: Jimmy Yang <jimmy.yang@oracle.com>
323
branch nick: mysql-5.1-innodb
324
timestamp: Wed 2010-11-10 21:27:10 -0800
326
Port fix for Bug #48026 to 5.1 built-in and plugin: Log start and end
327
of InnoDB buffer pool initialization to the error log
328
------------------------------------------------------------
329
revno: 3351.14.289 [merge]
330
committer: Vasil Dimov <vasil.dimov@oracle.com>
331
branch nick: mysql-5.1-innodb
332
timestamp: Wed 2010-11-10 10:40:22 +0200
334
Merge mysql-5.1-innodb from bk-internal into my local repo
335
------------------------------------------------------------
336
revno: 3351.61.8 [merge]
337
committer: Vasil Dimov <vasil.dimov@oracle.com>
338
branch nick: mysql-5.1-innodb
339
timestamp: Mon 2010-11-08 16:46:26 +0200
341
Merge mysql-5.1-bugteam -> mysql-5.1-innodb
342
------------------------------------------------------------
344
committer: Marko M?kel? <marko.makela@oracle.com>
345
branch nick: 5.1-innodb
346
timestamp: Thu 2010-11-04 15:12:15 +0200
348
row_ins_index_entry(): Note that only CREATE INDEX sets foreign=FALSE.
349
------------------------------------------------------------
351
committer: Sunny Bains <Sunny.Bains@Oracle.Com>
353
timestamp: Thu 2010-11-04 09:41:36 +1100
355
Add change log entry for bug#54538 fix.
356
------------------------------------------------------------
358
committer: Marko M?kel? <marko.makela@oracle.com>
359
branch nick: 5.1-innodb
360
timestamp: Wed 2010-11-03 14:38:36 +0200
362
rw_lock_debug_print(): Output the thread ID in unsigned format.
363
------------------------------------------------------------
365
committer: Marko M?kel? <marko.makela@oracle.com>
366
branch nick: 5.1-innodb
367
timestamp: Wed 2010-11-03 11:19:12 +0200
369
Bug#57947 InnoDB diagnostics shows btr_block_get calls instead of real callers
371
Improve the diagnostics of buffer pool accesses for B-trees,
372
so that the file names and line numbers of the real calls are shown
373
instead of the line of the buf_page_get() call in btr_block_get().
375
btr_page_get(): Replaced with a macro.
377
btr_block_get_func(): Renamed from btr_block_get(). Add file, line.
379
btr_block_get(): A macro that passes the __FILE__, __LINE__ to
380
btr_block_get_func().
382
dict_truncate_index_tree(): Replace a btr_page_get() call
383
with btr_block_get(), since we are only latching the page, not accessing it.
384
------------------------------------------------------------
386
committer: Marko M?kel? <marko.makela@oracle.com>
387
branch nick: 5.1-innodb
388
timestamp: Wed 2010-11-03 11:16:11 +0200
390
Non-functional change: Remove bogus const qualifiers
391
and make some function comments more accurate.
392
------------------------------------------------------------
394
committer: Sunny Bains <Sunny.Bains@Oracle.Com>
396
timestamp: Wed 2010-11-03 12:40:53 +1100
398
Fix Bug #54538 - use of exclusive innodb dictionary lock limits performance.
400
This patch doesn't get rid of the need to acquire the dict_sys->mutex but
401
reduces the need to keep the mutex locked for the duration of the query
402
to fsp_get_available_space_in_free_extents() from ha_innobase::info().
404
This is a port of revno:3548 from the builtin to the plugin.
406
rb://501 Approved by Jimmy Yang and Marko Makela.
407
------------------------------------------------------------
409
committer: kevin.lewis@oracle.com
410
branch nick: mysql-5.1-innodb
411
timestamp: Tue 2010-11-02 17:28:34 -0500
413
In this patch, existing tests innodb_bug54679.test and innodb_bug56632.test are
414
removed and replaced by the comprehensive innodb-create-options.test.
415
It uses the rules listed in the comments at the top of that test.
417
This patch introduces these differences from previous behavior;
418
1) KEY_BLOCK_SIZE=0 is allowed by Innodb in both strict and non-strict mode
419
with no errors or warnings. It was previously used by the server to set
420
KEY_BLOCK_SIZE to undefined. (Bug#56628)
421
2) An explicit valid non-DEFAULT ROW_FORMAT always takes priority over a
422
valid KEY_BLOCK_SIZE. (bug#56632)
423
3) Automatic use of COMPRESSED row format is only done if the ROW_FORMAT
424
is DEFAULT or unspecified.
425
4) ROW_FORMAT=FIXED is prevented in strict mode.
427
This patch also includes various formatting changes for consistency with
428
InnoDB coding standards.
431
Bug#54679: ALTER TABLE causes compressed row_format to revert to compact
432
Bug#56628: ALTER TABLE .. KEY_BLOCK_SIZE=0 produces untrue warning or unnecessary error
433
Bug#56632: ALTER TABLE implicitly changes ROW_FORMAT to COMPRESSED
434
------------------------------------------------------------
436
committer: Vasil Dimov <vasil.dimov@oracle.com>
437
branch nick: mysql-5.1-innodb
438
timestamp: Wed 2010-11-03 11:30:08 +0200
440
Add ChangeLog entry for Bug#53046
441
------------------------------------------------------------
443
committer: Vasil Dimov <vasil.dimov@oracle.com>
444
branch nick: mysql-5.1-innodb
445
timestamp: Tue 2010-11-02 18:57:20 +0200
447
Fix Bug#53046 dict_update_statistics_low can still be run concurrently on same table
449
Replace the array of mutexes that used to protect
450
dict_index_t::stat_n_diff_key_vals[] with an array of rw locks that protects
451
all the stats related members in dict_table_t and all of its indexes.
453
Approved by: Jimmy (rb://503)
454
------------------------------------------------------------
456
committer: Vasil Dimov <vasil.dimov@oracle.com>
457
branch nick: mysql-5.1-innodb
458
timestamp: Tue 2010-11-02 10:00:04 +0200
460
Increment InnoDB Plugin version to 1.0.14.
461
InnoDB Plugin 1.0.13 has been released with MySQL 5.1.52.
462
------------------------------------------------------------
464
committer: Marko M?kel? <marko.makela@oracle.com>
465
branch nick: 5.1-innodb
466
timestamp: Tue 2010-11-02 09:28:48 +0200
468
Bug#57799 READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSED
471
This is follow-up to Bug #54358. Not all occurrences of the bug were fixed.
472
We need to check all calls to btr_copy_externally_stored_field_prefix_low()
473
and do the right thing when the pointer to the off-page column is null
474
(full of zero bytes).
476
It turns out that only the call to btr_copy_externally_stored_field_prefix()
477
in row_sel_sec_rec_is_for_blob() needs to be changed.
479
For fetching complete off-page columns rather than prefixes, the function
480
btr_rec_copy_externally_stored_field() already checks if the pointer
481
is null (all-zero). Two of its callers (row_merge_copy_blobs() and
482
row_sel_fetch_columns()) are never executed as READ COMMITTED and can
483
rightfully assert that the fetch succeeded. The third caller,
484
row_sel_store_mysql_rec(), already does the right thing.
486
The calls in row_upd_ext_fetch() and trx_undo_page_fetch_ext() must
487
expect that the off-page column exists. Update and rollback are
488
locking operations, never READ UNCOMMITTED.
489
------------------------------------------------------------
491
committer: Marko M?kel? <marko.makela@oracle.com>
492
branch nick: 5.1-innodb
493
timestamp: Tue 2010-11-02 09:28:05 +0200
495
White-space corrections in the InnoDB Plugin ChangeLog
496
------------------------------------------------------------
498
committer: Ramil Kalimullin <ramil@mysql.com>
499
branch nick: mysql-5.1-security
500
timestamp: Thu 2010-11-18 13:40:57 +0300
502
Auto-merge from mysql-5.1-bugteam.
503
------------------------------------------------------------
505
committer: Davi Arnaut <davi.arnaut@oracle.com>
506
branch nick: mysql-5.1-bugteam
507
timestamp: Wed 2010-11-17 07:41:29 -0200
509
Bug#57994: Compiler flag change build error : my_redel.c
511
Use __builtin_stpcpy only if the system supports stpcpy.
512
This is necessary as in some cases a call to stpcpy will
513
be emitted if the built-in can not optimized.
514
------------------------------------------------------------
516
committer: Davi Arnaut <davi.arnaut@oracle.com>
517
branch nick: 57995-5.1
518
timestamp: Wed 2010-11-10 19:14:47 -0200
520
Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure
521
Bug#57995: Compiler flag change build error on OSX 10.4: my_getncpus.c
522
Bug#57996: Compiler flag change build error on OSX 10.5 : bind.c
523
Bug#57994: Compiler flag change build error : my_redel.c
524
Bug#57993: Compiler flag change build error on FreeBsd 7.0 : regexec.c
525
Bug#57992: Compiler flag change build error on FreeBsd : mf_keycache.c
526
Bug#57997: Compiler flag change build error on OSX 10.6: debug_sync.cc
528
Fix assorted compiler generated warnings.
529
------------------------------------------------------------
530
revno: 3452.20.10 [merge]
531
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
532
branch nick: topush-51-bugteam
533
timestamp: Mon 2010-11-15 23:57:14 +0100
536
------------------------------------------------------------
538
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
539
branch nick: b58197-51-bt
540
timestamp: Mon 2010-11-15 16:17:38 +0100
542
Bug#58197: main.variables-big fails on windows
544
The test result differs on windows, since
545
it writes out 'localhost:<port>' instead of
546
only 'localhost', since it uses tcp/ip instead
547
of unix sockets on windows.
549
Fixed by replacing that column.
551
Also requires --big-test from some long running tests
552
and added a weekly run of all test requiring --big-test.
553
------------------------------------------------------------
554
revno: 3452.20.9 [merge]
555
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
556
branch nick: topush-51-bugteam
557
timestamp: Mon 2010-11-15 17:13:53 +0100
560
------------------------------------------------------------
562
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
563
branch nick: b57890-51-bt
564
timestamp: Thu 2010-11-11 11:34:55 +0100
566
Bug#57890: Assertion failed: next_insert_id == 0
567
with on duplicate key update
569
There was a missed corner case in the partitioning
570
handler, which caused the next_insert_id to be changed
571
in the second level handlers (i.e the hander of a partition),
572
which caused this debug assertion.
574
The solution was to always ensure that only the partitioning
575
level generates auto_increment values, since if it was done
576
within a partition, it may fail to match the partition
578
------------------------------------------------------------
580
committer: Sergey Vojtovich <svoj@oracle.com>
581
branch nick: mysql-5.1-bugteam-bug58079
582
timestamp: Thu 2010-11-11 13:03:17 +0300
584
BUG#58079 - Remove the IBM DB2 storage engine
585
------------------------------------------------------------
587
committer: Dmitry Shulga <Dmitry.Shulga@oracle.com>
588
branch nick: 5.1-bugteam-bug54375
589
timestamp: Thu 2010-11-11 10:52:51 +0600
591
Fixed bug#54375 - Error in stored procedure leaves connection
592
in different default schema.
594
In strict mode, when data truncation or conversion happens,
595
THD::killed is set to THD::KILL_BAD_DATA.
597
This is abuse of KILL mechanism to guarantee that execution
598
of statement is aborted.
600
The stored procedures execution, on the other hand,
601
upon detection that a connection was killed, would
602
terminate immediately, without trying to restore the caller's
603
context, in particular, restore the caller's current schema.
605
The fix is, when terminating a stored procedure execution,
606
to only bypass cleanup if the entire connection was killed,
607
not in case of other forms of KILL.
608
------------------------------------------------------------
610
committer: Dmitry Shulga <Dmitry.Shulga@oracle.com>
611
branch nick: 5.1-bugteam-bug56619
612
timestamp: Wed 2010-11-10 14:32:42 +0600
614
Fixed bug#56619 - Assertion failed during
615
ALTER TABLE RENAME, DISABLE KEYS.
617
The code of ALTER TABLE RENAME, DISABLE KEYS could
618
issue a commit while holding LOCK_open mutex.
619
This is a regression introduced by the fix for
621
This failed an assert guarding us against a potential
622
deadlock with connections trying to execute
623
FLUSH TABLES WITH READ LOCK.
625
The fix is to move acquisition of LOCK_open outside
626
the section that issues ha_autocommit_or_rollback().
627
LOCK_open is taken to protect against concurrent
628
operations with .frms and the table definition
629
cache, and doesn't need to cover the call to commit.
631
A test case added to innodb_mysql.test.
633
The patch is to be null-merged to 5.5, which
634
already has 54453 null-merged to it.
635
------------------------------------------------------------
637
committer: Dmitry Shulga <Dmitry.Shulga@oracle.com>
638
branch nick: 5.1-bugteam-bug57386
639
timestamp: Wed 2010-11-10 11:49:37 +0600
641
Fixed Bug#57386 - main.execution_constants segfault on MIPS64EL.
642
------------------------------------------------------------
644
committer: Davi Arnaut <davi.arnaut@oracle.com>
645
branch nick: 57210-5.1
646
timestamp: Tue 2010-11-09 12:45:13 -0200
648
Bug#57210: remove pstack
650
Quoting from the bug report:
652
The pstack library has been included in MySQL since version
653
4.0.0. It's useless and should be removed.
655
Details: According to its own documentation, pstack only works
656
on Linux on x86 in 32 bit mode and requires LinuxThreads and a
657
statically linked binary. It doesn't really support any Linux
658
from 2003 or later and doesn't work on any other OS.
660
The --enable-pstack option is thus deprecated and has no effect.
661
------------------------------------------------------------
662
revno: 3452.20.3 [merge]
663
committer: Bjorn Munch <bjorn.munch@oracle.com>
664
branch nick: merge-51
665
timestamp: Tue 2010-11-09 11:20:50 +0100
668
------------------------------------------------------------
670
committer: Bjorn Munch <bjorn.munch@oracle.com>
671
branch nick: ordpar-51
672
timestamp: Fri 2010-11-05 15:26:38 +0100
674
Bug #57840 MTR: parallel execution breaks with smart ordering of test cases
675
There were actually more problems in this area:
676
Slaves (if any) were unconditionally restarted, this appears unnecessary.
677
Sort criteria were suboptimal, included the test name.
678
Added logic to "reserve" a sequence of tests with same config for one thread
679
Got rid of sort_criteria hash, put it into the test case itself
680
Adds little sanity check that expected worker picks up test
681
Fixed some tests that may fail if starting on running server
682
Some of these fail only if *same* test is repeated.
683
Finally, special sorting of tests that do --force-restart
684
------------------------------------------------------------
685
revno: 3452.20.2 [merge]
686
committer: Horst.Hunger <horst.hunger@sun.com>
687
branch nick: 5.1-52501
688
timestamp: Mon 2010-11-08 16:35:46 +0100
691
------------------------------------------------------------
693
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
694
branch nick: mysql-5.1-bugteam-gcov
695
timestamp: Mon 2010-11-08 12:51:48 +0100
697
Bug #45288 pb2 returns a lot of compilation warnings
699
GCOV builds were broken after the patch for Bug#57933
700
which added add -Wdeclaration-after-statement to gcc builds.
703
stacktrace.c:328: warning: ISO C90 forbids mixed
704
declarations and code
707
------------------------------------------------------------
709
committer: Anitha Gopi <anitha.gopi@sun.com>
710
branch nick: mysql-5.1-bugteam
711
timestamp: Mon 2010-11-08 14:57:05 +0530
713
Bug#58041 : Moved rpl_binlog_row to daily. Run just main suite for ps_row and embedded per push. Other suites run daily
714
------------------------------------------------------------
716
committer: Dmitry Shulga <Dmitry.Shulga@oracle.com>
717
branch nick: 5.1-bugteam-bug47924
718
timestamp: Sun 2010-11-07 23:42:54 +0600
720
A fix and a test case for Bug#47924 -main.log_tables times out
723
The cause of the sporadic time out was a leaking protection
724
against the global read lock, taken by the RENAME statement,
725
and not released in case of an error occurred during RENAME.
726
The leaking protection counter would lead to the value of
727
protect_against_global_read never dropping to 0.
728
Consequently FLUSH TABLES in all connections, including the
729
one that leaked the protection, could not proceed.
731
The fix is to ensure that all branchesin RENAME code properly
732
release GRL protection.
733
------------------------------------------------------------
735
committer: Guilhem Bichot <guilhem@mysql.com>
736
branch nick: mysql-5.1-bugteam
737
timestamp: Fri 2010-11-05 14:17:47 +0100
739
BUG#57933 "add -Wdeclaration-after-statement to gcc builds";
740
first part, for autotools build.
741
------------------------------------------------------------
742
revno: 3452.1.100 [merge]
743
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
744
branch nick: mysql-5.1-bugteam
745
timestamp: Wed 2010-11-03 16:09:17 +0200
748
------------------------------------------------------------
750
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
751
branch nick: mysql-5.1
752
timestamp: Wed 2010-11-03 16:03:40 +0200
754
bumped up the version
755
------------------------------------------------------------
757
committer: Georgi Kodinov <Georgi.Kodinov@oracle.com>
758
branch nick: B50021-5.1-bugteam
759
timestamp: Wed 2010-11-03 15:31:42 +0200
761
added windows cmake binaries
762
------------------------------------------------------------
764
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
765
branch nick: B51208-5.1-bugteam
766
timestamp: Tue 2010-11-02 15:20:02 +0200
768
Bug #51208: Extra string allocation from thd->mem_root
769
in sql_show.cc, find_files()
771
Removed the extra allocation.
772
------------------------------------------------------------
774
committer: Gleb Shchepa <gleb.shchepa@oracle.com>
775
branch nick: 52160-5.1-bugteam
776
timestamp: Sun 2010-10-31 19:04:38 +0300
778
Bug #52160: crash and inconsistent results when grouping
779
by a function and column
781
The bugreport reveals two different bugs about grouping
784
1) grouping by the TIME_TO_SEC function result caused
785
a server crash or wrong results and
786
2) grouping by the function returning a blob caused
787
an unexpected "Duplicate entry" error and wrong
790
Details for the 1st bug:
792
TIME_TO_SEC() returns NULL if its argument is invalid (empty
793
string for example). Thus its nullability depends not only
794
on the nullability of its arguments but also on their values.
795
Fixed by (overoptimistically) setting TIME_TO_SEC() to be
796
nullable despite the nullability of its arguments.
798
Details for the 2nd bug:
800
The server is unable to create indices on blobs without
801
explicit blob key part length. However, this fact was
802
ignored for blob function result fields of GROUP BY
804
Fixed by disabling GROUP BY index creation for blob
805
function result fields like regular blob fields.
806
------------------------------------------------------------
808
committer: Horst.Hunger <horst.hunger@sun.com>
809
branch nick: 5.1-52501
810
timestamp: Mon 2010-11-08 16:30:26 +0100
812
Fix for bug#52501 consisting of changes of some sys_vars tests including review results.
813
------------------------------------------------------------
815
committer: Sergey Glukhov <sergey.glukhov@oracle.com>
816
branch nick: mysql-5.1-security
817
timestamp: Thu 2010-11-18 11:53:08 +0300
819
Bug#58022 ... like ... escape export_set ( ... ) crashes when export_set returns warnings
820
ESCAPE argument might be empty string. It leads
821
to server crash under some circumstances.
823
-added check if ESCAPE argument result is not empty string
824
------------------------------------------------------------
826
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
827
branch nick: topush-5.1-security
828
timestamp: Wed 2010-11-17 10:13:57 +0100
830
post-push fix, backported --replace_result patch
831
for --list_files in mysqltest.
832
------------------------------------------------------------
834
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
835
branch nick: topush-5.1-security
836
timestamp: Mon 2010-11-15 23:27:37 +0100
838
post-push fix for test to pass on windows
839
------------------------------------------------------------
841
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
842
branch nick: topush-5.1-security
843
timestamp: Mon 2010-11-15 16:32:21 +0100
846
------------------------------------------------------------
848
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
849
branch nick: b55091-51-security
850
timestamp: Tue 2010-10-05 14:57:51 +0200
852
Bug#55091: Server crashes on ADD PARTITION after a failed attempt
854
In case of failure in ALTER ... PARTITION under LOCK TABLE
855
the server could crash, due to it had modified the locked
856
table object, which was not reverted in case of failure,
857
resulting in a bad table definition used after the failed
860
Solved by always closing the LOCKED TABLE, even in case
863
Note: this is a 5.1-only fix, bug#56172 fixed it in 5.5+
864
------------------------------------------------------------
866
committer: Alexander Barkov <bar@mysql.com>
867
branch nick: mysql-5.1-security.b58005
868
timestamp: Fri 2010-11-12 13:12:15 +0300
870
Bug#58005 utf8 + get_format causes failed assertion: !str || str != Ptr'
872
Problem: When GET_FORMAT() is called two times from the upper
873
level function (e.g. LEAST in the bug report), on the second
874
call "res= args[0]->val_str(...)" and str point to the same
877
1. Fix: changing the order from
878
- get val_str into tmp_value then convert to str
880
- get val_str into str then convert to tmp_value
882
The new order is more correct: the purpose of "str" parameter
883
is exactly to call val_str() for arguments.
884
The purpose of String class members (like tmp_value) is to do further
885
actions on the result.
886
Doing it in the other way around give unexpected surprises.
888
2. Using str_value instead of str to do padding, for the same reason.
889
------------------------------------------------------------
891
committer: Alexander Barkov <bar@mysql.com>
892
branch nick: mysql-5.1-security
893
timestamp: Thu 2010-11-11 13:25:23 +0300
895
Bug#57257 Replace(ExtractValue(...)) causes MySQL crash
896
Bug#57820 extractvalue crashes
898
Problem: ExtractValue and Replace crashed in some cases
899
due to invalid handling of empty and NULL arguments.
903
@mysql-test/r/ctype_ujis.result
904
@mysql-test/r/xml.result
905
@mysql-test/t/ctype_ujis.test
906
@mysql-test/t/xml.test
910
Make sure Item_func_replace::val_str safely handles empty strings.
913
set null_value if nodeset_func returned NULL,
914
which is possible when the second argument is an
916
------------------------------------------------------------
918
committer: Sergey Glukhov <sergey.glukhov@oracle.com>
919
branch nick: mysql-5.1-security
920
timestamp: Mon 2010-11-08 13:55:43 +0300
923
------------------------------------------------------------
925
committer: Sergey Glukhov <sergey.glukhov@oracle.com>
926
branch nick: mysql-5.0-security
927
timestamp: Mon 2010-11-08 13:51:39 +0300
929
Bug#52711 Segfault when doing EXPLAIN SELECT with union...order by (select... where...)
931
------------------------------------------------------------
933
committer: Sergey Glukhov <sergey.glukhov@oracle.com>
934
branch nick: mysql-5.0-security
935
timestamp: Mon 2010-11-08 13:34:27 +0300
937
Fix for bug #54575: crash when joining tables with unique set column(backport from 5.1)
939
Problem: a flaw (derefencing a NULL pointer) in the LIKE optimization
940
code may lead to a server crash in some rare cases.
942
Fix: check the pointer before its dereferencing.
943
------------------------------------------------------------
945
author: karen.langford@oracle.com
946
committer: smenon <sunanda.menon@sun.com
947
branch nick: mysql-5.1-security
948
timestamp: Wed 2010-11-03 14:02:15 +0100
950
Raise version number after cloning 5.1.53
951
------------------------------------------------------------
953
tags: mysql-5.1.53, clone-5.1.53-build
954
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
955
branch nick: merge-5.1-security
956
timestamp: Wed 2010-11-03 12:24:47 +0200
959
------------------------------------------------------------
960
revno: 3461.1.12 [merge]
961
author: karen.langford@oracle.com
962
committer: MySQL Build Team <build@mysql.com>
963
branch nick: mysql-5.1
964
timestamp: Mon 2010-11-01 19:44:43 +0100
966
Merge from mysql-5.1.52-release
967
------------------------------------------------------------
970
author: karen.langford@oracle.com
3
tags: clone-5.1.61-build
4
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
5
branch nick: topush-5.1-sec
6
timestamp: Thu 2011-12-15 16:59:18 +0100
8
Post push fix for merge.test and mysqlcheck.test on windows
9
------------------------------------------------------------
11
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
12
branch nick: merge-5.1-security
13
timestamp: Thu 2011-12-15 14:10:20 +0200
15
merge mysql-5.1->mysql-5.1-security
16
------------------------------------------------------------
18
committer: Annamalai Gurusami <annamalai.gurusami@oracle.com>
19
branch nick: mysql-5.1-bug13117023
20
timestamp: Tue 2011-12-13 14:26:12 +0530
22
Bug #13117023: Innodb increments handler_read_key when it should not
24
The counter handler_read_key (SSV::ha_read_key_count) is incremented
27
The mysql server maintains a per thread system_status_var (SSV)
28
object. This object contains among other things the counter
29
SSV::ha_read_key_count. The purpose of this counter is to measure the
30
number of requests to read a row based on a key (or the number of
33
This counter was wrongly incremented in the
34
ha_innobase::innobase_get_index(). The fix removes
35
this increment statement (for both innodb and innodb_plugin).
37
The various callers of the innobase_get_index() was checked to
38
determine if anybody must increment this counter (if they first call
39
innobase_get_index() and then perform an index lookup). It was found
40
that no caller of innobase_get_index() needs to worry about the
41
SSV::ha_read_key_count counter.
42
------------------------------------------------------------
44
committer: Marko M?kel? <marko.makela@oracle.com>
45
branch nick: mysql-5.1
46
timestamp: Mon 2011-12-12 13:48:24 +0200
48
Bug#13418887 ERROR IN DIAGNOSTIC FUNCTION PAGE_REC_PRINT()
50
When printing information about a ROW_FORMAT=REDUNDANT record, pass
51
the correct flag to rec_get_next_offs().
53
rb:821 approved by Jimmy Yang
54
------------------------------------------------------------
56
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
57
branch nick: topush-5.1-sec
58
timestamp: Wed 2011-12-14 14:41:40 +0100
61
------------------------------------------------------------
62
revno: 1810.3997.36 [merge]
63
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
64
branch nick: topush-5.0-sec
65
timestamp: Wed 2011-12-14 14:05:22 +0100
68
------------------------------------------------------------
70
committer: Mattias Jonsson <mattias.jonsson@oracle.com>
71
branch nick: b12361113-50-sec
72
timestamp: Mon 2011-12-12 14:07:02 +0100
74
Bug#12361113: CRASH WHEN "LOAD INDEX INTO CACHE" WITH TOO
77
The server crashed on division by zero because the key cache was not
78
initialized and the block length was 0 which was used in a division.
80
The fix was to not allow CACHE INDEX if the key cache was not initiallized.
81
Thus never try LOAD INDEX INTO CACHE for an uninitialized key cache.
83
Also added some windows files/directories to .bzrignore.
84
------------------------------------------------------------
86
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
87
branch nick: merge-5.1-security
88
timestamp: Mon 2011-12-12 12:25:35 +0100
90
merge 5.1->5.1-security.
91
------------------------------------------------------------
93
committer: Tor Didriksen <tor.didriksen@oracle.com>
94
branch nick: 5.1-sighandler
95
timestamp: Wed 2011-11-30 17:11:13 +0100
97
Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS
99
Post-push fix: build break on windows/optimized
100
------------------------------------------------------------
102
committer: Tor Didriksen <tor.didriksen@oracle.com>
103
branch nick: 5.1-sighandler
104
timestamp: Wed 2011-11-30 15:39:29 +0100
106
Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS
108
handle_segfault is the signal handler code of mysqld. however, it makes
109
calls to potentially unsafe functions localtime_r, fprintf, fflush.
110
------------------------------------------------------------
112
committer: Tor Didriksen <tor.didriksen@oracle.com>
114
timestamp: Tue 2011-11-29 15:52:47 +0100
116
Build broken for gcc 4.5.1 in optimized mode.
118
readline.cc: In function char* batch_readline(LINE_BUFFER*):
119
readline.cc:60:9: error: out_length may be used uninitialized in this function
120
log.cc: In function int find_uniq_filename(char*):
121
log.cc:1857:8: error: number may be used uninitialized in this function
122
------------------------------------------------------------
124
committer: Nirbhay Choubey <nirbhay.choubey@oracle.com>
125
branch nick: B11756764-5.1
126
timestamp: Tue 2011-11-29 17:59:35 +0530
128
Bug#11756764 48726: MYSQLD KEEPS CRASHING WITH SIGSEGV
129
WITH MYISAM_USE_MMAP ENABLED
131
MySQL server can crash due to segmentation fault when
132
started with myisam_use_mmap.
134
The reason behind this being, while making a request to
135
unmap (munmap) the previously mapped memory (mmap), the
136
size passed was 7 bytes larger than the size requested at
137
the time of mapping. This can eventually unmap the adjacent
138
memory mapped block, belonging to some other memory-map pool.
139
Hence the subsequent call to mmap can map a region which was
140
still a valid memory mapped area.
142
Fixed by removing the extra 7-byte margin which was erroneously
143
added to the size, used for unmappping.
144
------------------------------------------------------------
146
committer: Ashish Agarwal<ashish.y.agarwal@oracle.com>
147
branch nick: bug_93_5.1
148
timestamp: Wed 2011-11-23 18:33:29 +0530
150
BUG#11751793 - 42784: ARCHIVE TABLES CAUSE 100% CPU USAGE
151
AND HANG IN SHOW TABLE STATUS.
153
ISSUE: Table corruption due to concurrent queries.
154
Different threads running insert and check
155
query leads to table corruption. Not properly locked,
156
rows are inserted in between check query.
158
SOLUTION: In check query mutex lock is acquired
159
for a longer time to handle concurrent
160
insert and check query.
162
NOTE: Additionally we backported the fix for CHECKSUM
164
------------------------------------------------------------
166
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
167
branch nick: mysql-5.1-test
168
timestamp: Tue 2011-11-22 14:16:13 +0100
170
Disabling main.query_cache_28249.test since this test fails
171
sporadically on 5.1. See Bug#12584161.
173
Test runs successfully on 5.5/trunk, so this changeset will
175
------------------------------------------------------------
177
committer: Inaam Rana <inaam.rana@oracle.com>
178
branch nick: mysql-5.1
179
timestamp: Fri 2011-11-18 10:59:10 -0500
181
Bug#13390506 - VALGRIND FAILURE AFTER THE FIX FOR 13371000
184
approved by: Marko Makela
186
The title is misleading. This bug was actually introduced by
187
bug 12635227 and was unearthed by a later optimization.
188
We need to free buf_page_t structs that we are allocating using
189
malloc() at shutdown.
190
------------------------------------------------------------
192
committer: Jorgen Loland <jorgen.loland@oracle.com>
193
branch nick: mysql-5.1
194
timestamp: Fri 2011-11-18 14:47:11 +0100
196
Backmerge of BUG#12997905
197
------------------------------------------------------------
198
revno: 3560.6.61 [merge]
199
committer: Karen Langford <karen.langford@oracle.com>
200
branch nick: mysql-5.1
201
timestamp: Thu 2011-11-17 00:26:16 +0100
203
Merge from mysql-5.1.60-release
204
------------------------------------------------------------
971
207
committer: Karen Langford <karen.langford@oracle.com>
972
branch nick: mysql-5.1.52-release
973
timestamp: Mon 2010-10-11 22:13:47 +0200
208
branch nick: mysql-5.1.60-release
209
timestamp: Sat 2011-10-29 20:08:40 +0200
211
Patch to fix stdint.h missing from pre Solaris 10 versions.
added
removed
ChangeLog
