10.0-monty merge

includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE

4 files changed, 5 insertions, 8 deletions

diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc
index f7f962deaca..c0227cf1292 100644
--- a/plugin/feedback/utils.cc
+++ b/plugin/feedback/utils.cc
@@ -389,7 +389,6 @@ int calculate_server_uid(char *dest)
 {
   uchar rawbuf[2 + 6];
   uchar shabuf[SHA1_HASH_SIZE];
-  SHA1_CONTEXT ctx;
 
   int2store(rawbuf, mysqld_port);
   if (my_gethwaddr(rawbuf + 2))
@@ -398,9 +397,7 @@ int calculate_server_uid(char *dest)
     return 1;
   }
 
-  mysql_sha1_reset(&ctx);
-  mysql_sha1_input(&ctx, rawbuf, sizeof(rawbuf));
-  mysql_sha1_result(&ctx, shabuf);
+  compute_sha1_hash((uint8*) shabuf, (char*) rawbuf, sizeof(rawbuf));
 
   assert(base64_needed_encoded_length(sizeof(shabuf)) <= SERVER_UID_SIZE);
   base64_encode(shabuf, sizeof(shabuf), dest);
diff --git a/plugin/handler_socket/handlersocket/database.cpp b/plugin/handler_socket/handlersocket/database.cpp
index beb28ef708c..a15c18a4c70 100644
--- a/plugin/handler_socket/handlersocket/database.cpp
+++ b/plugin/handler_socket/handlersocket/database.cpp
@@ -762,7 +762,7 @@ dbcontext::cmd_find_internal(dbcallback_i& cb, const prep_stmt& pst,
     return cb.dbcb_resp_short(2, "idxnum");
   }
   KEY& kinfo = table->key_info[pst.get_idxnum()];
-  if (args.kvalslen > kinfo.key_parts) {
+  if (args.kvalslen > kinfo.user_defined_key_parts) {
     return cb.dbcb_resp_short(2, "kpnum");
   }
   uchar *const key_buf = DENA_ALLOCA_ALLOCATE(uchar, kinfo.key_length);
diff --git a/plugin/qc_info/qc_info.cc b/plugin/qc_info/qc_info.cc
index 8489b14c5db..717c54d548b 100644
--- a/plugin/qc_info/qc_info.cc
+++ b/plugin/qc_info/qc_info.cc
@@ -113,7 +113,7 @@ static int qc_info_fill_table(THD *thd, TABLE_LIST *tables,
     statement_text_length = strlen(statement_text);
     /* We truncate SQL statements up to MAX_STATEMENT_TEXT_LENGTH in our I_S table */
     table->field[COLUMN_STATEMENT_TEXT]->store((char*)statement_text,
-           min(statement_text_length, MAX_STATEMENT_TEXT_LENGTH), scs);
+           MY_MIN(statement_text_length, MAX_STATEMENT_TEXT_LENGTH), scs);
 
     /* get the entire key that identifies this query cache query */
     key = (const char*)query_cache_query_get_key(query_cache_block_raw,
diff --git a/plugin/query_response_time/query_response_time.h b/plugin/query_response_time/query_response_time.h
index b19833a6570..35b01b0db81 100644
--- a/plugin/query_response_time/query_response_time.h
+++ b/plugin/query_response_time/query_response_time.h
@@ -44,11 +44,11 @@
 #define QRT_DEFAULT_BASE 10
 
 #define QRT_TIME_STRING_LENGTH				\
-  max( (QRT_TIME_STRING_POSITIVE_POWER_LENGTH + 1 /* '.' */ + 6 /*QRT_TIME_STRING_NEGATIVE_POWER_LENGTH*/), \
+  MY_MAX( (QRT_TIME_STRING_POSITIVE_POWER_LENGTH + 1 /* '.' */ + 6 /*QRT_TIME_STRING_NEGATIVE_POWER_LENGTH*/), \
        (sizeof(QRT_TIME_OVERFLOW) - 1) )
 
 #define QRT_TOTAL_STRING_LENGTH				\
-  max( (QRT_TOTAL_STRING_POSITIVE_POWER_LENGTH + 1 /* '.' */ + 6 /*QRT_TOTAL_STRING_NEGATIVE_POWER_LENGTH*/), \
+  MY_MAX( (QRT_TOTAL_STRING_POSITIVE_POWER_LENGTH + 1 /* '.' */ + 6 /*QRT_TOTAL_STRING_NEGATIVE_POWER_LENGTH*/), \
        (sizeof(QRT_TIME_OVERFLOW) - 1) )
 
 extern ST_SCHEMA_TABLE query_response_time_table;