Commit acf5b949 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysys/default.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge backport
mysql-test/mysql-test-run.sh:
  Merge backport
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge
parents e9ad2183 81dd2cd0

mysql-test/r/mysqldump.result

+1 −0
Original line number Diff line number Diff line
@@ -655,6 +655,7 @@ UNLOCK TABLES; 
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



--fields-optionally-enclosed-by="



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

mysql-test/std_data/bug15328.cnf

0 → 100644
+2 −0
Original line number Diff line number Diff line 
[mysqldump]

fields-optionally-enclosed-by="

mysql-test/t/mysqldump.test

+7 −0
Original line number Diff line number Diff line
@@ -606,6 +606,13 @@ select * from t2 order by a; 
drop table t1, t2;

drop database db1;



#

# BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence

#



--exec $MYSQL_MY_PRINT_DEFAULTS --defaults-extra-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump





#

# Bug #9558 mysqldump --no-data db t1 t2 format still dumps data

#

mysys/default.c

+3 −1
Original line number Diff line number Diff line
@@ -755,7 +755,9 @@ static int search_default_file_with_ext(Process_option_func opt_handler, 
	value_end=value;



      /* remove quotes around argument */

      if ((*value == '\"' || *value == '\'') && *value == value_end[-1])

      if ((*value == '\"' || *value == '\'') && /* First char is quote */

          (value + 1 < value_end ) && /* String is longer than 1 */

          *value == value_end[-1] ) /* First char is equal to last char */

      {

	value++;

	value_end--;