Commit 9c3a41f3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/ram/work/mysql-4.1 

into mysql.com:/home/ram/work/mysql-5.0


include/my_global.h:
  Auto merged
BitKeeper/etc/logging_ok:
  auto-union
sql/share/charsets/Index.xml:
  Auto merged
parents f1def25a a67043db

include/my_global.h

+0 −12
Original line number Diff line number Diff line
@@ -235,18 +235,6 @@ C_MODE_END 
#define BAD_MEMCPY

#endif



/* In Linux-alpha we have atomic.h if we are using gcc */

#if defined(TARGET_OS_LINUX) && defined(__GNUC__) && defined(__alpha__) && (__GNUC__ > 2 || ( __GNUC__ == 2 &&  __GNUC_MINOR__ >= 95)) && !defined(HAVE_ATOMIC_ADD)

#define HAVE_ATOMIC_ADD

#define HAVE_ATOMIC_SUB

#endif



/* In Linux-ia64 including atomic.h will give us an error */

#if (defined(TARGET_OS_LINUX) && defined(__GNUC__) && (defined(__ia64__)||defined(__powerpc64__))) || !defined(THREAD)

#undef HAVE_ATOMIC_ADD

#undef HAVE_ATOMIC_SUB

#endif



#if defined(_lint) && !defined(lint)

#define lint

#endif

mysql-test/r/ctype_latin2.result

−158 B (6.26 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

mysql-test/t/ctype_latin2.test

+7 −4
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ drop table if exists t1; 


SET NAMES latin2;

CREATE TABLE t1 (a char(1) character set latin2);

INSERT INTO t1 VALUES (0x00),(0x01),(0x02),(0x03),(0x04),(0x05),(0x06),(0x07);

INSERT INTO t1 VALUES (0x08),(0x09),(0x0A),(0x0B),(0x0C),(0x0D),(0x0E),(0x0F);

INSERT INTO t1 VALUES (0x10),(0x11),(0x12),(0x13),(0x14),(0x15),(0x16),(0x17);

INSERT INTO t1 VALUES (0x18),(0x19),(0x1A),(0x1B),(0x1C),(0x1D),(0x1E),(0x1F);

INSERT INTO t1 VALUES (0x20),(0x21),(0x22),(0x23),(0x24),(0x25),(0x26),(0x27);

INSERT INTO t1 VALUES (0x28),(0x29),(0x2A),(0x2B),(0x2C),(0x2D),(0x2E),(0x2F);

INSERT INTO t1 VALUES (0x30),(0x31),(0x32),(0x33),(0x34),(0x35),(0x36),(0x37);
@@ -45,3 +41,10 @@ INSERT INTO t1 VALUES (0xF8),(0xF9),(0xFA),(0xFB),(0xFC),(0xFD),(0xFE),(0xFF); 
#

SELECT hex(a) ha, hex(lower(a)) hl, hex(upper(a)) hu, 

a, lower(a) l, upper(a) u from t1 order by ha;





#

# Bug#6505 wrong sorting order

#

SELECT group_concat(a collate latin2_croatian_ci order by binary a) from t1 group by a collate latin2_croatian_ci;

drop table t1;

sql/share/charsets/Index.xml

+3 −0
Original line number Diff line number Diff line
@@ -367,6 +367,9 @@ To make maintaining easier please: 
    <order>Slovenian</order>

    <order>Sorbian</order>

  </collation>

  <collation name="cp1250_croatian_ci"	id="44">

    <order>Croatian</order>

  </collation>

  <collation name="cp1250_czech_cs"	id="34"	order="Czech">

    <flag>compiled</flag>

  </collation>

sql/share/charsets/cp1250.xml

+23 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
  70  71  72  73  74  75  76  77  78  79  7A  7B  7C  7D  7E  7F

  80  81  82  83  84  85  86  87  88  89  9A  8B  9C  9D  9E  9F

  90  91  92  93  94  95  96  97  98  99  9A  9B  9C  9D  9E  9F

  A0  A1  A2  B3  A4  B9  A6  DF  A8  A9  BA  AB  AC  AD  AE  BF

  A0  A1  A2  B3  A4  B9  A6  A7  A8  A9  BA  AB  AC  AD  AE  BF

  B0  B1  B2  B3  B4  B5  B6  B7  B8  B9  BA  BB  BE  BD  BE  BF

  E0  E1  E2  E3  E4  E5  E6  E7  E8  E9  EA  EB  EC  ED  EE  EF

  F0  F1  F2  F3  F4  F5  F6  D7  F8  F9  FA  FB  FC  FD  FE  DF
@@ -82,7 +82,7 @@ 
  A0  A1  A2  A3  A4  A5  A6  A7  A8  A9  AA  AB  AC  AD  AE  AF

  B0  B1  B2  A3  B4  B5  B6  B7  B8  A5  AA  BB  BC  BD  BC  AF

  C0  C1  C2  C3  C4  C5  C6  C7  C8  C9  CA  CB  CC  CD  CE  CF

  D0  D1  D2  D3  D4  D5  D6  D7  D8  D9  DA  DB  DC  DD  DE  A7

  D0  D1  D2  D3  D4  D5  D6  D7  D8  D9  DA  DB  DC  DD  DE  DF

  C0  C1  C2  C3  C4  C5  C6  C7  C8  C9  CA  CB  CC  CD  CE  CF

  D0  D1  D2  D3  D4  D5  D6  F7  D8  D9  DA  DB  DC  DD  DE  FF

</map>
@@ -132,6 +132,27 @@ 
</map>

</collation>



<collation name="cp1250_croatian_ci">

<map>

00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F

10 11 12 13 14 15 16 17 18 19 1A 1B 1C 1D 1E 1F

20 21 22 23 24 25 26 27 28 29 2A 2B 2C 2D 2E 2F

30 31 32 33 34 35 36 37 38 39 3A 3B 3C 3D 3E 3F

40 41 43 44 48 4B 4D 4E 4F 50 52 53 54 56 57 59

5B 5C 5D 5F 62 64 66 67 68 69 6B 90 91 92 93 94

95 41 43 44 48 4B 4D 4E 4F 50 52 53 54 56 57 59

5B 5C 5D 5F 62 64 66 67 68 69 6B 96 97 98 99 9A

9B 9C 9E 9F A0 A1 A2 A3 A4 A5 60 A6 5F 62 6C 6B

A7 A8 A9 AA AB AC AD AE AF B0 60 B1 5F 62 6C 6B

B2 B3 B4 54 B5 41 B6 B7 B8 B9 5F BA BB BC BD 6B

BE BF C0 54 C1 C2 C3 C4 C5 41 5F C6 54 C7 54 6B

5D 41 41 41 41 54 47 44 46 4B 4B 4B 4B 50 50 48

4A 57 57 59 59 59 59 C8 5D 64 64 64 64 69 62 5F

5D 41 41 41 41 54 47 44 46 4B 4B 4B 4B 50 50 48

4A 57 57 59 59 59 59 C9 5D 64 64 64 64 69 62 FF

</map>

</collation>



<collation name="cp1250_czech_ci"/>



<collation name="cp1250_bin"	flag="binary"/>