Commit f21e2364 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-5.0
parents 9595c788 b775f986

client/mysqltest.c

+6 −5
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ typedef struct 


static char *subst_env_var(const char *cmd);

static FILE *my_popen(const char *cmd, const char *mode);

#undef popen

#define popen(A,B) my_popen((A),(B))

#endif /* __NETWARE__ */
@@ -2587,13 +2588,13 @@ static void append_result(DYNAMIC_STRING *ds, MYSQL_RES *res) 
      {

	if (i)

	  dynstr_append_mem(ds, "\t", 1);

	replace_dynstr_append_mem(ds, val, len);

	replace_dynstr_append_mem(ds, val, (int)len);

      }

      else

      {

	dynstr_append(ds, fields[i].name);

	dynstr_append_mem(ds, "\t", 1);

	replace_dynstr_append_mem(ds, val, len);

	replace_dynstr_append_mem(ds, val, (int)len);

	dynstr_append_mem(ds, "\n", 1);

      }

    }
@@ -2960,7 +2961,7 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) 
  int error= 0;             /* Function return code if "goto end;" */

  int err;                  /* Temporary storage of return code from calls */

  int query_len, got_error_on_execute;

  uint num_rows;

  ulonglong num_rows;

  char *query;

  MYSQL_RES *res= NULL;     /* Note that here 'res' is meta data result set */

  DYNAMIC_STRING *ds;
@@ -3215,13 +3216,13 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) 
          {

            if (col_idx)                      /* No tab before first col */

              dynstr_append_mem(ds, "\t", 1);

            replace_dynstr_append_mem(ds, val, len);

            replace_dynstr_append_mem(ds, val, (int)len);

          }

          else

          {

            dynstr_append(ds, field[col_idx].name);

            dynstr_append_mem(ds, "\t", 1);

            replace_dynstr_append_mem(ds, val, len);

            replace_dynstr_append_mem(ds, val, (int)len);

            dynstr_append_mem(ds, "\n", 1);

          }

        }

myisam/mi_create.c

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
  {

    tmp_keydef.keysegs=1;

    tmp_keydef.flag=		HA_UNIQUE_CHECK;

    tmp_keydef.block_length=	myisam_block_size;

    tmp_keydef.block_length=	(uint16)myisam_block_size;

    tmp_keydef.keylength=	MI_UNIQUE_HASH_LENGTH + pointer;

    tmp_keydef.minlength=tmp_keydef.maxlength=tmp_keydef.keylength;

    tmp_keyseg.type=		MI_UNIQUE_HASH_TYPE;

mysys/default.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ static void init_default_directories() 
  *ptr++= "C:/";



  if (GetWindowsDirectory(system_dir,sizeof(system_dir)))

    *ptr++= &system_dir;

    *ptr++= (char*)&system_dir;

#if defined(_MSC_VER) && (_MSC_VER >= 1300)

  /* Only VC7 and up */

  /* Only add shared system directory if different from default. */

mysys/my_handler.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length, 
{

  if (!part_key)

    return charset_info->coll->strnncollsp(charset_info, a, a_length,

                                           b, b_length, !skip_end_space);

                                           b, b_length, (my_bool)!skip_end_space);

  return charset_info->coll->strnncoll(charset_info, a, a_length,

                                       b, b_length, part_key);

}