Raise version number after cloning 5.5.39
--BZR--
revision-id: murthy.narkedimilli@oracle.com-20140701063152-ymx5100rzjfx6d92
property-audit-revid: murthy.narkedimilli@oracle.com-20140701063152-zgm5ltx9ufayu3hb
property-authors: murthy.narkedimilli@oracle.com
property-branch-nick: mysql-5.5
testament3-sha1: fe492d6b4c3217c3fe61662be9e3d60fdc65c8f1
BUG#18779944: MYSQLDUMP BUFFER OVERFLOW

Mysqldump overflows stack buffer when copying table name from commandline arguments resulting in stack corruption and ability to execute arbitrary code.

Fix: Check length of all positional arguments passed to mysqldump is smaller than NAME_LEN.
Note: Mysqldump heavily depends on that database objects (databases, tablespaces, tables, etc) are limited to small size (now it is 64).
--BZR--
revision-id: marcin.babij@oracle.com-20140702084522-r0xves84fabpmwrd
property-audit-revid: marcin.babij@oracle.com-20140702084522-mwnwd72eg1c0b3h3
property-branch-nick: mysql-5.5
testament3-sha1: 62c0a7a13e0f78dbe54534b812944b076d8b242b
Bug#17873011 NO DEPRECATION WARNING FOR THREAD_CONCURRENCY

Description:
THREAD_CONCURRENCY is deprecated and there is no 
deprecation warning message while setting this variable
while starting the server.

Analysis:
This variable is specific to Solaris 8 and earlier systems
and is ignored on all other platforms. But since many 
customers, who uses other than Solaris, still has this 
variable in their configuration file, it is important to
have a deprecation warning.

Fix:
THREAD_CONCURRENCY deprecation warning message is added.
--BZR--
revision-id: arun.kuruvila@oracle.com-20140702092252-gqgpaoici7t8ffiy
property-audit-revid: arun.kuruvila@oracle.com-20140702092252-09wqe9btf1chsvwy
property-branch-nick: mysql-5.5
testament3-sha1: e6c70ecb542e187923ceefe85a8428f353b2d858
Bug #19140907 DUPLICATES IN UNIQUE SECONDARY INDEX BECAUSE OF FIX OF BUG#68021

Problem:

