Commit 45ec54e4 authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
parents 27deb625 da6a5f6e

client/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \ 
				$(openssl_includes)

LIBS =				@CLIENT_LIBS@

DEPLIB=				../libmysql/libmysqlclient.la

REGEXLIB=			../regex/libregex.a

LDADD =				@CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen
@@ -37,8 +38,8 @@ mysqlshow_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB) 
mysqldump_DEPENDENCIES=		$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqlimport_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqltest_SOURCES=		mysqltest.c ../mysys/my_getsystime.c

mysqltest_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

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

mysqltest_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(REGEXLIB) $(DEPLIB)

mysqltest_LDADD =		$(REGEXLIB) $(LDADD)

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

mysqlbinlog_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES) $(DEPLIB)

mysqlmanagerc_SOURCES =   mysqlmanagerc.c

innobase/dict/dict0dict.c

+1 −1
Original line number Diff line number Diff line
@@ -2427,7 +2427,7 @@ dict_scan_id( 
		*id = s;

	}



	if (heap) {

	if (heap && !quote) {

		/* EMS MySQL Manager sometimes adds characters 0xA0 (in

		latin1, a 'non-breakable space') to the end of a table name.

		But isspace(0xA0) is not true, which confuses our foreign key

innobase/srv/srv0srv.c

+0 −1
Original line number Diff line number Diff line
@@ -1490,7 +1490,6 @@ srv_printf_innodb_monitor( 


	srv_last_monitor_time = time(NULL);



	rewind(file);

	fputs("\n=====================================\n", file);



	ut_print_timestamp(file);

libmysql/libmysql.c

+2 −2
Original line number Diff line number Diff line
@@ -3663,8 +3663,8 @@ static void fetch_result_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, 
  case MYSQL_TYPE_INT24: /* mediumint is sent as 4 bytes int */

  case MYSQL_TYPE_LONG:

  {

    long value= sint4korr(*row);

    longlong data= field_is_unsigned ? (longlong) (unsigned long) value :

    int32 value= sint4korr(*row);

    longlong data= field_is_unsigned ? (longlong) (uint32) value :

                                       (longlong) value;

    fetch_long_with_conversion(param, field, data);

    *row+= 4;

mysql-test/include/ctype_common.inc

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ USE d1; 
CREATE TABLE t1 (c CHAR(10), KEY(c));

--enable_warnings

# check the column was created with the expected charset/collation

--replace_result select,insert,update,references ""

SHOW FULL COLUMNS FROM t1;

INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');

SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';
@@ -37,6 +38,7 @@ DROP TABLE t1; 
CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));

--enable_warnings

# check the column was created with the expected charset/collation

--replace_result select,insert,update,references ""

SHOW FULL COLUMNS FROM t1;

INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');

SELECT c1 as want3results from t1 where c1 like 'l%';