← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/database_ms.cc

  • Committer: lbieber
  • Date: 2010-10-07 15:39:23 UTC
  • mfrom: (1819.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007153923-e9rwa9ha5oyhjdc2
Merge Monty - Bug 655294: load_data() function returns null if file is invalid 
Merge Monty - Bug 655342: select into outfile creates a garbage file on no results
Merge Monty - Fixes the haildb build

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/database_ms.cc
1259
1259
         * The database name is case sensitive here if the file system names are
1260
1260
         * case sensitive. This is desirable.
1261
1261
         */
1262
 
        path = CSPath::newPath(ms_my_get_mysql_home_path(), RETAIN(db_name));
 
1262
        path = CSPath::newPath(ms_my_get_mysql_home_path().c_str(), RETAIN(db_name));
1263
1263
        push_(path);
1264
1264
        if (create && !path->exists()) {
1265
1265
                CSException::throwException(CS_CONTEXT, MS_ERR_UNKNOWN_DB, db_name->getCString());
1605
1605
                bool create = false;
1606
1606
                uint32_t db_id;
1607
1607
                
1608
 
                path = createDatabasePath(ms_my_get_mysql_home_path(), CSString::newString(db_name), &db_id, &create);
 
1608
                path = createDatabasePath(ms_my_get_mysql_home_path().c_str(), CSString::newString(db_name), &db_id, &create);
1609
1609
                
1610
1610
                if (path) {
1611
1611
                        MSTransactionManager::dropDatabase(db_id);
1636
1636
// 3: <database>/<table>
1637
1637
bool MSDatabase::convertTablePathToIDs(const char *table_path, uint32_t *db_id, uint32_t *tab_id, bool create) 
1638
1638
{
1639
 
        const char      *base = ms_my_get_mysql_home_path();
 
1639
        const char      *base = ms_my_get_mysql_home_path().c_str();
1640
1640
        CSString        *table_url;
1641
1641
        CSString        *db_path = NULL;
1642
1642
        CSString        *db_name = NULL;
1736
1736
        MSDatabase *db;
1737
1737
        enter_();
1738
1738
        
1739
 
        db = newDatabase(ms_my_get_mysql_home_path(), db_name, 0, create);
 
1739
        db = newDatabase(ms_my_get_mysql_home_path().c_str(), db_name, 0, create);
1740
1740
        
1741
1741
        if (db) {
1742
1742
                push_(db);