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
6e87dc11
Commit
6e87dc11
authored
Aug 09, 2002
by
heikki@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ha_innobase.cc:
Revert changes to sprintf until we know why control characters scrambled the output
parent
ea3fe233
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
2 deletions
+36
-2
sql/ha_innobase.cc
sql/ha_innobase.cc
+36
-2
No files found.
sql/ha_innobase.cc
View file @
6e87dc11
...
...
@@ -265,7 +265,40 @@ innobase_mysql_print_thd(
{
THD
*
thd
;
thd
=
(
THD
*
)
input_thd
;
thd
=
(
THD
*
)
input_thd
;
buf
+=
sprintf
(
buf
,
"MySQL thread id %lu, query id %lu"
,
thd
->
thread_id
,
thd
->
query_id
);
if
(
thd
->
host
)
{
buf
+=
sprintf
(
buf
,
" %.30s"
,
thd
->
host
);
}
if
(
thd
->
ip
)
{
buf
+=
sprintf
(
buf
,
" %.20s"
,
thd
->
ip
);
}
if
(
thd
->
user
)
{
buf
+=
sprintf
(
buf
,
" %.20s"
,
thd
->
user
);
}
if
(
thd
->
proc_info
)
{
buf
+=
sprintf
(
buf
,
" %.50s"
,
thd
->
proc_info
);
}
if
(
thd
->
query
)
{
buf
+=
sprintf
(
buf
,
"
\n
%.150s"
,
thd
->
query
);
}
buf
+=
sprintf
(
buf
,
"
\n
"
);
#ifdef notdefined
/* August 8, 2002
Revert these changes because they seem to make control
characters sometimes appear in the output and scramble it;
on platforms (what are those?) where sprintf does not work
we should define sprintf as 'my_emulated_sprintf'; InnoDB code
contains lots of sprintfs, it does not help to remove them from
just a single file */
/* We can't use value of sprintf() as this is not portable */
buf
+=
my_sprintf
(
buf
,
...
...
@@ -301,6 +334,7 @@ innobase_mysql_print_thd(
buf
=
strnmov
(
buf
,
thd
->
query
,
150
);
}
*
buf
=
'\n'
;
#endif
}
}
...
...
@@ -894,7 +928,7 @@ ha_innobase::open(
norm_name
,
NULL
);
if
(
NULL
==
ib_table
)
{
sql_print_error
(
"InnoDB error:
\n
\
sql_print_error
(
"InnoDB error:
\n
\
Cannot find table %s from the internal data dictionary
\n
\
of InnoDB though the .frm file for the table exists. Maybe you
\n
\
have deleted and recreated InnoDB data files but have forgotten
\n
\
...
...
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