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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
ef9c2261
Commit
ef9c2261
authored
Dec 19, 2002
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BINARY_FLAG has been restored.
It's needed by ODBC code.
parent
c7182a99
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
include/mysql_com.h
include/mysql_com.h
+1
-0
sql/field.h
sql/field.h
+6
-2
No files found.
include/mysql_com.h
View file @
ef9c2261
...
@@ -57,6 +57,7 @@ enum enum_server_command
...
@@ -57,6 +57,7 @@ enum enum_server_command
#define BLOB_FLAG 16
/* Field is a blob */
#define BLOB_FLAG 16
/* Field is a blob */
#define UNSIGNED_FLAG 32
/* Field is unsigned */
#define UNSIGNED_FLAG 32
/* Field is unsigned */
#define ZEROFILL_FLAG 64
/* Field is zerofill */
#define ZEROFILL_FLAG 64
/* Field is zerofill */
#define BINARY_FLAG 128
/* Field is binary */
/* The following are only sent to new clients */
/* The following are only sent to new clients */
#define ENUM_FLAG 256
/* field is an enum */
#define ENUM_FLAG 256
/* field is an enum */
...
...
sql/field.h
View file @
ef9c2261
...
@@ -132,7 +132,7 @@ public:
...
@@ -132,7 +132,7 @@ public:
tmp
->
key_start
=
tmp
->
part_of_key
=
tmp
->
part_of_sortkey
=
0
;
tmp
->
key_start
=
tmp
->
part_of_key
=
tmp
->
part_of_sortkey
=
0
;
tmp
->
unireg_check
=
Field
::
NONE
;
tmp
->
unireg_check
=
Field
::
NONE
;
tmp
->
flags
&=
(
NOT_NULL_FLAG
|
BLOB_FLAG
|
UNSIGNED_FLAG
|
tmp
->
flags
&=
(
NOT_NULL_FLAG
|
BLOB_FLAG
|
UNSIGNED_FLAG
|
ZEROFILL_FLAG
|
ENUM_FLAG
|
SET_FLAG
);
ZEROFILL_FLAG
|
BINARY_FLAG
|
ENUM_FLAG
|
SET_FLAG
);
tmp
->
table_name
=
new_table
->
table_name
;
tmp
->
table_name
=
new_table
->
table_name
;
tmp
->
reset_fields
();
tmp
->
reset_fields
();
}
}
...
@@ -260,7 +260,11 @@ public:
...
@@ -260,7 +260,11 @@ public:
struct
st_table
*
table_arg
,
CHARSET_INFO
*
charset
)
struct
st_table
*
table_arg
,
CHARSET_INFO
*
charset
)
:
Field
(
ptr_arg
,
len_arg
,
null_ptr_arg
,
null_bit_arg
,
:
Field
(
ptr_arg
,
len_arg
,
null_ptr_arg
,
null_bit_arg
,
unireg_check_arg
,
field_name_arg
,
table_arg
)
unireg_check_arg
,
field_name_arg
,
table_arg
)
{
field_charset
=
charset
;
}
{
field_charset
=
charset
;
if
(
binary
())
flags
|=
BINARY_FLAG
;
}
Item_result
result_type
()
const
{
return
STRING_RESULT
;
}
Item_result
result_type
()
const
{
return
STRING_RESULT
;
}
void
add_binary_or_charset
(
String
&
res
)
const
;
void
add_binary_or_charset
(
String
&
res
)
const
;
uint
decimals
()
const
{
return
NOT_FIXED_DEC
;
}
uint
decimals
()
const
{
return
NOT_FIXED_DEC
;
}
...
...
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