← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_select.cc

  • Committer: Brian Aker
  • Date: 2008-07-07 16:58:11 UTC
  • mfrom: (77.1.25 codestyle)
  • Revision ID: brian@tangent.org-20080707165811-jfqxacc3436dut4n
Merge from Monty's tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_select.cc
17949
17949
      for (; sl && len + lastop + 5 < NAME_LEN; sl= sl->next_select())
17950
17950
      {
17951
17951
        len+= lastop;
17952
 
        lastop= my_snprintf(table_name_buffer + len, NAME_LEN - len,
17953
 
                            "%u,", sl->select_number);
 
17952
        lastop= snprintf(table_name_buffer + len, NAME_LEN - len,
 
17953
                         "%u,", sl->select_number);
17954
17954
      }
17955
17955
      if (sl || len + lastop >= NAME_LEN)
17956
17956
      {
18035
18035
      if (table->derived_select_number)
18036
18036
      {
18037
18037
        /* Derived table name generation */
18038
 
        int len= my_snprintf(table_name_buffer, sizeof(table_name_buffer)-1,
18039
 
                             "<derived%u>",
18040
 
                             table->derived_select_number);
 
18038
        int len= snprintf(table_name_buffer, sizeof(table_name_buffer)-1,
 
18039
                          "<derived%u>",
 
18040
                          table->derived_select_number);
18041
18041
        item_list.push_back(new Item_string(table_name_buffer, len, cs));
18042
18042
      }
18043
18043
      else
18321
18321
          {
18322
18322
            char namebuf[NAME_LEN];
18323
18323
            /* Derived table name generation */
18324
 
            int len= my_snprintf(namebuf, sizeof(namebuf)-1,
18325
 
                                 "<derived%u>",
18326
 
                                 prev_table->derived_select_number);
 
18324
            int len= snprintf(namebuf, sizeof(namebuf)-1,
 
18325
                              "<derived%u>",
 
18326
                              prev_table->derived_select_number);
18327
18327
            extra.append(namebuf, len);
18328
18328
          }
18329
18329
          else