List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:July 14 2010 10:23am
Subject:Re: bzr commit into mysql-trunk-bugfixing branch (davi:3092) WL#5486
View as plain text  
On 7/14/10 4:50 AM, Jon Olav Hauglid wrote:
> On 07/06/2010 04:35 AM, Davi Arnaut wrote:
>> # At a local mysql-trunk-bugfixing repository of davi
>>
>> 3092 Davi Arnaut 2010-07-05
>> WL#5486: Remove code for unsupported platforms
>>
>> Remove Netware specific code.
>
> See comments below.
>
>> === modified file 'sql/sql_bitmap.h'
>> --- a/sql/sql_bitmap.h 2010-05-25 20:01:38 +0000
>> +++ b/sql/sql_bitmap.h 2010-07-06 02:35:02 +0000
>> @@ -102,16 +102,7 @@ template <> class Bitmap<64>
>> ulonglong map;
>> public:
>> Bitmap<64>() { }
>> -#if defined(__NETWARE__) || defined(__MWERKS__)
>> - /*
>> - Metwork compiler gives error on Bitmap<64>
>> - Changed to Bitmap, since in this case also it will proper construct
>> - this class
>> - */
>> - explicit Bitmap(uint prefix_to_set) { set_prefix(prefix_to_set); }
>> -#else
>> explicit Bitmap<64>(uint prefix_to_set) { set_prefix(prefix_to_set); }
>> -#endif
>> void init() { }
>> void init(uint prefix_to_set) { set_prefix(prefix_to_set); }
>> uint length() const { return 64; }
>>
>
> Is CodeWarrior no longer supported?

It seems the product is dead.

>
>> === modified file 'extra/yassl/taocrypt/src/random.cpp'
>> --- a/extra/yassl/taocrypt/src/random.cpp 2009-10-06 16:10:34 +0000
>> +++ b/extra/yassl/taocrypt/src/random.cpp 2010-07-06 02:35:02 +0000
>> @@ -92,69 +92,6 @@ void OS_Seed::GenerateSeed(byte* output,
>> }
>>
>>
>> -#elif defined(__NETWARE__)
>> -
>> -/* The OS_Seed implementation for Netware */
>> -
>> -#include<nks/thread.h>
>> -#include<nks/plat.h>
>> -
>> -// Loop on high resulution Read Time Stamp Counter
>> -static void NetwareSeed(byte* output, word32 sz)
>> -{
>> - word32 tscResult;
>> -
>> - for (word32 i = 0; i< sz; i += sizeof(tscResult)) {
>> - #if defined(__GNUC__)
>> - asm volatile("rdtsc" : "=A" (tscResult));
>> - #else
>> - #ifdef __MWERKS__
>> - asm {
>> - #else
>> - __asm {
>> - #endif
>> - rdtsc
>> - mov tscResult, eax
>> - }
>> - #endif
>> -
>> - memcpy(output,&tscResult, sizeof(tscResult));
>> - output += sizeof(tscResult);
>> -
>> - NXThreadYield(); // induce more variance
>> - }
>> -}
>> -
>> -
>> -OS_Seed::OS_Seed()
>> -{
>> -}
>> -
>> -
>> -OS_Seed::~OS_Seed()
>> -{
>> -}
>> -
>> -
>> -void OS_Seed::GenerateSeed(byte* output, word32 sz)
>> -{
>> - /*
>> - Try to use NXSeedRandom as it will generate a strong
>> - seed using the onboard 82802 chip
>> -
>> - As it's not always supported, fallback to default
>> - implementation if an error is returned
>> - */
>> -
>> - if (NXSeedRandom(sz, output) != 0)
>> - {
>> - NetwareSeed(output, sz);
>> - }
>> -}
>> -
>> -
>> -#else
>> -
>> /* The default OS_Seed implementation */
>>
>> OS_Seed::OS_Seed()
>>
>
> I don't think #else should be removed here.
>

Agree. Thanks!
Thread
bzr commit into mysql-trunk-bugfixing branch (davi:3092) WL#5486Davi Arnaut6 Jul
Re: bzr commit into mysql-trunk-bugfixing branch (davi:3092) WL#5486Jon Olav Hauglid14 Jul
  • Re: bzr commit into mysql-trunk-bugfixing branch (davi:3092) WL#5486Davi Arnaut14 Jul