mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Fixed compiler warnings and errors
This commit is contained in:
@ -58,7 +58,7 @@ int Url::parse_proxy_server(const char *proxy_server, size_t proxy_length,
|
||||
if (proxy_server == NULL)
|
||||
return 0;
|
||||
|
||||
for (; proxy_length > 0 && isspace(*proxy_server);
|
||||
for (; proxy_length > 0 && my_isspace(system_charset_info, *proxy_server);
|
||||
proxy_server++, proxy_length--) /* no-op */;
|
||||
|
||||
if (proxy_length == 0)
|
||||
|
@ -35,6 +35,7 @@ public:
|
||||
type_handler_adjusted_to_max_octet_length(uint max_octet_length,
|
||||
CHARSET_INFO *cs) const
|
||||
{ return this; }
|
||||
virtual ~Type_handler() {}
|
||||
};
|
||||
|
||||
|
||||
@ -45,6 +46,7 @@ class Type_handler_real_result: public Type_handler
|
||||
public:
|
||||
Item_result result_type() const { return REAL_RESULT; }
|
||||
Item_result cmp_type() const { return REAL_RESULT; }
|
||||
virtual ~Type_handler_real_result() {}
|
||||
};
|
||||
|
||||
|
||||
@ -53,6 +55,7 @@ class Type_handler_decimal_result: public Type_handler
|
||||
public:
|
||||
Item_result result_type() const { return DECIMAL_RESULT; }
|
||||
Item_result cmp_type() const { return DECIMAL_RESULT; }
|
||||
virtual ~Type_handler_decimal_result() {};
|
||||
};
|
||||
|
||||
|
||||
@ -61,6 +64,7 @@ class Type_handler_int_result: public Type_handler
|
||||
public:
|
||||
Item_result result_type() const { return INT_RESULT; }
|
||||
Item_result cmp_type() const { return INT_RESULT; }
|
||||
virtual ~Type_handler_int_result() {}
|
||||
};
|
||||
|
||||
|
||||
@ -69,6 +73,7 @@ class Type_handler_temporal_result: public Type_handler
|
||||
public:
|
||||
Item_result result_type() const { return STRING_RESULT; }
|
||||
Item_result cmp_type() const { return TIME_RESULT; }
|
||||
virtual ~Type_handler_temporal_result() {}
|
||||
};
|
||||
|
||||
|
||||
@ -77,6 +82,7 @@ class Type_handler_string_result: public Type_handler
|
||||
public:
|
||||
Item_result result_type() const { return STRING_RESULT; }
|
||||
Item_result cmp_type() const { return STRING_RESULT; }
|
||||
virtual ~Type_handler_string_result() {}
|
||||
const Type_handler *
|
||||
type_handler_adjusted_to_max_octet_length(uint max_octet_length,
|
||||
CHARSET_INFO *cs) const;
|
||||
@ -106,6 +112,7 @@ public:
|
||||
class Type_handler_tiny: public Type_handler_int_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_tiny() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_TINY; }
|
||||
};
|
||||
|
||||
@ -113,6 +120,7 @@ public:
|
||||
class Type_handler_short: public Type_handler_int_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_short() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_SHORT; }
|
||||
};
|
||||
|
||||
@ -120,6 +128,7 @@ public:
|
||||
class Type_handler_long: public Type_handler_int_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_long() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_LONG; }
|
||||
};
|
||||
|
||||
@ -127,6 +136,7 @@ public:
|
||||
class Type_handler_longlong: public Type_handler_int_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_longlong() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_LONGLONG; }
|
||||
};
|
||||
|
||||
@ -134,6 +144,7 @@ public:
|
||||
class Type_handler_int24: public Type_handler_int_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_int24() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_INT24; }
|
||||
};
|
||||
|
||||
@ -141,6 +152,7 @@ public:
|
||||
class Type_handler_year: public Type_handler_int_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_year() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_YEAR; }
|
||||
};
|
||||
|
||||
@ -148,6 +160,7 @@ public:
|
||||
class Type_handler_bit: public Type_handler_int_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_bit() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_BIT; }
|
||||
};
|
||||
|
||||
@ -155,6 +168,7 @@ public:
|
||||
class Type_handler_float: public Type_handler_real_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_float() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_FLOAT; }
|
||||
};
|
||||
|
||||
@ -162,6 +176,7 @@ public:
|
||||
class Type_handler_double: public Type_handler_real_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_double() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_DOUBLE; }
|
||||
};
|
||||
|
||||
@ -169,6 +184,7 @@ public:
|
||||
class Type_handler_time: public Type_handler_temporal_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_time() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_TIME; }
|
||||
};
|
||||
|
||||
@ -176,6 +192,7 @@ public:
|
||||
class Type_handler_date: public Type_handler_temporal_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_date() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_DATE; }
|
||||
};
|
||||
|
||||
@ -183,6 +200,7 @@ public:
|
||||
class Type_handler_datetime: public Type_handler_temporal_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_datetime() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_DATETIME; }
|
||||
};
|
||||
|
||||
@ -190,6 +208,7 @@ public:
|
||||
class Type_handler_timestamp: public Type_handler_temporal_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_timestamp() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_TIMESTAMP; }
|
||||
};
|
||||
|
||||
@ -197,6 +216,7 @@ public:
|
||||
class Type_handler_olddecimal: public Type_handler_decimal_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_olddecimal() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_DECIMAL; }
|
||||
};
|
||||
|
||||
@ -204,6 +224,7 @@ public:
|
||||
class Type_handler_newdecimal: public Type_handler_decimal_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_newdecimal() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_NEWDECIMAL; }
|
||||
};
|
||||
|
||||
@ -211,6 +232,7 @@ public:
|
||||
class Type_handler_null: public Type_handler_string_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_null() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_NULL; }
|
||||
};
|
||||
|
||||
@ -218,6 +240,7 @@ public:
|
||||
class Type_handler_string: public Type_handler_string_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_string() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_STRING; }
|
||||
};
|
||||
|
||||
@ -225,6 +248,7 @@ public:
|
||||
class Type_handler_varchar: public Type_handler_string_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_varchar() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_VARCHAR; }
|
||||
};
|
||||
|
||||
@ -232,6 +256,7 @@ public:
|
||||
class Type_handler_tiny_blob: public Type_handler_string_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_tiny_blob() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_TINY_BLOB; }
|
||||
};
|
||||
|
||||
@ -239,6 +264,7 @@ public:
|
||||
class Type_handler_medium_blob: public Type_handler_string_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_medium_blob() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_MEDIUM_BLOB; }
|
||||
};
|
||||
|
||||
@ -246,6 +272,7 @@ public:
|
||||
class Type_handler_long_blob: public Type_handler_string_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_long_blob() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_LONG_BLOB; }
|
||||
};
|
||||
|
||||
@ -253,6 +280,7 @@ public:
|
||||
class Type_handler_blob: public Type_handler_string_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_blob() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_BLOB; }
|
||||
};
|
||||
|
||||
@ -260,6 +288,7 @@ public:
|
||||
class Type_handler_geometry: public Type_handler_string_result
|
||||
{
|
||||
public:
|
||||
virtual ~Type_handler_geometry() {}
|
||||
enum_field_types field_type() const { return MYSQL_TYPE_GEOMETRY; }
|
||||
};
|
||||
|
||||
|
@ -1114,7 +1114,7 @@ int GetIntegerTableOption(PGLOBAL g, PTOS options, char *opname, int idef)
|
||||
else if (!stricmp(opname, "Compressed"))
|
||||
opval= (options->compressed);
|
||||
|
||||
if (opval == (ulonglong)NO_IVAL) {
|
||||
if ((ulonglong) opval == (ulonglong)NO_IVAL) {
|
||||
char *pv;
|
||||
|
||||
if ((pv= GetListOption(g, opname, options->oplist)))
|
||||
|
Reference in New Issue
Block a user