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
66acd82f
Commit
66acd82f
authored
Apr 23, 2007
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
warning added
parent
2b146960
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
4 deletions
+10
-4
sql/sql_plugin.cc
sql/sql_plugin.cc
+10
-4
No files found.
sql/sql_plugin.cc
View file @
66acd82f
...
@@ -2683,7 +2683,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
...
@@ -2683,7 +2683,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
st_bookmark
*
v
;
st_bookmark
*
v
;
DBUG_ENTER
(
"construct_options"
);
DBUG_ENTER
(
"construct_options"
);
DBUG_PRINT
(
"plugin"
,
(
"plugin: '%s' enabled: %d can_disable: %d"
,
DBUG_PRINT
(
"plugin"
,
(
"plugin: '%s' enabled: %d can_disable: %d"
,
tmp
->
plugin
->
name
,
**
enabled
,
can_disable
));
plugin_
name
,
**
enabled
,
can_disable
));
/* support --skip-plugin-foo syntax */
/* support --skip-plugin-foo syntax */
memcpy
(
name
,
plugin_name
,
namelen
+
1
);
memcpy
(
name
,
plugin_name
,
namelen
+
1
);
...
@@ -2759,7 +2759,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
...
@@ -2759,7 +2759,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
break
;
break
;
default:
default:
sql_print_error
(
"Unknown variable type code 0x%x in plugin '%s'."
,
sql_print_error
(
"Unknown variable type code 0x%x in plugin '%s'."
,
opt
->
flags
,
tmp
->
plugin
->
name
);
opt
->
flags
,
plugin_
name
);
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
};
};
}
}
...
@@ -2799,7 +2799,13 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
...
@@ -2799,7 +2799,13 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
{
{
opt
->
update
=
update_func_str
;
opt
->
update
=
update_func_str
;
if
(
!
(
opt
->
flags
&
PLUGIN_VAR_MEMALLOC
))
if
(
!
(
opt
->
flags
&
PLUGIN_VAR_MEMALLOC
))
{
opt
->
flags
|=
PLUGIN_VAR_READONLY
;
opt
->
flags
|=
PLUGIN_VAR_READONLY
;
sql_print_warning
(
"Server variable %s of plugin %s was forced "
"to be read-only: string variable without "
"update_func and PLUGIN_VAR_MEMALLOC flag"
,
opt
->
name
,
plugin_name
);
}
}
}
break
;
break
;
case
PLUGIN_VAR_ENUM
:
case
PLUGIN_VAR_ENUM
:
...
@@ -2816,7 +2822,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
...
@@ -2816,7 +2822,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
break
;
break
;
default:
default:
sql_print_error
(
"Unknown variable type code 0x%x in plugin '%s'."
,
sql_print_error
(
"Unknown variable type code 0x%x in plugin '%s'."
,
opt
->
flags
,
tmp
->
plugin
->
name
);
opt
->
flags
,
plugin_
name
);
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
}
}
...
@@ -2826,7 +2832,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
...
@@ -2826,7 +2832,7 @@ static int construct_options(MEM_ROOT *mem_root, struct st_plugin_int *tmp,
if
(
!
opt
->
name
)
if
(
!
opt
->
name
)
{
{
sql_print_error
(
"Missing variable name in plugin '%s'."
,
sql_print_error
(
"Missing variable name in plugin '%s'."
,
tmp
->
plugin
->
name
);
plugin_
name
);
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
}
}
...
...
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