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
2d1089e8
Commit
2d1089e8
authored
Feb 22, 2005
by
lars@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
parents
89a55308
1d3c6700
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
56 additions
and
2 deletions
+56
-2
client/mysqldump.c
client/mysqldump.c
+4
-1
mysql-test/r/mysqldump.result
mysql-test/r/mysqldump.result
+36
-0
sql/mysql_priv.h
sql/mysql_priv.h
+4
-0
sql/mysqld.cc
sql/mysqld.cc
+2
-1
sql/set_var.cc
sql/set_var.cc
+6
-0
sql/sql_error.cc
sql/sql_error.cc
+4
-0
No files found.
client/mysqldump.c
View file @
2d1089e8
...
@@ -489,7 +489,8 @@ static void write_header(FILE *sql_file, char *db_name)
...
@@ -489,7 +489,8 @@ static void write_header(FILE *sql_file, char *db_name)
"
);
"
);
}
}
fprintf
(
sql_file
,
fprintf
(
sql_file
,
"/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;
\n
"
,
"/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='%s%s%s' */;
\n
"
"/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
\n
"
,
path
?
""
:
"NO_AUTO_VALUE_ON_ZERO"
,
compatible_mode_normal_str
[
0
]
==
0
?
""
:
","
,
path
?
""
:
"NO_AUTO_VALUE_ON_ZERO"
,
compatible_mode_normal_str
[
0
]
==
0
?
""
:
","
,
compatible_mode_normal_str
);
compatible_mode_normal_str
);
check_io
(
sql_file
);
check_io
(
sql_file
);
...
@@ -518,6 +519,8 @@ static void write_footer(FILE *sql_file)
...
@@ -518,6 +519,8 @@ static void write_footer(FILE *sql_file)
"/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
\n
"
"/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
\n
"
"/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
\n
"
"/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
\n
"
"/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
\n
"
);
"/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
\n
"
);
fprintf
(
sql_file
,
"/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
\n
"
);
fputs
(
"
\n
"
,
sql_file
);
fputs
(
"
\n
"
,
sql_file
);
check_io
(
sql_file
);
check_io
(
sql_file
);
}
}
...
...
mysql-test/r/mysqldump.result
View file @
2d1089e8
This diff is collapsed.
Click to expand it.
sql/mysql_priv.h
View file @
2d1089e8
...
@@ -212,6 +212,10 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
...
@@ -212,6 +212,10 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
#define OPTION_RELAXED_UNIQUE_CHECKS (1L << 27)
#define OPTION_RELAXED_UNIQUE_CHECKS (1L << 27)
#define SELECT_NO_UNLOCK (1L << 28)
#define SELECT_NO_UNLOCK (1L << 28)
/* If set to 0, then the thread will ignore all warnings with level notes.
Set by executing SET SQL_NOTES=1 */
#define OPTION_SQL_NOTES (1L << 31)
/* Bits for different SQL modes modes (including ANSI mode) */
/* Bits for different SQL modes modes (including ANSI mode) */
#define MODE_REAL_AS_FLOAT 1
#define MODE_REAL_AS_FLOAT 1
#define MODE_PIPES_AS_CONCAT 2
#define MODE_PIPES_AS_CONCAT 2
...
...
sql/mysqld.cc
View file @
2d1089e8
...
@@ -5623,7 +5623,8 @@ static void mysql_init_variables(void)
...
@@ -5623,7 +5623,8 @@ static void mysql_init_variables(void)
language_ptr
=
language
;
language_ptr
=
language
;
mysql_data_home
=
mysql_real_data_home
;
mysql_data_home
=
mysql_real_data_home
;
thd_startup_options
=
(
OPTION_UPDATE_LOG
|
OPTION_AUTO_IS_NULL
|
thd_startup_options
=
(
OPTION_UPDATE_LOG
|
OPTION_AUTO_IS_NULL
|
OPTION_BIN_LOG
|
OPTION_QUOTE_SHOW_CREATE
);
OPTION_BIN_LOG
|
OPTION_QUOTE_SHOW_CREATE
|
OPTION_SQL_NOTES
);
protocol_version
=
PROTOCOL_VERSION
;
protocol_version
=
PROTOCOL_VERSION
;
what_to_log
=
~
(
1L
<<
(
uint
)
COM_TIME
);
what_to_log
=
~
(
1L
<<
(
uint
)
COM_TIME
);
refresh_version
=
flush_version
=
1L
;
/* Increments on each reload */
refresh_version
=
flush_version
=
1L
;
/* Increments on each reload */
...
...
sql/set_var.cc
View file @
2d1089e8
...
@@ -423,6 +423,9 @@ static sys_var_thd_bit sys_log_binlog("sql_log_bin",
...
@@ -423,6 +423,9 @@ static sys_var_thd_bit sys_log_binlog("sql_log_bin",
static
sys_var_thd_bit
sys_sql_warnings
(
"sql_warnings"
,
0
,
static
sys_var_thd_bit
sys_sql_warnings
(
"sql_warnings"
,
0
,
set_option_bit
,
set_option_bit
,
OPTION_WARNINGS
);
OPTION_WARNINGS
);
static
sys_var_thd_bit
sys_sql_notes
(
"sql_notes"
,
0
,
set_option_bit
,
OPTION_SQL_NOTES
);
static
sys_var_thd_bit
sys_auto_is_null
(
"sql_auto_is_null"
,
0
,
static
sys_var_thd_bit
sys_auto_is_null
(
"sql_auto_is_null"
,
0
,
set_option_bit
,
set_option_bit
,
OPTION_AUTO_IS_NULL
);
OPTION_AUTO_IS_NULL
);
...
@@ -610,6 +613,7 @@ sys_var *sys_variables[]=
...
@@ -610,6 +613,7 @@ sys_var *sys_variables[]=
&
sys_sql_max_join_size
,
&
sys_sql_max_join_size
,
&
sys_sql_mode
,
&
sys_sql_mode
,
&
sys_sql_warnings
,
&
sys_sql_warnings
,
&
sys_sql_notes
,
&
sys_storage_engine
,
&
sys_storage_engine
,
#ifdef HAVE_REPLICATION
#ifdef HAVE_REPLICATION
&
sys_sync_binlog_period
,
&
sys_sync_binlog_period
,
...
@@ -859,6 +863,8 @@ struct show_var_st init_vars[]= {
...
@@ -859,6 +863,8 @@ struct show_var_st init_vars[]= {
{
sys_sort_buffer
.
name
,
(
char
*
)
&
sys_sort_buffer
,
SHOW_SYS
},
{
sys_sort_buffer
.
name
,
(
char
*
)
&
sys_sort_buffer
,
SHOW_SYS
},
{
sys_sql_mode
.
name
,
(
char
*
)
&
sys_sql_mode
,
SHOW_SYS
},
{
sys_sql_mode
.
name
,
(
char
*
)
&
sys_sql_mode
,
SHOW_SYS
},
{
sys_storage_engine
.
name
,
(
char
*
)
&
sys_storage_engine
,
SHOW_SYS
},
{
sys_storage_engine
.
name
,
(
char
*
)
&
sys_storage_engine
,
SHOW_SYS
},
{
"sql_notes"
,
(
char
*
)
&
sys_sql_notes
,
SHOW_BOOL
},
{
"sql_warnings"
,
(
char
*
)
&
sys_sql_warnings
,
SHOW_BOOL
},
#ifdef HAVE_REPLICATION
#ifdef HAVE_REPLICATION
{
sys_sync_binlog_period
.
name
,(
char
*
)
&
sys_sync_binlog_period
,
SHOW_SYS
},
{
sys_sync_binlog_period
.
name
,(
char
*
)
&
sys_sync_binlog_period
,
SHOW_SYS
},
{
sys_sync_replication
.
name
,
(
char
*
)
&
sys_sync_replication
,
SHOW_SYS
},
{
sys_sync_replication
.
name
,
(
char
*
)
&
sys_sync_replication
,
SHOW_SYS
},
...
...
sql/sql_error.cc
View file @
2d1089e8
...
@@ -104,6 +104,10 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
...
@@ -104,6 +104,10 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
{
{
MYSQL_ERROR
*
err
=
0
;
MYSQL_ERROR
*
err
=
0
;
DBUG_ENTER
(
"push_warning"
);
DBUG_ENTER
(
"push_warning"
);
if
(
level
==
MYSQL_ERROR
::
WARN_LEVEL_NOTE
&&
!
(
thd
->
options
&
OPTION_SQL_NOTES
))
return
(
0
);
if
(
thd
->
query_id
!=
thd
->
warn_id
)
if
(
thd
->
query_id
!=
thd
->
warn_id
)
mysql_reset_errors
(
thd
);
mysql_reset_errors
(
thd
);
...
...
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