← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/include/que0que.ic

  • Committer: Brian Aker
  • Date: 2008-11-04 15:39:09 UTC
  • mfrom: (575.1.2 devel)
  • Revision ID: brian@tangent.org-20081104153909-c72hn65udxs1ccal
Merge of Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/include/que0que.ic
126
126
{
127
127
        ut_ad(node);
128
128
 
129
 
        return(&(((que_common_t*)node)->val.type));
 
129
        return(dfield_get_type(&((que_common_t*) node)->val));
130
130
}
131
131
 
132
132
/*************************************************************************
142
142
        que_common_t*   cnode;
143
143
        que_common_t*   cnode2;
144
144
 
145
 
        cnode = node;
 
145
        cnode = (que_common_t*) node;
146
146
 
147
147
        cnode->brother = NULL;
148
148
 
151
151
                return(node);
152
152
        }
153
153
 
154
 
        cnode2 = node_list;
 
154
        cnode2 = (que_common_t*) node_list;
155
155
 
156
156
        while (cnode2->brother != NULL) {
157
 
                cnode2 = cnode2->brother;
 
157
                cnode2 = (que_common_t*) cnode2->brother;
158
158
        }
159
159
 
160
160
        cnode2->brother = node;
183
183
                                        /* out: length, for NULL list 0 */
184
184
        que_node_t*     node_list)      /* in: node list, or NULL */
185
185
{
186
 
        que_common_t*   cnode;
187
 
        ulint           len;
 
186
        const que_common_t*     cnode;
 
187
        ulint                   len;
188
188
 
189
 
        cnode = node_list;
 
189
        cnode = (const que_common_t*) node_list;
190
190
        len = 0;
191
191
 
192
192
        while (cnode != NULL) {
193
193
                len++;
194
 
                cnode = cnode->brother;
 
194
                cnode = (const que_common_t*) cnode->brother;
195
195
        }
196
196
 
197
197
        return(len);