bk commit into 5.0 tree (msvensson:1.1993)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1993 05/06/22 20:12:21 msvensson@neptunus.(none) +3 -0
  Fix mysqldump for so that my_programname is set to "mysqldump". 
  Correct test results now when error message output is predictable.

  mysql-test/t/mysqldump.test
    1.44 05/06/22 20:12:17 msvensson@neptunus.(none) +1 -16
    Update test result, removed --replace now ehn test output is predictable.

  mysql-test/r/mysqldump.result
    1.50 05/06/22 20:12:17 msvensson@neptunus.(none) +9 -9
    Update test results

  client/mysqldump.c
    1.185 05/06/22 20:12:17 msvensson@neptunus.(none) +1 -1
    Set mysqldump as progname instead of totally long and strange path provided by
libtool.

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.184/client/mysqldump.c	2005-06-22 15:43:46 +02:00
+++ 1.185/client/mysqldump.c	2005-06-22 20:12:17 +02:00
@@ -2835,7 +2835,7 @@
   compatible_mode_normal_str[0]= 0;
   default_charset= (char *)mysql_universal_client_charset;
 
-  MY_INIT(argv[0]);
+  MY_INIT("mysqldump");
   if (get_options(&argc, &argv))
   {
     my_end(0);

--- 1.49/mysql-test/r/mysqldump.result	2005-06-22 15:43:46 +02:00
+++ 1.50/mysql-test/r/mysqldump.result	2005-06-22 20:12:17 +02:00
@@ -1560,23 +1560,23 @@
 create table t3(a varchar(30) primary key, b int not null);
 test_sequence
 ------ Testing with illegal table names ------
-MYSQL_DUMP_DIR: Couldn't find table: "\d-2-1.sql"
+mysqldump: Couldn't find table: "\d-2-1.sql"
 
-MYSQL_DUMP_DIR: Couldn't find table: "\t1"
+mysqldump: Couldn't find table: "\t1"
 
-MYSQL_DUMP_DIR: Couldn't find table: "\t1"
+mysqldump: Couldn't find table: "\t1"
 
-MYSQL_DUMP_DIR: Couldn't find table: "\\t1"
+mysqldump: Couldn't find table: "\\t1"
 
-MYSQL_DUMP_DIR: Couldn't find table: "t\1"
+mysqldump: Couldn't find table: "t\1"
 
-MYSQL_DUMP_DIR: Couldn't find table: "t\1"
+mysqldump: Couldn't find table: "t\1"
 
-MYSQL_DUMP_DIR: Couldn't find table: "t/1"
+mysqldump: Couldn't find table: "t/1"
 
 test_sequence
 ------ Testing with illegal database names ------
-MYSQL_DUMP_DIR: Got error: 1049: Unknown database 'mysqldump_test_d' when selecting the
database
-MYSQL_DUMP_DIR: Got error: 1102: Incorrect database name 'mysqld\ump_test_db' when
selecting the database
+mysqldump: Got error: 1049: Unknown database 'mysqldump_test_d' when selecting the
database
+mysqldump: Got error: 1102: Incorrect database name 'mysqld\ump_test_db' when selecting
the database
 drop table t1, t2, t3;
 drop database mysqldump_test_db;

--- 1.43/mysql-test/t/mysqldump.test	2005-06-22 15:43:46 +02:00
+++ 1.44/mysql-test/t/mysqldump.test	2005-06-22 20:12:17 +02:00
@@ -619,62 +619,47 @@
 --disable_query_log
 select '------ Testing with illegal table names ------' as test_sequence ;
 --enable_query_log
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db "\d-2-1.sql" 2>&1
-
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "\t1" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "\\t1" 2>&1
- 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
+
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "\\\\t1" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "t\1" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments  mysqldump_test_db  "t\\1" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "t/1" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments "mysqldump_test_db" "T_1"
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments "mysqldump_test_db" "T%1"
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments "mysqldump_test_db" "T'1"
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments "mysqldump_test_db" "T_1"
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments "mysqldump_test_db" "T_"
 
 --disable_query_log
 select '------ Testing with illegal database names ------' as test_sequence ;
 --enable_query_log
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 2
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_d 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 2
 --exec $MYSQL_DUMP --compact --skip-comments "mysqld\ump_test_db" 2>&1