bk commit into 5.0 tree (cmiller:1.2295)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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, 2006-10-09 18:46:28-04:00, cmiller@stripped +5 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
  MERGE: 1.1616.2144.202

  BitKeeper/deleted/.del-collapsed~fbec3523369aae99@stripped, 2006-10-09 18:43:33-04:00,
cmiller@stripped +0 -0
    Delete: BitKeeper/etc/collapsed

  BitKeeper/deleted/.del-mysql_client.result@stripped, 2006-10-09 18:46:09-04:00,
cmiller@stripped +0 -14
    File is gone.
    MERGE: 1.2.2.2

  BitKeeper/deleted/.del-mysql_client.result@stripped, 2006-10-09 18:43:37-04:00,
cmiller@stripped +0 -0
    Merge rename: mysql-test/r/mysql_client.result ->
BitKeeper/deleted/.del-mysql_client.result

  BitKeeper/deleted/.del-mysql_client.test@stripped, 2006-10-09 18:46:21-04:00,
cmiller@stripped +0 -19
    File is gone.
    MERGE: 1.2.2.2

  BitKeeper/deleted/.del-mysql_client.test@stripped, 2006-10-09 18:43:37-04:00,
cmiller@stripped +0 -0
    Merge rename: mysql-test/t/mysql_client.test ->
BitKeeper/deleted/.del-mysql_client.test

  BitKeeper/etc/collapsed@stripped, 2006-10-09 18:43:33-04:00, cmiller@stripped +1 -0
    'Auto converge'

  BitKeeper/etc/collapsed@stripped, 2006-10-09 18:43:33-04:00, cmiller@stripped +0 -0
    Rename: BitKeeper/deleted/.del-collapsed -> BitKeeper/etc/collapsed

  BitKeeper/deleted/.del-collapsed@stripped, 2006-10-09 18:43:33-04:00,
cmiller@stripped +0 -0
    'Auto converge rename'

  client/mysql.cc@stripped, 2006-10-09 18:43:37-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.121.1.100

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/bug17583/my50-bug17583/RESYNC

--- 1.219/client/mysql.cc	2006-10-09 18:46:32 -04:00
+++ 1.220/client/mysql.cc	2006-10-09 18:46:32 -04:00
@@ -384,6 +384,21 @@ int main(int argc,char *argv[])
   else
     status.add_to_history=1;
   status.exit_status=1;
+
+  {
+    /* 
+     The file descriptor-layer may be out-of-sync with the file-number layer,
+     so we make sure that "stdout" is really open.  If its file is closed then
+     explicitly close the FD layer. 
+    */
+    int stdout_fileno_copy;
+    stdout_fileno_copy= dup(fileno(stdout)); /* Okay if fileno fails. */
+    if (stdout_fileno_copy == -1)
+      fclose(stdout);
+    else
+      close(stdout_fileno_copy);             /* Clean up dup(). */
+  }
+
   load_defaults("my",load_default_groups,&argc,&argv);
   defaults_argv=argv;
   if (get_options(argc, (char **) argv))

--- 1.5/BitKeeper/etc/collapsed	2006-10-09 18:46:32 -04:00
+++ 1.8/BitKeeper/etc/collapsed	2006-10-09 18:46:32 -04:00
@@ -3,3 +3,4 @@
 44edb86b1iE5knJ97MbliK_3lCiAXA
 44f33f3aj5KW5qweQeekY1LU0E9ZCg
 4513d8e4Af4dQWuk13sArwofRgFDQw
+452a92d0-31-8wSzSfZi165fcGcXPA

--- 1.2.2.1/mysql-test/r/mysql_client.result	2006-10-09 18:46:32 -04:00
+++ 1.8/BitKeeper/deleted/.del-mysql_client.result	2006-10-09 18:46:32 -04:00
@@ -2,17 +2,7 @@
 1
 ERROR 1064 (42000) at line 3: You have an error in your SQL syntax; check the manual that
corresponds to your MySQL server version for the right syntax to use near '' at line 1
 ERROR at line 1: USE must be followed by a database name
-create table t17583 (a int);
-insert into t17583 (a) values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-select count(*) from t17583;
-count(*)
-1280
-drop table t17583;
-End of 4.1 tests.
+\
+\\
+';
+';

--- 1.2.2.1/mysql-test/t/mysql_client.test	2006-10-09 18:46:32 -04:00
+++ 1.7/BitKeeper/deleted/.del-mysql_client.test	2006-10-09 18:46:32 -04:00
@@ -30,25 +30,16 @@
 
 #
 # Bug #20328: mysql client: dumb about trailing spaces on 'help' command
-#
 --exec echo 'help' | $MYSQL   >  $MYSQLTEST_VARDIR/tmp/bug20328.tmp
 --exec echo 'help ' | $MYSQL  >  $MYSQLTEST_VARDIR/tmp/bug20328.tmp
 
 #
-# Bug#17583: mysql drops connection when stdout is not writable
+# Bug #20103: Escaping with backslash does not work
 #
-create table t17583 (a int);
-insert into t17583 (a) values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-insert into t17583 select a from t17583;
-# Close to the minimal data needed to exercise bug.
-select count(*) from t17583;
---exec echo "select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; select count(*) from t17583; select count(*) from t17583; select count(*)
from t17583; " |$MYSQL test >&-
-drop table t17583;
+--exec echo "SET SQL_MODE = 'NO_BACKSLASH_ESCAPES';"  >
$MYSQLTEST_VARDIR/tmp/bug20103.sql
+--exec echo "SELECT '\';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql
+--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1
 
---echo End of 4.1 tests.
+--exec echo "SET SQL_MODE = '';"  > $MYSQLTEST_VARDIR/tmp/bug20103.sql
+--exec echo "SELECT '\';';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql
+--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1