From f547b03edbb3a078c9917184b7469cc324f99bfb Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 May 2005 16:12:42 +0500 Subject: [PATCH 1/3] A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h). include/my_global.h: A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h). We don't need to manipulate HAVE_ATOMIC_XXX here as we test it in the configure. --- include/my_global.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/include/my_global.h b/include/my_global.h index bf6f3b52c4b..017cdea140a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -214,18 +214,6 @@ C_MODE_START int __cxa_pure_virtual() {\ #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 From cdbf4939975a579179c3cdeb744416841d5416af Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 May 2005 18:41:41 +0500 Subject: [PATCH 2/3] Bug#6505 Wrong sorting order: latin2_croatian_ci collation was fixed. --- mysql-test/r/ctype_latin2.result | Bin 6569 -> 6411 bytes mysql-test/t/ctype_latin2.test | 11 +++++++---- sql/share/charsets/latin2.xml | 32 +++++++++++++++---------------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/mysql-test/r/ctype_latin2.result b/mysql-test/r/ctype_latin2.result index 2876accaf72bef7fcf4830192431a3bcb02d497b..c2c021b076067245298cd64b5bf61e2667e7e93f 100644 GIT binary patch delta 660 zcmb7-Rc})P07gSdNH~E9{=vmJ_>gV*@G*4ghD*8ax>4wQ$E6z#D{e!E4|f^Pio3hJ zySuxM@WK-bFJDgbCFf*Cq=#pu2D5YJ$s5efS0H~NHaaFcD$Yo>t(0Vk%ksHQe~4+g zEU(w}yN#Uj_`)47+sXmc=Wuxp%Z_*3hBM7@dVHpxW|*Nyf^8)k{;)ri-`Bqck^J2X z{BH~jQi#G7p(w>DP6(ltpd_Lcr71&M!U!jVa+Ie66{$pJst`$4s!^R9)TEY7&C^=# z)*kH*XrFHDj_&FnwdEvAE*;cE4(SmG^nf~w*GawPlwJ`nw+`!wj_Q~m>xrJ~8FiIF zJtb0KU1%VWj_ZV;>je$fl}74DjJ#T)MG9)Y_Uk^4l|&QybXsThT5kw6m8G*fr}Mg? zw|b}d`am-!(_GzYAzQn2Nw@TgSoP3iEz<^V(M__nnK=2iTw8TRKWM2GUDg#{)ir(A z7k$+?S}B#*>PZ{*qOH<&UEgV^-dds6+NPbX(hk}O=s-t0;h-~p=u1EP6JP)X8N^_Q zFqB~oX9Ob|MLMGy!&t_V!FVPxkx5Ku3RB5s8q=A2(|a++mUY0w@sRJpcdz delta 718 zcmXBNOHLbM5Jh2PC%`Gf%RoW`4h%tJP`CZS9{R;XvIrE3ffv98$*W+9SP46#I=9dF ztJI_W+`JB69-GYDyPN!%@@aeqK0}|8&)8>k-R(Cy@z2y}<}>$M_$+-^KAVqDzmeDE zHF-^5lh@=mc}@S<53#!ODwnr7Yz`j#OF0p;8$Q5=#75RW2 zQiT#bqFRT99aDuGtVb0ZU?)_eA$Cd?8ewNtp)vM@Ds+$iqzX;2bE?pk^0(fvw$Kdw hO% - 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 42 43 46 48 49 4A 4B 4C 4D 4E 4F 50 51 52 - 53 54 55 56 58 59 5A 5B 5C 5D 5E 5B 5C 5D 5E 5F - 60 41 42 43 46 48 49 4A 4B 4C 4D 4E 4F 50 51 52 - 53 54 55 56 58 59 5A 5B 5C 5D 5E 7B 7C 7D 7E 7F - 80 81 82 83 84 85 86 87 88 89 57 8B 8C 8D 5F 8F - 90 91 92 93 94 95 96 97 98 99 57 9B 9C 9D 5F 9F - A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 AA AB AC AD AE AF - B0 B1 B2 B3 B4 B5 B6 B7 B8 B9 BA BB BC BD BE BF - 41 41 41 41 5C 5B 45 43 44 45 45 45 49 49 49 49 - 47 4E 4F 4F 4F 4F 5D D7 D8 55 55 55 59 59 DE DF - 41 41 41 41 5C 5B 45 43 44 45 45 45 49 49 49 49 - 47 4E 4F 4F 4F 4F 5D F7 D8 55 55 55 59 59 DE FF +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 C6 C7 C8 C9 CA +CB 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 CC CD CE CF D0 +D1 D2 D3 D4 D5 D6 D7 D8 D9 DA DB DC DD DE DF E0 +E1 E2 E3 E4 E5 E6 E7 E8 E9 EA EB EC ED EE EF F0 +F1 41 F2 54 F3 54 5F F4 F5 61 5F 62 6B F6 8E 6B +F7 41 F8 54 F9 54 5F FA FB 61 5F 62 6B FC 8E 6B +5D 41 41 41 41 54 47 44 46 4B 4B 4B 4B 50 50 48 +4A 57 57 59 59 59 59 FD 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 FE 5D 64 64 64 64 69 62 FF From a67043dbd812c2cf4da0950d1b12bf91ee3af14d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 6 May 2005 20:11:00 +0500 Subject: [PATCH 3/3] Bug#6611: wrong sorting order. Adding cp1250_croatian_ci collation. --- sql/share/charsets/Index.xml | 3 +++ sql/share/charsets/cp1250.xml | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/sql/share/charsets/Index.xml b/sql/share/charsets/Index.xml index 74763b195a8..a41ea80564a 100644 --- a/sql/share/charsets/Index.xml +++ b/sql/share/charsets/Index.xml @@ -367,6 +367,9 @@ To make maintaining easier please: Slovenian Sorbian + + Croatian + compiled diff --git a/sql/share/charsets/cp1250.xml b/sql/share/charsets/cp1250.xml index 8e7102b6737..1e62e64ad5a 100644 --- a/sql/share/charsets/cp1250.xml +++ b/sql/share/charsets/cp1250.xml @@ -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 @@ -132,6 +132,27 @@ + + +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 + + +