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
31fdcd3b
Commit
31fdcd3b
authored
Jun 28, 2006
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added purecov comment for new, not executed code for my recent changeset
(Found by dgcov)
parent
059c45d0
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
38 additions
and
4 deletions
+38
-4
mysql-test/r/show_check.result
mysql-test/r/show_check.result
+6
-0
mysql-test/t/show_check.test
mysql-test/t/show_check.test
+13
-0
mysys/my_handler.c
mysys/my_handler.c
+2
-1
sql/filesort.cc
sql/filesort.cc
+9
-1
sql/ha_ndbcluster_binlog.cc
sql/ha_ndbcluster_binlog.cc
+2
-0
sql/log_event.cc
sql/log_event.cc
+2
-0
sql/mysqld.cc
sql/mysqld.cc
+2
-0
sql/sql_parse.cc
sql/sql_parse.cc
+2
-2
No files found.
mysql-test/r/show_check.result
View file @
31fdcd3b
...
...
@@ -623,4 +623,10 @@ delete from mysql.db where user='mysqltest_4';
delete from mysql.tables_priv where user='mysqltest_4';
flush privileges;
drop database mysqltest;
show full plugin;
show warnings;
Level Code Message
Warning 1541 The syntax 'SHOW PLUGIN' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW PLUGINS' instead.
show plugin;
show plugins;
End of 5.1 tests
mysql-test/t/show_check.test
View file @
31fdcd3b
...
...
@@ -445,4 +445,17 @@ delete from mysql.tables_priv where user='mysqltest_4';
flush
privileges
;
drop
database
mysqltest
;
#
# Ensure that show plugin code is tested
#
--
disable_result_log
show
full
plugin
;
--
enable_result_log
show
warnings
;
--
disable_result_log
show
plugin
;
show
plugins
;
--
enable_result_log
--
echo
End
of
5.1
tests
mysys/my_handler.c
View file @
31fdcd3b
...
...
@@ -548,7 +548,8 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a)
case
HA_KEYTYPE_DOUBLE
:
a
=
end
;
break
;
case
HA_KEYTYPE_END
:
case
HA_KEYTYPE_END
:
/* purecov: inspected */
/* keep compiler happy */
DBUG_ASSERT
(
0
);
break
;
}
...
...
sql/filesort.cc
View file @
31fdcd3b
...
...
@@ -688,9 +688,17 @@ static void make_sortkey(register SORTPARAM *param,
bzero
((
char
*
)
to
-
1
,
sort_field
->
length
+
1
);
else
{
/* purecov: begin deadcode */
/*
This should only happen during extreme conditions if we run out
of memory or have an item marked not null when it can be null.
This code is here mainly to avoid a hard crash in this case.
*/
DBUG_ASSERT
(
0
);
DBUG_PRINT
(
"warning"
,
(
"Got null on something that shouldn't be null"
));
bzero
((
char
*
)
to
,
sort_field
->
length
);
// Avoid crash
/* purecov: end */
}
break
;
}
...
...
@@ -699,7 +707,7 @@ static void make_sortkey(register SORTPARAM *param,
diff
=
(
int
)
(
sort_field_length
-
length
);
if
(
diff
<
0
)
{
diff
=
0
;
/* purecov: inspected */
diff
=
0
;
length
=
sort_field_length
;
}
if
(
sort_field
->
suffix_length
)
...
...
sql/ha_ndbcluster_binlog.cc
View file @
31fdcd3b
...
...
@@ -125,6 +125,7 @@ static TABLE_LIST binlog_tables;
*/
#ifndef DBUG_OFF
/* purecov: begin deadcode */
static
void
print_records
(
TABLE
*
table
,
const
char
*
record
)
{
for
(
uint
j
=
0
;
j
<
table
->
s
->
fields
;
j
++
)
...
...
@@ -144,6 +145,7 @@ static void print_records(TABLE *table, const char *record)
DBUG_PRINT
(
"info"
,(
"[%u]field_ptr[0->%d]: %s"
,
j
,
n
,
buf
));
}
}
/* purecov: end */
#else
#define print_records(a,b)
#endif
...
...
sql/log_event.cc
View file @
31fdcd3b
...
...
@@ -5918,6 +5918,7 @@ int Table_map_log_event::exec_event(st_relay_log_info *rli)
if
(
col
<=
tsh
->
fields
)
{
/* purecov: begin inspected */
/*
If we get here, the number of columns in the event didn't
match the number of columns in the table on the slave, *or*
...
...
@@ -5950,6 +5951,7 @@ int Table_map_log_event::exec_event(st_relay_log_info *rli)
thd
->
query_error
=
1
;
error
=
ERR_BAD_TABLE_DEF
;
goto
err
;
/* purecov: end */
}
/*
...
...
sql/mysqld.cc
View file @
31fdcd3b
...
...
@@ -3223,9 +3223,11 @@ server.");
/* fall back to the log files if tables are not present */
if
(
have_csv_db
==
SHOW_OPTION_NO
)
{
/* purecov: begin inspected */
sql_print_error
(
"CSV engine is not present, falling back to the "
"log files"
);
log_output_options
=
(
log_output_options
&
~
LOG_TABLE
)
|
LOG_FILE
;
/* purecov: end */
}
logger
.
set_handlers
(
LOG_FILE
,
opt_slow_log
?
log_output_options
:
LOG_NONE
,
...
...
sql/sql_parse.cc
View file @
31fdcd3b
...
...
@@ -5212,7 +5212,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
even if the query itself redirects the output.
*/
if
(
!
(
result
=
new
select_send
()))
return
1
;
return
1
;
/* purecov: inspected */
thd
->
send_explain_fields
(
result
);
res
=
mysql_explain_union
(
thd
,
&
thd
->
lex
->
unit
,
result
);
if
(
lex
->
describe
&
DESCRIBE_EXTENDED
)
...
...
@@ -5231,7 +5231,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
else
{
if
(
!
result
&&
!
(
result
=
new
select_send
()))
return
1
;
return
1
;
/* purecov: inspected */
query_cache_store_query
(
thd
,
all_tables
);
res
=
handle_select
(
thd
,
lex
,
result
,
0
);
if
(
result
!=
lex
->
result
)
...
...
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