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
1e641502
Commit
1e641502
authored
Sep 28, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
after merge fix
parent
5f10ffd0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
5 deletions
+4
-5
sql/log.h
sql/log.h
+1
-1
sql/sp.cc
sql/sp.cc
+2
-2
sql/sp_head.cc
sql/sp_head.cc
+1
-1
sql/table.cc
sql/table.cc
+0
-1
No files found.
sql/log.h
View file @
1e641502
...
...
@@ -177,7 +177,7 @@ class MYSQL_LOG
pthread_mutex_t
LOCK_log
;
char
*
name
;
char
log_file_name
[
FN_REFLEN
];
char
time_buff
[
20
],
db
[
NAME_
BYTE_
LEN
+
1
];
char
time_buff
[
20
],
db
[
NAME_LEN
+
1
];
bool
write_error
,
inited
;
IO_CACHE
log_file
;
enum_log_type
log_type
;
...
...
sql/sp.cc
View file @
1e641502
...
...
@@ -414,8 +414,8 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
sp_rcontext
*
old_spcont
=
thd
->
spcont
;
char
definer_user_name_holder
[
USERNAME_LENGTH
+
1
];
LEX_STRING
_WITH_INIT
definer_user_name
(
definer_user_name_holder
,
USERNAME_LENGTH
)
;
LEX_STRING
definer_user_name
=
{
definer_user_name_holder
,
USERNAME_LENGTH
}
;
char
definer_host_name_holder
[
HOSTNAME_LENGTH
+
1
];
LEX_STRING
definer_host_name
=
{
definer_host_name_holder
,
HOSTNAME_LENGTH
};
...
...
sql/sp_head.cc
View file @
1e641502
...
...
@@ -2011,7 +2011,7 @@ void
sp_head
::
set_definer
(
const
char
*
definer
,
uint
definerlen
)
{
char
user_name_holder
[
USERNAME_LENGTH
+
1
];
LEX_STRING
_WITH_INIT
user_name
(
user_name_holder
,
USERNAME_LENGTH
)
;
LEX_STRING
user_name
=
{
user_name_holder
,
USERNAME_LENGTH
}
;
char
host_name_holder
[
HOSTNAME_LENGTH
+
1
];
LEX_STRING
host_name
=
{
host_name_holder
,
HOSTNAME_LENGTH
};
...
...
sql/table.cc
View file @
1e641502
...
...
@@ -2277,7 +2277,6 @@ bool check_db_name(char *name)
name
+=
len
;
continue
;
}
name_length
++
;
}
#else
last_char_is_space
=
*
name
==
' '
;
...
...
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