← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/ha_xtsys.cc

  • Committer: Monty Taylor
  • Date: 2010-04-22 02:46:23 UTC
  • mto: (1497.3.4 enable-dtrace)
  • mto: This revision was merged to the branch mainline in revision 1527.
  • Revision ID: mordred@inaugust.com-20100422024623-4urw8fi8eraci08p
https://launchpad.net/bugs/561683
Don't overwrite the pandora_vc_revinfo file if we don't have new
authoratative information.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/ha_xtsys.cc
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
 * Paul McCullagh
20
20
 *
58
58
 * HANDLER INTERFACE
59
59
 */
60
60
 
 
61
ha_xtsys::ha_xtsys(handlerton *hton, TableShare& table_arg):
61
62
#ifdef DRIZZLED
62
 
ha_xtsys::ha_xtsys(handlerton *hton, Table& table_arg):
63
63
handler(*hton, table_arg),
64
 
ha_open_tab(NULL)
65
 
{
66
 
}
67
64
#else
68
 
ha_xtsys::ha_xtsys(handlerton *hton, TABLE_SHARE *table_arg):
69
65
handler(hton, table_arg),
 
66
#endif
70
67
ha_open_tab(NULL)
71
68
{
 
69
#ifndef DRIZZLED
72
70
        init();
 
71
#endif
73
72
}
74
 
#endif
75
73
 
76
74
static const char *ha_pbms_exts[] = {
77
75
        "",
96
94
        try_(a) {
97
95
                xt_ha_open_database_of_table(self, (XTPathStrPtr) table_path);
98
96
 
99
 
                ha_open_tab = XTSystemTableShare::openSystemTable(self, table_path, getTable());
100
 
                MYSQL_INIT_LOCK(ha_lock, ha_open_tab->ost_share->sts_my_lock);
 
97
                ha_open_tab = XTSystemTableShare::openSystemTable(self, table_path, table);
 
98
                thr_lock_data_init(ha_open_tab->ost_share->sts_my_lock, &ha_lock, NULL);
101
99
                ref_length = ha_open_tab->getRefLen();
102
100
        }
103
101
        catch_(a) {
149
147
        return err;
150
148
}
151
149
 
152
 
#ifdef DRIZZLED
153
 
int ha_xtsys::doStartTableScan(bool XT_UNUSED(scan))
154
 
#else
155
150
int ha_xtsys::rnd_init(bool XT_UNUSED(scan))
156
 
#endif
157
151
{
158
152
        int err = 0;
159
153