push into mysql-5.0 branch (kgeorge:2634)

[Georgi Kodinov]

------------------------------------------------------------
revno: 2634
revision-id: kgeorge@stripped
parent: kgeorge@stripped
parent: bar@stripped
committer: Georgi Kodinov <kgeorge@stripped>
branch nick: B36887-5.0-bugteam
timestamp: Wed 2008-05-28 17:26:26 +0300
message:
  automatically merged
modified:
  sql/share/charsets/README     
sp1f-readme-19700101030959-biiq664z5e4hu6e76gmanzfplb7dqfv5
  strings/CHARSET_INFO.txt      
sp1f-charset_info.txt-20041018102512-ynunzmkv53gcy2f575oi7kp7isj5tbfi
    ------------------------------------------------------------
    revno: 2632.1.1
    revision-id: bar@stripped
    parent: chad@stripped
    committer: Alexander Barkov <bar@stripped>
    branch nick: mysql-5.0-bugteam
    timestamp: Wed 2008-05-28 15:03:47 +0500
    message:
      Updating charset doc files.
      Thanks to Paul for preparing the up-to-date files
      reflecting 4.1 changes.
    modified:
      sql/share/charsets/README     
sp1f-readme-19700101030959-biiq664z5e4hu6e76gmanzfplb7dqfv5
      strings/CHARSET_INFO.txt      
sp1f-charset_info.txt-20041018102512-ynunzmkv53gcy2f575oi7kp7isj5tbfi

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2008-03-28 20:01:05 +0000
+++ b/tests/mysql_client_test.c	2008-05-27 11:33:08 +0000
@@ -11675,7 +11675,7 @@
                         MAX_PARAM_COUNT * CHARS_PER_PARAM + 1);
   param_str= (char*) malloc(COLUMN_COUNT * CHARS_PER_PARAM);
 
-  if (bind == 0 || query == 0 || param_str == 0)
+  if (my_bind == 0 || query == 0 || param_str == 0)
   {
     fprintf(stderr, "Can't allocate enough memory for query structs\n");
     if (my_bind)