Raise version number after cloning 5.5.31
--BZR--
revision-id: balasubramanian.kandasamy@oracle.com-20130305111907-29r7hrte57iad8eo
property-audit-revid: balasubramanian.kandasamy@oracle.com-20130305111907-25u157mz8i4gjrwu
property-authors: ramesh.maddali@oracle.com
property-branch-nick: mysql-5.5
testament3-sha1: b4a1db52de9c812736daaaabc17cfd2469040bea
Bug#16068056 INNODB CALLS BUF_VALIDATE() TOO OFTEN WITH UNIV_DEBUG

Approved by: Marko Makela (patch in bug report)

Reduce the number of debug buf_validate() calls

--BZR--
revision-id: inaam.rana@oracle.com-20130305154749-n43ek732f2df27qv
property-audit-revid: inaam.rana@oracle.com-20130305154749-efo104sfp0or27kw
property-branch-nick: mysql-5.5
testament3-sha1: a64b62f07be9b6d8087845e39b9b27501e4828f1
NULL Merge for release 5.1.69
--BZR--
revision-id: murthy.narkedimilli@oracle.com-20130306055218-p4602pvdx8cwddox
property-audit-revid: murthy.narkedimilli@oracle.com-20130306055218-9ierykt1o3rmer7e
property-authors: murthy.narkedimilli@oracle.com
property-branch-nick: mysql-5.5
testament3-sha1: 23c1f7824de82b4620b54fc27a94c5c8c10a9371
Bug #16133801 UNEXPLAINABLE INNODB UNIQUE INDEX LOCKS ON DELETE +
INSERT WITH SAME VALUES

Problem:

When a transaction is in READ COMMITTED isolation level, gap locks are still
taken in the secondary index, when row is inserted.  This happens when the
secondary index is scanned for duplicate.  

The function row_ins_scan_sec_index_for_duplicate() always calls the 
function row_ins_set_shared_rec_lock() with LOCK_ORDINARY irrespective of
the transaction isolation level.

Solution:

The function row_ins_scan_sec_index_for_duplicate() calls the 
function row_ins_set_shared_rec_lock() with LOCK_ORDINARY or 
LOCK_REC_NOT_GAP based on the transaction isolation level.

rb://2035 approved by Krunal and Marko


--BZR--
revision-id: annamalai.gurusami@oracle.com-20130306061957-kbojud8y7er0zjqs
property-audit-revid: annamalai.gurusami@oracle.com-20130306061957-4kxwqtcfsp5sshjo
property-branch-nick: mysql-5.5
testament3-sha1: 29969679d7d700616d85849bb134ba1070aeac21
Bug#16169063: SECURITY CONCERN BECAUSE OF INSUFFICIENT LOGGING

PROBLEM: If multiple statements are sent by a single
         request then only the last statement was
         getting logged. An attacker can bypass the
         audit log just by sending two comsecutive
         statements in one request.

SOLUTION: Each statements from a single request are
          logged.
--BZR--
revision-id: ashish.y.agarwal@oracle.com-20130307064258-xnaonf34wmhwrlc2
property-audit-revid: ashish.y.agarwal@oracle.com-20130307064258-yg5185fosgi6r0vr
property-branch-nick: bug_16169063
testament3-sha1: d9b0d50793e643b7c8a3a804a0523c86ad49679d
Bug#11765489 CMAKE BUILD ON MAC OS X DOES NOT DETERMINE CPU TYPE

Don't use CMAKE_OSX_ARCHITECTURES to determine DEFAULT_MACHINE
if it is not defined.

If we're 64bit, then use "x86_64" rather than "x86"

--BZR--
revision-id: tor.didriksen@oracle.com-20130301122559-vntneinv9w4rieeb
property-audit-revid: tor.didriksen@oracle.com-20130301122559-9n2mdadbm2md3aq0
property-branch-nick: 5.5
property-rebase-of: tor.didriksen@oracle.com-20130301122559-evwkigptr0aafjvx
testament3-sha1: 19fd07fea91e928f516b0d5e31745ca8bb3bb7e6
Raise version number after cloning 5.1.69
--BZR--
revision-id: murthy.narkedimilli@oracle.com-20130305150954-xbky623pf7cd41oo
property-audit-revid: murthy.narkedimilli@oracle.com-20130305150954-pxw0zszptnycrxj7
property-authors: murthy.narkedimilli@oracle.com
property-branch-nick: mysql-5.1
testament3-sha1: 4343fa7ee1ab18cd4e7a303227017f81e29923a7
BUG#16069598 - SERVER CRASH BY NULL POINTER DEREFERENCING IN 
               MEM_HEAP_CREATE_BLOCK() 

PROBLEM
-------

