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
4956432b
Commit
4956432b
authored
Sep 21, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aftermerge fix
parent
aa7bc459
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
8 deletions
+11
-8
include/myisam.h
include/myisam.h
+1
-1
myisam/myisamchk.c
myisam/myisamchk.c
+2
-3
mysql-test/r/innodb.result
mysql-test/r/innodb.result
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+2
-1
sql/sql_parse.cc
sql/sql_parse.cc
+5
-2
No files found.
include/myisam.h
View file @
4956432b
...
...
@@ -390,7 +390,7 @@ typedef struct st_sort_key_blocks /* Used when sorting */
typedef
enum
{
/* Treat NULLs as inequal when collecting statistics (default for 4.1/5.0) */
MI_STATS_METHOD_NULLS_NOT_EQUAL
=
1
,
MI_STATS_METHOD_NULLS_NOT_EQUAL
,
/* Treat NULLs as equal when collecting statistics (like 4.0 did) */
MI_STATS_METHOD_NULLS_EQUAL
}
enum_mi_stats_method
;
...
...
myisam/myisamchk.c
View file @
4956432b
...
...
@@ -698,15 +698,14 @@ get_one_option(int optid,
break
;
case
OPT_STATS_METHOD
:
{
myisam_stats_method_str
=
argument
;
int
method
;
myisam_stats_method_str
=
argument
;
if
((
method
=
find_type
(
argument
,
&
myisam_stats_method_typelib
,
2
))
<=
0
)
{
fprintf
(
stderr
,
"Invalid value of stats_method: %s.
\n
"
,
argument
);
exit
(
1
);
}
check_param
.
stats_method
=
test
(
method
-
1
)
?
MI_STATS_METHOD_NULLS_EQUAL
:
MI_STATS_METHOD_NULLS_NOT_EQUAL
;
check_param
.
stats_method
=
method
-
1
;
break
;
}
#ifdef DEBUG
/* Only useful if debugging */
...
...
mysql-test/r/innodb.result
View file @
4956432b
...
...
@@ -1785,7 +1785,7 @@ Variable_name Value
Innodb_rows_deleted 2070
show status like "Innodb_rows_inserted";
Variable_name Value
Innodb_rows_inserted 3172
5
Innodb_rows_inserted 3172
7
show status like "Innodb_rows_updated";
Variable_name Value
Innodb_rows_updated 29530
...
...
sql/mysqld.cc
View file @
4956432b
...
...
@@ -6767,6 +6767,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
fprintf
(
stderr
,
"Unknown option to tc-heuristic-recover: %s
\n
"
,
argument
);
exit
(
1
);
}
}
case
OPT_MYISAM_STATS_METHOD
:
{
myisam_stats_method_str
=
argument
;
...
...
@@ -6776,7 +6777,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
fprintf
(
stderr
,
"Invalid value of myisam_stats_method: %s.
\n
"
,
argument
);
exit
(
1
);
}
global_system_variables
.
myisam_stats_method
=
method
;
global_system_variables
.
myisam_stats_method
=
method
-
1
;
break
;
}
case
OPT_SQL_MODE
:
...
...
sql/sql_parse.cc
View file @
4956432b
...
...
@@ -7175,8 +7175,11 @@ bool multi_delete_set_locks_and_link_aux_tables(LEX *lex)
target_tbl
->
table_name
,
"MULTI DELETE"
);
DBUG_RETURN
(
TRUE
);
}
target_tbl
->
table_name
=
walk
->
table_name
;
target_tbl
->
table_name_length
=
walk
->
table_name_length
;
if
(
!
walk
->
derived
)
{
target_tbl
->
table_name
=
walk
->
table_name
;
target_tbl
->
table_name_length
=
walk
->
table_name_length
;
}
walk
->
updating
=
target_tbl
->
updating
;
walk
->
lock_type
=
target_tbl
->
lock_type
;
target_tbl
->
correspondent_table
=
walk
;
// Remember corresponding table
...
...
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