← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2008-12-24 02:06:33 UTC
  • Revision ID: brian@tangent.org-20081224020633-sbe7ca5yvo8yj5d3
Removal of client side collation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
5685
5685
          {
5686
5686
            LEX_STRING tmp;
5687
5687
            Session *session= YYSession;
5688
 
            const CHARSET_INFO * const cs_con= session->variables.collation_connection;
5689
 
            const CHARSET_INFO * const cs_cli= session->variables.character_set_client;
 
5688
            const CHARSET_INFO * const cs_con= session->variables.getCollation();
 
5689
            const CHARSET_INFO * const cs_cli= default_charset_info;
5690
5690
            uint32_t repertoire= session->lex->text_string_is_7bit &&
5691
5691
                             my_charset_is_ascii_based(cs_cli) ?
5692
5692
                             MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
5717
5717
                 If the string has been pure ASCII so far,
5718
5718
                 check the new part.
5719
5719
              */
5720
 
              const CHARSET_INFO * const cs= YYSession->variables.collation_connection;
 
5720
              const CHARSET_INFO * const cs= YYSession->variables.getCollation();
5721
5721
              item->collation.repertoire|= my_string_repertoire(cs,
5722
5722
                                                                $2.str,
5723
5723
                                                                $2.length);
5730
5730
          {
5731
5731
            $$= new (YYSession->mem_root) String($1.str,
5732
5732
                                             $1.length,
5733
 
                                             YYSession->variables.collation_connection);
 
5733
                                             YYSession->variables.getCollation());
5734
5734
          }
5735
5735
        | HEX_NUM
5736
5736
          {
6071
6071
            if (session->charset_is_collation_connection)
6072
6072
              $$= $1;
6073
6073
            else
6074
 
              session->convert_string(&$$, session->variables.collation_connection,
 
6074
              session->convert_string(&$$, session->variables.getCollation(),
6075
6075
                                  $1.str, $1.length, session->charset());
6076
6076
          }
6077
6077
        ;