merge with 5.3

sql/sql_insert.cc:
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
  ******
  CREATE ... IF NOT EXISTS may do nothing, but
  it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
  small cleanup
  ******
  small cleanup

1 files changed, 3 insertions, 1 deletions

diff --git a/include/thr_lock.h b/include/thr_lock.h
index 531575e9e9f..a744fab8aec 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -104,9 +104,10 @@ typedef struct st_thr_lock_data {
   struct st_thr_lock *lock;
   mysql_cond_t *cond;
   void *status_param;			/* Param to status functions */
-  void *debug_print_param;
+  void *debug_print_param;              /* For error messages */
   struct PSI_table *m_psi;
   enum thr_lock_type type;
+  enum thr_lock_type org_type;		/* Cache for MariaDB */
   uint priority;
 } THR_LOCK_DATA;
 
@@ -131,6 +132,7 @@ typedef struct st_thr_lock {
   my_bool (*start_trans)(void*);	/* When all locks are taken */
   my_bool (*check_status)(void *);
   void   (*fix_status)(void *, void *);/* For thr_merge_locks() */
+  const char *name;                     /* Used for error reporting */
   my_bool allow_multiple_concurrent_insert;
 } THR_LOCK;