mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
50bd97a943
Fixed a couple of usage of not initialized warnings (unlikely cases) client/mysqldump.c: Fixed compiler warnings from 'max' build client/mysqltest.c: Removed compiler warnings cmd-line-utils/readline/xmalloc.c: Fixed compiler warnings from 'max' build extra/comp_err.c: Fixed compiler warnings from 'max' build extra/yassl/include/openssl/ssl.h: Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/include/socket_wrapper.hpp: Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit extra/yassl/src/ssl.cpp: Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/taocrypt/src/integer.cpp: Fixed compiler warnings include/my_global.h: Added my_offsetof() macro from 5.1 to get rid of compiler warnings innobase/include/ut0byte.ic: Fixed compiler warnings on win64 innobase/include/ut0ut.ic: Fixed compiler warnings on win64 libmysql/libmysql.def: Fixed compiler warnings on win64 myisam/mi_packrec.c: Fixed compiler warnings on win64 myisam/myisamchk.c: Fixed compiler warnings from 'max' build mysys/base64.c: Fixed compiler warnings on win64 mysys/mf_keycache.c: Fixed compiler warnings from 'max' build mysys/my_getopt.c: Fixed compiler warnings from 'max' build mysys/my_init.c: Fixed compiler warnings from 'max' build mysys/my_thr_init.c: Fixed compiler warnings mysys/ptr_cmp.c: Fixed compiler warnings from 'max' build ndb/include/kernel/signaldata/DictTabInfo.hpp: Fixed compiler warnings server-tools/instance-manager/mysql_connection.cc: Fixed compiler warnings server-tools/instance-manager/mysqlmanager.cc: Fixed compiler warnings sql/filesort.cc: Initalize variable that was used unitialized in error conditions sql/ha_berkeley.cc: Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64 sql/ha_berkeley.h: Moved get_auto_primary_key() to ha_berkeley.cc sql/ha_innodb.cc: Fixed compiler warnings sql/item.cc: Fixed compiler warnings from 'max' build sql/item_timefunc.cc: Fixed compiler warnings sql/mysqld.cc: Fixed compiler warnings sql/sql_acl.cc: Fixed compiler warnings from 'max' build sql/sql_base.cc: Fixed compiler warnings from 'max' build sql/sql_insert.cc: Initialize variable that may be used unitialized on error conditions (not fatal) sql/sql_prepare.cc: Fixed compiler warnings from 'max' build sql/sql_select.cc: Fixed compiler warnings sql/sql_show.cc: Fixed compiler warnings sql/udf_example.def: Fixed compiler warnings on win64 sql/unireg.cc: Initialize variable that may be used unitialized on error conditions strings/ctype-ucs2.c: Fixed compiler warnings strings/ctype-utf8.c: Fixed compiler warnings strings/decimal.c: Fixed compiler warnings support-files/compiler_warnings.supp: Ignore warnings from sql_yacc.cc that are hard to remove Ignore some not important warnings from windows 64 bit build tools/mysqlmanager.c: Fixed compiler warnings
192 lines
4.4 KiB
C
192 lines
4.4 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
get_ptr_compare(len) returns a pointer to a optimal byte-compare function
|
|
for a array of stringpointer where all strings have size len.
|
|
The bytes are compare as unsigned chars.
|
|
*/
|
|
|
|
#include "mysys_priv.h"
|
|
#include <myisampack.h>
|
|
|
|
static int ptr_compare(uint *compare_length, uchar **a, uchar **b);
|
|
static int ptr_compare_0(uint *compare_length, uchar **a, uchar **b);
|
|
static int ptr_compare_1(uint *compare_length, uchar **a, uchar **b);
|
|
static int ptr_compare_2(uint *compare_length, uchar **a, uchar **b);
|
|
static int ptr_compare_3(uint *compare_length, uchar **a, uchar **b);
|
|
|
|
/* Get a pointer to a optimal byte-compare function for a given size */
|
|
|
|
qsort2_cmp get_ptr_compare (uint size)
|
|
{
|
|
if (size < 4)
|
|
return (qsort2_cmp) ptr_compare;
|
|
switch (size & 3) {
|
|
case 0: return (qsort2_cmp) ptr_compare_0;
|
|
case 1: return (qsort2_cmp) ptr_compare_1;
|
|
case 2: return (qsort2_cmp) ptr_compare_2;
|
|
case 3: return (qsort2_cmp) ptr_compare_3;
|
|
}
|
|
return 0; /* Impossible */
|
|
}
|
|
|
|
|
|
/*
|
|
Compare to keys to see witch is smaller.
|
|
Loop unrolled to make it quick !!
|
|
*/
|
|
|
|
#define cmp(N) if (first[N] != last[N]) return (int) first[N] - (int) last[N]
|
|
|
|
static int ptr_compare(uint *compare_length, uchar **a, uchar **b)
|
|
{
|
|
reg3 int length= *compare_length;
|
|
reg1 uchar *first,*last;
|
|
|
|
first= *a; last= *b;
|
|
while (--length)
|
|
{
|
|
if (*first++ != *last++)
|
|
return (int) first[-1] - (int) last[-1];
|
|
}
|
|
return (int) first[0] - (int) last[0];
|
|
}
|
|
|
|
|
|
static int ptr_compare_0(uint *compare_length,uchar **a, uchar **b)
|
|
{
|
|
reg3 int length= *compare_length;
|
|
reg1 uchar *first,*last;
|
|
|
|
first= *a; last= *b;
|
|
loop:
|
|
cmp(0);
|
|
cmp(1);
|
|
cmp(2);
|
|
cmp(3);
|
|
if ((length-=4))
|
|
{
|
|
first+=4;
|
|
last+=4;
|
|
goto loop;
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
|
|
static int ptr_compare_1(uint *compare_length,uchar **a, uchar **b)
|
|
{
|
|
reg3 int length= *compare_length-1;
|
|
reg1 uchar *first,*last;
|
|
|
|
first= *a+1; last= *b+1;
|
|
cmp(-1);
|
|
loop:
|
|
cmp(0);
|
|
cmp(1);
|
|
cmp(2);
|
|
cmp(3);
|
|
if ((length-=4))
|
|
{
|
|
first+=4;
|
|
last+=4;
|
|
goto loop;
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
static int ptr_compare_2(uint *compare_length,uchar **a, uchar **b)
|
|
{
|
|
reg3 int length= *compare_length-2;
|
|
reg1 uchar *first,*last;
|
|
|
|
first= *a +2 ; last= *b +2;
|
|
cmp(-2);
|
|
cmp(-1);
|
|
loop:
|
|
cmp(0);
|
|
cmp(1);
|
|
cmp(2);
|
|
cmp(3);
|
|
if ((length-=4))
|
|
{
|
|
first+=4;
|
|
last+=4;
|
|
goto loop;
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
static int ptr_compare_3(uint *compare_length,uchar **a, uchar **b)
|
|
{
|
|
reg3 int length= *compare_length-3;
|
|
reg1 uchar *first,*last;
|
|
|
|
first= *a +3 ; last= *b +3;
|
|
cmp(-3);
|
|
cmp(-2);
|
|
cmp(-1);
|
|
loop:
|
|
cmp(0);
|
|
cmp(1);
|
|
cmp(2);
|
|
cmp(3);
|
|
if ((length-=4))
|
|
{
|
|
first+=4;
|
|
last+=4;
|
|
goto loop;
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
void my_store_ptr(byte *buff, uint pack_length, my_off_t pos)
|
|
{
|
|
switch (pack_length) {
|
|
#if SIZEOF_OFF_T > 4
|
|
case 8: mi_int8store(buff,pos); break;
|
|
case 7: mi_int7store(buff,pos); break;
|
|
case 6: mi_int6store(buff,pos); break;
|
|
case 5: mi_int5store(buff,pos); break;
|
|
#endif
|
|
case 4: mi_int4store(buff,pos); break;
|
|
case 3: mi_int3store(buff,pos); break;
|
|
case 2: mi_int2store(buff,pos); break;
|
|
case 1: buff[0]= (uchar) pos; break;
|
|
default: DBUG_ASSERT(0);
|
|
}
|
|
return;
|
|
}
|
|
|
|
my_off_t my_get_ptr(byte *ptr, uint pack_length)
|
|
{
|
|
my_off_t pos;
|
|
switch (pack_length) {
|
|
#if SIZEOF_OFF_T > 4
|
|
case 8: pos= (my_off_t) mi_uint8korr(ptr); break;
|
|
case 7: pos= (my_off_t) mi_uint7korr(ptr); break;
|
|
case 6: pos= (my_off_t) mi_uint6korr(ptr); break;
|
|
case 5: pos= (my_off_t) mi_uint5korr(ptr); break;
|
|
#endif
|
|
case 4: pos= (my_off_t) mi_uint4korr(ptr); break;
|
|
case 3: pos= (my_off_t) mi_uint3korr(ptr); break;
|
|
case 2: pos= (my_off_t) mi_uint2korr(ptr); break;
|
|
case 1: pos= (my_off_t) mi_uint2korr(ptr); break;
|
|
default: DBUG_ASSERT(0); return 0;
|
|
}
|
|
return pos;
|
|
}
|
|
|