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
7941c9af
Commit
7941c9af
authored
Apr 21, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
C99 Portability fix
parent
e2f56710
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
sql/sql_insert.cc
sql/sql_insert.cc
+3
-3
No files found.
sql/sql_insert.cc
View file @
7941c9af
...
@@ -80,7 +80,7 @@ static int check_insert_fields(THD *thd, TABLE *table, List<Item> &fields,
...
@@ -80,7 +80,7 @@ static int check_insert_fields(THD *thd, TABLE *table, List<Item> &fields,
check_grant_all_columns
(
thd
,
INSERT_ACL
,
table
))
check_grant_all_columns
(
thd
,
INSERT_ACL
,
table
))
return
-
1
;
return
-
1
;
#endif
#endif
(
int
)
table
->
timestamp_field_type
&=
~
(
int
)
TIMESTAMP_AUTO_SET_ON_INSERT
;
*
(
int
*
)
&
table
->
timestamp_field_type
&=
~
(
int
)
TIMESTAMP_AUTO_SET_ON_INSERT
;
}
}
else
else
{
// Part field list
{
// Part field list
...
@@ -110,7 +110,7 @@ static int check_insert_fields(THD *thd, TABLE *table, List<Item> &fields,
...
@@ -110,7 +110,7 @@ static int check_insert_fields(THD *thd, TABLE *table, List<Item> &fields,
}
}
if
(
table
->
timestamp_field
&&
// Don't set timestamp if used
if
(
table
->
timestamp_field
&&
// Don't set timestamp if used
table
->
timestamp_field
->
query_id
==
thd
->
query_id
)
table
->
timestamp_field
->
query_id
==
thd
->
query_id
)
(
int
)
table
->
timestamp_field_type
&=
~
(
int
)
TIMESTAMP_AUTO_SET_ON_INSERT
;
*
(
int
*
)
&
table
->
timestamp_field_type
&=
~
(
int
)
TIMESTAMP_AUTO_SET_ON_INSERT
;
}
}
// For the values we need select_priv
// For the values we need select_priv
#ifndef NO_EMBEDDED_ACCESS_CHECKS
#ifndef NO_EMBEDDED_ACCESS_CHECKS
...
@@ -167,7 +167,7 @@ static int check_update_fields(THD *thd, TABLE *table,
...
@@ -167,7 +167,7 @@ static int check_update_fields(THD *thd, TABLE *table,
{
{
/* Don't set timestamp column if this is modified. */
/* Don't set timestamp column if this is modified. */
if
(
table
->
timestamp_field
->
query_id
==
thd
->
query_id
)
if
(
table
->
timestamp_field
->
query_id
==
thd
->
query_id
)
(
int
)
table
->
timestamp_field_type
&=
~
(
int
)
TIMESTAMP_AUTO_SET_ON_UPDATE
;
*
(
int
*
)
&
table
->
timestamp_field_type
&=
~
(
int
)
TIMESTAMP_AUTO_SET_ON_UPDATE
;
else
else
table
->
timestamp_field
->
query_id
=
timestamp_query_id
;
table
->
timestamp_field
->
query_id
=
timestamp_query_id
;
}
}
...
...
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