Raise version number after cloning 5.5.34
--BZR--
revision-id: balasubramanian.kandasamy@oracle.com-20130827070849-h3sum2kngibir760
property-audit-revid: balasubramanian.kandasamy@oracle.com-20130827070849-fkellmp0vfgr1eok
property-authors: balasubramanian.kandasamy@oracle.com
property-branch-nick: mysql-5.5
testament3-sha1: 9ff125e107037faf951bc77623876bf4cffaa48c
Bug#16346241 - SERVER CRASH IN ITEM_PARAM::QUERY_VAL_STR

Problem:-
Second execution of prepared statement for query with 
parameter in limit clause, causes an assert when using 
connectors (e.g., Connector C).  


Analysis:-
In prepared statement, LIMIT parameters can be
specified using '?' markers. Value for the parameter can
be supplied while executing the prepared statement.

Passing string, float or double values for LIMIT clause
works well from command-line client. That's because, while 
setting the LIMIT parameter value from a user-variable,
the value is converted to integer value.

However, when prepared statement is executed from other
interfaces as J connectors, or C applications etc,
the value for the parameters are sent to the server
with execute command. Each item in command has value and
the data TYPE. So, while setting parameter values
from this log, value is set to all the parameters
with the same data type as passed.
Here, we have the logic to convert the value to change the 
state and item_type if it is part of LIMIT parameter and 
its item_type is not INT.
But when we reset this parameter we save the item_type but change 
state. So on second execution we have old item_type but our state 
has been changed, which make us to use string type variable 
in Item_param::query_str_val(). This cause an assert.

Fix:
Instead of checking the item_type of the parameter, check for 
the state of the parameter. As state value are reset everytime
we execute the statement.
--BZR--
revision-id: neeraj.x.bisht@oracle.com-20130828092453-k49wbwhfo43giwxj
property-audit-revid: neeraj.x.bisht@oracle.com-20130828092453-9hpov6wmwdppahms
property-branch-nick: 5.5
testament3-sha1: e2f753320135f8dba6b3670b312bf311d78476db
BUG#17294150-POTENTIAL CRASH DUE TO BUFFER OVERRUN IN SSL 
             ERROR HANDLING CODE 

BACKGROUND:
There can be a potential crash due to buffer overrun in 
SSL error handling code due to missing comma in
ssl_error_string[] array in viosslfactories.c.

ANALYSIS:
Found by code Inspection.

FIX:
Added the missing comma in SSL error handling code
in ssl_error_string[] array in viosslfactories.c.
--BZR--
revision-id: raghav.kapoor@oracle.com-20130828094746-0x0c24dzwzrlugpl
property-audit-revid: raghav.kapoor@oracle.com-20130828094746-yivvatr7auabz5ao
property-branch-nick: mysql-5.1-bug-17294150
testament3-sha1: 095d3673977a7e285bfb2eaa5e0c37d0b9c7ff87
BUG#17294150-POTENTIAL CRASH DUE TO BUFFER OVERRUN IN SSL 
             ERROR HANDLING CODE 

BACKGROUND:
There can be a potential crash due to buffer overrun in 
SSL error handling code due to missing comma in
ssl_error_string[] array in viosslfactories.c.

ANALYSIS:
Found by code Inspection.

FIX:
Added the missing comma in SSL error handling code
in ssl_error_string[] array in viosslfactories.c.
--BZR--
revision-id: raghav.kapoor@oracle.com-20130828094930-hgtrn8q3iyhn241b
property-audit-revid: raghav.kapoor@oracle.com-20130828094930-xxwizwpod3tsgu3p
property-branch-nick: mysql-5.5-bug-17294150
testament3-sha1: 5b64c8f11082cd786fa0958935a3837ab02472e2
Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script
--BZR--
revision-id: balasubramanian.kandasamy@oracle.com-20130829124255-2uo5g3sj3whjd6jg
property-audit-revid: balasubramanian.kandasamy@oracle.com-20130829124255-4ycxmy839amud1p6
property-branch-nick: mysql-5.1.72-release
testament3-sha1: b118bd1758fed940e5b8a87f0370afa5ab6f1f80
Fix to ignore mysqld_safe.pid
--BZR--
revision-id: balasubramanian.kandasamy@oracle.com-20130830151446-we5p5cml0da52n7a
property-audit-revid: balasubramanian.kandasamy@oracle.com-20130830151446-sn7kf0g68d4sac5p
property-branch-nick: mysql-5.1.72-release
testament3-sha1: a1cbe5c6fd8d13cd2e429cf2837cc9ac78423d2d
Bug #17297012	MEMORY LEAK IN MYSQL_OPTIONS WHILE CALLING WITH OPTION MYSQL_SET_CLIENT_IP

