Drizzle

Merge lp:~stewart/drizzle/use-catalog-for-path into lp:~drizzle-trunk/drizzle/development

  1. use-catalog-for-path
  2. Merge into development
Proposed by Stewart Smith
Status: Work in progress
Proposed branch: lp:~stewart/drizzle/use-catalog-for-path
Merge into: lp:~drizzle-trunk/drizzle/development
Prerequisite: lp:~barry-leslie/drizzle/drizzle_pbmsV2
Diff against target: 1101 lines (+205/-96)
59 files modified
drizzled/catalog/local.cc (+5/-0)
drizzled/catalog/local.h (+3/-0)
drizzled/data_home.cc (+2/-7)
drizzled/data_home.h (+0/-1)
drizzled/drizzled.cc (+1/-4)
drizzled/function/str/load_file.cc (+2/-1)
drizzled/identifier/catalog.cc (+6/-2)
drizzled/identifier/catalog.h (+5/-0)
drizzled/identifier/schema.cc (+26/-13)
drizzled/identifier/schema.h (+6/-0)
drizzled/identifier/table.cc (+11/-1)
drizzled/main.cc (+0/-7)
drizzled/message/replication_options.h (+47/-0)
drizzled/session.cc (+1/-1)
drizzled/sql_load.cc (+2/-1)
plugin/filtered_replicator/tests/t/var_filteredschemas.test (+1/-1)
plugin/filtered_replicator/tests/t/var_filteredtables.test (+1/-1)
plugin/filtered_replicator/tests/t/var_schemaregex.test (+1/-1)
plugin/filtered_replicator/tests/t/var_tableregex.test (+1/-1)
plugin/innobase/dict/dict0dict.cc (+13/-2)
plugin/innobase/handler/ha_innodb.cc (+8/-1)
plugin/innobase/tests/r/innodb-system-table-view.result (+9/-9)
plugin/pbms/src/plugin/ha_pbms.cc (+2/-1)
plugin/schema_engine/schema.cc (+10/-2)
plugin/storage_engine_api_tester/tests/t/txn_log_insert.test (+1/-1)
plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test (+1/-1)
plugin/tableprototester/tableprototester.cc (+3/-3)
plugin/transaction_log/tests/r/truncate_log.result (+2/-2)
plugin/transaction_log/tests/t/alter.test (+1/-1)
plugin/transaction_log/tests/t/alter_schema.test (+1/-1)
plugin/transaction_log/tests/t/auto_commit.test (+1/-1)
plugin/transaction_log/tests/t/blob.test (+1/-1)
plugin/transaction_log/tests/t/create_select.test (+1/-1)
plugin/transaction_log/tests/t/create_table.test (+1/-1)
plugin/transaction_log/tests/t/delete.test (+1/-1)
plugin/transaction_log/tests/t/embedded_quotes.test (+1/-1)
plugin/transaction_log/tests/t/insert.test (+1/-1)
plugin/transaction_log/tests/t/insert_multi.test (+1/-1)
plugin/transaction_log/tests/t/insert_on_duplicate_update.test (+1/-1)
plugin/transaction_log/tests/t/insert_select.test (+1/-1)
plugin/transaction_log/tests/t/multi_column_primary_key.test (+1/-1)
plugin/transaction_log/tests/t/multi_table.test (+1/-1)
plugin/transaction_log/tests/t/no_modification.test (+1/-1)
plugin/transaction_log/tests/t/no_primary_key.test (+1/-1)
plugin/transaction_log/tests/t/null_values.test (+1/-1)
plugin/transaction_log/tests/t/rand.test (+1/-1)
plugin/transaction_log/tests/t/rename.test (+1/-1)
plugin/transaction_log/tests/t/replace.test (+1/-1)
plugin/transaction_log/tests/t/rollback.test (+1/-1)
plugin/transaction_log/tests/t/rollback_statement.test (+2/-2)
plugin/transaction_log/tests/t/schema.test (+1/-1)
plugin/transaction_log/tests/t/select_for_update.test (+1/-1)
plugin/transaction_log/tests/t/temp_tables.test (+1/-1)
plugin/transaction_log/tests/t/truncate.test (+1/-1)
plugin/transaction_log/tests/t/truncate_log.test (+2/-2)
plugin/transaction_log/tests/t/update.test (+1/-1)
tests/lib/sys_mgmt/codeTree.py (+3/-0)
tests/r/broken_table_proto_file.result (+1/-1)
unittests/table_identifier.cc (+1/-1)
To merge this branch: bzr merge lp:~stewart/drizzle/use-catalog-for-path
Reviewer Review Type Date Requested Status
Lee Bieber (community) Needs Fixing
Review via email: mp+57115@code.launchpad.net

Description of the change

first patch in series of getting catalog support going. This changes the working directory of the server and constructs the patch including a catalog name.

This tree also has PBMSv2 branch and fixes up PBMSv2 to just (for the moment) hard code in local catalog. this will need to be fixed in the future for PBMS to support multiple catalogs.

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

http://jenkins.drizzle.org/view/Drizzle-param/job/drizzle-param/801/

Reply
Revision history for this message
Stewart Smith (stewart) wrote :

also http://jenkins.drizzle.org/view/Drizzle-param/job/drizzle-param/803/ looks better, there seems to be something odd with jenkins occationally

Reply
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

Please re-merge with trunk

Text conflict in drizzled/session.cc
Text conflict in plugin/innobase/handler/ha_innodb.cc
2 conflicts encountered.

review: Needs Fixing
Reply

Unmerged revisions

2273. By Stewart Smith

remove some debug printouts from the CATALOG work.

2272. By Stewart Smith

fix unit test for table_identifier to include catalog in the path

2271. By Stewart Smith

merge in PBMS v2 tree as well as fixing the pbs_get_database_home_path() method to just get the local catalog path. This will need to be fixed for PBMS to do full catalog support.

2270. By Stewart Smith

start using Catalog to generat paths, server working directory of datadir, not inside local catalog.

PBMS is currently not working due to reconstructing paths itself.

We have the schema identifier generate the path, not places around the code
generating paths based on getDataHomeLocal().

