← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-04 08:13:04 UTC
  • mfrom: (2384 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110804081304-rlejjpvoos17bjdf
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
7795
7795
  while (foreign != NULL) {
7796
7796
 
7797
7797
    uint i;
7798
 
    LEX_STRING *name = 0;
 
7798
    lex_string_t *name = 0;
7799
7799
    uint ulen;
7800
7800
    char uname[NAME_LEN + 1];           /* Unencoded name */
7801
7801
    char db_name[NAME_LEN + 1];
7807
7807
    while (tmp_buff[i] != '/')
7808
7808
      i++;
7809
7809
    tmp_buff += i + 1;
7810
 
    LEX_STRING *tmp_foreign_id = session->make_lex_string(NULL, tmp_buff, strlen(tmp_buff), true);
 
7810
    lex_string_t *tmp_foreign_id = session->make_lex_string(NULL, tmp_buff, strlen(tmp_buff), true);
7811
7811
 
7812
7812
    /* Database name */
7813
7813
    tmp_buff = foreign->referenced_table_name;
7820
7820
    }
7821
7821
    db_name[i] = 0;
7822
7822
    ulen= identifier::Table::filename_to_tablename(db_name, uname, sizeof(uname));
7823
 
    LEX_STRING *tmp_referenced_db = session->make_lex_string(NULL, uname, ulen, true);
 
7823
    lex_string_t *tmp_referenced_db = session->make_lex_string(NULL, uname, ulen, true);
7824
7824
 
7825
7825
    /* Table name */
7826
7826
    tmp_buff += i + 1;
7827
7827
    ulen= identifier::Table::filename_to_tablename(tmp_buff, uname, sizeof(uname));
7828
 
    LEX_STRING *tmp_referenced_table = session->make_lex_string(NULL, uname, ulen, true);
 
7828
    lex_string_t *tmp_referenced_table = session->make_lex_string(NULL, uname, ulen, true);
7829
7829
 
7830
7830
    /** Foreign Fields **/
7831
 
    List<LEX_STRING> tmp_foreign_fields;
7832
 
    List<LEX_STRING> tmp_referenced_fields;
 
7831
    List<lex_string_t> tmp_foreign_fields;
 
7832
    List<lex_string_t> tmp_referenced_fields;
7833
7833
    for (i= 0;;) {
7834
7834
      tmp_buff= foreign->foreign_col_names[i];
7835
7835
      name = session->make_lex_string(name, tmp_buff, strlen(tmp_buff), true);
7862
7862
      length=8;
7863
7863
      tmp_buff= "RESTRICT";
7864
7864
    }
7865
 
    LEX_STRING *tmp_delete_method = session->make_lex_string(NULL, tmp_buff, length, true);
 
7865
    lex_string_t *tmp_delete_method = session->make_lex_string(NULL, tmp_buff, length, true);
7866
7866
 
7867
7867
 
7868
7868
    if (foreign->type & DICT_FOREIGN_ON_UPDATE_CASCADE)
7885
7885
      length=8;
7886
7886
      tmp_buff= "RESTRICT";
7887
7887
    }
7888
 
    LEX_STRING *tmp_update_method = session->make_lex_string(NULL, tmp_buff, length, true);
 
7888
    lex_string_t *tmp_update_method = session->make_lex_string(NULL, tmp_buff, length, true);
7889
7889
 
7890
 
    LEX_STRING *tmp_referenced_key_name = NULL;
 
7890
    lex_string_t *tmp_referenced_key_name = NULL;
7891
7891
 
7892
7892
    if (foreign->referenced_index &&
7893
7893
        foreign->referenced_index->name)