← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Andrew Hutchings
  • Date: 2011-02-07 17:20:59 UTC
  • mfrom: (2148 staging)
  • mto: (2148.2.3 build)
  • mto: This revision was merged to the branch mainline in revision 2149.
  • Revision ID: andrew@linuxjedi.co.uk-20110207172059-dyeahrgzrlincoe3
Merge with trunk

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
 
59
61
/** the dictionary system */
60
62
UNIV_INTERN dict_sys_t* dict_sys        = NULL;
61
63
 
3836
3838
        heap = mem_heap_create(10000);
3837
3839
 
3838
3840
        err = dict_create_foreign_constraints_low(
3839
 
                trx, heap, innobase_get_charset(trx->mysql_thd), str, name,
 
3841
                trx, heap, trx->session()->charset(), str, name,
3840
3842
                reject_fks);
3841
3843
 
3842
3844
        mem_heap_free(heap);
3874
3876
        ut_a(trx);
3875
3877
        ut_a(trx->mysql_thd);
3876
3878
 
3877
 
        cs = innobase_get_charset(trx->mysql_thd);
 
3879
        cs = trx->session()->charset();
3878
3880
 
3879
3881
        *n = 0;
3880
3882
 
3881
3883
        *constraints_to_drop = static_cast<const char **>(mem_heap_alloc(heap, 1000 * sizeof(char*)));
3882
3884
 
3883
 
        ptr = innobase_get_stmt(trx->mysql_thd, &len);
 
3885
        ptr= trx->session()->getQueryStringCopy(len);
3884
3886
 
3885
3887
        str = dict_strip_comments(ptr, len);
3886
3888