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
a858ff17
Commit
a858ff17
authored
Oct 10, 2022
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
different fix for MDEV-26778
parent
d94ed0bb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
6 deletions
+1
-6
sql/sql_insert.cc
sql/sql_insert.cc
+0
-1
sql/sql_load.cc
sql/sql_load.cc
+0
-1
sql/sql_update.cc
sql/sql_update.cc
+1
-1
sql/table.cc
sql/table.cc
+0
-3
No files found.
sql/sql_insert.cc
View file @
a858ff17
...
@@ -4193,7 +4193,6 @@ int select_insert::send_data(List<Item> &values)
...
@@ -4193,7 +4193,6 @@ int select_insert::send_data(List<Item> &values)
bool
error
=
0
;
bool
error
=
0
;
thd
->
count_cuted_fields
=
CHECK_FIELD_WARN
;
// Calculate cuted fields
thd
->
count_cuted_fields
=
CHECK_FIELD_WARN
;
// Calculate cuted fields
table
->
reset_default_fields
();
store_values
(
values
);
store_values
(
values
);
if
(
table
->
default_field
&&
if
(
table
->
default_field
&&
unlikely
(
table
->
update_default_fields
(
info
.
ignore
)))
unlikely
(
table
->
update_default_fields
(
info
.
ignore
)))
...
...
sql/sql_load.cc
View file @
a858ff17
...
@@ -1106,7 +1106,6 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
...
@@ -1106,7 +1106,6 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
}
}
}
}
restore_record
(
table
,
s
->
default_values
);
restore_record
(
table
,
s
->
default_values
);
table
->
reset_default_fields
();
while
((
item
=
it
++
))
while
((
item
=
it
++
))
{
{
...
...
sql/sql_update.cc
View file @
a858ff17
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
compare_record(TABLE*).
compare_record(TABLE*).
*/
*/
bool
records_are_comparable
(
const
TABLE
*
table
)
{
bool
records_are_comparable
(
const
TABLE
*
table
)
{
return
!
table
->
versioned
(
VERS_TRX_ID
)
&&
return
!
table
->
versioned
()
&&
(((
table
->
file
->
ha_table_flags
()
&
HA_PARTIAL_COLUMN_READ
)
==
0
)
||
(((
table
->
file
->
ha_table_flags
()
&
HA_PARTIAL_COLUMN_READ
)
==
0
)
||
bitmap_is_subset
(
table
->
write_set
,
table
->
read_set
));
bitmap_is_subset
(
table
->
write_set
,
table
->
read_set
));
}
}
...
...
sql/table.cc
View file @
a858ff17
...
@@ -9164,13 +9164,11 @@ bool TABLE::vers_update_fields()
...
@@ -9164,13 +9164,11 @@ bool TABLE::vers_update_fields()
{
{
DBUG_ASSERT
(
0
);
DBUG_ASSERT
(
0
);
}
}
vers_start_field
()
->
set_has_explicit_value
();
}
}
if
(
!
versioned
(
VERS_TIMESTAMP
)
||
!
vers_end_field
()
->
has_explicit_value
())
if
(
!
versioned
(
VERS_TIMESTAMP
)
||
!
vers_end_field
()
->
has_explicit_value
())
{
{
vers_end_field
()
->
set_max
();
vers_end_field
()
->
set_max
();
vers_end_field
()
->
set_has_explicit_value
();
res
=
true
;
res
=
true
;
}
}
...
@@ -9185,7 +9183,6 @@ void TABLE::vers_update_end()
...
@@ -9185,7 +9183,6 @@ void TABLE::vers_update_end()
if
(
vers_end_field
()
->
store_timestamp
(
in_use
->
query_start
(),
if
(
vers_end_field
()
->
store_timestamp
(
in_use
->
query_start
(),
in_use
->
query_start_sec_part
()))
in_use
->
query_start_sec_part
()))
DBUG_ASSERT
(
0
);
DBUG_ASSERT
(
0
);
vers_end_field
()
->
set_has_explicit_value
();
}
}
/**
/**
...
...
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