bk commit into 5.1 tree (kostja:1.2557)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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@stripped, 2007-07-17 01:30:57+04:00, kostja@bodhi.(none) +2 -0
  Fix a build break on 64 bit (uint and size_t are distinct types).

  sql/sql_lex.cc@stripped, 2007-07-17 01:30:49+04:00, kostja@bodhi.(none) +1 -1
    Fix a build break on 64 bit (uint and size_t are distinct types).

  sql/sql_lex.h@stripped, 2007-07-17 01:30:49+04:00, kostja@bodhi.(none) +1 -1
    Fix a build break on 64 bit (uint and size_t are distinct types).

diff -Nrup a/sql/sql_lex.cc b/sql/sql_lex.cc
--- a/sql/sql_lex.cc	2007-07-16 23:02:45 +04:00
+++ b/sql/sql_lex.cc	2007-07-17 01:30:49 +04:00
@@ -2326,7 +2326,7 @@ uint8 st_lex::get_effective_with_check(T
 */
 
 bool
-st_lex::copy_db_to(char **p_db, uint *p_db_length) const
+st_lex::copy_db_to(char **p_db, size_t *p_db_length) const
 {
   if (sphead)
   {
diff -Nrup a/sql/sql_lex.h b/sql/sql_lex.h
--- a/sql/sql_lex.h	2007-07-16 23:02:45 +04:00
+++ b/sql/sql_lex.h	2007-07-17 01:30:49 +04:00
@@ -1782,7 +1782,7 @@ typedef struct st_lex : public Query_tab
     context_stack.pop();
   }
 
-  bool copy_db_to(char **p_db, uint *p_db_length) const;
+  bool copy_db_to(char **p_db, size_t *p_db_length) const;
 
   Name_resolution_context *current_context()
   {