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
0b00ae6b
Commit
0b00ae6b
authored
Jun 29, 2006
by
monty@hasky.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
parents
3b3dde6f
8eb9c06d
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
55 additions
and
8 deletions
+55
-8
.bzrignore
.bzrignore
+3
-0
BUILD/compile-pentium-gcov
BUILD/compile-pentium-gcov
+1
-1
mysql-test/r/show_check.result
mysql-test/r/show_check.result
+6
-0
mysql-test/t/events_stress.test
mysql-test/t/events_stress.test
+2
-1
mysql-test/t/rpl_ndb_auto_inc.test
mysql-test/t/rpl_ndb_auto_inc.test
+2
-1
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.cc
sql/ha_ndbcluster.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.
.bzrignore
View file @
0b00ae6b
...
@@ -7,6 +7,8 @@
...
@@ -7,6 +7,8 @@
*.d
*.d
*.da
*.da
*.exe
*.exe
*.gcda
*.gcno
*.gcov
*.gcov
*.idb
*.idb
*.la
*.la
...
@@ -1778,3 +1780,4 @@ vio/viotest-sslconnect.cpp
...
@@ -1778,3 +1780,4 @@ vio/viotest-sslconnect.cpp
vio/viotest.cpp
vio/viotest.cpp
zlib/*.ds?
zlib/*.ds?
zlib/*.vcproj
zlib/*.vcproj
server-tools/instance-manager/net_serv.cc
BUILD/compile-pentium-gcov
View file @
0b00ae6b
...
@@ -14,7 +14,7 @@ export LDFLAGS="-fprofile-arcs -ftest-coverage"
...
@@ -14,7 +14,7 @@ export LDFLAGS="-fprofile-arcs -ftest-coverage"
# The -fprofile-arcs and -ftest-coverage options cause GCC to instrument the
# The -fprofile-arcs and -ftest-coverage options cause GCC to instrument the
# code with profiling information used by gcov.
# code with profiling information used by gcov.
# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
extra_flags
=
"
$pentium_cflags
-fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM"
extra_flags
=
"
$pentium_cflags
-fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM
-DHAVE_MUTEX_THREAD_ONLY
"
extra_configs
=
"
$pentium_configs
$debug_configs
--disable-shared
$static_link
"
extra_configs
=
"
$pentium_configs
$debug_configs
--disable-shared
$static_link
"
extra_configs
=
"
$extra_configs
$max_configs
"
extra_configs
=
"
$extra_configs
$max_configs
"
...
...
mysql-test/r/show_check.result
View file @
0b00ae6b
...
@@ -623,4 +623,10 @@ delete from mysql.db where user='mysqltest_4';
...
@@ -623,4 +623,10 @@ delete from mysql.db where user='mysqltest_4';
delete from mysql.tables_priv where user='mysqltest_4';
delete from mysql.tables_priv where user='mysqltest_4';
flush privileges;
flush privileges;
drop database mysqltest;
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
End of 5.1 tests
mysql-test/t/events_stress.test
View file @
0b00ae6b
# Can't test with embedded server that doesn't support grants
# Can't test with embedded server that doesn't support grants
--
source
include
/
not_embedded
.
inc
--
source
include
/
not_embedded
.
inc
--
source
include
/
big_test
.
inc
CREATE
DATABASE
IF
NOT
EXISTS
events_test
;
CREATE
DATABASE
IF
NOT
EXISTS
events_test
;
#
#
...
...
mysql-test/t/rpl_ndb_auto_inc.test
View file @
0b00ae6b
...
@@ -6,7 +6,8 @@
...
@@ -6,7 +6,8 @@
# Date: 2006-02-10
# Date: 2006-02-10
# Change: Augmented test to use with cluster
# Change: Augmented test to use with cluster
#####################################
#####################################
--
source
include
/
master
-
slave
.
inc
--
source
include
/
master
-
slave
.
inc
--
source
include
/
have_binlog_format_mixed_or_row
.
inc
--
echo
*****************
Test
1
************************
--
echo
*****************
Test
1
************************
--
echo
--
echo
...
...
mysql-test/t/show_check.test
View file @
0b00ae6b
...
@@ -445,4 +445,17 @@ delete from mysql.tables_priv where user='mysqltest_4';
...
@@ -445,4 +445,17 @@ delete from mysql.tables_priv where user='mysqltest_4';
flush
privileges
;
flush
privileges
;
drop
database
mysqltest
;
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
--
echo
End
of
5.1
tests
mysys/my_handler.c
View file @
0b00ae6b
...
@@ -548,7 +548,8 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a)
...
@@ -548,7 +548,8 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a)
case
HA_KEYTYPE_DOUBLE
:
case
HA_KEYTYPE_DOUBLE
:
a
=
end
;
a
=
end
;
break
;
break
;
case
HA_KEYTYPE_END
:
case
HA_KEYTYPE_END
:
/* purecov: inspected */
/* keep compiler happy */
DBUG_ASSERT
(
0
);
DBUG_ASSERT
(
0
);
break
;
break
;
}
}
...
...
sql/filesort.cc
View file @
0b00ae6b
...
@@ -688,9 +688,17 @@ static void make_sortkey(register SORTPARAM *param,
...
@@ -688,9 +688,17 @@ static void make_sortkey(register SORTPARAM *param,
bzero
((
char
*
)
to
-
1
,
sort_field
->
length
+
1
);
bzero
((
char
*
)
to
-
1
,
sort_field
->
length
+
1
);
else
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"
,
DBUG_PRINT
(
"warning"
,
(
"Got null on something that shouldn't be null"
));
(
"Got null on something that shouldn't be null"
));
bzero
((
char
*
)
to
,
sort_field
->
length
);
// Avoid crash
bzero
((
char
*
)
to
,
sort_field
->
length
);
// Avoid crash
/* purecov: end */
}
}
break
;
break
;
}
}
...
@@ -699,7 +707,7 @@ static void make_sortkey(register SORTPARAM *param,
...
@@ -699,7 +707,7 @@ static void make_sortkey(register SORTPARAM *param,
diff
=
(
int
)
(
sort_field_length
-
length
);
diff
=
(
int
)
(
sort_field_length
-
length
);
if
(
diff
<
0
)
if
(
diff
<
0
)
{
{
diff
=
0
;
/* purecov: inspected */
diff
=
0
;
length
=
sort_field_length
;
length
=
sort_field_length
;
}
}
if
(
sort_field
->
suffix_length
)
if
(
sort_field
->
suffix_length
)
...
...
sql/ha_ndbcluster.cc
View file @
0b00ae6b
...
@@ -4699,7 +4699,15 @@ int ha_ndbcluster::create(const char *name,
...
@@ -4699,7 +4699,15 @@ int ha_ndbcluster::create(const char *name,
// reset at return
// reset at return
m_table
=
ndbtab_g
.
get_table
();
m_table
=
ndbtab_g
.
get_table
();
// TODO check also that we have the same frm...
// TODO check also that we have the same frm...
DBUG_ASSERT
(
m_table
!=
0
);
if
(
!
m_table
)
{
/* purecov: begin deadcode */
const
NdbError
err
=
dict
->
getNdbError
();
ERR_PRINT
(
err
);
my_errno
=
ndb_to_mysql_error
(
&
err
);
DBUG_RETURN
(
my_errno
);
/* purecov: end */
}
DBUG_PRINT
(
"info"
,
(
"Table %s/%s created successfully"
,
DBUG_PRINT
(
"info"
,
(
"Table %s/%s created successfully"
,
m_dbname
,
m_tabname
));
m_dbname
,
m_tabname
));
...
...
sql/ha_ndbcluster_binlog.cc
View file @
0b00ae6b
...
@@ -125,6 +125,7 @@ static TABLE_LIST binlog_tables;
...
@@ -125,6 +125,7 @@ static TABLE_LIST binlog_tables;
*/
*/
#ifndef DBUG_OFF
#ifndef DBUG_OFF
/* purecov: begin deadcode */
static
void
print_records
(
TABLE
*
table
,
const
char
*
record
)
static
void
print_records
(
TABLE
*
table
,
const
char
*
record
)
{
{
for
(
uint
j
=
0
;
j
<
table
->
s
->
fields
;
j
++
)
for
(
uint
j
=
0
;
j
<
table
->
s
->
fields
;
j
++
)
...
@@ -144,6 +145,7 @@ static void print_records(TABLE *table, const char *record)
...
@@ -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
));
DBUG_PRINT
(
"info"
,(
"[%u]field_ptr[0->%d]: %s"
,
j
,
n
,
buf
));
}
}
}
}
/* purecov: end */
#else
#else
#define print_records(a,b)
#define print_records(a,b)
#endif
#endif
...
...
sql/log_event.cc
View file @
0b00ae6b
...
@@ -5918,6 +5918,7 @@ int Table_map_log_event::exec_event(st_relay_log_info *rli)
...
@@ -5918,6 +5918,7 @@ int Table_map_log_event::exec_event(st_relay_log_info *rli)
if
(
col
<=
tsh
->
fields
)
if
(
col
<=
tsh
->
fields
)
{
{
/* purecov: begin inspected */
/*
/*
If we get here, the number of columns in the event didn't
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*
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)
...
@@ -5950,6 +5951,7 @@ int Table_map_log_event::exec_event(st_relay_log_info *rli)
thd
->
query_error
=
1
;
thd
->
query_error
=
1
;
error
=
ERR_BAD_TABLE_DEF
;
error
=
ERR_BAD_TABLE_DEF
;
goto
err
;
goto
err
;
/* purecov: end */
}
}
/*
/*
...
...
sql/mysqld.cc
View file @
0b00ae6b
...
@@ -3223,9 +3223,11 @@ server.");
...
@@ -3223,9 +3223,11 @@ server.");
/* fall back to the log files if tables are not present */
/* fall back to the log files if tables are not present */
if
(
have_csv_db
==
SHOW_OPTION_NO
)
if
(
have_csv_db
==
SHOW_OPTION_NO
)
{
{
/* purecov: begin inspected */
sql_print_error
(
"CSV engine is not present, falling back to the "
sql_print_error
(
"CSV engine is not present, falling back to the "
"log files"
);
"log files"
);
log_output_options
=
(
log_output_options
&
~
LOG_TABLE
)
|
LOG_FILE
;
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
,
logger
.
set_handlers
(
LOG_FILE
,
opt_slow_log
?
log_output_options
:
LOG_NONE
,
...
...
sql/sql_parse.cc
View file @
0b00ae6b
...
@@ -5209,7 +5209,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
...
@@ -5209,7 +5209,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
even if the query itself redirects the output.
even if the query itself redirects the output.
*/
*/
if
(
!
(
result
=
new
select_send
()))
if
(
!
(
result
=
new
select_send
()))
return
1
;
return
1
;
/* purecov: inspected */
thd
->
send_explain_fields
(
result
);
thd
->
send_explain_fields
(
result
);
res
=
mysql_explain_union
(
thd
,
&
thd
->
lex
->
unit
,
result
);
res
=
mysql_explain_union
(
thd
,
&
thd
->
lex
->
unit
,
result
);
if
(
lex
->
describe
&
DESCRIBE_EXTENDED
)
if
(
lex
->
describe
&
DESCRIBE_EXTENDED
)
...
@@ -5228,7 +5228,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
...
@@ -5228,7 +5228,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
else
else
{
{
if
(
!
result
&&
!
(
result
=
new
select_send
()))
if
(
!
result
&&
!
(
result
=
new
select_send
()))
return
1
;
return
1
;
/* purecov: inspected */
query_cache_store_query
(
thd
,
all_tables
);
query_cache_store_query
(
thd
,
all_tables
);
res
=
handle_select
(
thd
,
lex
,
result
,
0
);
res
=
handle_select
(
thd
,
lex
,
result
,
0
);
if
(
result
!=
lex
->
result
)
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