bk commit into 5.1 tree (davi:1.2600)

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
5.1 repository of davi. When davi 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-10-31 13:54:53-02:00, davi@stripped +1 -0
  Post merge fix for bug 31669.

  tests/mysql_client_test.c@stripped, 2007-10-31 13:54:51-02:00, davi@stripped +8 -8
    Macro name changed in 5.1

diff -Nrup a/tests/mysql_client_test.c b/tests/mysql_client_test.c
--- a/tests/mysql_client_test.c	2007-10-31 02:04:03 -02:00
+++ b/tests/mysql_client_test.c	2007-10-31 13:54:51 -02:00
@@ -17112,8 +17112,8 @@ static void test_bug31669()
   int rc;
   static char buff[LARGE_BUFFER_SIZE+1];
 #ifndef EMBEDDED_LIBRARY
-  static char user[USERNAME_LENGTH+1];
-  static char db[NAME_LEN+1];
+  static char user[USERNAME_CHAR_LENGTH+1];
+  static char db[NAME_CHAR_LEN+1];
   static char query[LARGE_BUFFER_SIZE*2];
 #endif
 
@@ -17136,13 +17136,13 @@ static void test_bug31669()
 
 #ifndef EMBEDDED_LIBRARY
   memset(db, 'a', sizeof(db));
-  db[NAME_LEN]= 0;
+  db[NAME_CHAR_LEN]= 0;
   strxmov(query, "CREATE DATABASE IF NOT EXISTS ", db, NullS);
   rc= mysql_query(mysql, query);
   myquery(rc);
 
   memset(user, 'b', sizeof(user));
-  user[USERNAME_LENGTH]= 0;
+  user[USERNAME_CHAR_LENGTH]= 0;
   memset(buff, 'c', sizeof(buff));
   buff[LARGE_BUFFER_SIZE]= 0;
   strxmov(query, "GRANT ALL PRIVILEGES ON *.* TO '", user, "'@'%' IDENTIFIED BY "
@@ -17156,21 +17156,21 @@ static void test_bug31669()
   rc= mysql_change_user(mysql, user, buff, db);
   DIE_UNLESS(!rc);
 
-  user[USERNAME_LENGTH-1]= 'a';
+  user[USERNAME_CHAR_LENGTH-1]= 'a';
   rc= mysql_change_user(mysql, user, buff, db);
   DIE_UNLESS(rc);
 
-  user[USERNAME_LENGTH-1]= 'b';
+  user[USERNAME_CHAR_LENGTH-1]= 'b';
   buff[LARGE_BUFFER_SIZE-1]= 'd';
   rc= mysql_change_user(mysql, user, buff, db);
   DIE_UNLESS(rc);
 
   buff[LARGE_BUFFER_SIZE-1]= 'c';
-  db[NAME_LEN-1]= 'e';
+  db[NAME_CHAR_LEN-1]= 'e';
   rc= mysql_change_user(mysql, user, buff, db);
   DIE_UNLESS(rc);
 
-  db[NAME_LEN-1]= 'a';
+  db[NAME_CHAR_LEN-1]= 'a';
   rc= mysql_change_user(mysql, user, buff, db);
   DIE_UNLESS(!rc);