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
290f4efb
Commit
290f4efb
authored
Mar 19, 2003
by
guilhem@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23
into mysql.com:/home/mysql_src/mysql-3.23
parents
85de2223
45e3de8f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
9 deletions
+20
-9
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
client/client_priv.h
client/client_priv.h
+2
-1
client/mysqldump.c
client/mysqldump.c
+17
-8
No files found.
BitKeeper/etc/logging_ok
View file @
290f4efb
...
...
@@ -5,6 +5,7 @@ bar@bar.mysql.r18.ru
bar@bar.udmsearch.izhnet.ru
bell@sanja.is.com.ua
bk@admin.bk
guilhem@mysql.com
heikki@donna.mysql.fi
heikki@hundin.mysql.fi
jani@hynda.mysql.fi
...
...
client/client_priv.h
View file @
290f4efb
...
...
@@ -30,4 +30,5 @@ enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
OPT_LOW_PRIORITY
,
OPT_AUTO_REPAIR
,
OPT_COMPRESS
,
OPT_DROP
,
OPT_LOCKS
,
OPT_KEYWORDS
,
OPT_DELAYED
,
OPT_OPTIMIZE
,
OPT_FTB
,
OPT_LTB
,
OPT_ENC
,
OPT_O_ENC
,
OPT_ESC
,
OPT_TABLES
,
OPT_MASTER_DATA
,
OPT_AUTOCOMMIT
,
OPT_LOCAL_INFILE
};
OPT_MASTER_DATA
,
OPT_AUTOCOMMIT
,
OPT_LOCAL_INFILE
,
OPT_DELETE_MASTER_LOGS
};
client/mysqldump.c
View file @
290f4efb
...
...
@@ -73,7 +73,8 @@ static my_bool verbose=0,tFlag=0,cFlag=0,dFlag=0,quick=0, extended_insert = 0,
ignore
=
0
,
opt_drop
=
0
,
opt_keywords
=
0
,
opt_lock
=
0
,
opt_compress
=
0
,
opt_delayed
=
0
,
create_options
=
0
,
opt_quoted
=
0
,
opt_databases
=
0
,
opt_alldbs
=
0
,
opt_create_db
=
0
,
opt_first_slave
=
0
,
opt_autocommit
=
0
,
opt_master_data
,
opt_disable_keys
=
0
,
opt_xml
=
0
;
opt_autocommit
=
0
,
opt_master_data
,
opt_disable_keys
=
0
,
opt_xml
=
0
,
opt_delete_master_logs
=
0
;
static
MYSQL
mysql_connection
,
*
sock
=
0
;
static
char
insert_pat
[
12
*
1024
],
*
opt_password
=
0
,
*
current_user
=
0
,
*
current_host
=
0
,
*
path
=
0
,
*
fields_terminated
=
0
,
...
...
@@ -101,6 +102,7 @@ static struct option long_options[] =
{
"debug"
,
optional_argument
,
0
,
'#'
},
{
"default-character-set"
,
required_argument
,
0
,
OPT_DEFAULT_CHARSET
},
{
"delayed-insert"
,
no_argument
,
0
,
OPT_DELAYED
},
{
"delete-master-logs"
,
no_argument
,
0
,
OPT_DELETE_MASTER_LOGS
},
{
"disable-keys"
,
no_argument
,
0
,
'K'
},
{
"extended-insert"
,
no_argument
,
0
,
'e'
},
{
"fields-terminated-by"
,
required_argument
,
0
,
(
int
)
OPT_FTB
},
...
...
@@ -206,9 +208,12 @@ static void usage(void)
--add-locks Add locks around insert statements.
\n
\
--allow-keywords Allow creation of column names that are keywords.
\n
\
--delayed-insert Insert rows with INSERT DELAYED.
\n
\
--delete-master-logs Issue RESET MASTER on the master just after taking
\n
\
the dump, and before unlocking tables.
\n
\
This will automatically enable --first-slave.
\n
\
--master-data This will cause the master position and filename to
\n
\
be appended to your output
. This will automagically
\n
\
enable --first-slave.
\n
\
be appended to your output
, before unlocking tables.
\n
\
This will automatically
enable --first-slave.
\n
\
-F, --flush-logs Flush logs file in server before starting dump.
\n
\
-f, --force Continue even if we get an sql-error.
\n
\
-h, --host=... Connect to host.
\n
"
);
...
...
@@ -317,6 +322,10 @@ static int get_options(int *argc,char ***argv)
opt_master_data
=
1
;
opt_first_slave
=
1
;
break
;
case
OPT_DELETE_MASTER_LOGS
:
opt_delete_master_logs
=
1
;
opt_first_slave
=
1
;
break
;
case
OPT_AUTOCOMMIT
:
opt_autocommit
=
1
;
break
;
...
...
@@ -1489,6 +1498,11 @@ int main(int argc, char **argv)
if
(
opt_first_slave
)
{
if
(
opt_delete_master_logs
&&
mysql_query
(
sock
,
"FLUSH MASTER"
))
{
my_printf_error
(
0
,
"Error: Couldn't execute 'FLUSH MASTER': %s"
,
MYF
(
0
),
mysql_error
(
sock
));
}
if
(
opt_master_data
)
{
if
(
mysql_query
(
sock
,
"SHOW MASTER STATUS"
)
||
...
...
@@ -1511,11 +1525,6 @@ int main(int argc, char **argv)
mysql_free_result
(
master
);
}
}
if
(
mysql_query
(
sock
,
"FLUSH MASTER"
))
{
my_printf_error
(
0
,
"Error: Couldn't execute 'FLUSH MASTER': %s"
,
MYF
(
0
),
mysql_error
(
sock
));
}
if
(
mysql_query
(
sock
,
"UNLOCK TABLES"
))
{
my_printf_error
(
0
,
"Error: Couldn't execute 'UNLOCK TABLES': %s"
,
...
...
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