Commit 01a6568c authored by unknown's avatar unknown
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-qc
parents 92882749 1ae7fd9f

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      {

	char *pos,buff[40];

	ulong sec;

	pos=strchr(status,' ');

	pos= (char*) strchr(status,' ');

	*pos++=0;

	printf("%s\t\t\t",status);			/* print label */

	if ((status=str2int(pos,10,0,LONG_MAX,(long*) &sec)))

innobase/configure.in

+3 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ esac 
case "$target" in

       i[[4567]]86-*-*)

	 CFLAGS="$CFLAGS -DUNIV_INTEL_X86";;

	 # The compiler on Linux/S390 does not seem to have inlining

       s390-*-*)

	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;

esac



AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl

myisam/mi_test3.c

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#endif





const char *filename= "test3.MSI";

const char *filename= "test3";

uint tests=10,forks=10,key_cacheing=0,use_log=0;



static void get_options(int argc, char *argv[]);
@@ -363,7 +363,7 @@ int test_write(MI_INFO *file,int id,int lock_type) 
  }



  sprintf(record.id,"%7d",getpid());

  strmov(record.text,"Testing...");

  strnmov(record.text,"Testing...", sizeof(record.text));



  tries=(uint) rnd(100)+10;

  for (i=count=0 ; i < tries ; i++)

myisam/mi_write.c

+6 −10
Original line number Diff line number Diff line
@@ -165,12 +165,7 @@ int mi_write(MI_INFO *info, byte *record) 
    {

      uint j;

      for (j=0 ; j < share->base.keys ; j++)

      {

        if (is_tree_inited(&info->bulk_insert[j]))

        {

          reset_tree(&info->bulk_insert[j]);

        }

      }

        mi_flush_bulk_insert(info, j);

    }

    info->errkey= (int) i;

    while ( i-- > 0)
@@ -329,7 +324,7 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, 
  uchar *temp_buff,*keypos;

  uchar keybuff[MI_MAX_KEY_BUFF];

  my_bool was_last_key;

  my_off_t next_page;

  my_off_t next_page, dupp_key_pos;

  DBUG_ENTER("w_search");

  DBUG_PRINT("enter",("page: %ld",page));
@@ -349,9 +344,9 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, 
	/* get position to record with duplicated key */

    tmp_key_length=(*keyinfo->get_key)(keyinfo,nod_flag,&keypos,keybuff);

    if (tmp_key_length)

      info->dupp_key_pos=_mi_dpos(info,0,keybuff+tmp_key_length);

      dupp_key_pos=_mi_dpos(info,0,keybuff+tmp_key_length);

    else

      info->dupp_key_pos= HA_OFFSET_ERROR;

      dupp_key_pos= HA_OFFSET_ERROR;

    if (keyinfo->flag & HA_FULLTEXT)

    {

      uint off;
@@ -370,7 +365,7 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, 
      else

      {

        /* popular word. two-level tree. going down */

        my_off_t root=info->dupp_key_pos;

        my_off_t root=dupp_key_pos;

        keyinfo=&info->s->ft2_keyinfo;

        get_key_full_length_rdonly(off, key);

        key+=off;
@@ -389,6 +384,7 @@ static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, 
    }

    else /* not HA_FULLTEXT, normal HA_NOSAME key */

    {

      info->dupp_key_pos= dupp_key_pos;

      my_afree((byte*) temp_buff);

      my_errno=HA_ERR_FOUND_DUPP_KEY;

      DBUG_RETURN(-1);

mysql-test/r/ctype_uca.result

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ select 'a ' = 'a\t', 'a ' < 'a\t', 'a ' > 'a\t'; 
select 'a  a' > 'a', 'a  \t' < 'a';

'a  a' > 'a'	'a  \t' < 'a'

1	1

select 'c' like '\_' as want0;

want0

0

CREATE TABLE t (

c char(20) NOT NULL

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;