~daniel-nichter/drizzle/fix-slave-reconnect-bug-956200

« back to all changes in this revision

Viewing changes to plugin/innobase/dict/dict0dict.cc

  • Committer: Continuous Integration
  • Date: 2012-04-23 09:10:11 UTC
  • mfrom: (2546.1.6 drizzle-greenlake)
  • Revision ID: ci@drizzle.org-20120423091011-occ5xj26cv99opu6
modified:
  client/conclusions.h
  client/drizzledump.cc
  client/drizzledump_data.h
  client/drizzledump_drizzle.cc
  client/drizzledump_mysql.cc
  client/drizzleimport.cc
  client/include.am
  client/option_string.h
  client/server_detect.cc
  client/statement.h
  client/stats.h
  client/thread_context.h
  drizzled/identifier/catalog.cc
  drizzled/identifier/constants/schema.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/table.cc
  drizzled/include.am
  drizzled/main.cc
  plugin/innobase/dict/dict0dict.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/innobase/plugin.am
  plugin/innobase/tests/r/innodb-system-table-view.result
  plugin/tableprototester/tableprototester.cc
  tests/r/broken_table_proto_file.result
  unittests/include.am
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-23 Update to add in dependency for unittest

Show diffs side-by-side

added added

removed removed

Lines of Context:
225
225
        const char*     s = strchr(name, '/');
226
226
        ut_a(s);
227
227
 
 
228
        s= strchr(s+1, '/');
 
229
 
 
230
        if (s == NULL)
 
231
          s= strchr(name, '/');
 
232
 
228
233
        return(s + 1);
229
234
}
230
235
 
239
244
                                dbname '/' tablename */
240
245
{
241
246
        const char*     s;
242
 
        s = strchr(name, '/');
243
 
        ut_a(s);
 
247
        const char*     catalog;
 
248
        catalog = strchr(name, '/');
 
249
        ut_a(catalog);
 
250
        s= strchr(catalog+1, '/');
 
251
 
 
252
        if (s == NULL)
 
253
                s = catalog;
 
254
 
244
255
        return(s - name);
245
256
}
246
257