Null-merge from mysql-5.1
Fixed build break in NDBCluster (MDL instrumentation)
Null-merge from mysql-5.1
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.
Null-merge from mysql-5.5
Null-merge from mysql-5.5
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.
Merge from mysql-5.6
Merge 7.3 -> trunk-cluster
Bug#16970785 MEMORY LEAK, EXPLAIN JSON

We do table->mem_root= own_rot, which invokes (the synthesized)
st_mem_root &operator=(const st_mem_root&)

So we need to switch memroot for 'copy_func' as well,
otherwise we will be allocating memory in two
different copies of the same mem-root
(and free only one of them)
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.
Bug #17168602 MYSQL_PLUGIN REMOVES NON-DIRECTORY TYPE FILES
              SPECIFIED WITH THE BASEDIR OPTION
Merging from mysql-5.5 to mysql-5.6
Bug #17168602 MYSQL_PLUGIN REMOVES NON-DIRECTORY TYPE FILES
              SPECIFIED WITH THE BASEDIR OPTION
Merging from mysql-5.6 to mysql-trunk
Adapt ndb_blob.result since the oputput of EPLAIN UPDATE has changed.

 -  The output now indicates UPDATE instead of SIMPLE.
 - See "WL#6369: EXPLAIN for other thread. 
             Implementation and fixed assiciated bugs."