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
dd71fde3
Commit
dd71fde3
authored
Feb 02, 2005
by
mysqldev@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge production:my/mysql-4.1-build
into mysql.com:/home/mysqldev/tulin/mysql-4.1
parents
3bdb9734
33fc4b10
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
configure.in
configure.in
+2
-2
sql/mysqld.cc
sql/mysqld.cc
+2
-0
sql/sql_update.cc
sql/sql_update.cc
+7
-6
No files found.
configure.in
View file @
dd71fde3
...
...
@@ -1677,8 +1677,8 @@ then
elif test "
$with_debug
" = "
full
"
then
# Full debug. Very slow in some cases
CFLAGS="
$DEBUG_CFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
-DUNIV_DEBUG
$CFLAGS
"
CXXFLAGS="
$DEBUG_CXXFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
-DUNIV_DEBUG
$CXXFLAGS
"
CFLAGS="
$DEBUG_CFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
$CFLAGS
"
CXXFLAGS="
$DEBUG_CXXFLAGS
-DDBUG_ON
-DSAFE_MUTEX
-DSAFEMALLOC
$CXXFLAGS
"
else
# Optimized version. No debug
CFLAGS="
$OPTIMIZE_CFLAGS
-DDBUG_OFF
$CFLAGS
"
...
...
sql/mysqld.cc
View file @
dd71fde3
...
...
@@ -5215,6 +5215,7 @@ The minimum value for this variable is 4096.",
(
gptr
*
)
&
sync_binlog_period
,
(
gptr
*
)
&
sync_binlog_period
,
0
,
GET_ULONG
,
REQUIRED_ARG
,
0
,
0
,
~
0L
,
0
,
1
,
0
},
#ifdef DOES_NOTHING_YET
{
"sync-replication"
,
OPT_SYNC_REPLICATION
,
"Enable synchronous replication"
,
(
gptr
*
)
&
global_system_variables
.
sync_replication
,
...
...
@@ -5230,6 +5231,7 @@ The minimum value for this variable is 4096.",
(
gptr
*
)
&
global_system_variables
.
sync_replication_timeout
,
(
gptr
*
)
&
global_system_variables
.
sync_replication_timeout
,
0
,
GET_ULONG
,
REQUIRED_ARG
,
10
,
0
,
~
0L
,
0
,
1
,
0
},
#endif
{
"sync-frm"
,
OPT_SYNC_FRM
,
"Sync .frm to disk on create. Enabled by default"
,
(
gptr
*
)
&
opt_sync_frm
,
(
gptr
*
)
&
opt_sync_frm
,
0
,
GET_BOOL
,
NO_ARG
,
1
,
0
,
0
,
0
,
0
,
0
},
...
...
sql/sql_update.cc
View file @
dd71fde3
...
...
@@ -57,11 +57,11 @@ int mysql_update(THD *thd,
enum
enum_duplicates
handle_duplicates
,
bool
ignore
)
{
bool
using_limit
=
limit
!=
HA_POS_ERROR
;
bool
using_limit
=
limit
!=
HA_POS_ERROR
;
bool
safe_update
=
thd
->
options
&
OPTION_SAFE_UPDATES
;
bool
used_key_is_modified
,
transactional_table
,
log_delayed
;
int
error
=
0
;
uint
used_index
=
MAX_KEY
;
uint
used_index
;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
uint
want_privilege
;
#endif
...
...
@@ -71,7 +71,7 @@ int mysql_update(THD *thd,
TABLE
*
table
;
SQL_SELECT
*
select
;
READ_RECORD
info
;
TABLE_LIST
*
update_table_list
=
((
TABLE_LIST
*
)
TABLE_LIST
*
update_table_list
=
((
TABLE_LIST
*
)
thd
->
lex
->
select_lex
.
table_list
.
first
);
DBUG_ENTER
(
"mysql_update"
);
...
...
@@ -159,10 +159,11 @@ int mysql_update(THD *thd,
init_ftfuncs
(
thd
,
&
thd
->
lex
->
select_lex
,
1
);
/* Check if we are modifying a key that we are used to search with */
if
(
select
&&
select
->
quick
)
{
used_index
=
select
->
quick
->
index
;
used_key_is_modified
=
(
!
select
->
quick
->
unique_key_range
()
&&
check_if_key_used
(
table
,
(
used_index
=
select
->
quick
->
index
),
fields
));
check_if_key_used
(
table
,
used_index
,
fields
));
}
else
if
((
used_index
=
table
->
file
->
key_used_on_scan
)
<
MAX_KEY
)
used_key_is_modified
=
check_if_key_used
(
table
,
used_index
,
fields
);
else
...
...
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