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
38802b71
Commit
38802b71
authored
Jan 18, 2007
by
cbell/Chuck@mysql_cab_desk
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
into mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_21490
parents
771f7e7f
6ace4889
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
7 deletions
+34
-7
sql/mysql_priv.h
sql/mysql_priv.h
+10
-7
sql/mysqld.cc
sql/mysqld.cc
+24
-0
No files found.
sql/mysql_priv.h
View file @
38802b71
...
@@ -92,15 +92,18 @@ char* query_table_status(THD *thd,const char *db,const char *table_name);
...
@@ -92,15 +92,18 @@ char* query_table_status(THD *thd,const char *db,const char *table_name);
#define PREV_BITS(type,A) ((type) (((type) 1 << (A)) -1))
#define PREV_BITS(type,A) ((type) (((type) 1 << (A)) -1))
#define all_bits_set(A,B) ((A) & (B) != (B))
#define all_bits_set(A,B) ((A) & (B) != (B))
#define WARN_DEPRECATED(Thd,Ver,Old,New) \
#define WARN_DEPRECATED(Thd,Ver,Old,New) \
do { \
do { \
DBUG_ASSERT(strncmp(Ver, MYSQL_SERVER_VERSION, sizeof(Ver)-1) >= 0); \
DBUG_ASSERT(strncmp(Ver, MYSQL_SERVER_VERSION, sizeof(Ver)-1) > 0); \
push_warning_printf(((THD *)Thd), MYSQL_ERROR::WARN_LEVEL_WARN, \
if (Thd != NULL) \
ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), \
push_warning_printf(((THD *)Thd), MYSQL_ERROR::WARN_LEVEL_WARN, \
(Old), (Ver), (New)); \
ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), \
(Old), (Ver), (New)); \
else \
sql_print_warning("The syntax %s is deprecated and will be removed " \
"in MySQL %s. Please use %s instead.", (Old), (Ver), (New)); \
} while(0)
} while(0)
extern
CHARSET_INFO
*
system_charset_info
,
*
files_charset_info
;
extern
CHARSET_INFO
*
system_charset_info
,
*
files_charset_info
;
extern
CHARSET_INFO
*
national_charset_info
,
*
table_alias_charset
;
extern
CHARSET_INFO
*
national_charset_info
,
*
table_alias_charset
;
...
...
sql/mysqld.cc
View file @
38802b71
...
@@ -361,6 +361,7 @@ my_bool opt_safe_user_create = 0, opt_no_mix_types = 0;
...
@@ -361,6 +361,7 @@ my_bool opt_safe_user_create = 0, opt_no_mix_types = 0;
my_bool
opt_show_slave_auth_info
,
opt_sql_bin_update
=
0
;
my_bool
opt_show_slave_auth_info
,
opt_sql_bin_update
=
0
;
my_bool
opt_log_slave_updates
=
0
;
my_bool
opt_log_slave_updates
=
0
;
my_bool
opt_innodb
;
my_bool
opt_innodb
;
bool
slave_warning_issued
=
false
;
/*
/*
Legacy global handlerton. These will be removed (please do not add more).
Legacy global handlerton. These will be removed (please do not add more).
...
@@ -7485,6 +7486,29 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
...
@@ -7485,6 +7486,29 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case
(
int
)
OPT_STANDALONE
:
/* Dummy option for NT */
case
(
int
)
OPT_STANDALONE
:
/* Dummy option for NT */
break
;
break
;
#endif
#endif
/*
The following change issues a deprecation warning if the slave
configuration is specified either in the my.cnf file or on
the command-line. See BUG#21490.
*/
case
OPT_MASTER_HOST
:
case
OPT_MASTER_USER
:
case
OPT_MASTER_PASSWORD
:
case
OPT_MASTER_PORT
:
case
OPT_MASTER_CONNECT_RETRY
:
case
OPT_MASTER_SSL
:
case
OPT_MASTER_SSL_KEY
:
case
OPT_MASTER_SSL_CERT
:
case
OPT_MASTER_SSL_CAPATH
:
case
OPT_MASTER_SSL_CIPHER
:
case
OPT_MASTER_SSL_CA
:
if
(
!
slave_warning_issued
)
//only show the warning once
{
slave_warning_issued
=
true
;
WARN_DEPRECATED
(
0
,
"5.2"
,
"for replication startup options"
,
"'CHANGE MASTER'"
);
}
break
;
case
OPT_CONSOLE
:
case
OPT_CONSOLE
:
if
(
opt_console
)
if
(
opt_console
)
opt_error_log
=
0
;
// Force logs to stdout
opt_error_log
=
0
;
// Force logs to stdout
...
...
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