If we give start mysqld with the option --innodb_log_buffer_size=50GB
,then  mem_area_alloc() function fails to allocate memory and returns
NULL.In debug version we assert at this point,but there is no check in
release version and we get a segmentation fault.

FIX
---
Added a log message saying that we are unable to allocate memory.
After this message we assert.

[Approved by Kevin http://rb.no.oracle.com/rb/r/2065 ]

--BZR--
revision-id: aditya.a@oracle.com-20130307091435-zd0aep7o1krirl1u
property-audit-revid: aditya.a@oracle.com-20130307091435-ma6wuo0sywxkxoo1
property-branch-nick: mysql-5.5
testament3-sha1: 21587c97dc6b79614a62a107351b3793c9ff144d


--BZR--
revision-id: mysql-builder@oracle.com-20130308092541-b7y531oq74x80z3v
property-audit-revid: thayumanavar.x.sachithanantha@oracle.com-20130308092541-h6sdjpdx3h08e4l1
property-branch-nick: clone
testament3-sha1: 459ca07088b36f19338ca7c1aa738e5907b7c973


--BZR--
revision-id: mysql-builder@oracle.com-20130311063326-z2oyq6d7t97qg2wx
property-audit-revid: thayumanavar.x.sachithanantha@oracle.com-20130311063326-p0rgbrg7dsax1xdj
property-branch-nick: clone
testament3-sha1: 4fbdaf25c4d4e9f23ee8eb9202c2003c4e8efef2
Bug#11766815 INVALID SYSTEM CHECK TIME_T_UNSIGNED

The check for unsigned time_t failed, on all platforms, due to missing #include.

from CMakeFiles/CMakeError.log
with this patch: error: size of array array is negative
without this patch: error: time_t undeclared (first use in this function)

--BZR--
revision-id: tor.didriksen@oracle.com-20130311154611-fuf8xb8opeev0m98
property-audit-revid: tor.didriksen@oracle.com-20130311154611-1jsnnu1rh6icjhs7
property-branch-nick: 5.5
testament3-sha1: b6c3442675a9fdab7f7771fd8add00ad9fe11604


--BZR--
revision-id: mysql-builder@oracle.com-20130312113700-27xel3blvufj3w94
property-audit-revid: marko.makela@oracle.com-20130312113700-k8obvv7u9c9ne0kb
property-branch-nick: clone
testament3-sha1: 1a2a498768b416f1dc2fa2c6a2a772e16086c2d2
Bug#16463505 PESSIMISTIC PAGE_ZIP_AVAILABLE() MAY CAUSE INFINITE PAGE SPLIT

For a fresh insert, page_zip_available() was counting some fields twice.
In the worst case, the compressed page size grows by PAGE_ZIP_DIR_SLOT_SIZE
plus the size of the record that is being inserted. The size of the record
already includes the fields that will be stored in the uncompressed portion
of the compressed page.

page_zip_get_trailer_len(): Remove the output parameter entry_size,
because no caller is interested in it.

page_zip_max_ins_size(), page_zip_available(): Assume that the page grows
by PAGE_ZIP_DIR_SLOT_SIZE and the record size (which includes the fields
that would be stored in the uncompressed portion of the page).

rb#2169 approved by Sunny Bains
--BZR--
revision-id: marko.makela@oracle.com-20130312114212-2conlbcquhis03d6
property-audit-revid: marko.makela@oracle.com-20130312114212-rmu89cta4orrnt1u
property-branch-nick: mysql-5.1
testament3-sha1: 30d66452eb825fdd7dfa99b59023912cb5845aaa
Merge mysql-5.1 to mysql-5.5.
--BZR--
revision-id: marko.makela@oracle.com-20130312115702-cw5sj66rgz4t6ffz
property-audit-revid: marko.makela@oracle.com-20130312115702-codbdx8iea8p370d
property-branch-nick: mysql-5.5
testament3-sha1: c16240764a7b782794e4825d8383cb77c1412c4e
Bug#16409715 ASSERT SYNC_THREAD_LEVELS_G(ARRAY, LEVEL - 1, TRUE),
IBUF, FREE SPACE MANAGEMENT

ibuf_merge_or_delete_for_page(): Declare the user index page latched
for UNIV_SYNC_DEBUG after opening the change buffer cursor. This
should avoid the bogus latching order violation.

ibuf_delete_rec(): Add assertions to the callers, checking that the
mini-transaction was committed when the function returned TRUE. This
is a non-functional change, just clarifying the code.

rb#2136 approved by Kevin Lewis
--BZR--
revision-id: marko.makela@oracle.com-20130312115810-tm5kwdg3k128zynd
property-audit-revid: marko.makela@oracle.com-20130312115810-t8bqg8lp6ytrxl03
property-branch-nick: mysql-5.5
testament3-sha1: c1ee2d7c4cb872f7efa66db4cfac0d89c1fe951a
BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE                              
COLUMNS ARE USED INSIDE A STORED PROCEDURE                                      
                                                                                
Problem: The operator '=' overload method inside
'String' class is not coping str_charset member from
R.H.S object to L.H.S object. Hence charset is wrongly
set while using string assignments

Analaysis: The above mentioned problem is
identified while doing the analaysis of bug#14593883.
Though the test scenario mentioned in the bug page
is not  an issue in mysql-5.1 code, the actual root cause
ie., "str_charset member is not copied" exists in the 
mysql-5.1 code base. 

Fix: Handle coping str_charset member in operator '=' overload                  
method.
--BZR--
revision-id: venkatesh.duggirala@oracle.com-20130312170613-qfnhsjtgtzddhjj8
property-audit-revid: venkatesh.duggirala@oracle.com-20130312170613-bm5n73jmk9kykm0e
property-branch-nick: mysql-5.1
property-file-info: ld7:file_id65:sp1f-sql_string.h-19700101030959-nogsoxwv222e4vm4toic7cabeb4swajz7:message84:Handled coping str_charset member in operator '=' overload                  
property-file-info: method.4:path16:sql/sql_string.hee
testament3-sha1: 99bc78380054a012dc4cedcf1164e3866c429ce8
BUG#14593883-REPLICATION BREAKS WHEN SET DATA TYPE                              
COLUMNS ARE USED INSIDE A STORED PROCEDURE                                      
                                                                                
Problem: When 'SET' type columns are used in a DML                              
inside a stored procedure and a NULL value is passed                            
to that column, replication is breaking.                                        
                                                                                
Analysis: All stored procedure variables used inside                            
a DML will be substituted with NAME_CONST functions.                            
While NAME_CONST are used in this particular scenario,                          
i.e., when NULL value is passed then charset is copied                          
from 'empty_set_string' member of Field_set class.                              
The operator '=' overload method inside 'String' class                          
is not coping str_charset from R.H.S object to L.H.S object.                    
Hence charset is wrongly copied in the string assignment                        
                                                                                
Fix: Handle coping str_charset member in operator '=' overload                  
method.
--BZR--
revision-id: venkatesh.duggirala@oracle.com-20130312171432-0iz73h8rz4mggx63
property-audit-revid: venkatesh.duggirala@oracle.com-20130312171432-2nihvs7ouizhyk2f
property-branch-nick: mysql-5.5
property-file-info: ld7:file_id65:sp1f-sql_string.h-19700101030959-nogsoxwv222e4vm4toic7cabeb4swajz7:message84:Handled coping str_charset member in operator '=' overload                  
property-file-info: method.4:path16:sql/sql_string.hee
testament3-sha1: 5de100c747bddb02d6c1a6fccc7277233c9ba918


--BZR--
revision-id: mysql-builder@oracle.com-20130313041207-pmaa17bvriqfkrzi
property-audit-revid: harin.vadodaria@oracle.com-20130313041207-k90zmc7bwp9mmi8h
property-branch-nick: clone
testament3-sha1: 0a2e27678f399d817c628a4be63e06f36f94921f
Bug#16084346: SSL_CONNECT_DEBUG.TEST FAILURE IN 5.1

Description: Null merge from 5.1.
--BZR--
revision-id: harin.vadodaria@oracle.com-20130313041350-2r6qq0bp2h2lkvog
property-audit-revid: harin.vadodaria@oracle.com-20130313041350-5lia7ltioy6ggha2
property-branch-nick: mysql-5.5
testament3-sha1: e470d52153016adb4e5b52dd743638e99dc2aa64
Bug#16268289 LOCK_REC_VALIDATE_PAGE() MAY DEREFERENCE A POINTER TO A
             FREED LOCK

ANALYIS
-------

In 5.5 code the lock_rec_block_validate() is called after releasing
the kernel mutex. There is a chance that the lock might be invalid so,
we are getting the valgrind error on invalid read on lock->index.

FIX
---

Fix would be to copy the lock->index when we are holding the kernel mutex 
and then pass it to the lock_rec_block_validate(). This implementation
is present in 5.1 code.  

[ Approved by sunny rb.no.oracle.com/rb/r/2152/ ]

--BZR--
revision-id: aditya.a@oracle.com-20130313061321-ibget09llt3x3ukn
property-audit-revid: aditya.a@oracle.com-20130313061321-v9ohvhd5bv0zhx54
property-branch-nick: mysql-5.5
testament3-sha1: c5e326f5771e32c026e6888f58e55b9e3325a1c5