Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
c696fc74
Commit
c696fc74
authored
Oct 09, 2015
by
Monty
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compiler warnings and errors
parent
b0935fc5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
2 deletions
+31
-2
plugin/feedback/url_base.cc
plugin/feedback/url_base.cc
+1
-1
sql/sql_type.h
sql/sql_type.h
+29
-0
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+1
-1
No files found.
plugin/feedback/url_base.cc
View file @
c696fc74
...
...
@@ -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
)
...
...
sql/sql_type.h
View file @
c696fc74
...
...
@@ -35,6 +35,7 @@ class Type_handler
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 @@ class Type_handler_string_result: public Type_handler
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 @@ class Type_handler_tiny: public Type_handler_int_result
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 @@ class Type_handler_short: public Type_handler_int_result
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 @@ class Type_handler_long: public Type_handler_int_result
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 @@ class Type_handler_longlong: public Type_handler_int_result
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 @@ class Type_handler_int24: public Type_handler_int_result
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 @@ class Type_handler_year: public Type_handler_int_result
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 @@ class Type_handler_bit: public Type_handler_int_result
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 @@ class Type_handler_float: public Type_handler_real_result
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 @@ class Type_handler_double: public Type_handler_real_result
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 @@ class Type_handler_time: public Type_handler_temporal_result
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 @@ class Type_handler_date: public Type_handler_temporal_result
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 @@ class Type_handler_datetime: public Type_handler_temporal_result
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 @@ class Type_handler_timestamp: public Type_handler_temporal_result
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 @@ class Type_handler_olddecimal: public Type_handler_decimal_result
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 @@ class Type_handler_newdecimal: public Type_handler_decimal_result
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 @@ class Type_handler_null: public Type_handler_string_result
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 @@ class Type_handler_string: public Type_handler_string_result
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 @@ class Type_handler_varchar: public Type_handler_string_result
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 @@ class Type_handler_tiny_blob: public Type_handler_string_result
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 @@ class Type_handler_medium_blob: public Type_handler_string_result
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 @@ class Type_handler_long_blob: public Type_handler_string_result
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 @@ class Type_handler_blob: public Type_handler_string_result
class
Type_handler_geometry
:
public
Type_handler_string_result
{
public:
virtual
~
Type_handler_geometry
()
{}
enum_field_types
field_type
()
const
{
return
MYSQL_TYPE_GEOMETRY
;
}
};
...
...
storage/connect/ha_connect.cc
View file @
c696fc74
...
...
@@ -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
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment