← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/dict/dict0dict.cc

edit

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/dict/dict0dict.cc
56
56
 
57
57
#include <ctype.h>
58
58
 
59
 
#include <drizzled/session.h>
60
 
 
61
59
/** the dictionary system */
62
60
UNIV_INTERN dict_sys_t* dict_sys        = NULL;
63
61
 
3838
3836
        heap = mem_heap_create(10000);
3839
3837
 
3840
3838
        err = dict_create_foreign_constraints_low(
3841
 
                trx, heap, trx->session()->charset(), str, name,
 
3839
                trx, heap, innobase_get_charset(trx->mysql_thd), str, name,
3842
3840
                reject_fks);
3843
3841
 
3844
3842
        mem_heap_free(heap);
3876
3874
        ut_a(trx);
3877
3875
        ut_a(trx->mysql_thd);
3878
3876
 
3879
 
        cs = trx->session()->charset();
 
3877
        cs = innobase_get_charset(trx->mysql_thd);
3880
3878
 
3881
3879
        *n = 0;
3882
3880
 
3883
3881
        *constraints_to_drop = static_cast<const char **>(mem_heap_alloc(heap, 1000 * sizeof(char*)));
3884
3882
 
3885
 
        ptr= trx->session()->getQueryStringCopy(len);
 
3883
        ptr = innobase_get_stmt(trx->mysql_thd, &len);
3886
3884
 
3887
3885
        str = dict_strip_comments(ptr, len);
3888
3886