Memory Leak in mysql_options() was caused by missing call
to my_free() in MYSQL_SET_CLIENT_IP branch. Fixed by adding
my_free() to cleanup mysql->options.client_ip value before
assigning new value.
--BZR--
revision-id: igor.solodovnikov@oracle.com-20130830170537-luihb5fffmlve3n6
property-audit-revid: igor.solodovnikov@oracle.com-20130830170537-x1mdnif5hyu2ayzl
property-branch-nick: mysql-5.1
testament3-sha1: b06e1bf04bdd262d5b63997ff1ec41a1ad4e3533
Null-merge from mysql-5.1
--BZR--
revision-id: igor.solodovnikov@oracle.com-20130830170612-sdyaw5k1zr01k22l
property-audit-revid: igor.solodovnikov@oracle.com-20130830170612-dz3gschqsdkix72u
property-branch-nick: mysql-5.5
testament3-sha1: 9cdb1f0b0d4f6c17b8782125db0b6424335d74dd
Bug #17297012	MEMORY LEAK IN MYSQL_OPTIONS WHILE CALLING WITH OPTION MYSQL_SET_CLIENT_IP

Memory Leak in mysql_options() was caused by missing call
to my_free() in MYSQL_SET_CLIENT_IP branch. Fixed by adding
my_free() to cleanup mysql->options.client_ip value before
assigning new value.
--BZR--
revision-id: igor.solodovnikov@oracle.com-20130830172209-5phr9u98x4za7czc
property-audit-revid: igor.solodovnikov@oracle.com-20130830172209-s9f8rz1mhfw9kmy0
property-branch-nick: mysql-5.5
testament3-sha1: 30a805fdc9c58a2bf110b2f8bbfef9b6898cab3b
--BZR--
revision-id: mysql-builder@oracle.com-20130901132152-yybn4zgdyk9agiv1
property-audit-revid: neeraj.x.bisht@oracle.com-20130901132152-nyih2ffmlhv59z79
property-branch-nick: clone
testament3-sha1: 297b1f124bf8699320fba85b6a518ce951155404
Bug #17168602 MYSQL_PLUGIN REMOVES NON-DIRECTORY TYPE FILES 
              SPECIFIED WITH THE BASEDIR OPTION

Description: The mysql_plugin client attempts to remove any
filename specified to the --basedir option. The problem is 
that if the filename does not end with a slash, it will 
attempt to unlink it, which succeeds for files, but not for 
directories.

Analysis: When we are starting mysql_plugin with basedir 
option and if we are giving path of a file as basedir, it 
deletes that file. It was because it uses a function 
my_delete which unlinks the file path given.

Fix:  As a fix we replace that line using another function 
my_free, which will only free the  pointer which is having 
that file path.

--BZR--
revision-id: arun.kuruvila@oracle.com-20130902092345-vhv2ol8x7rw7tbgv
property-audit-revid: arun.kuruvila@oracle.com-20130902092345-q3nn73l2yavwfvn0
property-branch-nick: fixed-5-5
testament3-sha1: 77320dd6b56d10e1df17935eb773ac3f12cafbe6
Fixing sles11 build that /usr/lib/mysql/plugin is not owned by a package

--BZR--
revision-id: hery.ramilison@oracle.com-20130903163746-yeu8uof3972qymvl
property-audit-revid: hery.ramilison@oracle.com-20130903163746-2ihyv5mokr26bp7i
property-branch-nick: mysql-5.1.72-release
testament3-sha1: 661129652cd38782a86758325ff55f80cee499bb
Bug#17222452 - SELECT COUNT(DISTINCT A,B) INCORRECTLY COUNTS ROWS 
	       CONTAINING NULL

Problem:-
In MySQL, We can obtain the number of distinct expression
combinations that do not contain NULL by giving a list of 
expressions in COUNT(DISTINCT).
However rows with NULL values are
incorrectly included in the count when loose index scan is 
used.

Analysis:-
In case of loose index scan, we check whether the field is null or 
not and increase the count in Item_sum_count::add().
But there we are checking for the first field in COUNT(DISTINCT), 
not for every field. This is causing an incorrect result.

Solution:-
Check all field in Item_sum_count::add(), whether there values 
are null or not. Then only increment the count.
******
Bug#17222452 - SELECT COUNT(DISTINCT A,B) INCORRECTLY COUNTS ROWS 
	       CONTAINING NULL

Problem:-
In MySQL, We can obtain the number of distinct expression
combinations that do not contain NULL by giving a list of 
expressions in COUNT(DISTINCT).
However rows with NULL values are
incorrectly included in the count when loose index scan is 
used.