When a unique secondary index is scanned for duplicate checking, gap locks
were not taken if the transaction had isolation level <= READ COMMITTED. 
This change was done while fixing Bug #16133801 UNEXPLAINABLE INNODB UNIQUE
INDEX LOCKS ON DELETE + INSERT WITH SAME VALUES (rb#2035). Because of this
the duplicate check logic failed, and resulted in duplicate values in unique
secondary index.

Solution:

When a unique secondary index is scanned for duplicate checking, gap locks
must be taken irrespective of the transaction isolation level.  This is
achieved by reverting rb#2035.

rb#5910 approved by Jimmy

--BZR--
revision-id: annamalai.gurusami@oracle.com-20140703044329-urguzj1jfvs677wx
property-audit-revid: annamalai.gurusami@oracle.com-20140703044329-227l9eqy63xhiosc
property-branch-nick: mysql-5.5
testament3-sha1: 1ec43934456bb541180569815d30a41ac2704ab3
Bug#18469276: MOD FOR SMALL DECIMALS FAILS
      
Problem:
If leading zeroes of fractional part of a decimal
number exceeds 45, mod operation on the same fails.
      
Analysis:
Currently there is a miscalcultion of fractional
part for very small decimals in do_div_mod.
      
For ex:
For 0.000(45 times).....3
length of the integer part becomes -5 (for a length of one,
buffer can hold 9 digits. Since number of zeroes are 45, integer
part becomes 5) and it is negative because of the leading
zeroes present in the fractional part.
Fractional part is the number of digits present after the
point which is 46 and therefore rounded off to the nearest 9
multiple which is 54. So the length of the resulting fractional
part becomes 6.
      
Because of this, the combined length of integer part and fractional
part exceeds the max length allocated which is 9 and thereby failing.
      
Solution:
In case of negative integer value, it indicates there are
leading zeroes in fractional part. As a result stop1 pointer 
should be set not just based on frac0 but also intg0. This is
because the detination buffer will be filled with 0's for the length
of intg0.
--BZR--
revision-id: chaithra.gopalareddy@oracle.com-20140703084202-g68kysanck2k3ltn
property-audit-revid: chaithra.gopalareddy@oracle.com-20140703084202-0iy67hhi3b9wueu4
property-branch-nick: mysql-5.5
property-file-info: ld7:file_id62:sp1f-decimal.c-20041018120639-qqm4oeadwhbdhuxgwlc657il4tu44n6m7:message63:Calculate stop1 pointer based on the length of intg0 and frac0.4:path17:strings/decimal.cee
testament3-sha1: 914763d53ed98e3d5087133bc321d891bef2fb81
WL#7219: Implement audit filter
--BZR--
revision-id: ashish.y.agarwal@oracle.com-20140703215934-5p19zcakwj3ygnva
property-audit-revid: ashish.y.agarwal@oracle.com-20140703215934-aeeqrzqsga34v24v
property-branch-nick: mysql-5.5
testament3-sha1: 7cda04ff87205c56d5d67e43f3248beafa9140ac
Bug#18935421 RPAD DIES WITH CERTAIN PADSTR INTPUTS....

For rpad() and lpad(): verify that the padding string is well-formed.

--BZR--
revision-id: tor.didriksen@oracle.com-20140707100530-itmypugpsoaejqtv
property-audit-revid: tor.didriksen@oracle.com-20140707100530-9q3rjofa38ssrljf
property-branch-nick: 5.5-merge
testament3-sha1: 831fc14267135a130086abe148fdc7a3c81e2ffa
BUG#18942294 - SEGV IN DICT_FIND_TABLE_BY_SPACE TRYING TO MARK SPACE CORRUPT
IN RECOVERY

During redo log processing, the data dictionary is not available. We should
check it in dict_find_table_by_space() to prevent SEGV error.

rb#5678, approved by Jimmy.

--BZR--
revision-id: bin.x.su@oracle.com-20140708071015-29wnb0z2tocvq4wi
property-audit-revid: bin.x.su@oracle.com-20140708071015-145yy90wt72m2pjt
property-branch-nick: mysql-5.5
testament3-sha1: bc21cc23fd0b775e2defd697baf0d8400c33ac25
--BZR--
revision-id: mysql-builder@oracle.com-20140709074113-pmu2szulpf8u66vf
property-audit-revid: bin.x.su@oracle.com-20140709074113-suel572f40edd9s0
property-branch-nick: clone
testament3-sha1: a83ece5b2f84332594d8a29fa76da0c1768b05ad
Bug #19149091 5.5 BUILD BREAKS ON LINUX IF SUN DTRACE IS INSTALLED

  Add some code adapted from 5.6 to check for "real" DTrace. If found,
  and system is Linux, we simply set DTRACE to OFF. Otherwise no change.

  Build will still break if one tries to manually set DTRACE to ON.

--BZR--
revision-id: bjorn.munch@oracle.com-20140709081138-6w1o8zczg5chfzcn
property-audit-revid: bjorn.munch@oracle.com-20140709081138-be9y4qokizyipsyv
property-branch-nick: main-55
testament3-sha1: 55ff2938bcbbd7324b74ec6ac92a8cdc0c1988f8
Bug#19172145 - Remove perl(GD) and dtrace dependencies and bench fix
--BZR--
revision-id: balasubramanian.kandasamy@oracle.com-20140709103919-dsyzlpc5rzrypjgx
property-audit-revid: balasubramanian.kandasamy@oracle.com-20140709103919-wy3w5wcm3a40pqm3
property-branch-nick: mysql-5.5
testament3-sha1: 7a3e9866b12fef87b1590fbf7b905267694f8186
Bug#14757009: WHEN THE GENERAL_LOG IS A SOCKET AND THE READER
              GOES AWAY, MYSQL QUITS WORKING.

Analysis:
-----------------
Issue in this bug and in bug 11907705 is, the socket file or
fifo file is set for general log at command line while starting
the server. But currently, only regular file can be set for the 
general log. Instead of reporting any error, the provided files
are opened for writing and continued. Because of this issues
mentioned in the bug reports are seen.

As mentioned, only when any non-regular file is set for general
log at command line while starting the server, these issues are
seen. If general log file is set to non-regular file from CLI
using system variable general_log_file then error is reported.

These issues can also be faced with slow query log file, if it is
set to non-regular file.

Fix:
-----------------
Currently while starting the server if we fail to open log file
then we report an error, disable logging to file and continue.
To fix issue reported code is modified to check whether file
is regular file or not before opening it. If file is not a 
regular file then error is logged to error log and logging to 
file is disabled.

--BZR--
revision-id: praveenkumar.hulakund@oracle.com-20140717055118-s5cj0pmjl8ltbvyp
property-audit-revid: praveenkumar.hulakund@oracle.com-20140717055118-r8xtidwg6k5bdj1r
property-branch-nick: mysql-5.5
testament3-sha1: f35e130e99d1f14fa31d19b838bd99b3f7bcdfef
Bug #17297324 GLIBC DOUBLE FREE OR CORRUPTION WHEN KILLING CLIENT; CTRL+C 

Description: Sometimes when killing the mysql command line client with
KILL -2(SIGINT), mysql client core dumps as a result of a double free or
corruption.

Analysis: When we run the mysql client in command line mode it will goes
to mysql_end() and frees many data structures. At the same time (i.e
after some data structures are freed), if we give "KILL -2" signal then
the signal will be handled with function handle_kill_signal() and as
part of it will again calls mysql_end() and goes with free() to the
already freed data structure for batch_readline_end() function, which
causes core dump.

Fix: Ignoring SIGQUIT and SIGINT signals when cleanup process starts.
This will help in resolving the double free issues, which occurs 
in case the signal handler function is started in between of the 
clean up function.
For 5.6 we need to ignore SIGHUP also.
--BZR--
revision-id: venkata.sidagam@oracle.com-20140721055650-nqm22s62uoc2kc3i
property-audit-revid: venkata.sidagam@oracle.com-20140721055650-wnjetiy1mltrdzov
property-branch-nick: 5.5
testament3-sha1: b27ec00d922bbcf7dda3a00667f71eef65264508
Bug#19223915 Provide mysql-compat-server dependencies
--BZR--
revision-id: balasubramanian.kandasamy@oracle.com-20140724093740-it05itak8t9i36ak
property-audit-revid: balasubramanian.kandasamy@oracle.com-20140724093740-ck0vmf38pusdgu2m
property-branch-nick: mysql-5.5.39-ol7-release
testament3-sha1: 5fd05351830122a699e3b457f5c6b4cf52b7083a
--BZR--
revision-id: mysql-builder@oracle.com-20140728071919-lftyt7vse9pcrhwt
property-audit-revid: ramil.kalimullin@oracle.com-20140728071919-waa228gz10rawc8y
property-branch-nick: clone
testament3-sha1: 0c034d593a4b59554ce620c678b5c97aab3751a4
Bug #18384260: MULTIPLE SECURITY ISSUES IN CERTIFICATE VALIDATION

the 5.5 version of the fix.
Added a call to X509_verify_cert_error_string() into the client certificate
verification code.
--BZR--
revision-id: georgi.kodinov@oracle.com-20140731095249-jfto2l5vqolbbh1b
property-audit-revid: georgi.kodinov@oracle.com-20140731095249-kghlxqasd7oaigo5
property-branch-nick: B18384260-5.5
testament3-sha1: 27f1c666cff807aba10686fa963950e8108ac795
Merge from mysql-5.5.39-release
--BZR--
revision-id: murthy.narkedimilli@oracle.com-20140731103005-c0o55ceumq5gyhfl
property-audit-revid: murthy.narkedimilli@oracle.com-20140731103005-k1pe6666bsky9qgg
property-authors: 
property-branch-nick: mysql-5.5
testament3-sha1: 6e81836930151b2cd74a8441cc9338b2813771c1
Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, 5.6.15+, 5.7.3+

Description: mysql_upgrade fails with below error, 
when there are duplicate entries(like 'root'@'LOCALHOST'
and 'root'@'localhost') in mysql.user table.
ERROR 1062 (23000) at line 1140: Duplicate entry 'localhost-root' for key 'PRIMARY'
FATAL ERROR: Upgrade failed

Analysis: As part of the bug 12917151 fix we are 
making all the hostnames as lower case hostnames.
So, this has been done by mysql_upgrade.
In case of above mentioned duplicate entries 
mysql_upgrade tries to change hostname to lowercase.
Since there is already 'root'@'localhost' exists.
it is failing with "duplicate entry" error.

Fix: Since its a valid error failure. We are 
making the error more verbose. So, that user will
delete the duplicate errors manually.
Along with existing error we are printing below
error as well.
ERROR 1644 (45000) at line 1153: Multiple accounts exist for @user_name, @host_name that differ only in Host lettercase; remove all except one of them
--BZR--
revision-id: venkata.sidagam@oracle.com-20140801084828-jvql6i8i5d7xzoof
property-audit-revid: venkata.sidagam@oracle.com-20140801084828-vj13lgyzu5pw6bhv
property-branch-nick: 5.5
testament3-sha1: 9417acdd9cbe3be786938522ed627f4d291ea7ef
Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, 5.6.15+, 5.7.3+

Follow-up patch. Removed unwanted code.
--BZR--
revision-id: venkata.sidagam@oracle.com-20140801113955-adlqhffohcxc0r05
property-audit-revid: venkata.sidagam@oracle.com-20140801113955-v8wkuyj5uvoumlla
property-branch-nick: 5.5
testament3-sha1: 3bbe1aa9cd949dc5f2a7bb818d2a13169170ce15
Updated for el7 regular rpms
--BZR--
revision-id: balasubramanian.kandasamy@oracle.com-20140804135619-qvbn3qhmf9jz0hma
property-audit-revid: balasubramanian.kandasamy@oracle.com-20140804135619-ss8kn9lcc3zoj0qh
property-branch-nick: mysql-5.5.39-ol7-release
testament3-sha1: 0213d8c2a6c1485bee9b04aaf33f41da7e2e8b03