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
f6023857
Commit
f6023857
authored
Apr 04, 2019
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not pass table_name_t to printf-like functions
parent
b718ec05
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
storage/innobase/btr/btr0btr.cc
storage/innobase/btr/btr0btr.cc
+1
-1
storage/innobase/btr/btr0cur.cc
storage/innobase/btr/btr0cur.cc
+6
-6
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+1
-1
storage/innobase/row/row0ins.cc
storage/innobase/row/row0ins.cc
+1
-1
storage/innobase/row/row0mysql.cc
storage/innobase/row/row0mysql.cc
+2
-2
storage/innobase/row/row0sel.cc
storage/innobase/row/row0sel.cc
+1
-1
No files found.
storage/innobase/btr/btr0btr.cc
View file @
f6023857
...
...
@@ -236,7 +236,7 @@ btr_root_block_get(
"Table %s in tablespace %lu is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table."
,
index
->
table
->
name
,
space
);
index
->
table
->
name
.
m_name
,
space
);
}
return
NULL
;
...
...
storage/innobase/btr/btr0cur.cc
View file @
f6023857
...
...
@@ -1254,7 +1254,7 @@ btr_cur_search_to_nth_level(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table."
,
index
->
table
->
name
);
index
->
table
->
name
.
m_name
);
index
->
table
->
file_unreadable
=
true
;
}
...
...
@@ -1367,7 +1367,7 @@ btr_cur_search_to_nth_level(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table."
,
index
->
table
->
name
);
index
->
table
->
name
.
m_name
);
index
->
table
->
file_unreadable
=
true
;
}
...
...
@@ -1396,7 +1396,7 @@ btr_cur_search_to_nth_level(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table."
,
index
->
table
->
name
);
index
->
table
->
name
.
m_name
);
index
->
table
->
file_unreadable
=
true
;
}
...
...
@@ -2294,7 +2294,7 @@ btr_cur_open_at_index_side_func(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table."
,
index
->
table
->
name
);
index
->
table
->
name
.
m_name
);
index
->
table
->
file_unreadable
=
true
;
}
...
...
@@ -2654,7 +2654,7 @@ btr_cur_open_at_rnd_pos_func(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table."
,
index
->
table
->
name
);
index
->
table
->
name
.
m_name
);
index
->
table
->
file_unreadable
=
true
;
}
...
...
@@ -5585,7 +5585,7 @@ btr_estimate_n_rows_in_range_on_level(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table."
,
index
->
table
->
name
);
index
->
table
->
name
.
m_name
);
index
->
table
->
file_unreadable
=
true
;
}
...
...
storage/innobase/handler/ha_innodb.cc
View file @
f6023857
...
...
@@ -14701,7 +14701,7 @@ ha_innobase::optimize(
push_warning_printf
(
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
err
,
"InnoDB: Cannot defragment table %s: returned error code %d
\n
"
,
m_prebuilt
->
table
->
name
,
err
);
m_prebuilt
->
table
->
name
.
m_name
,
err
);
if
(
err
==
ER_SP_ALREADY_EXISTS
)
{
try_alter
=
false
;
...
...
storage/innobase/row/row0ins.cc
View file @
f6023857
...
...
@@ -2932,7 +2932,7 @@ row_ins_sec_index_entry_low(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table."
,
index
->
table
->
name
);
index
->
table
->
name
.
m_name
);
index
->
table
->
file_unreadable
=
true
;
}
goto
func_exit
;
...
...
storage/innobase/row/row0mysql.cc
View file @
f6023857
...
...
@@ -1307,7 +1307,7 @@ row_mysql_get_table_status(
"Table %s in tablespace %lu encrypted."
"However key management plugin or used key_id is not found or"
" used encryption algorithm or method does not match."
,
table
->
name
,
table
->
space
);
table
->
name
.
m_name
,
table
->
space
);
}
err
=
DB_DECRYPTION_FAILED
;
...
...
@@ -1315,7 +1315,7 @@ row_mysql_get_table_status(
if
(
push_warning
)
{
ib_push_warning
(
trx
,
DB_CORRUPTION
,
"Table %s in tablespace %lu corrupted."
,
table
->
name
,
table
->
space
);
table
->
name
.
m_name
,
table
->
space
);
}
err
=
DB_CORRUPTION
;
...
...
storage/innobase/row/row0sel.cc
View file @
f6023857
...
...
@@ -4738,7 +4738,7 @@ row_search_mvcc(
"Table %s is encrypted but encryption service or"
" used key_id is not available. "
" Can't continue reading table."
,
prebuilt
->
table
->
name
);
prebuilt
->
table
->
name
.
m_name
);
index
->
table
->
file_unreadable
=
true
;
}
rec
=
NULL
;
...
...
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