Drizzle

Merge lp:~prachee/drizzle/drizzle-dump into lp:drizzle

  1. drizzle-dump
  2. Merge into 7.2
Proposed by Prachee Rai
Status: Merged
Merged at revision: 2620
Proposed branch: lp:~prachee/drizzle/drizzle-dump
Merge into: lp:drizzle
Diff against target: 142 lines (+18/-20)
1 file modified
client/drizzledump.cc (+18/-20)
To merge this branch: bzr merge lp:~prachee/drizzle/drizzle-dump
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Drizzle Trunk Pending
Review via email: mp+146548@code.launchpad.net

Description of the change

Changes drizzledump.cc , previous file uses db_connection as global parameter but now it is function parameter.

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/drizzledump.cc'
2--- client/drizzledump.cc 2012-04-23 08:25:39 +0000
3+++ client/drizzledump.cc 2013-02-05 04:23:21 +0000
4@@ -93,7 +93,6 @@
5 FILE *md_result_file= 0;
6 FILE *stderror_file= 0;
7 std::vector<DrizzleDumpDatabase*> database_store;
8-DrizzleDumpConnection* db_connection;
9 DrizzleDumpConnection* destination_connection;
10
11 enum destinations {
12@@ -125,10 +124,10 @@
13
14 void maybe_exit(int error);
15 static void die(int error, const char* reason, ...);
16-static void write_header(char *db_name);
17-static int dump_selected_tables(const string &db, const vector<string> &table_names);
18-static int dump_databases(const vector<string> &db_names);
19-static int dump_all_databases(void);
20+static void write_header(DrizzleDumpConnection* db_connection,char *db_name);
21+static int dump_selected_tables(DrizzleDumpConnection* db_connection,const string &db, const vector<string> &table_names);
22+static int dump_databases(DrizzleDumpConnection* db_connection,const vector<string> &db_names);
23+static int dump_all_databases(DrizzleDumpConnection* db_connection);
24 int get_server_type();
25 void dump_all_tables(void);
26 void generate_dump(void);
27@@ -234,7 +233,7 @@
28 die(EX_EOF, _("Got errno %d on write"), errno);
29 }
30
31-static void write_header(char *db_name)
32+static void write_header(DrizzleDumpConnection* db_connection,char *db_name)
33 {
34 if ((not opt_compact) and (opt_comments))
35 {
36@@ -337,13 +336,12 @@
37 first_error= error;
38 if (ignore_errors)
39 return;
40- delete db_connection;
41 delete destination_connection;
42 free_resources();
43 exit(error);
44 }
45
46-static int dump_all_databases()
47+static int dump_all_databases(DrizzleDumpConnection* db_connection)
48 {
49 drizzle_row_t row;
50 drizzle_result_st *tableres;
51@@ -378,7 +376,7 @@
52 /* dump_all_databases */
53
54
55-static int dump_databases(const vector<string> &db_names)
56+static int dump_databases(DrizzleDumpConnection* db_connection,const vector<string> &db_names)
57 {
58 int result=0;
59 string temp;
60@@ -396,7 +394,7 @@
61 return(result);
62 } /* dump_databases */
63
64-static int dump_selected_tables(const string &db, const vector<string> &table_names)
65+static int dump_selected_tables(DrizzleDumpConnection* db_connection,const string &db, const vector<string> &table_names)
66 {
67 DrizzleDumpDatabase *database;
68
69@@ -417,7 +415,7 @@
70 return 0;
71 } /* dump_selected_tables */
72
73-static int do_flush_tables_read_lock()
74+static int do_flush_tables_read_lock(DrizzleDumpConnection* db_connection)
75 {
76 /*
77 We do first a FLUSH TABLES. If a long update is running, the FLUSH TABLES
78@@ -434,7 +432,7 @@
79 return 0;
80 }
81
82-static int start_transaction()
83+static int start_transaction(DrizzleDumpConnection* db_connection)
84 {
85 db_connection->queryNoResult("SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ");
86 db_connection->queryNoResult("START TRANSACTION WITH CONSISTENT SNAPSHOT");
87@@ -460,7 +458,7 @@
88 try
89 {
90 int exit_code;
91-
92+ DrizzleDumpConnection* db_connection=NULL;
93 #if defined(ENABLE_NLS)
94 # if defined(HAVE_LOCALE_H)
95 setlocale(LC_ALL, "");
96@@ -770,26 +768,26 @@
97 if (path.empty() && vm.count("database-used"))
98 {
99 string database_used= *vm["database-used"].as< vector<string> >().begin();
100- write_header((char *)database_used.c_str());
101+ write_header(db_connection,(char *)database_used.c_str());
102 }
103
104- if ((opt_lock_all_tables) && do_flush_tables_read_lock())
105+ if ((opt_lock_all_tables) && do_flush_tables_read_lock(db_connection))
106 goto err;
107- if (opt_single_transaction && start_transaction())
108+ if (opt_single_transaction && start_transaction(db_connection))
109 goto err;
110 if (opt_lock_all_tables)
111 db_connection->queryNoResult("FLUSH LOGS");
112
113 if (opt_alldbs)
114 {
115- dump_all_databases();
116+ dump_all_databases(db_connection);
117 dump_all_tables();
118 }
119 if (vm.count("database-used") && vm.count("Table-used") && not opt_databases)
120 {
121 string database_used= *vm["database-used"].as< vector<string> >().begin();
122 /* Only one database and selected table(s) */
123- dump_selected_tables(database_used, vm["Table-used"].as< vector<string> >());
124+ dump_selected_tables(db_connection,database_used, vm["Table-used"].as< vector<string> >());
125 }
126
127 if (vm.count("Table-used") && opt_databases)
128@@ -804,13 +802,13 @@
129 database_used.insert(database_used.end(), *it);
130 }
131
132- dump_databases(database_used);
133+ dump_databases(db_connection,database_used);
134 dump_all_tables();
135 }
136
137 if (vm.count("database-used") && not vm.count("Table-used"))
138 {
139- dump_databases(vm["database-used"].as< vector<string> >());
140+ dump_databases(db_connection,vm["database-used"].as< vector<string> >());
141 dump_all_tables();
142 }
143

Subscribers

People subscribed via source and target branches

to all changes: