Commit f0364b7b authored by unknown's avatar unknown
Browse files

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

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


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
parents 413d2e28 a04d3827

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -403,8 +403,10 @@ heap/hp_test2 
help

help.c

help.h

include/check_abi

include/my_config.h

include/my_global.h

include/mysql_h.ic

include/mysql_version.h

include/mysqld_ername.h

include/mysqld_error.h
@@ -704,6 +706,7 @@ mysql-test/r/bdb-deadlock.err 
mysql-test/r/bdb.err

mysql-test/r/bdb.log

mysql-test/r/bdb_cache.err

mysql-test/r/blackhole.log

mysql-test/r/client_test.err

mysql-test/r/csv.err

mysql-test/r/ctype_ucs.err

BitKeeper/etc/collapsed

+8 −0
Original line number Diff line number Diff line
@@ -5,5 +5,13 @@ 
45001f7c3b2hhCXDKfUvzkX9TNe6VA

45002051rHJfMEXAIMiAZV0clxvKSA

4513d8e4Af4dQWuk13sArwofRgFDQw

45143312u0Tz4r0wPXCbUKwdHa2jWA

45143b90ewOQuTW8-jrB3ZSAQvMRJw

45184588w9U72A6KX1hUFeAC4shSHA

45185df8mZbxfp85FbA0VxUXkmDewA

4519a6c5BVUxEHTf5iJnjZkixMBs8g

451ab499rgdjXyOnUDqHu-wBDoS-OQ

451b110a3ZV6MITl93ehXk2wxrbW7g

45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -135,6 +135,11 @@ test-force-pl: 
	./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



# Don't update the files from bitkeeper

%::SCCS/s.%

client/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \ 
mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc

mysqladmin_SOURCES =		mysqladmin.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(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 \

                                $(yassl_dummy_link_fix)

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

mysqlbinlog_SOURCES =   mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c $(top_srcdir)/mysys/my_new.cc

client/mysql.cc

+22 −1
Original line number Diff line number Diff line
@@ -388,6 +388,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))
@@ -2109,6 +2124,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)
@@ -2919,7 +2936,11 @@ com_connect(String *buffer, char *line) 
  bzero(buff, sizeof(buff));

  if (buffer)

  {

    strmake(buff, line, sizeof(buff) - 1);

    /*

      Two null bytes are needed in the end of buff to allow

      get_arg to find end of string the second time it's called.

    */

    strmake(buff, line, sizeof(buff)-2);

    tmp= get_arg(buff, 0);

    if (tmp && *tmp)

    {