Commit c1cad51e authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/home/ram/work/5.0.b16511


sql/sql_prepare.cc:
  Auto merged
parents 32691e6e f4266bc4

client/mysqltest.c

+2 −1
Original line number Diff line number Diff line
@@ -3048,7 +3048,8 @@ static void append_field(DYNAMIC_STRING *ds, uint col_idx, MYSQL_FIELD* field, 
    len= 4;

  }

#ifdef __WIN__

  else if (field->type == MYSQL_TYPE_DOUBLE &&

  else if ((field->type == MYSQL_TYPE_DOUBLE ||

            field->type == MYSQL_TYPE_FLOAT ) &&

           field->decimals >= 31)

  {

    /* Convert 1.2e+018 to 1.2e+18 and 1.2e-018 to 1.2e-18 */

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ MYSQL_PROG_AR 


# libmysqlclient versioning when linked with GNU ld.

if $LD --version 2>/dev/null|grep -q GNU; then

  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmysql/libmysql.ver"

  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver"

  AC_CONFIG_FILES(libmysql/libmysql.ver)

fi

AC_SUBST(LD_VERSION_SCRIPT)

heap/hp_create.c

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
      DBUG_RETURN(1);

    }

    share->keydef= (HP_KEYDEF*) (share + 1);

    share->key_stat_version= 1;

    keyseg= (HA_KEYSEG*) (share->keydef + keys);

    init_block(&share->block, reclength + 1, min_records, max_records);

	/* Fix keys */

include/heap.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ typedef struct st_heap_share 
  HP_KEYDEF  *keydef;

  ulong min_records,max_records;	/* Params to open */

  ulong data_length,index_length,max_table_size;

  uint key_stat_version;                /* version to indicate insert/delete */

  uint records;				/* records */

  uint blength;				/* records rounded up to 2^n */

  uint deleted;				/* Deleted records in database */

libmysql/libmysql.c

+6 −0
Original line number Diff line number Diff line
@@ -5036,6 +5036,12 @@ my_bool STDCALL mysql_stmt_reset(MYSQL_STMT *stmt) 
{

  DBUG_ENTER("mysql_stmt_reset");

  DBUG_ASSERT(stmt != 0);

  if (!stmt->mysql)

  {

    /* mysql can be reset in mysql_close called from mysql_reconnect */

    set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);

    DBUG_RETURN(1);

  }

  /* Reset the client and server sides of the prepared statement */

  DBUG_RETURN(reset_stmt_handle(stmt, RESET_SERVER_SIDE | RESET_LONG_DATA));

}