← 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: Patrick Crews
  • Date: 2010-09-14 20:21:03 UTC
  • mto: (1771.1.1 pcrews)
  • mto: This revision was merged to the branch mainline in revision 1772.
  • Revision ID: gleebix@gmail.com-20100914202103-1db2n0bshzafep19
Moved transaction_log tests into updated non-publisher-based tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/database_ms.cc
1
 
/* Copyright (C) 2008 PrimeBase Technologies GmbH, Germany
 
1
/* Copyright (c) 2008 PrimeBase Technologies GmbH, Germany
2
2
 *
3
3
 * PrimeBase Media Stream for MySQL
4
4
 *
14
14
 *
15
15
 * You should have received a copy of the GNU General Public License
16
16
 * along with this program; if not, write to the Free Software
17
 
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
17
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
 *
19
19
 * Original author: Paul McCullagh
20
20
 * Continued development: Barry Leslie
545
545
        push_(file);
546
546
        if ((repo = file->myRepo)) {
547
547
                if (repo->isRemovingFP) {
548
 
                        repo->removeRepoFile(RETAIN(file));
 
548
                        repo->removeRepoFile(file);
549
549
                        myRepostoryList->wakeup();
550
550
                }
551
551
                else
552
 
                        repo->returnRepoFile(RETAIN(file));
 
552
                        repo->returnRepoFile(file);
553
553
                repo->release(); /* [++] here is the release.  */
554
554
        }
555
555
        release_(file);
1076
1076
                                                int len = ptr - dir_name;
1077
1077
                                                ptr++;
1078
1078
                                                if ((strtoul(ptr, NULL, 10) == db_id) && len) {
1079
 
                                                        db = getDatabase(CSString::newString(dir_name, len), true);
 
1079
                                                        db = getDatabase(CSCString::newString(dir_name, len), true);
1080
1080
                                                        ASSERT(db->myDatabaseID == db_id);
1081
1081
                                                }
1082
1082
                                        }
1597
1597
                        gDatabaseList->remove(doomedDatabase->getKey());
1598
1598
                if (!self->myMustQuit) 
1599
1599
                        unlock_(gDatabaseList); 
1600
 
                ASSERT(doomedDatabase->getRefCount() == 1);
 
1600
                ASSERT(doomedDatabase->iRefCount == 1);
1601
1601
                release_(doomedDatabase);
1602
1602
                
1603
1603
        } else {