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
78991587
Commit
78991587
authored
Apr 07, 2004
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correct SET GLOBAL ft_boolean_syntax=DEFAULT behaviour
parent
1c0d4c4a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
sql/mysql_priv.h
sql/mysql_priv.h
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+3
-5
sql/set_var.cc
sql/set_var.cc
+1
-1
No files found.
sql/mysql_priv.h
View file @
78991587
...
@@ -791,7 +791,7 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create);
...
@@ -791,7 +791,7 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create);
extern
time_t
start_time
;
extern
time_t
start_time
;
extern
char
*
mysql_data_home
,
server_version
[
SERVER_VERSION_LENGTH
],
extern
char
*
mysql_data_home
,
server_version
[
SERVER_VERSION_LENGTH
],
mysql_real_data_home
[],
*
opt_mysql_tmpdir
,
mysql_charsets_dir
[],
mysql_real_data_home
[],
*
opt_mysql_tmpdir
,
mysql_charsets_dir
[],
opt
_ft_boolean_syntax
[
sizeof
(
ft_boolean_syntax
)];
def
_ft_boolean_syntax
[
sizeof
(
ft_boolean_syntax
)];
#define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list))
#define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list))
extern
MY_TMPDIR
mysql_tmpdir_list
;
extern
MY_TMPDIR
mysql_tmpdir_list
;
extern
const
char
*
command_name
[];
extern
const
char
*
command_name
[];
...
...
sql/mysqld.cc
View file @
78991587
...
@@ -326,7 +326,7 @@ char mysql_real_data_home[FN_REFLEN],
...
@@ -326,7 +326,7 @@ char mysql_real_data_home[FN_REFLEN],
language
[
LIBLEN
],
reg_ext
[
FN_EXTLEN
],
mysql_charsets_dir
[
FN_REFLEN
],
language
[
LIBLEN
],
reg_ext
[
FN_EXTLEN
],
mysql_charsets_dir
[
FN_REFLEN
],
max_sort_char
,
*
mysqld_user
,
*
mysqld_chroot
,
*
opt_init_file
,
max_sort_char
,
*
mysqld_user
,
*
mysqld_chroot
,
*
opt_init_file
,
*
opt_init_connect
,
*
opt_init_slave
,
*
opt_init_connect
,
*
opt_init_slave
,
opt
_ft_boolean_syntax
[
sizeof
(
ft_boolean_syntax
)];
def
_ft_boolean_syntax
[
sizeof
(
ft_boolean_syntax
)];
const
char
*
opt_date_time_formats
[
3
];
const
char
*
opt_date_time_formats
[
3
];
...
@@ -5651,7 +5651,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
...
@@ -5651,7 +5651,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
fprintf
(
stderr
,
"Invalid ft-boolean-syntax string: %s
\n
"
,
argument
);
fprintf
(
stderr
,
"Invalid ft-boolean-syntax string: %s
\n
"
,
argument
);
exit
(
1
);
exit
(
1
);
}
}
strmake
(
opt_
ft_boolean_syntax
,
argument
,
sizeof
(
ft_boolean_syntax
)
-
1
);
strmake
(
ft_boolean_syntax
,
argument
,
sizeof
(
ft_boolean_syntax
)
-
1
);
break
;
break
;
case
OPT_SKIP_SAFEMALLOC
:
case
OPT_SKIP_SAFEMALLOC
:
#ifdef SAFEMALLOC
#ifdef SAFEMALLOC
...
@@ -5701,7 +5701,7 @@ static void get_options(int argc,char **argv)
...
@@ -5701,7 +5701,7 @@ static void get_options(int argc,char **argv)
int
ho_error
;
int
ho_error
;
my_getopt_register_get_addr
(
mysql_getopt_value
);
my_getopt_register_get_addr
(
mysql_getopt_value
);
strmake
(
opt_ft_boolean_syntax
,
ft_boolean_syntax
,
strmake
(
def_ft_boolean_syntax
,
ft_boolean_syntax
,
sizeof
(
ft_boolean_syntax
)
-
1
);
sizeof
(
ft_boolean_syntax
)
-
1
);
if
((
ho_error
=
handle_options
(
&
argc
,
&
argv
,
my_long_options
,
get_one_option
)))
if
((
ho_error
=
handle_options
(
&
argc
,
&
argv
,
my_long_options
,
get_one_option
)))
exit
(
ho_error
);
exit
(
ho_error
);
...
@@ -5758,8 +5758,6 @@ static void get_options(int argc,char **argv)
...
@@ -5758,8 +5758,6 @@ static void get_options(int argc,char **argv)
table_alias_charset
=
(
lower_case_table_names
?
table_alias_charset
=
(
lower_case_table_names
?
files_charset_info
:
files_charset_info
:
&
my_charset_bin
);
&
my_charset_bin
);
strmake
(
ft_boolean_syntax
,
opt_ft_boolean_syntax
,
sizeof
(
ft_boolean_syntax
)
-
1
);
if
(
opt_short_log_format
)
if
(
opt_short_log_format
)
opt_specialflag
|=
SPECIAL_SHORT_LOG_FORMAT
;
opt_specialflag
|=
SPECIAL_SHORT_LOG_FORMAT
;
...
...
sql/set_var.cc
View file @
78991587
...
@@ -901,7 +901,7 @@ static bool sys_update_ftb_syntax(THD *thd, set_var * var)
...
@@ -901,7 +901,7 @@ static bool sys_update_ftb_syntax(THD *thd, set_var * var)
static
void
sys_default_ftb_syntax
(
THD
*
thd
,
enum_var_type
type
)
static
void
sys_default_ftb_syntax
(
THD
*
thd
,
enum_var_type
type
)
{
{
strmake
(
ft_boolean_syntax
,
opt
_ft_boolean_syntax
,
strmake
(
ft_boolean_syntax
,
def
_ft_boolean_syntax
,
sizeof
(
ft_boolean_syntax
)
-
1
);
sizeof
(
ft_boolean_syntax
)
-
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