Commit 7f5bf3dc authored by unknown's avatar unknown
Browse files

Manual merge (again) 


configure.in:
  Auto merged
include/mysql.h:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ps_grant.test:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
parents 18fd0b94 ba3540cc

BUILD/check-cpu

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ case "$cpu_family--$model_name" in 
  ;;

  *Pentium*M*pro*)

    cpu_flag="pentium-m";

    cpu_flag_old="pentium";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

cmd-line-utils/libedit/vi.c

+1 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ vi_histedit(EditLine *el, int c) 
		return CC_ERROR;

	case 0:

		close(fd);

		execlp("vi", "vi", tempfile, 0);

		execlp("vi", "vi", tempfile, (char *) NULL);

		exit(0);

		/*NOTREACHED*/

	default:

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -141,8 +141,11 @@ AC_ARG_WITH(darwin-mwcc, 
  export CC CXX LD AR RANLIB

  AC_SUBST(AR)

  AC_SUBST(RANLIB)

  with_darwin_mwcc=yes

])



AM_CONDITIONAL(DARWIN_MWCC, test x$with_darwin_mwcc = xyes)



if test "x${CFLAGS-}" = x ; then

  cflags_is_set=no

else

include/mysql.h

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ unsigned int STDCALL mysql_warning_count(MYSQL *mysql); 
const char * STDCALL mysql_info(MYSQL *mysql);

unsigned long STDCALL mysql_thread_id(MYSQL *mysql);

const char * STDCALL mysql_character_set_name(MYSQL *mysql);

int          STDCALL mysql_set_character_set(MYSQL *mysql, char *csname);



MYSQL *		STDCALL mysql_init(MYSQL *mysql);

my_bool		STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,

innobase/row/row0mysql.c

+10 −2
Original line number Diff line number Diff line
@@ -1885,10 +1885,18 @@ row_create_table_for_mysql( 
		trx_general_rollback_for_mysql(trx, FALSE, NULL);



		if (err == DB_OUT_OF_FILE_SPACE) {

			fputs("InnoDB: Warning: cannot create table ", stderr);

	    		ut_print_timestamp(stderr);



			fputs("  InnoDB: Warning: cannot create table ", 

								stderr);

			ut_print_name(stderr, trx, table->name);

			fputs(" because tablespace full\n", stderr);

		     	row_drop_table_for_mysql(table->name, trx, FALSE);



			if (dict_table_get_low(table->name)) {



		     		row_drop_table_for_mysql(table->name, trx,

								FALSE);

			}



		} else if (err == DB_DUPLICATE_KEY) {

	    		ut_print_timestamp(stderr);