Commit 525a7cb5 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583


BitKeeper/etc/collapsed:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
parents 59d4e243 7a717661

BitKeeper/etc/collapsed

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ 
451ab499rgdjXyOnUDqHu-wBDoS-OQ

45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

client/mysql.cc

+15 −0
Original line number Diff line number Diff line
@@ -386,6 +386,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))

mysql-test/r/mysql.result

+13 −0
Original line number Diff line number Diff line
@@ -149,4 +149,17 @@ 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 5.0 tests

mysql-test/t/mysql.test

+17 −0
Original line number Diff line number Diff line
@@ -153,4 +153,21 @@ drop table t1; 
--exec echo "SELECT '\';';" >> $MYSQLTEST_VARDIR/tmp/bug20103.sql

--exec $MYSQL              < $MYSQLTEST_VARDIR/tmp/bug20103.sql 2>&1



#

# Bug#17583: mysql drops connection when stdout is not writable

#

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;



--echo End of 5.0 tests