1
1
------------------------------------------------------------
3
author: karen.langford@oracle.com
4
committer: Karen Langford <karen.langford@oracle.com>
5
branch nick: mysql-5.1.49-release
6
timestamp: Fri 2010-07-09 14:23:48 +0200
8
Fix bug #55039 Failing assertion: space_id > 0 in fil0fil.c.
9
------------------------------------------------------------
11
committer: sunanda <sunanda.menon@sun.com>
12
branch nick: mysql-5.1.49-release
13
timestamp: Wed 2010-07-07 20:34:50 +0200
15
rko Mdkeld change, revision 3351.14.134 add innodb_plugin to mysql-test-run default suites
16
was not complete. Bootstrap failed to pick up necessary files needed by test and hence
18
------------------------------------------------------------
20
tags: clone-5.1.49-build
21
committer: Vasil Dimov <vasil.dimov@oracle.com>
22
branch nick: mysql-5.1-security
23
timestamp: Sun 2010-07-04 10:12:44 +0300
25
Merge mysql-5.1-innodb -> mysql-5.1-security
27
Merge up to sunny.bains@oracle.com-20100625081841-ppulnkjk1qlazh82 .
28
There are 8 more changesets in mysql-5.1-innodb, but PB2 shows a
29
failure for a test added in one of them. If that is resolved quickly
30
then those 8 more changesets will be merged too.
31
------------------------------------------------------------
33
committer: Sunny Bains <Sunny.Bains@Oracle.Com>
35
timestamp: Fri 2010-06-25 18:18:41 +1000
37
Fix bug#54583. This change reverses rsvn:1350 by getting rid of a bogus assertion
38
and clarifies the invariant in dict_table_get_on_id().
40
In Mar 2007 Marko observed a crash during recovery, the crash resulted from
41
an UNDO operation on a system table. His solution was to acquire an X lock on
42
the data dictionary, this in hindsight was an overkill. It is unclear what
43
caused the crash, current hypothesis is that it was a memory corruption.
45
The X lock results in performance issues by when undoing changes due to
46
rollback during normal operation on regular tables.
48
Why the change is safe:
49
======================
50
The InnoDB code has changed since the original X lock change was made. In the
51
new code we always lock the data dictionary in X mode during startup when
52
UNDOing operations on the system tables (this is a given). This ensures that
53
the crash Marko observed cannot happen as long as all transactions that update
54
the system tables follow the standard rules by setting the appropriate DICT_OP
55
flag when writing the log records when they make the changes.
57
If transactions violate the above mentioned rule then during recovery (at
58
startup) the rollback code (see trx0roll.c) will not acquire the X lock
59
and we will see the crash again. This will however be a different bug.
60
------------------------------------------------------------
61
revno: 3351.14.163 [merge]
62
committer: Vasil Dimov <vasil.dimov@oracle.com>
63
branch nick: mysql-5.1-innodb
64
timestamp: Fri 2010-06-25 11:10:44 +0300
66
Merge a lost changeset inaam.rana@oracle.com-20100624124843-m7ouqwe5zqcqapn1
68
------------------------------------------------------------
69
revno: 3351.57.2 [merge]
70
committer: Inaam Rana <inaam.rana@oracle.com>
72
timestamp: Thu 2010-06-24 08:48:43 -0400
75
------------------------------------------------------------
76
revno: 3351.14.162 [merge]
77
committer: Vasil Dimov <vasil.dimov@oracle.com>
78
branch nick: mysql-5.1-innodb
79
timestamp: Fri 2010-06-25 11:08:52 +0300
81
Merge a lost changeset inaam.rana@oracle.com-20100624124450-2m3mg1238ewvakgx
82
------------------------------------------------------------
84
committer: Inaam Rana <inaam.rana@oracle.com>
86
timestamp: Thu 2010-06-24 08:44:50 -0400
88
Add ChangeLog for bug#39168
89
------------------------------------------------------------
90
revno: 3351.14.161 [merge]
91
committer: Vasil Dimov <vasil.dimov@oracle.com>
92
branch nick: mysql-5.1-innodb
93
timestamp: Fri 2010-06-25 11:06:02 +0300
95
Merge a lost changeset marko.makela@oracle.com-20100624104820-p4ojmxcmq8qeos6d
96
------------------------------------------------------------
98
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
99
branch nick: 5.1-innodb
100
timestamp: Thu 2010-06-24 13:48:20 +0300
102
Add ChangeLog entry for Bug#54679
103
------------------------------------------------------------
104
revno: 3351.14.160 [merge]
105
committer: Vasil Dimov <vasil.dimov@oracle.com>
106
branch nick: mysql-5.1-innodb
107
timestamp: Fri 2010-06-25 11:03:38 +0300
109
Merge a lost changeset marko.makela@oracle.com-20100624104620-pklunowaigv7quu9
110
------------------------------------------------------------
112
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
113
branch nick: 5.1-innodb
114
timestamp: Thu 2010-06-24 13:46:20 +0300
116
Bug#54679: alter table causes compressed row_format to revert to compact
118
ha_innobase::create(): Add the local variable row_type = form->s->row_type.
119
Adjust it to ROW_TYPE_COMPRESSED when ROW_FORMAT is not specified or inherited
120
but KEY_BLOCK_SIZE is. Observe the inherited ROW_FORMAT even when it is not
121
explicitly specified.
123
innodb_bug54679.test: New test, to test the bug and to ensure that there are
124
no regressions. (The only difference in the test result without the patch
125
applied is that the first ALTER TABLE changes ROW_FORMAT to Compact.)
126
------------------------------------------------------------
127
revno: 3351.14.159 [merge]
128
committer: Vasil Dimov <vasil.dimov@oracle.com>
129
branch nick: mysql-5.1-innodb
130
timestamp: Fri 2010-06-25 11:02:31 +0300
132
Merge a lost changeset jimmy.yang@oracle.com-20100624021010-oh2hnp8e1xbaax6u
133
------------------------------------------------------------
135
committer: Jimmy Yang <jimmy.yang@oracle.com>
136
branch nick: mysql-5.1-innodb
137
timestamp: Wed 2010-06-23 19:10:10 -0700
139
Move the fix for bug #54044 to security branch, and revert commit -r3520:3521.
140
------------------------------------------------------------
142
committer: Jimmy Yang <jimmy.yang@oracle.com>
143
branch nick: mysql-5.1-innodb
144
timestamp: Tue 2010-06-22 19:39:20 -0700
146
Port fix for "bug #54044 Create temporary tables and using innodb crashes"
147
to 5.1 plugin codeline.
149
rb://378, approved by Marko
150
------------------------------------------------------------
152
committer: Jimmy Yang <jimmy.yang@oracle.com>
153
branch nick: mysql-5.1-innodb
154
timestamp: Tue 2010-06-22 19:04:31 -0700
156
Fix bug #54044, Create temporary tables and using innodb crashes. Screen
157
out NULL type columns, and return without creating the table.
159
rb://378 approved by Marko
160
------------------------------------------------------------
161
revno: 3351.14.156 [merge]
162
committer: Vasil Dimov <vasil.dimov@oracle.com>
163
branch nick: mysql-5.1-innodb
164
timestamp: Tue 2010-06-22 20:12:05 +0300
166
Merge mysql-5.1-innodb from bk-internal to my local tree
167
------------------------------------------------------------
169
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
170
branch nick: 5.1-innodb
171
timestamp: Tue 2010-06-22 14:59:49 +0300
173
ChangeLog for Bug#54686 "field->col->mtype == type" assertion error at row/row0sel.c
174
------------------------------------------------------------
176
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
177
branch nick: 5.1-innodb
178
timestamp: Tue 2010-06-22 14:52:15 +0300
180
Bug#54686 "field->col->mtype == type" assertion error at row/row0sel.c
181
ha_innobase::index_read(), ha_innobase::records_in_range(): Check that
182
the index is useable before invoking row_sel_convert_mysql_key_to_innobase().
184
This fix is based on a suggestion by Yasufumi Kinoshita.
185
------------------------------------------------------------
187
committer: Vasil Dimov <vasil.dimov@oracle.com>
188
branch nick: mysql-5.1-innodb
189
timestamp: Tue 2010-06-22 20:04:54 +0300
191
Add ChangeLog entry for the fix of Bug#47991
192
------------------------------------------------------------
194
committer: Vasil Dimov <vasil.dimov@oracle.com>
195
branch nick: mysql-5.1-innodb
196
timestamp: Tue 2010-06-22 19:30:43 +0300
198
Fix Bug#47991 InnoDB Dictionary Cache memory usage increases indefinitely
201
Allocate the table name using ut_malloc() instead of table->heap because
202
the latter cannot be freed.
204
Adjust dict_sys->size calculations all over the code.
206
Change dict_table_t::name from const char* to char* because we need to
207
ut_malloc()/ut_free() it.
209
Reviewed by: Inaam, Marko, Heikki (rb://384)
210
Approved by: Heikki (rb://384)
211
------------------------------------------------------------
213
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
214
branch nick: 5.1-innodb
215
timestamp: Mon 2010-06-21 12:51:48 +0300
217
Bug#54658: Add ChangeLog entry
218
------------------------------------------------------------
220
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
221
branch nick: 5.1-innodb
222
timestamp: Mon 2010-06-21 12:40:08 +0300
224
Bug #54658: InnoDB: Warning: allocated tablespace %lu, old maximum was 0
226
dict_check_tablespaces_and_store_max_id(): Initialize max_space_id
227
and fil_system->max_assigned_id from DICT_HDR_MAX_SPACE_ID.
229
fil_space_create(): Suppress the warning unless !recv_recovery_on
230
(do not complain while applying the redo log).
231
------------------------------------------------------------
232
revno: 3351.14.151 [merge]
233
committer: Vasil Dimov <vasil.dimov@oracle.com>
234
branch nick: mysql-5.1-innodb
235
timestamp: Fri 2010-06-18 11:51:55 +0300
237
Merge mysql-5.1-innodb from bk-internal to my local repo
238
------------------------------------------------------------
240
committer: Jimmy Yang <jimmy.yang@oracle.com>
241
branch nick: mysql-5.1-innodb
242
timestamp: Thu 2010-06-17 22:38:22 -0700
244
Check in fix for Bug #52814 InnoDB: Use the new ha_data interfaces
246
rb://290, approved by Sunny
247
------------------------------------------------------------
249
committer: Jimmy Yang <jimmy.yang@oracle.com>
250
branch nick: mysql-5.1-innodb
251
timestamp: Thu 2010-06-17 10:33:03 -0700
253
Fix an overly asserted assertion during previous checkin for bug #54330.
254
------------------------------------------------------------
256
committer: Vasil Dimov <vasil.dimov@oracle.com>
257
branch nick: mysql-5.1-innodb
258
timestamp: Fri 2010-06-18 10:00:01 +0300
260
Increment InnoDB Plugin version from 1.0.9 to 1.0.10, after
261
1.0.9 has been released with MySQL 5.1.48.
262
------------------------------------------------------------
264
committer: Jimmy Yang <jimmy.yang@oracle.com>
265
branch nick: mysql-5.1-innodb
266
timestamp: Wed 2010-06-16 19:12:04 -0700
268
Fix Bug #54330 Broken fast index creation. Add additional array to
269
account for each merge run's start offset, so correct offsets are
270
paired up for multiple merge runs.
272
rb://377 approved by Marko
273
------------------------------------------------------------
275
committer: Jimmy Yang <jimmy.yang@oracle.com>
276
branch nick: mysql-5.1-innodb
277
timestamp: Tue 2010-06-15 02:33:26 -0700
279
Add checkin description for bug #47622 to ChangeLog.
280
------------------------------------------------------------
282
committer: Vasil Dimov <vasil.dimov@oracle.com>
283
branch nick: mysql-5.1-innodb
284
timestamp: Mon 2010-06-14 13:35:15 +0300
286
Adjust suite/innodb/r/innodb_mysql.result after the merge
287
------------------------------------------------------------
288
revno: 3351.14.146 [merge]
289
committer: Vasil Dimov <vasil.dimov@oracle.com>
290
branch nick: mysql-5.1-innodb
291
timestamp: Mon 2010-06-14 12:43:02 +0300
293
Merge mysql-5.1 -> mysql-5.1-innodb
294
(innodb_mysql.result needs to be adjusted after this commit)
295
------------------------------------------------------------
296
revno: 3351.14.145 [merge]
297
committer: Inaam Rana <inaam.rana@oracle.com>
299
timestamp: Thu 2010-06-10 10:35:39 -0400
302
------------------------------------------------------------
304
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
305
branch nick: 5.1-innodb
306
timestamp: Thu 2010-06-10 15:56:23 +0300
308
Bug #38999: Re-enable innodb_multi_update.test
309
------------------------------------------------------------
311
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
312
branch nick: mysql-5.1-innodb
313
timestamp: Wed 2010-06-09 16:17:18 +0400
315
Bug#38999 valgrind warnings for update statement in function compare_record()
316
(InnoDB plugin branch)
317
------------------------------------------------------------
319
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
320
branch nick: mysql-5.1-innodb
321
timestamp: Wed 2010-06-09 16:07:34 +0400
323
Bug#38999 valgrind warnings for update statement in function compare_record()
324
Valgrind warning happpens because of uninitialized null bytes.
325
In row_sel_push_cache_row_for_mysql() function we fill fetch cache
326
with necessary field values, row_sel_store_mysql_rec() is called
327
for this and leaves null bytes untouched.
328
Later row_sel_pop_cached_row_for_mysql() rewrites table record
329
buffer with uninited null bytes. We can see the problem from the
331
At 'SELECT...' we call row_sel_push...->row_sel_store...->row_sel_pop_cached...
332
chain which rewrites table->record[0] buffer with uninitialized null bytes.
333
When we call 'UPDATE...' statement, compare_record uses this buffer and
334
valgrind warning occurs.
335
The fix is to init null bytes with default values.
336
------------------------------------------------------------
338
committer: Inaam Rana <inaam.rana@oracle.com>
340
timestamp: Thu 2010-06-10 10:31:28 -0400
342
Add a debug assertion.
343
------------------------------------------------------------
345
committer: Inaam Rana <inaam.rana@oracle.com>
347
timestamp: Thu 2010-06-10 09:58:11 -0400
350
------------------------------------------------------------
352
committer: Inaam Rana <inaam.rana@oracle.com>
354
timestamp: Tue 2010-06-08 14:14:08 -0400
356
Add call to log_free_check() in the DML code paths that were missing
358
------------------------------------------------------------
360
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
361
branch nick: 5.1-innodb
362
timestamp: Tue 2010-06-08 15:12:15 +0300
364
Document Bug#54009 in the InnoDB Plugin ChangeLog.
365
------------------------------------------------------------
367
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
368
branch nick: 5.1-innodb
369
timestamp: Tue 2010-06-08 15:10:41 +0300
371
Bug#54009: Server crashes when data is selected from non backed up table
374
dict_load_table(): Pass the correct tablespace flags to
375
fil_open_single_table_tablespace(). For ROW_FORMAT=COMPACT and REDUNDANT,
376
the tablespace flags are 0. The table flags would be 0 or DICT_TF_COMPACT.
377
------------------------------------------------------------
379
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
380
branch nick: 5.1-innodb
381
timestamp: Tue 2010-06-08 14:40:55 +0300
383
buf_page_get_gen(): Pass file,line to rw_lock_x_lock().
384
------------------------------------------------------------
386
committer: Jimmy Yang <jimmy.yang@oracle.com>
387
branch nick: mysql-5.1-innodb
388
timestamp: Thu 2010-06-03 06:44:48 -0700
390
Remove unncessary name comapre in innobase_get_mysql_key_number_for_index()
391
introduced in bug fix #53592, since dict_table_t can sufficiently unique
392
identify the the table.
393
------------------------------------------------------------
395
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
396
branch nick: 5.1-innodb
397
timestamp: Thu 2010-06-03 12:50:32 +0300
399
Move some InnoDB tests to mysql-test/suite/innodb.
400
------------------------------------------------------------
402
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
403
branch nick: 5.1-innodb
404
timestamp: Thu 2010-06-03 12:48:59 +0300
406
Copy built-in InnoDB tests to mysql-test/suite/innodb_plugin.
407
------------------------------------------------------------
409
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
410
branch nick: 5.1-innodb
411
timestamp: Thu 2010-06-03 12:46:37 +0300
413
Source have_innodb_plugin.inc in the plugin tests.
414
------------------------------------------------------------
416
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
417
branch nick: 5.1-innodb
418
timestamp: Thu 2010-06-03 12:45:34 +0300
420
Add innodb_plugin to mysql-test-run default suites.
421
------------------------------------------------------------
423
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
424
branch nick: 5.1-innodb
425
timestamp: Wed 2010-06-02 13:39:03 +0300
427
Document the Bug #53674 fix in the InnoDB Plugin
428
------------------------------------------------------------
430
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
431
branch nick: 5.1-innodb
432
timestamp: Wed 2010-06-02 13:37:14 +0300
434
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
436
In semi-consistent read, only unlock freshly locked non-matching records.
438
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
439
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
441
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
442
operation where a record lock was created.
444
lock_sec_rec_read_check_and_lock(),
445
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
446
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
447
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
448
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
449
new record lock was created. Adjust callers.
451
row_unlock_for_mysql(): Correct the function documentation.
453
row_prebuilt_t::new_rec_locks: Correct the documentation.
454
------------------------------------------------------------
456
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
457
branch nick: 5.1-innodb
458
timestamp: Wed 2010-06-02 13:26:37 +0300
460
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
462
In semi-consistent read, only unlock freshly locked non-matching records.
464
Define DB_SUCCESS_LOCKED_REC for indicating a successful operation
465
where a record lock was created.
467
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
468
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
470
lock_sec_rec_read_check_and_lock(),
471
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
472
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
473
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
474
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
475
new record lock was created. Adjust callers.
477
row_unlock_for_mysql(): Correct the function documentation.
479
row_prebuilt_t::new_rec_locks: Correct the documentation.
480
------------------------------------------------------------
482
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
483
branch nick: 5.1-innodb
484
timestamp: Wed 2010-06-02 13:19:40 +0300
486
fil_print_orphaned_tablespaces(): Unused function, remove.
487
------------------------------------------------------------
489
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
490
branch nick: 5.1-innodb
491
timestamp: Tue 2010-06-01 16:58:02 +0300
493
Document Bug #48197 fix
494
------------------------------------------------------------
496
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
497
branch nick: 5.1-innodb
498
timestamp: Tue 2010-06-01 16:43:35 +0300
500
Bug#48197: Concurrent rw_lock_free may cause assertion failure
502
rw_lock_t: Remove magic_n unless UNIV_DEBUG is defined.
503
rw_lock_free(): Invalidate magic_n only after removing from rw_lock_list.
504
------------------------------------------------------------
506
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
507
branch nick: 5.1-innodb
508
timestamp: Tue 2010-06-01 15:07:51 +0300
512
lock_rec_unlock(): Cache first_lock and rewrite while() loops as for().
514
btr_cur_optimistic_update(): Use common error handling return.
516
row_create_prebuilt(): Add Valgrind instrumentation.
517
------------------------------------------------------------
519
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
520
branch nick: 5.1-innodb
521
timestamp: Tue 2010-06-01 15:05:21 +0300
523
Document the Bug #53812 fix.
524
------------------------------------------------------------
526
committer: Marko Mļæ½kelļæ½ <marko.makela@oracle.com>
527
branch nick: 5.1-innodb
528
timestamp: Tue 2010-06-01 13:37:38 +0300
530
Bug#53812: assert row/row0umod.c line 660 in txn rollback after crash recovery
532
row_undo_mod_upd_exist_sec(): Tolerate a failure to build the index entry
533
for a DYNAMIC or COMPRESSED table during crash recovery.
534
------------------------------------------------------------
536
committer: Vasil Dimov <vasil.dimov@oracle.com>
537
branch nick: mysql-5.1-innodb
538
timestamp: Mon 2010-05-31 19:35:40 +0300
540
Merge a change from mysql-trunk-innodb:
542
------------------------------------------------------------
544
revision-id: vasil.dimov@oracle.com-20100531152341-x2d4hma644icamh1
545
parent: vasil.dimov@oracle.com-20100531105923-kpjwl4rbgfpfj13c
546
committer: Vasil Dimov <vasil.dimov@oracle.com>
547
branch nick: mysql-trunk-innodb
548
timestamp: Mon 2010-05-31 18:23:41 +0300
550
Fix Bug #53947 InnoDB: Assertion failure in thread 4224 in file .\sync\sync0sync.c line 324
552
Destroy the rw-lock object before freeing the memory it is occupying.
553
If we do not do this, then the mutex that is contained in the rw-lock
554
object btr_search_latch_temp->mutex gets "freed" and subsequently
555
mutex_free() from sync_close() hits a mutex whose memory has been
558
Approved by: Heikki (via IRC)
559
Discussed with: Calvin
560
------------------------------------------------------------
562
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
563
branch nick: merge-5.1-bugteam
564
timestamp: Fri 2010-07-02 14:34:17 +0300
567
------------------------------------------------------------
569
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
570
branch nick: merge-5.0-bugteam
571
timestamp: Fri 2010-07-02 14:33:17 +0300
574
------------------------------------------------------------
575
revno: 1810.3987.32 [merge]
576
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
577
branch nick: merge-5.0-bugteam
578
timestamp: Fri 2010-07-02 14:29:19 +0300
581
------------------------------------------------------------
583
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
584
branch nick: merge-5.1-bugteam
585
timestamp: Fri 2010-07-02 14:31:16 +0300
588
------------------------------------------------------------
590
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
591
branch nick: merge-5.1-bugteam
592
timestamp: Fri 2010-07-02 14:29:55 +0300
595
------------------------------------------------------------
597
committer: Jimmy Yang <jimmy.yang@oracle.com>
598
branch nick: mysql-5.1-security
599
timestamp: Tue 2010-06-29 00:13:18 -0700
601
Change the table name in innodb_bug54044 to lower case to avoid
602
platform dependent diffs.
603
------------------------------------------------------------
605
committer: Jimmy Yang <jimmy.yang@oracle.com>
606
branch nick: mysql-5.1-security
607
timestamp: Thu 2010-06-24 01:20:25 -0700
609
Fix Bug #54044 Create temporary tables and using innodb crashes.
610
------------------------------------------------------------
611
revno: 3436.2.1 [merge]
612
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
613
branch nick: mysql-5.1-security
614
timestamp: Mon 2010-06-21 14:49:37 +0300
617
------------------------------------------------------------
619
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
620
branch nick: mysql-5.0-security
621
timestamp: Mon 2010-06-21 14:09:23 +0300
624
------------------------------------------------------------
626
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
627
branch nick: mysql-5.0-security
628
timestamp: Mon 2010-06-21 14:06:14 +0300
630
Switched the mailing lists
631
------------------------------------------------------------
633
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
634
branch nick: merge-5.1-bugteam
635
timestamp: Fri 2010-07-02 14:25:26 +0300
638
------------------------------------------------------------
639
revno: 1810.3987.31 [merge]
640
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
641
branch nick: merge-5.0-bugteam
642
timestamp: Fri 2010-07-02 14:21:48 +0300
645
------------------------------------------------------------
647
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
648
branch nick: merge-5.1-bugteam
649
timestamp: Fri 2010-07-02 14:23:07 +0300
652
------------------------------------------------------------
654
author: karen.langford@oracle.com
655
committer: MySQL Build Team<build@mysql.com>
656
branch nick: mysql-5.1
657
timestamp: Thu 2010-06-03 16:03:17 +0200
659
Raise version number after cloning 5.1.48
660
------------------------------------------------------------
661
revno: 3408.1.1 [merge]
662
tags: mysql-5.1.48, clone-5.1.48-build
663
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
664
branch nick: merge-5.1-bugteam
665
timestamp: Wed 2010-06-02 11:44:11 +0300
668
------------------------------------------------------------
670
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
671
branch nick: merge-5.0-bugteam
672
timestamp: Wed 2010-06-02 11:42:37 +0300
674
changed the tree name
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
------------------------------------------------------------
207
committer: Karen Langford <karen.langford@oracle.com>
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.