← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/eval/eval0proc.cc

  • Committer: Monty Taylor
  • Date: 2010-12-26 00:22:34 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226002234-2sb62sm2gs0iftuy
Fixing some of the innodb c++ casting issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/eval/eval0proc.cc
43
43
 
44
44
        ut_ad(thr);
45
45
 
46
 
        node = thr->run_node;
 
46
        node = static_cast<if_node_t *>(thr->run_node);
47
47
        ut_ad(que_node_get_type(node) == QUE_NODE_IF);
48
48
 
49
49
        if (thr->prev_node == que_node_get_parent(node)) {
80
80
                                        break;
81
81
                                }
82
82
 
83
 
                                elsif_node = que_node_get_next(elsif_node);
 
83
                                elsif_node = static_cast<elsif_node_t *>(que_node_get_next(elsif_node));
84
84
 
85
85
                                if (elsif_node == NULL) {
86
86
                                        thr->run_node = NULL;
118
118
 
119
119
        ut_ad(thr);
120
120
 
121
 
        node = thr->run_node;
 
121
        node = static_cast<while_node_t *>(thr->run_node);
122
122
        ut_ad(que_node_get_type(node) == QUE_NODE_WHILE);
123
123
 
124
124
        ut_ad((thr->prev_node == que_node_get_parent(node))
154
154
 
155
155
        ut_ad(thr);
156
156
 
157
 
        node = thr->run_node;
 
157
        node = static_cast<assign_node_t *>(thr->run_node);
158
158
        ut_ad(que_node_get_type(node) == QUE_NODE_ASSIGNMENT);
159
159
 
160
160
        /* Evaluate the value to assign */
183
183
 
184
184
        ut_ad(thr);
185
185
 
186
 
        node = thr->run_node;
 
186
        node = static_cast<for_node_t *>(thr->run_node);
187
187
 
188
188
        ut_ad(que_node_get_type(node) == QUE_NODE_FOR);
189
189
 
244
244
 
245
245
        ut_ad(thr);
246
246
 
247
 
        node = thr->run_node;
 
247
        node = static_cast<exit_node_t *>(thr->run_node);
248
248
 
249
249
        ut_ad(que_node_get_type(node) == QUE_NODE_EXIT);
250
250
 
276
276
 
277
277
        ut_ad(thr);
278
278
 
279
 
        node = thr->run_node;
 
279
        node = static_cast<return_node_t *>(thr->run_node);
280
280
 
281
281
        ut_ad(que_node_get_type(node) == QUE_NODE_RETURN);
282
282