Changeset to deal with 4.1 -> 4.0 merge

include/mysql_com.h:
  Partial changes for new secure connection handing required to 
  pull 4.0 -> 4.1 merge
sql/item_strfunc.cc:
  Handling of dynamic possible length for password
sql/item_strfunc.h:
  Larger buffer for password
sql/mysqld.cc:
  Added option to force old password format
sql/password.c:
  Begin implementing new hashing
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index af94e387717..90b843f5fd7 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -224,11 +224,11 @@ public:
 
 class Item_func_password :public Item_str_func
 {
-  char tmp_value[17];
+  char tmp_value[64]; /* This should be enough for new password format */
 public:
   Item_func_password(Item *a) :Item_str_func(a) {}
   String *val_str(String *);
-  void fix_length_and_dec() { max_length = 16; }
+  void fix_length_and_dec() { max_length = get_password_length(); }
   const char *func_name() const { return "password"; }
 };