← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge in Stewart's FK work

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/ha_xtsys.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
 * Paul McCullagh
20
20
 *
59
59
 */
60
60
 
61
61
#ifdef DRIZZLED
62
 
ha_xtsys::ha_xtsys(handlerton *hton, Table& table_arg):
 
62
ha_xtsys::ha_xtsys(handlerton *hton, TableShare& table_arg):
63
63
handler(*hton, table_arg),
64
64
ha_open_tab(NULL)
65
65
{
96
96
        try_(a) {
97
97
                xt_ha_open_database_of_table(self, (XTPathStrPtr) table_path);
98
98
 
99
 
                ha_open_tab = XTSystemTableShare::openSystemTable(self, table_path, getTable());
100
 
                MYSQL_INIT_LOCK(ha_lock, ha_open_tab->ost_share->sts_my_lock);
 
99
                ha_open_tab = XTSystemTableShare::openSystemTable(self, table_path, table);
 
100
                ha_lock.init(ha_open_tab->ost_share->sts_my_lock);
101
101
                ref_length = ha_open_tab->getRefLen();
102
102
        }
103
103
        catch_(a) {
149
149
        return err;
150
150
}
151
151
 
152
 
#ifdef DRIZZLED
153
152
int ha_xtsys::doStartTableScan(bool XT_UNUSED(scan))
154
 
#else
155
 
int ha_xtsys::rnd_init(bool XT_UNUSED(scan))
156
 
#endif
157
153
{
158
154
        int err = 0;
159
155