Also modify innobase plugin to deal with foreign keys and table names involving
catalog/schema/table

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/catalog/local.cc'
2--- drizzled/catalog/local.cc 2011-03-23 23:34:24 +0000
3+++ drizzled/catalog/local.cc 2011-04-11 07:17:33 +0000
4@@ -47,6 +47,11 @@
5 return default_catalog;
6 }
7
8+void resetPath_for_local_identifier()
9+{
10+ default_catalog.resetPath();
11+}
12+
13 Instance::shared_ptr local()
14 {
15 boost::call_once(&init, run_once);
16
17=== modified file 'drizzled/catalog/local.h'
18--- drizzled/catalog/local.h 2011-03-23 23:34:24 +0000
19+++ drizzled/catalog/local.h 2011-04-11 07:17:33 +0000
20@@ -28,6 +28,9 @@
21 namespace drizzled {
22 namespace catalog {
23
24+/* only for use by drizzled after command line parsing (new datadir) */
25+void resetPath_for_local_identifier();
26+
27 DRIZZLED_API const identifier::Catalog& local_identifier();
28 DRIZZLED_API Instance::shared_ptr local();
29
30
31=== modified file 'drizzled/data_home.cc'
32--- drizzled/data_home.cc 2011-02-17 00:14:13 +0000
33+++ drizzled/data_home.cc 2011-04-11 07:17:33 +0000
34@@ -1,7 +1,7 @@
35 /* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
36 * vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
37 *
38- * Copyright (C) 2011 Brian Aker
39+ * Copyright (C) 2011 Brian Aker, Stewart Smith
40 *
41 * This program is free software; you can redistribute it and/or modify
42 * it under the terms of the GNU General Public License as published by
43@@ -24,6 +24,7 @@
44 #include <boost/filesystem.hpp>
45
46 #include <drizzled/data_home.h>
47+#include <drizzled/catalog.h>
48
49 namespace drizzled {
50
51@@ -40,10 +41,4 @@
52 return data_home;
53 }
54
55-boost::filesystem::path& getDataHomeCatalog()
56-{
57- static boost::filesystem::path data_home_catalog(getDataHome());
58- return data_home_catalog;
59-}
60-
61 } // namespace drizzled
62
63=== modified file 'drizzled/data_home.h'
64--- drizzled/data_home.h 2011-03-14 05:40:28 +0000
65+++ drizzled/data_home.h 2011-04-11 07:17:33 +0000
66@@ -30,7 +30,6 @@
67
68 DRIZZLED_API boost::filesystem::path& getFullDataHome();
69 DRIZZLED_API boost::filesystem::path& getDataHome();
70-DRIZZLED_API boost::filesystem::path& getDataHomeCatalog();
71
72 } /* namespace drizzled */
73
74
75=== modified file 'drizzled/drizzled.cc'
76--- drizzled/drizzled.cc 2011-03-28 02:46:21 +0000
77+++ drizzled/drizzled.cc 2011-04-11 07:17:33 +0000
78@@ -2114,10 +2114,7 @@
79 */
80 static void get_options()
81 {
82-
83- fs::path &data_home_catalog= getDataHomeCatalog();
84- data_home_catalog= getDataHome();
85- data_home_catalog /= "local";
86+ catalog::resetPath_for_local_identifier();
87
88 if (vm.count("user"))
89 {
90
91=== modified file 'drizzled/function/str/load_file.cc'
92--- drizzled/function/str/load_file.cc 2011-03-21 18:32:26 +0000
93+++ drizzled/function/str/load_file.cc 2011-04-11 07:17:33 +0000
94@@ -26,6 +26,7 @@
95 #include <drizzled/internal/my_sys.h>
96 #include <drizzled/sys_var.h>
97 #include <drizzled/system_variables.h>
98+#include <drizzled/catalog/local.h>
99
100 #include <boost/filesystem.hpp>
101
102@@ -52,7 +53,7 @@
103 return(0);
104 }
105
106- fs::path target_path(fs::system_complete(getDataHomeCatalog()));
107+ fs::path target_path(catalog::local_identifier().getPath());
108 fs::path to_file(file_name->c_ptr());
109 if (not to_file.has_root_directory())
110 {
111
112=== modified file 'drizzled/identifier/catalog.cc'
113--- drizzled/identifier/catalog.cc 2011-03-28 14:13:55 +0000
114+++ drizzled/identifier/catalog.cc 2011-04-11 07:17:33 +0000
115@@ -26,6 +26,8 @@
116 #include <drizzled/session.h>
117 #include <drizzled/internal/my_sys.h>
118
119+#include <drizzled/data_home.h>
120+
121 #include <drizzled/util/tablename_to_filename.h>
122 #include <drizzled/util/backtrace.h>
123 #include <drizzled/charset_info.h>
124@@ -54,9 +56,11 @@
125 }
126
127 void Catalog::init()
128-{
129+{
130 assert(not _name.empty());
131- path.append("../");
132+
133+ path.clear();
134+
135 if (util::tablename_to_filename(_name, path))
136 errmsg_printf(error::ERROR, _("Catalog name cannot be encoded and fit within filesystem name length restrictions."));
137 assert(path.length()); // TODO throw exception, this is a possibility
138
139=== modified file 'drizzled/identifier/catalog.h'
140--- drizzled/identifier/catalog.h 2011-03-29 10:15:45 +0000
141+++ drizzled/identifier/catalog.h 2011-04-11 07:17:33 +0000
142@@ -84,6 +84,11 @@
143 {
144 return boost::iequals(left.getName(), right.getName());
145 }
146+
147+ void resetPath()
148+ {
149+ init();
150+ }
151 private:
152 void init();
153
154
155=== modified file 'drizzled/identifier/schema.cc'
156--- drizzled/identifier/schema.cc 2011-03-29 09:53:56 +0000
157+++ drizzled/identifier/schema.cc 2011-04-11 07:17:33 +0000
158@@ -43,9 +43,14 @@
159
160 extern string drizzle_tmpdir;
161
162-static size_t build_schema_filename(string &path, const string &db)
163+static size_t build_schema_filename(const identifier::Catalog &catalog,
164+ string &path, const string &db)
165 {
166 path.append("");
167+
168+ path+= catalog.getPath();
169+ path+= FN_LIBCHAR;
170+
171 bool conversion_error= false;
172
173 conversion_error= util::tablename_to_filename(db, path);
174@@ -61,21 +66,27 @@
175 }
176
177 Schema::Schema(const std::string &db_arg) :
178- db(db_arg)
179-{
180-#if 0
181- string::size_type lastPos= db.find_first_of('/', 0);
182-
183- if (lastPos != std::string::npos)
184+ db(db_arg),
185+ _catalog(drizzled::catalog::local_identifier())
186+{
187+ if (not db_arg.empty())
188 {
189- catalog= db.substr(0, lastPos);
190- db.erase(0, lastPos + 1);
191+ build_schema_filename(_catalog, db_path, db);
192+ assert(db_path.length()); // TODO throw exception, this is a possibility
193 }
194-#endif
195+}
196+
197+
198+Schema::Schema(const drizzled::identifier::Catalog &catalog_arg,
199+ const std::string &db_arg) :
200+ db(db_arg),
201+ db_path(""),
202+ _catalog(catalog_arg)
203+{
204
205 if (not db_arg.empty())
206 {
207- build_schema_filename(db_path, db);
208+ build_schema_filename(_catalog, db_path, db);
209 assert(db_path.length()); // TODO throw exception, this is a possibility
210 }
211 }
212@@ -151,12 +162,14 @@
213
214 const std::string &Schema::getCatalogName() const
215 {
216- return drizzled::catalog::local_identifier().name();
217+ return _catalog.name();
218 }
219
220 std::ostream& operator<<(std::ostream& output, const Schema&identifier)
221 {
222- return output << "identifier::Schema:(" << drizzled::catalog::local_identifier() << ", " << identifier.getSchemaName() << ", " << identifier.getPath() << ")";
223+ return output << "identifier::Schema:(" << identifier.getCatalogName()
224+ << ", " << identifier.getSchemaName()
225+ << ", " << identifier.getPath() << ")";
226 }
227
228 } /* namespace identifier */
229
230=== modified file 'drizzled/identifier/schema.h'
231--- drizzled/identifier/schema.h 2011-03-28 17:55:27 +0000
232+++ drizzled/identifier/schema.h 2011-04-11 07:17:33 +0000
233@@ -37,12 +37,18 @@
234 namespace drizzled {
235 namespace identifier {
236
237+class Catalog;
238+
239 class DRIZZLED_API Schema : public Identifier
240 {
241 std::string db;
242 std::string db_path;
243+ drizzled::identifier::Catalog _catalog;
244
245 public:
246+ Schema(const drizzled::identifier::Catalog &catalog_arg,
247+ const std::string &db_arg);
248+
249 Schema(const std::string &db_arg);
250
251 virtual std::string getSQLPath() const
252
253=== modified file 'drizzled/identifier/table.cc'
254--- drizzled/identifier/table.cc 2011-03-29 10:15:45 +0000
255+++ drizzled/identifier/table.cc 2011-04-11 07:17:33 +0000
256@@ -34,6 +34,8 @@
257 #include <drizzled/util/string.h>
258 #include <drizzled/util/tablename_to_filename.h>
259
260+#include <drizzled/catalog/local.h>
261+
262 #include <algorithm>
263 #include <sstream>
264 #include <cstdio>
265@@ -214,7 +216,7 @@
266 return 0;
267 }
268
269- in_path.append(FN_ROOTDIR);
270+ in_path+= FN_LIBCHAR;
271
272 if (is_tmp) // It a conversion tmp
273 {
274@@ -246,10 +248,18 @@
275 case message::Table::FUNCTION:
276 case message::Table::STANDARD:
277 assert(path.size() == 0);
278+
279+ path+= drizzled::catalog::local_identifier().getPath();
280+ path+= FN_LIBCHAR;
281+
282 build_table_filename(path, getSchemaName(), table_name, false);
283 break;
284 case message::Table::INTERNAL:
285 assert(path.size() == 0);
286+
287+ path+= drizzled::catalog::local_identifier().getPath();
288+ path+= FN_LIBCHAR;
289+
290 build_table_filename(path, getSchemaName(), table_name, true);
291 break;
292 case message::Table::TEMPORARY:
293
294=== modified file 'drizzled/main.cc'
295--- drizzled/main.cc 2011-03-21 18:32:26 +0000
296+++ drizzled/main.cc 2011-04-11 07:17:33 +0000
297@@ -296,13 +296,6 @@
298 {
299 /* We don't actually care */
300 }
301- if (chdir("local"))
302- {
303- errmsg_printf(error::ERROR,
304- _("Local catalog %s/local does not exist\n"),
305- getDataHome().file_string().c_str());
306- unireg_abort(1);
307- }
308
309 boost::filesystem::path &full_data_home= getFullDataHome();
310 full_data_home= boost::filesystem::system_complete(getDataHome());
311
312=== added file 'drizzled/message/replication_options.h'
313--- drizzled/message/replication_options.h 1970-01-01 00:00:00 +0000
314+++ drizzled/message/replication_options.h 2011-04-03 06:02:00 +0000
315@@ -0,0 +1,47 @@
316+/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
317+ * vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
318+ *
319+ * Copyright (C) 2010 Brian Aker
320+ *
321+ * This program is free software; you can redistribute it and/or modify
322+ * it under the terms of the GNU General Public License as published by
323+ * the Free Software Foundation; either version 2 of the License, or
324+ * (at your option) any later version.
325+ *
326+ * This program is distributed in the hope that it will be useful,
327+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
328+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
329+ * GNU General Public License for more details.
330+ *
331+ * You should have received a copy of the GNU General Public License
332+ * along with this program; if not, write to the Free Software
333+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
334+ */
335+
336+
337+#pragma once
338+
339+#include <drizzled/message/replication_options.pb.h>
340+
341+namespace drizzled {
342+namespace message {
343+
344+template<class T> bool is_replicated(const T& reference)
345+{
346+ if (reference.has_replication_options() and
347+ reference.replication_options().has_is_replicated())
348+ {
349+ return reference.replication_options().is_replicated();
350+ }
351+
352+ return true;
353+}
354+
355+template<class T> void set_is_replicated(T& reference, bool arg)
356+{
357+ message::ReplicationOptions *options= reference.mutable_replication_options();
358+ options->set_is_replicated(arg);
359+}
360+
361+} /* namespace message */
362+} /* namespace drizzled */
363
364=== modified file 'drizzled/session.cc'
365--- drizzled/session.cc 2011-04-04 22:17:21 +0000
366+++ drizzled/session.cc 2011-04-11 07:17:33 +0000
367@@ -1082,7 +1082,7 @@
368
369 if (not to_file.has_root_directory())
370 {
371- target_path= fs::system_complete(getDataHomeCatalog());
372+ target_path= fs::system_complete(catalog::local_identifier().getPath());
373 util::string::const_shared_ptr schema(session->schema());
374 if (schema and not schema->empty())
375 {
376
377=== modified file 'drizzled/sql_load.cc'
378--- drizzled/sql_load.cc 2011-03-29 20:45:43 +0000
379+++ drizzled/sql_load.cc 2011-04-11 07:17:33 +0000
380@@ -32,6 +32,7 @@
381 #include <drizzled/file_exchange.h>
382 #include <drizzled/util/test.h>
383 #include <drizzled/session/transactions.h>
384+#include <drizzled/catalog/local.h>
385
386 #include <sys/stat.h>
387 #include <fcntl.h>
388@@ -263,7 +264,7 @@
389 }
390
391 fs::path to_file(ex->file_name);
392- fs::path target_path(fs::system_complete(getDataHomeCatalog()));
393+ fs::path target_path(fs::system_complete(catalog::local_identifier().getPath()));
394 if (not to_file.has_root_directory())
395 {
396 int count_elements= 0;
397
398=== modified file 'plugin/filtered_replicator/tests/t/var_filteredschemas.test'
399--- plugin/filtered_replicator/tests/t/var_filteredschemas.test 2011-04-03 16:54:43 +0000
400+++ plugin/filtered_replicator/tests/t/var_filteredschemas.test 2011-04-11 07:17:33 +0000
401@@ -19,6 +19,6 @@
402 --echo We should only see the 'bar' schema in the log
403 --echo
404 --replace_result $DRIZZLETEST_VARDIR VARDIR
405---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
406+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
407
408 --source ../plugin/transaction_log/tests/t/truncate_log.inc
409
410=== modified file 'plugin/filtered_replicator/tests/t/var_filteredtables.test'
411--- plugin/filtered_replicator/tests/t/var_filteredtables.test 2011-04-03 16:54:43 +0000
412+++ plugin/filtered_replicator/tests/t/var_filteredtables.test 2011-04-11 07:17:33 +0000
413@@ -29,6 +29,6 @@
414 --echo
415 --replace_regex /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g/creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/ /transaction_id: [0-9]+/TRANSACTION_ID/ /$DRIZZLETEST_VARDIR/VARDIR/
416
417---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
418+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
419
420 --source ../plugin/transaction_log/tests/t/truncate_log.inc
421
422=== modified file 'plugin/filtered_replicator/tests/t/var_schemaregex.test'
423--- plugin/filtered_replicator/tests/t/var_schemaregex.test 2011-04-03 16:54:43 +0000
424+++ plugin/filtered_replicator/tests/t/var_schemaregex.test 2011-04-11 07:17:33 +0000
425@@ -22,6 +22,6 @@
426 --echo We should only see the 'bar' schema in the log
427 --echo
428 --replace_result $DRIZZLETEST_VARDIR VARDIR
429---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
430+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
431
432 --source ../plugin/transaction_log/tests/t/truncate_log.inc
433
434=== modified file 'plugin/filtered_replicator/tests/t/var_tableregex.test'
435--- plugin/filtered_replicator/tests/t/var_tableregex.test 2011-04-03 16:54:43 +0000
436+++ plugin/filtered_replicator/tests/t/var_tableregex.test 2011-04-11 07:17:33 +0000
437@@ -32,6 +32,6 @@
438 --echo
439 --replace_regex /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g/creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/ /transaction_id: [0-9]+/TRANSACTION_ID/ /$DRIZZLETEST_VARDIR/VARDIR/
440
441---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
442+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
443
444 --source ../plugin/transaction_log/tests/t/truncate_log.inc
445
446=== modified file 'plugin/innobase/dict/dict0dict.cc'
447--- plugin/innobase/dict/dict0dict.cc 2011-02-04 22:30:00 +0000
448+++ plugin/innobase/dict/dict0dict.cc 2011-04-11 07:17:33 +0000
449@@ -225,6 +225,11 @@
450 const char* s = strchr(name, '/');
451 ut_a(s);
452
453+ s= strchr(s+1, '/');
454+
455+ if (s == NULL)
456+ s= strchr(name, '/');
457+
458 return(s + 1);
459 }
460
461@@ -239,8 +244,14 @@
462 dbname '/' tablename */
463 {
464 const char* s;
465- s = strchr(name, '/');
466- ut_a(s);
467+ const char* catalog;
468+ catalog = strchr(name, '/');
469+ ut_a(catalog);
470+ s= strchr(catalog+1, '/');
471+
472+ if (s == NULL)
473+ s = catalog;
474+
475 return(s - name);
476 }
477
478
479=== modified file 'plugin/innobase/handler/ha_innodb.cc'
480--- plugin/innobase/handler/ha_innodb.cc 2011-03-29 21:04:17 +0000
481+++ plugin/innobase/handler/ha_innodb.cc 2011-04-11 07:17:33 +0000
482@@ -71,6 +71,7 @@
483 #include <drizzled/statistics_variables.h>
484 #include <drizzled/system_variables.h>
485 #include <drizzled/session/transactions.h>
486+#include <drizzled/catalog/local.h>
487
488 #include <boost/algorithm/string.hpp>
489 #include <boost/program_options.hpp>
490@@ -1727,6 +1728,12 @@
491 const char* bufend = buf + buflen;
492
493 if (table_id) {
494+ const char* catalog_skip= (const char*) memchr(id, '/', idlen);
495+ if (catalog_skip)
496+ {
497+ idlen = idlen - (catalog_skip - id);
498+ id = catalog_skip + 1;
499+ }
500 const char* slash = (const char*) memchr(id, '/', idlen);
501 if (!slash) {
502
503@@ -7076,7 +7083,7 @@
504
505 prebuilt->trx->op_info = "returning various info to MySQL";
506
507- fs::path get_status_path(getDataHomeCatalog());
508+ fs::path get_status_path(catalog::local_identifier().getPath());
509 get_status_path /= ib_table->name;
510 fs::change_extension(get_status_path, "dfe");
511
512
513=== modified file 'plugin/innobase/tests/r/innodb-system-table-view.result'
514--- plugin/innobase/tests/r/innodb-system-table-view.result 2011-02-10 18:19:37 +0000
515+++ plugin/innobase/tests/r/innodb-system-table-view.result 2011-04-11 07:17:33 +0000
516@@ -56,23 +56,23 @@
517 ON DELETE CASCADE) ENGINE=INNODB;
518 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN;
519 ID FOR_NAME REF_NAME N_COLS TYPE
520-test/constraint_test test/child test/parent 1 1
521+local/test/constraint_test local/test/child local/test/parent 1 1
522 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN_COLS;
523 ID FOR_COL_NAME REF_COL_NAME POS
524-test/constraint_test parent_id id 0
525+local/test/constraint_test parent_id id 0
526 INSERT INTO parent VALUES(1);
527 SELECT name, num_rows, handles_opened
528 FROM DATA_DICTIONARY.INNODB_SYS_TABLESTATS
529 WHERE name LIKE "%parent";
530 name num_rows handles_opened
531-test/parent 1 1
532+local/test/parent 1 1
533 SELECT NAME, FLAG, N_COLS, SPACE FROM DATA_DICTIONARY.INNODB_SYS_TABLES;
534 NAME FLAG N_COLS SPACE
535 SYS_FOREIGN 0 7 0
536 SYS_FOREIGN_COLS 0 7 0
537 SYS_REPLICATION_LOG 0 9 0
538-test/child 1 5 0
539-test/parent 1 4 0
540+local/test/child 1 5 0
541+local/test/parent 1 4 0
542 SELECT name, n_fields
543 from DATA_DICTIONARY.INNODB_SYS_INDEXES
544 WHERE table_id In (SELECT table_id from
545@@ -107,11 +107,11 @@
546 ON DELETE CASCADE) ENGINE=INNODB;
547 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN;
548 ID FOR_NAME REF_NAME N_COLS TYPE
549-test/constraint_test test/child test/parent 2 1
550+local/test/constraint_test local/test/child local/test/parent 2 1
551 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN_COLS;
552 ID FOR_COL_NAME REF_COL_NAME POS
553-test/constraint_test id id 0
554-test/constraint_test parent_id newid 1
555+local/test/constraint_test id id 0
556+local/test/constraint_test parent_id newid 1
557 INSERT INTO parent VALUES(1, 9);
558 SELECT * FROM parent WHERE id IN (SELECT id FROM parent);
559 id newid
560@@ -120,6 +120,6 @@
561 FROM DATA_DICTIONARY.INNODB_SYS_TABLESTATS
562 WHERE name LIKE "%parent";
563 name num_rows handles_opened
564-test/parent 1 2
565+local/test/parent 1 2
566 DROP TABLE child;
567 DROP TABLE parent;
568
569=== modified file 'plugin/pbms/src/plugin/ha_pbms.cc'
570--- plugin/pbms/src/plugin/ha_pbms.cc 2011-04-11 07:17:31 +0000
571+++ plugin/pbms/src/plugin/ha_pbms.cc 2011-04-11 07:17:33 +0000
572@@ -42,6 +42,7 @@
573 #include <drizzled/plugin/transactional_storage_engine.h>
574 #include <drizzled/identifier.h>
575 #include <drizzled/named_savepoint.h>
576+#include <drizzled/catalog/local.h>
577
578 #define my_strdup(a,b) strdup(a)
579 using namespace drizzled;
580@@ -250,7 +251,7 @@
581 #ifdef DRIZZLED
582 const char *pbms_get_databases_home_path()
583 {
584- return drizzled::getDataHomeCatalog().file_string().c_str();
585+ return drizzled::catalog::local_identifier().getPath().c_str();
586 }
587
588 //---------
589
590=== modified file 'plugin/schema_engine/schema.cc'
591--- plugin/schema_engine/schema.cc 2011-03-29 09:53:56 +0000
592+++ plugin/schema_engine/schema.cc 2011-04-11 07:17:33 +0000
593@@ -44,6 +44,8 @@
594 #include <google/protobuf/io/zero_copy_stream.h>
595 #include <google/protobuf/io/zero_copy_stream_impl.h>
596
597+#include <drizzled/catalog/local.h>
598+
599 #include <iostream>
600 #include <fstream>
601 #include <string>
602@@ -72,7 +74,9 @@
603
604 void Schema::prime()
605 {
606- CachedDirectory directory(getDataHomeCatalog().file_string(), CachedDirectory::DIRECTORY);
607+ CachedDirectory directory(catalog::local_identifier().getPath(),
608+ CachedDirectory::DIRECTORY,
609+ true);
610 CachedDirectory::Entries files= directory.getEntries();
611 boost::unique_lock<boost::shared_mutex> scopedLock(mutex);
612
613@@ -85,7 +89,11 @@
614 if (not entry->filename.compare(GLOBAL_TEMPORARY_EXT))
615 continue;
616
617- if (readSchemaFile(entry->filename, schema_message))
618+ std::string filename= catalog::local_identifier().getPath();
619+ filename+= FN_LIBCHAR;
620+ filename+= entry->filename;
621+
622+ if (readSchemaFile(filename, schema_message))
623 {
624 identifier::Schema schema_identifier(schema_message.name());
625
626
627=== modified file 'plugin/storage_engine_api_tester/tests/t/txn_log_insert.test'
628--- plugin/storage_engine_api_tester/tests/t/txn_log_insert.test 2011-04-03 16:54:43 +0000
629+++ plugin/storage_engine_api_tester/tests/t/txn_log_insert.test 2011-04-11 07:17:33 +0000
630@@ -54,7 +54,7 @@
631 select seapitester_clear_engine_state_history();
632
633 --replace_result $DRIZZLETEST_VARDIR VARDIR
634---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
635+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
636
637 # Truncate the log file to reset for the next test
638 --source ../plugin/transaction_log/tests/t/truncate_log.inc
639
640=== modified file 'plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test'
641--- plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test 2011-04-03 16:54:43 +0000
642+++ plugin/storage_engine_api_tester/tests/t/txn_log_rollback_large_stmt.test 2011-04-11 07:17:33 +0000
643@@ -52,7 +52,7 @@
644 select seapitester_clear_engine_state_history();
645
646 --replace_result $DRIZZLETEST_VARDIR VARDIR
647---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
648+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
649
650 # Truncate the log file to reset for the next test
651 --source ../plugin/transaction_log/tests/t/truncate_log.inc
652
653=== modified file 'plugin/tableprototester/tableprototester.cc'
654--- plugin/tableprototester/tableprototester.cc 2011-03-28 17:36:12 +0000
655+++ plugin/tableprototester/tableprototester.cc 2011-04-11 07:17:33 +0000
656@@ -239,17 +239,17 @@
657 const drizzled::identifier::Table &identifier,
658 drizzled::message::Table &table_proto)
659 {
660- if (not identifier.getPath().compare("test/t1"))
661+ if (not identifier.getPath().compare("local/test/t1"))
662 {
663 fill_table1(table_proto);
664 return EEXIST;
665 }
666- else if (not identifier.getPath().compare("test/too_many_enum_values"))
667+ else if (not identifier.getPath().compare("local/test/too_many_enum_values"))
668 {
669 fill_table_too_many_enum_values(table_proto);
670 return EEXIST;
671 }
672- else if (not identifier.getPath().compare("test/invalid_table_collation"))
673+ else if (not identifier.getPath().compare("local/test/invalid_table_collation"))
674 {
675 fill_table_invalid_table_collation(table_proto);
676 return EEXIST;
677
678=== modified file 'plugin/transaction_log/tests/r/truncate_log.result'
679--- plugin/transaction_log/tests/r/truncate_log.result 2011-01-21 22:24:55 +0000
680+++ plugin/transaction_log/tests/r/truncate_log.result 2011-04-11 07:17:33 +0000
681@@ -7,6 +7,6 @@
682 INSERT INTO t1 VALUES (1, "I love testing.");
683 INSERT INTO t1 VALUES (2, "I hate testing.");
684 DROP TABLE t1;
685-25VARDIR/master-data/local/transaction.log
686+25VARDIR/master-data/transaction.log
687 SET GLOBAL transaction_log_truncate_debug= true;
688-0VARDIR/master-data/local/transaction.log
689+0VARDIR/master-data/transaction.log
690
691=== modified file 'plugin/transaction_log/tests/t/alter.test'
692--- plugin/transaction_log/tests/t/alter.test 2011-04-03 16:54:43 +0000
693+++ plugin/transaction_log/tests/t/alter.test 2011-04-11 07:17:33 +0000
694@@ -17,7 +17,7 @@
695
696 # Read in the transaction.log.
697 --replace_result $DRIZZLETEST_VARDIR VARDIR
698---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
699+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
700
701 --echo
702 --echo Generating statements for innodb replication log
703
704=== modified file 'plugin/transaction_log/tests/t/alter_schema.test'
705--- plugin/transaction_log/tests/t/alter_schema.test 2011-04-03 16:54:43 +0000
706+++ plugin/transaction_log/tests/t/alter_schema.test 2011-04-11 07:17:33 +0000
707@@ -10,7 +10,7 @@
708
709 --echo
710 --replace_result $DRIZZLETEST_VARDIR VARDIR
711---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
712+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
713
714 --disable_query_log
715 DROP SCHEMA alter_schema_test;
716
717=== modified file 'plugin/transaction_log/tests/t/auto_commit.test'
718--- plugin/transaction_log/tests/t/auto_commit.test 2011-04-03 16:54:43 +0000
719+++ plugin/transaction_log/tests/t/auto_commit.test 2011-04-11 07:17:33 +0000
720@@ -18,7 +18,7 @@
721 # Read in the transaction.log.
722
723 --replace_result $DRIZZLETEST_VARDIR VARDIR
724---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
725+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
726
727 --echo
728 --echo Generating statements for innodb replication log
729
730=== modified file 'plugin/transaction_log/tests/t/blob.test'
731--- plugin/transaction_log/tests/t/blob.test 2011-04-03 16:54:43 +0000
732+++ plugin/transaction_log/tests/t/blob.test 2011-04-11 07:17:33 +0000
733@@ -19,7 +19,7 @@
734 # Read in the transaction.log.
735
736 --replace_result $DRIZZLETEST_VARDIR VARDIR
737---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
738+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
739
740 --echo
741 --echo Generating statements for innodb replication log
742
743=== modified file 'plugin/transaction_log/tests/t/create_select.test'
744--- plugin/transaction_log/tests/t/create_select.test 2011-04-03 16:54:43 +0000
745+++ plugin/transaction_log/tests/t/create_select.test 2011-04-11 07:17:33 +0000
746@@ -15,7 +15,7 @@
747 # Read in the transaction.log.
748
749 --replace_result $DRIZZLETEST_VARDIR VARDIR
750---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
751+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
752
753 --echo
754 --echo Generating statements for innodb replication log
755
756=== modified file 'plugin/transaction_log/tests/t/create_table.test'
757--- plugin/transaction_log/tests/t/create_table.test 2011-04-03 16:54:43 +0000
758+++ plugin/transaction_log/tests/t/create_table.test 2011-04-11 07:17:33 +0000
759@@ -15,7 +15,7 @@
760 # Read in the transaction.log.
761
762 --replace_result $DRIZZLETEST_VARDIR VARDIR
763---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
764+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
765
766 --echo
767 --echo Generating statements for innodb replication log
768
769=== modified file 'plugin/transaction_log/tests/t/delete.test'
770--- plugin/transaction_log/tests/t/delete.test 2011-04-03 16:54:43 +0000
771+++ plugin/transaction_log/tests/t/delete.test 2011-04-11 07:17:33 +0000
772@@ -19,7 +19,7 @@
773 # Read in the transaction.log.
774
775 --replace_result $DRIZZLETEST_VARDIR VARDIR
776---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
777+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
778
779 --echo
780 --echo Generating statements for innodb replication log
781
782=== modified file 'plugin/transaction_log/tests/t/embedded_quotes.test'
783--- plugin/transaction_log/tests/t/embedded_quotes.test 2011-04-03 16:54:43 +0000
784+++ plugin/transaction_log/tests/t/embedded_quotes.test 2011-04-11 07:17:33 +0000
785@@ -14,7 +14,7 @@
786 # Read in the transaction.log.
787
788 --replace_result $DRIZZLETEST_VARDIR VARDIR
789---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
790+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
791
792 DROP TABLE t;
793
794
795=== modified file 'plugin/transaction_log/tests/t/insert.test'
796--- plugin/transaction_log/tests/t/insert.test 2011-04-03 16:54:43 +0000
797+++ plugin/transaction_log/tests/t/insert.test 2011-04-11 07:17:33 +0000
798@@ -19,7 +19,7 @@
799 # Read in the transaction.log.
800
801 --replace_result $DRIZZLETEST_VARDIR VARDIR
802---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
803+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
804
805 --echo
806 --echo Generating statements for innodb replication log
807
808=== modified file 'plugin/transaction_log/tests/t/insert_multi.test'
809--- plugin/transaction_log/tests/t/insert_multi.test 2011-04-03 16:54:43 +0000
810+++ plugin/transaction_log/tests/t/insert_multi.test 2011-04-11 07:17:33 +0000
811@@ -19,7 +19,7 @@
812 # Read in the transaction.log.
813
814 --replace_result $DRIZZLETEST_VARDIR VARDIR
815---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
816+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
817
818 --echo
819 --echo Generating statements for innodb replication log
820
821=== modified file 'plugin/transaction_log/tests/t/insert_on_duplicate_update.test'
822--- plugin/transaction_log/tests/t/insert_on_duplicate_update.test 2011-04-03 16:54:43 +0000
823+++ plugin/transaction_log/tests/t/insert_on_duplicate_update.test 2011-04-11 07:17:33 +0000
824@@ -18,7 +18,7 @@
825 # Read in the transaction.log.
826
827 --replace_result $DRIZZLETEST_VARDIR VARDIR
828---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
829+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
830
831 --echo
832 --echo Generating statements for innodb replication log
833
834=== modified file 'plugin/transaction_log/tests/t/insert_select.test'
835--- plugin/transaction_log/tests/t/insert_select.test 2011-04-03 16:54:43 +0000
836+++ plugin/transaction_log/tests/t/insert_select.test 2011-04-11 07:17:33 +0000
837@@ -19,7 +19,7 @@
838 # Read in the transaction.log.
839
840 --replace_result $DRIZZLETEST_VARDIR VARDIR
841---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
842+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
843
844 --echo
845 --echo Generating statements for innodb replication log
846
847=== modified file 'plugin/transaction_log/tests/t/multi_column_primary_key.test'
848--- plugin/transaction_log/tests/t/multi_column_primary_key.test 2011-04-03 16:54:43 +0000
849+++ plugin/transaction_log/tests/t/multi_column_primary_key.test 2011-04-11 07:17:33 +0000
850@@ -15,7 +15,7 @@
851 # Read in the transaction.log.
852
853 --replace_result $DRIZZLETEST_VARDIR VARDIR
854---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
855+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
856
857 --echo
858 --echo Generating statements for innodb replication log
859
860=== modified file 'plugin/transaction_log/tests/t/multi_table.test'
861--- plugin/transaction_log/tests/t/multi_table.test 2011-04-03 16:54:43 +0000
862+++ plugin/transaction_log/tests/t/multi_table.test 2011-04-11 07:17:33 +0000
863@@ -19,7 +19,7 @@
864 # Read in the transaction.log.
865
866 --replace_result $DRIZZLETEST_VARDIR VARDIR
867---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
868+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
869
870 --echo
871 --echo Generating statements for innodb replication log
872
873=== modified file 'plugin/transaction_log/tests/t/no_modification.test'
874--- plugin/transaction_log/tests/t/no_modification.test 2011-04-03 16:54:43 +0000
875+++ plugin/transaction_log/tests/t/no_modification.test 2011-04-11 07:17:33 +0000
876@@ -19,7 +19,7 @@
877 # Read in the transaction.log.
878
879 --replace_result $DRIZZLETEST_VARDIR VARDIR
880---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
881+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
882
883 --echo
884 --echo Generating statements for innodb replication log
885
886=== modified file 'plugin/transaction_log/tests/t/no_primary_key.test'
887--- plugin/transaction_log/tests/t/no_primary_key.test 2011-04-03 16:54:43 +0000
888+++ plugin/transaction_log/tests/t/no_primary_key.test 2011-04-11 07:17:33 +0000
889@@ -20,7 +20,7 @@
890 # Read in the transaction.log.
891
892 --replace_result $DRIZZLETEST_VARDIR VARDIR
893---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
894+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
895
896 --echo
897 --echo Generating statements for innodb replication log
898
899=== modified file 'plugin/transaction_log/tests/t/null_values.test'
900--- plugin/transaction_log/tests/t/null_values.test 2011-04-03 16:54:43 +0000
901+++ plugin/transaction_log/tests/t/null_values.test 2011-04-11 07:17:33 +0000
902@@ -19,7 +19,7 @@
903 # Read in the transaction.log.
904
905 --replace_result $DRIZZLETEST_VARDIR VARDIR
906---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
907+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
908
909 --echo
910 --echo Generating statements for innodb replication log
911
912=== modified file 'plugin/transaction_log/tests/t/rand.test'
913--- plugin/transaction_log/tests/t/rand.test 2011-04-03 16:54:43 +0000
914+++ plugin/transaction_log/tests/t/rand.test 2011-04-11 07:17:33 +0000
915@@ -15,7 +15,7 @@
916 # Read in the transaction.log.
917
918 --replace_result $DRIZZLETEST_VARDIR VARDIR
919---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
920+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
921
922 --echo
923 --echo Generating statements for innodb replication log
924
925=== modified file 'plugin/transaction_log/tests/t/rename.test'
926--- plugin/transaction_log/tests/t/rename.test 2011-04-03 16:54:43 +0000
927+++ plugin/transaction_log/tests/t/rename.test 2011-04-11 07:17:33 +0000
928@@ -19,7 +19,7 @@
929 # Read in the transaction.log.
930
931 --replace_result $DRIZZLETEST_VARDIR VARDIR
932---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
933+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
934
935 --echo
936 --echo Generating statements for innodb replication log
937
938=== modified file 'plugin/transaction_log/tests/t/replace.test'
939--- plugin/transaction_log/tests/t/replace.test 2011-04-03 16:54:43 +0000
940+++ plugin/transaction_log/tests/t/replace.test 2011-04-11 07:17:33 +0000
941@@ -20,7 +20,7 @@
942 # Read in the transaction.log.
943
944 --replace_result $DRIZZLETEST_VARDIR VARDIR
945---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
946+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
947
948 --echo
949 --echo Generating statements for innodb replication log
950
951=== modified file 'plugin/transaction_log/tests/t/rollback.test'
952--- plugin/transaction_log/tests/t/rollback.test 2011-04-03 16:54:43 +0000
953+++ plugin/transaction_log/tests/t/rollback.test 2011-04-11 07:17:33 +0000
954@@ -20,7 +20,7 @@
955 # Read in the transaction.log.
956
957 --replace_result $DRIZZLETEST_VARDIR VARDIR
958---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
959+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
960
961 --echo
962 --echo Generating statements for innodb replication log
963
964=== modified file 'plugin/transaction_log/tests/t/rollback_statement.test'
965--- plugin/transaction_log/tests/t/rollback_statement.test 2011-04-03 16:54:43 +0000
966+++ plugin/transaction_log/tests/t/rollback_statement.test 2011-04-11 07:17:33 +0000
967@@ -45,11 +45,11 @@
968
969 --echo
970 --replace_regex /start_timestamp: [0-9]+/START_TIMESTAMP/g /end_timestamp: [0-9]+/END_TIMESTAMP/g /creation_timestamp: [0-9]+/CREATE_TIMESTAMP/ /update_timestamp: [0-9]+/UPDATE_TIMESTAMP/ /transaction_id: [0-9]+/TRANSACTION_ID/ /$DRIZZLETEST_VARDIR/VARDIR/
971---exec $DRIZZLE_TRX_READER --raw $DRIZZLETEST_VARDIR/master-data/local/transaction.log
972+--exec $DRIZZLE_TRX_READER --raw $DRIZZLETEST_VARDIR/master-data/transaction.log
973
974 --echo
975 --replace_result $DRIZZLETEST_VARDIR VARDIR
976---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
977+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
978
979 --disable_query_log
980 DROP TABLE src;
981
982=== modified file 'plugin/transaction_log/tests/t/schema.test'
983--- plugin/transaction_log/tests/t/schema.test 2011-04-03 16:54:43 +0000
984+++ plugin/transaction_log/tests/t/schema.test 2011-04-11 07:17:33 +0000
985@@ -15,7 +15,7 @@
986 # Read in the transaction.log.
987
988 --replace_result $DRIZZLETEST_VARDIR VARDIR
989---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
990+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
991
992 --echo
993 --echo Generating statements for innodb replication log
994
995=== modified file 'plugin/transaction_log/tests/t/select_for_update.test'
996--- plugin/transaction_log/tests/t/select_for_update.test 2011-04-03 16:54:43 +0000
997+++ plugin/transaction_log/tests/t/select_for_update.test 2011-04-11 07:17:33 +0000
998@@ -20,7 +20,7 @@
999 # Read in the transaction.log.
1000
1001 --replace_result $DRIZZLETEST_VARDIR VARDIR
1002---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1003+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
1004
1005 --echo
1006 --echo Generating statements for innodb replication log
1007
1008=== modified file 'plugin/transaction_log/tests/t/temp_tables.test'
1009--- plugin/transaction_log/tests/t/temp_tables.test 2011-04-03 16:54:43 +0000
1010+++ plugin/transaction_log/tests/t/temp_tables.test 2011-04-11 07:17:33 +0000
1011@@ -7,7 +7,7 @@
1012
1013 # Read in the transaction.log.
1014 --replace_result $DRIZZLETEST_VARDIR VARDIR
1015---exec $DRIZZLE_TRX_READER --ignore-events $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1016+--exec $DRIZZLE_TRX_READER --ignore-events $DRIZZLETEST_VARDIR/master-data/transaction.log
1017
1018 # Truncate the log file to reset for the next test
1019 --source ../plugin/transaction_log/tests/t/truncate_log.inc
1020
1021=== modified file 'plugin/transaction_log/tests/t/truncate.test'
1022--- plugin/transaction_log/tests/t/truncate.test 2011-04-03 16:54:43 +0000
1023+++ plugin/transaction_log/tests/t/truncate.test 2011-04-11 07:17:33 +0000
1024@@ -13,7 +13,7 @@
1025 # Read in the transaction.log.
1026
1027 --replace_result $DRIZZLETEST_VARDIR VARDIR
1028---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1029+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
1030
1031 # Truncate the log file to reset for the next test
1032 --source ../plugin/transaction_log/tests/t/truncate_log.inc
1033
1034=== modified file 'plugin/transaction_log/tests/t/truncate_log.test'
1035--- plugin/transaction_log/tests/t/truncate_log.test 2011-01-21 22:24:55 +0000
1036+++ plugin/transaction_log/tests/t/truncate_log.test 2011-04-11 07:17:33 +0000
1037@@ -13,11 +13,11 @@
1038
1039 # Trim result since Solaris/BSD wc program apparently adds whitespace before output
1040 --replace_result $DRIZZLETEST_VARDIR VARDIR
1041---exec wc -l $DRIZZLETEST_VARDIR/master-data/local/transaction.log | tr -d ' '
1042+--exec wc -l $DRIZZLETEST_VARDIR/master-data/transaction.log | tr -d ' '
1043
1044 # Truncate the log file
1045 --source ../plugin/transaction_log/tests/t/truncate_log.inc
1046
1047 # Trim result since Solaris/BSD wc program apparently adds whitespace before output
1048 --replace_result $DRIZZLETEST_VARDIR VARDIR
1049---exec wc -l $DRIZZLETEST_VARDIR/master-data/local/transaction.log | tr -d ' '
1050+--exec wc -l $DRIZZLETEST_VARDIR/master-data/transaction.log | tr -d ' '
1051
1052=== modified file 'plugin/transaction_log/tests/t/update.test'
1053--- plugin/transaction_log/tests/t/update.test 2011-04-03 16:54:43 +0000
1054+++ plugin/transaction_log/tests/t/update.test 2011-04-11 07:17:33 +0000
1055@@ -19,7 +19,7 @@
1056 # Read in the transaction.log.
1057
1058 --replace_result $DRIZZLETEST_VARDIR VARDIR
1059---exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/local/transaction.log
1060+--exec $DRIZZLE_TRX_READER $DRIZZLETEST_VARDIR/master-data/transaction.log
1061
1062 --echo
1063 --echo Generating statements for innodb replication log
1064
1065=== modified file 'tests/lib/sys_mgmt/codeTree.py'
1066--- tests/lib/sys_mgmt/codeTree.py 2011-04-03 16:54:43 +0000
1067+++ tests/lib/sys_mgmt/codeTree.py 2011-04-11 07:17:33 +0000
1068@@ -106,6 +106,9 @@
1069 self.drizzle_trx_reader = self.system_manager.find_path([os.path.join(self.basedir,
1070 'plugin/transaction_log/utilities/drizzletrx')])
1071
1072+ self.drizzle_trx_reader = self.system_manager.find_path([os.path.join(self.basedir,
1073+ 'plugin/transaction_log/utilities/drizzletrx')])
1074+
1075 self.server_version_string = None
1076 self.server_executable = None
1077 self.server_version = None
1078
1079=== modified file 'tests/r/broken_table_proto_file.result'
1080--- tests/r/broken_table_proto_file.result 2011-01-12 22:54:12 +0000
1081+++ tests/r/broken_table_proto_file.result 2011-04-11 07:17:33 +0000
1082@@ -2,6 +2,6 @@
1083 SHOW TABLE STATUS like 't1';
1084 Session Schema Name Type Engine Version Rows Avg_row_length Table_size Auto_increment
1085 show create table t1;
1086-ERROR HY000: Corrupt or invalid table definition for 'test/t1.dfe': name, schema, type, engine, creation_timestamp, update_timestamp
1087+ERROR HY000: Corrupt or invalid table definition for 'local/test/t1.dfe': name, schema, type, engine, creation_timestamp, update_timestamp
1088 drop table if exists t1;
1089 Got one of the listed errors
1090
1091=== modified file 'unittests/table_identifier.cc'
1092--- unittests/table_identifier.cc 2011-03-23 14:35:15 +0000
1093+++ unittests/table_identifier.cc 2011-04-11 07:17:33 +0000
1094@@ -31,7 +31,7 @@
1095 BOOST_AUTO_TEST_CASE(CreateStandard)
1096 {
1097 identifier::Table identifier("test", "a");
1098- BOOST_REQUIRE_EQUAL("test/a", identifier.getPath());
1099+ BOOST_REQUIRE_EQUAL("local/test/a", identifier.getPath());
1100 BOOST_REQUIRE_EQUAL("test.a", identifier.getSQLPath());
1101 }
1102