Commit 999b0638 authored by unknown's avatar unknown
Browse files

Merge deer.(none):/home/hf/work/mysql-4.1.clean 

into deer.(none):/home/hf/work/mysql-4.1.11083


mysql-test/t/myisam.test:
  Auto merged
parents b863330d 36a2a092

VC++Files/client/mysqlclient_ia64.dsp

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ SOURCE="..\strings\ctype-czech.c" 
# End Source File

# Begin Source File



SOURCE="..\strings\ctype-cp963.c"

SOURCE="..\strings\ctype-cp932.c"

# End Source File

# Begin Source File

include/config-win.h

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ inline double ulonglong2double(ulonglong value) 
#define doublestore(T,V) { *((long *) T) = *((long*) &V); \

			   *(((long *) T)+1) = *(((long*) &V)+1); }

#define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); }

#define floatget(V,M) memcpy((byte*) &V,(byte*) (M),sizeof(float))

#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V), sizeof(float))

#define float8get(V,M) doubleget((V),(M))

#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))

libmysql/libmysql.c

+7 −0
Original line number Diff line number Diff line
@@ -188,6 +188,13 @@ void STDCALL mysql_server_end() 
    mysql_thread_end();

  free_charsets();

  mysql_client_init= org_my_init_done= 0;

#ifdef EMBEDDED_SERVER

  if (stderror_file)

  {

    fclose(stderror_file);

    stderror_file= 0;

  }

#endif

}



static MYSQL_PARAMETERS mysql_internal_parameters=

myisam/sort.c

+8 −6
Original line number Diff line number Diff line
@@ -587,11 +587,13 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) 


      while (!got_error &&

	     !my_b_read(&sinfo->tempfile_for_exceptions,(byte*)&key_length,

			sizeof(key_length)) &&

	     !my_b_read(&sinfo->tempfile_for_exceptions,(byte*)mergebuf,

			(uint) key_length))

			sizeof(key_length)))

      {

	if (_mi_ck_write(info,sinfo->key,(uchar*) mergebuf,

        byte ft_buf[HA_FT_MAXBYTELEN + HA_FT_WLEN + 10];

        if (key_length > sizeof(ft_buf) ||

            my_b_read(&sinfo->tempfile_for_exceptions, (byte*)ft_buf,

                      (uint)key_length) ||

            _mi_ck_write(info, sinfo->key, (uchar*)ft_buf,

                         key_length - info->s->rec_reflength))

          got_error=1;

      }

mysql-test/r/ctype_big5.result

+6 −0
Original line number Diff line number Diff line
@@ -128,3 +128,9 @@ SELECT * FROM t1; 
a



DROP TABLE t1;

CREATE TABLE t1 (a CHAR(50) CHARACTER SET big5 NOT NULL, FULLTEXT(a));

INSERT INTO t1 VALUES(0xA741ADCCA66EB6DC20A7DAADCCABDCA66E);

SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST (0xA741ADCCA66EB6DC IN BOOLEAN MODE);

HEX(a)

A741ADCCA66EB6DC20A7DAADCCABDCA66E

DROP TABLE t1;