Analysis:-
In case of loose index scan, we check whether the field is null or 
not and increase the count in Item_sum_count::add().
But there we are checking for the first field in COUNT(DISTINCT), 
not for every field. This is causing an incorrect result.

Solution:-
Check all field in Item_sum_count::add(), whether there values 
are null or not. Then only increment the count.
--BZR--
revision-id: neeraj.x.bisht@oracle.com-20130904051555-axfo64sey4smbwfe
property-audit-revid: neeraj.x.bisht@oracle.com-20130904051555-p167z9gavd80l6hf
property-branch-nick: 5.5
testament3-sha1: 4b94af8ec9a691f245c0e2320b6490829deac0e2
BUG#16032946 - PLEASE GIVE A MESSAGE FOR "THREAD_CONCURRENCY DOESN'T
               DO WHAT YOU EXPECT"

Fix info:
--------

Backport of the deprecation bug fix (WL#5265) for global variable
'THREAD_CONCURRENCY' from mysql-5.6 to mysql-5.5

Note: With this backport, certain additional deprecation warnings
      would be reported under error conditions while setting the
      global/session variables.
--BZR--
revision-id: nisha.gopalakrishnan@oracle.com-20130905081027-z82ciode93vrq98k
property-audit-revid: nisha.gopalakrishnan@oracle.com-20130905081027-9gpoei2fr7235inh
property-branch-nick: mysql-5.5-16032946
testament3-sha1: d1748fefda216b0452a2f92d73e513f3e81520aa
Bug #17168602 MYSQL_PLUGIN REMOVES NON-DIRECTORY TYPE 
              FILES SPECIFIED WITH THE BASEDIR OPTION

Reverting the patch. Because asked for second review.
--BZR--
revision-id: venkata.sidagam@oracle.com-20130905084843-iizoh25ut6zd5jd7
property-audit-revid: venkata.sidagam@oracle.com-20130905084843-6j65hbfgv21i2jsu
property-branch-nick: 5.5
testament3-sha1: 5890cda40fc53bea82c49ebdb8b239027a369cfc
Post push fix of openssl_1.test failure
--BZR--
revision-id: raghav.kapoor@oracle.com-20130906070811-orguzigayo5ir0ns
property-audit-revid: raghav.kapoor@oracle.com-20130906070811-yrmy5nsep9m6aoyw
property-branch-nick: mysql-5.5-bug-17294150
testament3-sha1: f88bbccf828adc26e8c13accd3d58014c2ad978f
Bug#16870783 RECENT REGRESSION: CRASH WITH GROUP_CONCAT AND INVALID SEPARATOR

Add missing initialization in lex_start()

--BZR--
revision-id: tor.didriksen@oracle.com-20130909104308-jyucm8f6hz21auyl
property-audit-revid: tor.didriksen@oracle.com-20130909104308-1pv4xr06g6l4rnfr
property-branch-nick: 5.5-bug16870783groupconcat
testament3-sha1: e38c411599163c94771f84692d8cc9e4d30e835d
Bug#17296644 CONV(X, INT_MIN, INT_MIN) SEGFAULTS THE SERVER

Do not call abs(INT_MIN) as the result is undefined.

--BZR--
revision-id: tor.didriksen@oracle.com-20130909122050-m0zin9n1o1hlyt8x
property-audit-revid: tor.didriksen@oracle.com-20130909122050-ptz7fdjj8l5uzxu3
property-branch-nick: 5.5
testament3-sha1: 3c02f6f6b83e7f4e60814cc9ef4b08a0a3d288d2
Bug #16776528 RACE CONDITION CAN CAUSE MYSQLD TO REMOVE SOCKET FILE ERRANTLY
      
Reverting the patch. Because this change is not to me made for GA versions.

--BZR--
revision-id: venkata.sidagam@oracle.com-20130909150250-6026cifvpp9iug6o
property-audit-revid: venkata.sidagam@oracle.com-20130909150250-zaeypntgb6tegv3o
property-branch-nick: 5.1
testament3-sha1: b4699927be4376602dad15fe9d8bfda20c24f1b7
Bug #16776528 RACE CONDITION CAN CAUSE MYSQLD TO REMOVE SOCKET FILE ERRANTLY

Merging from 5.1 to 5.5
--BZR--
revision-id: venkata.sidagam@oracle.com-20130909160150-7dtyl73qz1nrdn0b
property-audit-revid: venkata.sidagam@oracle.com-20130909160150-r0ubej9a5uj53tsr
property-branch-nick: 5.5
testament3-sha1: f878b483f5b95becef41170e23e140b976629f01