← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/cslib/CSStream.cc

Merge Stewart - fix bug 587772: READ COMMITTED isolation level doesn't work (at least with InnoDB)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/cslib/CSStream.cc
738
738
 * Callback InPUT STREAM
739
739
 */
740
740
 
741
 
CSCallbackInputStream *CSCallbackInputStream::newStream(CSStreamReadCallbackFunc in_callback, void *user_data)
 
741
CSCallbackInputStream *CSCallbackInputStream::newStream(CSStreamReadCallbackFunc callback, void *user_data)
742
742
{
743
743
        CSCallbackInputStream *s;
744
744
 
746
746
                CSException::throwOSError(CS_CONTEXT, ENOMEM);
747
747
        }
748
748
        
749
 
        s->callback = in_callback;
 
749
        s->callback = callback;
750
750
        s->cb_data = user_data;
751
751
        return s;
752
752
}