bk commit into 5.1 tree (sergefp:1.2068)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.1 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2068 06/01/20 19:38:11 sergefp@stripped +5 -0
  Merge spetrunia@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5

  sql/sql_lex.h
    1.213 06/01/20 19:38:06 sergefp@stripped +0 -0
    Auto merged

  sql/sql_class.cc
    1.239 06/01/20 19:38:06 sergefp@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.522 06/01/20 19:38:06 sergefp@stripped +0 -0
    Auto merged

  sql/item.h
    1.189 06/01/20 19:38:06 sergefp@stripped +0 -0
    Auto merged

  sql/handler.h
    1.180 06/01/20 19:38:06 sergefp@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	pylon.mylan
# Root:	/home/psergey/mysql-5.1-ppruning-r5/RESYNC

--- 1.179/sql/handler.h	2006-01-19 16:37:44 +03:00
+++ 1.180/sql/handler.h	2006-01-20 19:38:06 +03:00
@@ -1161,6 +1161,8 @@
   byte *end_of_used_area;     /* End of area that was used by handler */
 } HANDLER_BUFFER;
 
+typedef struct system_status_var SSV;
+
 class handler :public Sql_alloc
 {
 #ifdef WITH_PARTITION_STORAGE_ENGINE
@@ -1182,6 +1184,9 @@
   virtual int rnd_init(bool scan) =0;
   virtual int rnd_end() { return 0; }
 
+  void ha_statistic_increment(ulong SSV::*offset) const;
+
+
 private:
   virtual int reset() { return extra(HA_EXTRA_RESET); }
 public:
@@ -1264,7 +1269,10 @@
       TRUE      Locking is allowed
       FALSE     Locking is not allowed. The error was thrown.
   */
-  virtual bool check_if_locking_is_allowed(THD *thd, TABLE *table, uint count)
+  virtual bool check_if_locking_is_allowed(uint sql_command,
+                                           ulong type, TABLE *table,
+                                           uint count,
+                                           bool called_by_logger_thread)
   {
     return TRUE;
   }

--- 1.188/sql/item.h	2006-01-18 13:56:18 +03:00
+++ 1.189/sql/item.h	2006-01-20 19:38:06 +03:00
@@ -1939,7 +1939,7 @@
   virtual Item *real_item() { return ref; }
 };
 
-
+#ifdef MYSQL_SERVER
 #include "gstream.h"
 #include "spatial.h"
 #include "item_sum.h"
@@ -1952,6 +1952,7 @@
 #include "item_uniq.h"
 #include "item_subselect.h"
 #include "item_xmlfunc.h"
+#endif
 
 class Item_copy_string :public Item
 {

--- 1.521/sql/mysqld.cc	2006-01-19 09:58:39 +03:00
+++ 1.522/sql/mysqld.cc	2006-01-20 19:38:06 +03:00
@@ -6525,24 +6525,24 @@
 {
   var->type= SHOW_CHAR;
   if (!ssl_acceptor_fd)
-    var->value= "NONE";
+    var->value= const_cast<char*>("NONE");
   else
     switch (SSL_CTX_get_session_cache_mode(ssl_acceptor_fd->ssl_context))
     {
     case SSL_SESS_CACHE_OFF:
-      var->value= "OFF"; break;
+      var->value= const_cast<char*>("OFF"); break;
     case SSL_SESS_CACHE_CLIENT:
-      var->value= "CLIENT"; break;
+      var->value= const_cast<char*>("CLIENT"); break;
     case SSL_SESS_CACHE_SERVER:
-      var->value= "SERVER"; break;
+      var->value= const_cast<char*>("SERVER"); break;
     case SSL_SESS_CACHE_BOTH:
-      var->value= "BOTH"; break;
+      var->value= const_cast<char*>("BOTH"); break;
     case SSL_SESS_CACHE_NO_AUTO_CLEAR:
-      var->value= "NO_AUTO_CLEAR"; break;
+      var->value= const_cast<char*>("NO_AUTO_CLEAR"); break;
     case SSL_SESS_CACHE_NO_INTERNAL_LOOKUP:
-      var->value= "NO_INTERNAL_LOOKUP"; break;
+      var->value= const_cast<char*>("NO_INTERNAL_LOOKUP"); break;
     default:
-      var->value= "Unknown"; break;
+      var->value= const_cast<char*>("Unknown"); break;
     }
   return 0;
 }
@@ -6563,6 +6563,7 @@
   *((long *)buff)= (long)thd->net.vio->ssl_arg ?
                          SSL_session_reused((SSL*) thd->net.vio->ssl_arg) :
                          0;
+  return 0;
 }
 
 static int show_ssl_get_default_timeout(THD *thd, SHOW_VAR *var, char *buff)

--- 1.238/sql/sql_class.cc	2006-01-20 00:40:51 +03:00
+++ 1.239/sql/sql_class.cc	2006-01-20 19:38:06 +03:00
@@ -785,7 +785,10 @@
 #ifdef WITH_PARTITION_STORAGE_ENGINE
   if (lex->describe & DESCRIBE_PARTITIONS)
   {
-    field_list.push_back(item= new Item_empty_string("partitions", 10, cs));
+    /* Maximum length of string that make_used_partitions_str() can produce */
+    item= new Item_empty_string("partitions", MAX_PARTITIONS * (1 + FN_LEN),
+                                cs);
+    field_list.push_back(item);
     item->maybe_null= 1;
   }
 #endif

--- 1.212/sql/sql_lex.h	2006-01-18 13:56:18 +03:00
+++ 1.213/sql/sql_lex.h	2006-01-20 19:38:06 +03:00
@@ -29,6 +29,7 @@
 class partition_info;
 class event_timed;
 
+#ifdef MYSQL_SERVER
 /*
   The following hack is needed because mysql_yacc.cc does not define
   YYSTYPE before including this file
@@ -43,6 +44,7 @@
 #include "sql_yacc.h"
 #define LEX_YYSTYPE YYSTYPE *
 #endif
+#endif
 
 /*
   When a command is added here, be sure it's also added in mysqld.cc
@@ -115,6 +117,8 @@
 */
 #define DESCRIBE_PARTITIONS	4
 
+#ifdef MYSQL_SERVER
+
 enum enum_sp_suid_behaviour
 {
   SP_IS_DEFAULT_SUID= 0,
@@ -1109,3 +1113,5 @@
 extern pthread_key(LEX*,THR_LEX);
 
 #define current_lex (current_thd->lex)
+
+#endif