← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2011-07-25 14:24:19 UTC
  • mto: This revision was merged to the branch mainline in revision 2373.
  • Revision ID: brian@tangent.org-20110725142419-3vobv9u6k7jp4qej
Remove the typedef on lexkey

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
401
401
*/
402
402
static bool _schema_select(Session& session, Select_Lex& sel, const string& schema_table_name)
403
403
{
404
 
  LEX_STRING db, table;
 
404
  lex_string_t db, table;
405
405
  bitset<NUM_OF_TABLE_OPTIONS> table_options;
406
406
  /*
407
407
     We have to make non const db_name & table_name
730
730
  LEX& lex= session->lex();
731
731
  init_select(&lex);
732
732
  lex.sql_command= SQLCOM_SELECT;
733
 
  LEX_STRING tmp;
 
733
  lex_string_t tmp;
734
734
  tmp.str= (char*) var_name;
735
735
  tmp.length=strlen(var_name);
736
 
  LEX_STRING null_lex_string;
 
736
  lex_string_t null_lex_string;
737
737
  memset(&null_lex_string.str, 0, sizeof(null_lex_string));
738
738
  /*
739
739
    We set the name of Item to @@session.var_name because that then is used
804
804
    Return 0 if ok
805
805
*/
806
806
 
807
 
bool add_field_to_list(Session *session, LEX_STRING *field_name, enum_field_types type,
 
807
bool add_field_to_list(Session *session, lex_string_t *field_name, enum_field_types type,
808
808
                       char *length, char *decimals,
809
809
                       uint32_t type_modifier,
810
810
                       enum column_format_type column_format,
811
811
                       Item *default_value, Item *on_update_value,
812
 
                       LEX_STRING *comment,
 
812
                       lex_string_t *comment,
813
813
                       char *change,
814
814
                       List<String> *interval_list, const charset_info_st * const cs)
815
815
{
824
824
  {
825
825
    Key *key;
826
826
    lex->col_list.push_back(new Key_part_spec(*field_name, 0));
827
 
    key= new Key(Key::PRIMARY, null_lex_str,
 
827
    key= new Key(Key::PRIMARY, null_lex_string(),
828
828
                      &default_key_create_info,
829
829
                      0, lex->col_list);
830
830
    statement->alter_info.key_list.push_back(key);
834
834
  {
835
835
    Key *key;
836
836
    lex->col_list.push_back(new Key_part_spec(*field_name, 0));
837
 
    key= new Key(Key::UNIQUE, null_lex_str,
 
837
    key= new Key(Key::UNIQUE, null_lex_string(),
838
838
                 &default_key_create_info, 0,
839
839
                 lex->col_list);
840
840
    statement->alter_info.key_list.push_back(key);
913
913
 
914
914
TableList *Select_Lex::add_table_to_list(Session *session,
915
915
                                         Table_ident *table,
916
 
                                         LEX_STRING *alias,
 
916
                                         lex_string_t *alias,
917
917
                                         const bitset<NUM_OF_TABLE_OPTIONS>& table_options,
918
918
                                         thr_lock_type lock_type,
919
919
                                         List<Index_hint> *index_hints_arg,
920
 
                                         LEX_STRING *option)
 
920
                                         lex_string_t *option)
921
921
{
922
922
  TableList *previous_table_ref; /* The table preceding the current one. */
923
923
  char *alias_str;
1578
1578
*/
1579
1579
 
1580
1580
 
1581
 
bool check_string_char_length(LEX_STRING *str, const char *err_msg,
 
1581
bool check_string_char_length(lex_string_t *str, const char *err_msg,
1582
1582
                              uint32_t max_char_length, const charset_info_st * const cs,
1583
1583
                              bool no_error)
1584
1584
{
1595
1595
}
1596
1596
 
1597
1597
 
1598
 
bool check_identifier_name(LEX_STRING *str, error_t err_code,
 
1598
bool check_identifier_name(lex_string_t *str, error_t err_code,
1599
1599
                           uint32_t max_char_length,
1600
1600
                           const char *param_for_err_msg)
1601
1601
{