Commit e160646e authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.1


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 8ee12417 853c2c78

client/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
# This file is public domain and comes with NO WARRANTY of any kind



#AUTOMAKE_OPTIONS =              nostdinc

INCLUDES =			-I$(top_srcdir)/include $(openssl_includes)

INCLUDES =			-I$(top_srcdir)/include -I$(top_srcdir)/regex \

				$(openssl_includes)

LIBS =				@CLIENT_LIBS@

DEPLIB=				../libmysql/libmysqlclient.la

LDADD =				@CLIENT_EXTRA_LDFLAGS@ $(DEPLIB)
@@ -36,6 +37,7 @@ 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

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

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

mysqlmanagerc_SOURCES =   mysqlmanagerc.c

client/mysqltest.c

+637 −54

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -2811,7 +2811,7 @@ thread_dirs= 


dnl This probably should be cleaned up more - for now the threaded

dnl client is just using plain-old libs.

sql_client_dirs="libmysql client"

sql_client_dirs="libmysql strings regex client"

linked_client_targets="linked_libmysql_sources"

CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS

if test "$THREAD_SAFE_CLIENT" != "no"

libmysql/libmysql.c

+29 −10
Original line number Diff line number Diff line
@@ -1880,6 +1880,7 @@ my_bool cli_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt) 
  }

  stmt->field_count=  (uint) field_count;

  stmt->param_count=  (ulong) param_count;

  mysql->warning_count= 0;



  DBUG_RETURN(0);

}
@@ -3263,7 +3264,6 @@ static void read_binary_time(MYSQL_TIME *tm, uchar **pos) 
    tm->minute= (uint) to[6];

    tm->second= (uint) to[7];

    tm->second_part= (length > 8) ? (ulong) sint4korr(to+8) : 0;



    tm->year= tm->month= 0;



    *pos+= length;
@@ -3489,7 +3489,16 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, 
    char buff[22];                              /* Enough for longlong */

    char *end= longlong10_to_str(value, buff, field_is_unsigned ? 10: -10);

    /* Resort to string conversion which supports all typecodes */

    fetch_string_with_conversion(param, buff, (uint) (end - buff));

    uint length= (uint) (end-buff);



    if (field->flags & ZEROFILL_FLAG && length < field->length &&

        field->length < 21)

    {

      bmove_upp((char*) buff+field->length,buff+length, length);

      bfill((char*) buff, field->length - length,'0');

      length= field->length;

    }

    fetch_string_with_conversion(param, buff, length);

    break;

  }

  }
@@ -3556,8 +3565,14 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, 
    if (field->decimals >= NOT_FIXED_DEC)

#undef NOT_FIXED_DEC

    {

      sprintf(buff, "%-*.*g", (int) min(sizeof(buff)-1, param->buffer_length),

	      width, value);

      /*

        The 14 below is to ensure that the server and client has the same

        precisions. This will ensure that on the same machine you get the

        same value as a string independent of the protocol you use.

      */

      sprintf(buff, "%-*.*g", (int) min(sizeof(buff)-1,

                                        param->buffer_length),

	      min(14,width), value);

      end= strcend(buff, ' ');

      *end= 0;

    }
@@ -3868,12 +3883,12 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind) 
{

  MYSQL_BIND *param, *end;

  MYSQL_FIELD *field;

  ulong       bind_count;

  ulong       bind_count= stmt->field_count;

  uint        param_count= 0;

  DBUG_ENTER("mysql_stmt_bind_result");

  DBUG_ASSERT(stmt != 0);

  DBUG_PRINT("enter",("field_count: %d", bind_count));



  if (!stmt->field_count)

  if (!bind_count)

  {

    if ((int) stmt->state < (int) MYSQL_STMT_PREPARE_DONE)

    {
@@ -3881,7 +3896,6 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind) 
    }

    DBUG_RETURN(0);

  }

  bind_count= stmt->field_count;



  /*

    We only need to check that stmt->field_count - if it is not null
@@ -3894,6 +3908,8 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind) 
       param < end ;

       param++, field++)

  {

    DBUG_PRINT("info",("buffer_type: %u  field_type: %u",

                       (uint) param->buffer_type, (uint) field->type));

    /*

      Set param->is_null to point to a dummy variable if it's not set.

      This is to make the execute code easier
@@ -4221,6 +4237,8 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) 
      *prev_ptr= 0;

      mysql->warning_count= uint2korr(cp+1);

      mysql->server_status= uint2korr(cp+3);

      DBUG_PRINT("info",("status: %u  warning_count: %u",

                         mysql->server_status, mysql->warning_count));

      DBUG_RETURN(0);

    }

  }
@@ -4316,11 +4334,12 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) 
	 bind < end ;

	 bind++, field++)

    {

      bind->buffer_type= field->type;

      bind->buffer_type= MYSQL_TYPE_NULL;

      bind->buffer_length=1;

    }



    mysql_stmt_bind_result(stmt, stmt->bind);

    if (mysql_stmt_bind_result(stmt, stmt->bind))

      DBUG_RETURN(1);

    stmt->bind_result_done= 0;			/* No normal bind done */

  }

libmysqld/examples/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -14,13 +14,14 @@ link_sources: 


DEFS = 		-DEMBEDDED_LIBRARY

INCLUDES =	@MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \

		-I$(top_srcdir) -I$(top_srcdir)/client $(openssl_includes)

		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \

		$(openssl_includes)

LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@

LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)



mysqltest_LINK = $(CXXLINK)



mysqltest_SOURCES =	mysqltest.c

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



mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \

                my_readline.h sql_string.h completion_hash.h