Commit e1a722b2 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


configure.in:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
myisam/sort.c:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.
mysys/mf_iocache.c:
  Manual merge.
parents 24232ff0 2772d9e1

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1064,3 +1064,6 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

include/check_abi

include/mysql_h.ic

mysql-test/r/blackhole.log

BitKeeper/etc/collapsed

0 → 100644
+1 −0
Original line number Diff line number Diff line 
452a92d0-31-8wSzSfZi165fcGcXPA

Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -124,3 +124,8 @@ test-force-pl: 
	cd mysql-test; \

	./mysql-test-run.pl --force && \

	./mysql-test-run.pl --ps-protocol --force



test-force-pl-mem:

	cd mysql-test; \

	./mysql-test-run.pl --force --mem && \

	./mysql-test-run.pl --ps-protocol --force --mem

client/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc 
mysqladmin_SOURCES =		mysqladmin.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

mysqltest_SOURCES=		mysqltest.c $(top_srcdir)/mysys/my_getsystime.c

mysqltest_SOURCES=		mysqltest.c \

				$(top_srcdir)/mysys/my_getsystime.c \

				$(top_srcdir)/mysys/my_copy.c

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)

mysqlbinlog_SOURCES =   mysqlbinlog.cc ../mysys/mf_tempdir.c

mysqlmanagerc_SOURCES =   mysqlmanagerc.c

client/mysql.cc

+17 −0
Original line number Diff line number Diff line
@@ -372,6 +372,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))
@@ -1997,6 +2012,8 @@ com_go(String *buffer,char *line __attribute__((unused))) 
		(long) mysql_num_rows(result),

		(long) mysql_num_rows(result) == 1 ? "row" : "rows");

	end_pager();

        if (mysql_errno(&mysql))

          error= put_error(&mysql);

      }

    }

    else if (mysql_affected_rows(&mysql) == ~(ulonglong) 0)