bk commit into 4.1 tree (msvensson:1.2304)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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.2304 05/06/22 20:37:14 msvensson@neptunus.(none) +3 -0
  Fix so that my_progname is set to "mysqldump"

  mysql-test/t/mysqldump.test
    1.37 05/06/22 20:37:12 msvensson@neptunus.(none) +1 -15
    Update tests, no need for results

  mysql-test/r/mysqldump.result
    1.49 05/06/22 20:37:12 msvensson@neptunus.(none) +11 -10
    Update test results

  client/mysqldump.c
    1.191 05/06/22 20:37:11 msvensson@neptunus.(none) +1 -1
    Fix progname of mysqldump

# 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-4.1

--- 1.190/client/mysqldump.c	2005-06-22 20:15:06 +02:00
+++ 1.191/client/mysqldump.c	2005-06-22 20:37:11 +02:00
@@ -2621,7 +2621,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.48/mysql-test/r/mysqldump.result	2005-06-22 20:21:33 +02:00
+++ 1.49/mysql-test/r/mysqldump.result	2005-06-22 20:37:12 +02:00
@@ -1416,26 +1416,27 @@
 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;
+use test;
 create table t1 (a int(10));
 create table t2 (pk int primary key auto_increment,
 a int(10), b varchar(30), c datetime, d blob, e text);
@@ -1453,7 +1454,7 @@
 	</row>
 	<row>
 		<field name="a">20</field>
- 	</row>
+	</row>
 	</table_data>
 	<table_data name="t2">
 	<row>

--- 1.36/mysql-test/t/mysqldump.test	2005-06-22 20:19:40 +02:00
+++ 1.37/mysql-test/t/mysqldump.test	2005-06-22 20:37:12 +02:00
@@ -573,68 +573,54 @@
 --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
 
 drop table t1, t2, t3;
 drop database mysqldump_test_db;
-
+use test;
 
 
 #