Commit 6364edc6 authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 8d13a5f4 11244083

include/my_base.h

+1 −1
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ enum ha_base_keytype { 
#define HA_OPTION_CHECKSUM		32

#define HA_OPTION_DELAY_KEY_WRITE	64

#define HA_OPTION_NO_PACK_KEYS		128  /* Reserved for MySQL */

#define HA_OPTION_CREATE_FROM_ENGINE    256 

#define HA_OPTION_TEMP_COMPRESS_RECORD	((uint) 16384)	/* set by isamchk */

#define HA_OPTION_READ_ONLY_DATA	((uint) 32768)	/* Set by isamchk */
@@ -258,7 +259,6 @@ enum ha_base_keytype { 
#define HA_CREATE_TMP_TABLE	4

#define HA_CREATE_CHECKSUM	8

#define HA_CREATE_DELAY_KEY_WRITE 64

#define HA_CREATE_FROM_ENGINE   128 



	/* Bits in flag to _status */

mysql-test/r/ndb_basic.result

+4 −0
Original line number Diff line number Diff line
@@ -673,3 +673,7 @@ select * from atablewithareallylongandirritatingname; 
a

2

drop table atablewithareallylongandirritatingname;

CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;

select * from t1;

b

drop table t1;

mysql-test/t/ndb_basic.test

+9 −0
Original line number Diff line number Diff line
@@ -615,3 +615,12 @@ create table atablewithareallylongandirritatingname (a int); 
insert into atablewithareallylongandirritatingname values (2);

select * from atablewithareallylongandirritatingname;

drop table atablewithareallylongandirritatingname;





#

# BUG#14514

#



CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;

select * from t1;

drop table t1;

mysys/base64.c

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ base64_decode(const char *src, size_t size, void *dst) 
{

  char b[3];

  size_t i= 0;

  void *d= dst;

  unsigned char *d= (unsigned char*)dst;

  size_t j;



  while (i < size)
@@ -186,14 +186,14 @@ base64_decode(const char *src, size_t size, void *dst) 
    b[2]= (c >>  0) & 0xff;



    for (j=0; j<3-mark; j++)

      *(char *)d++= b[j];

      *d++= b[j];

  }



  if (i != size)

  {

    return -1;

  }

  return d - dst;

  return d - (unsigned char*)dst;

}

sql/ha_ndbcluster.cc

+1 −1
Original line number Diff line number Diff line
@@ -3861,7 +3861,7 @@ int ha_ndbcluster::create(const char *name, 
  uint pack_length, length, i, pk_length= 0;

  const void *data, *pack_data;

  char name2[FN_HEADLEN];

  bool create_from_engine= (info->table_options & HA_CREATE_FROM_ENGINE);

  bool create_from_engine= (info->table_options & HA_OPTION_CREATE_FROM_ENGINE);

   

  DBUG_ENTER("ha_ndbcluster::create");

  DBUG_PRINT("enter", ("name: %s", name));