← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • 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/session.h
224
224
 
225
225
  /* Only charset part of these variables is sensible */
226
226
  const CHARSET_INFO  *character_set_filesystem;
227
 
  const CHARSET_INFO  *character_set_client;
228
 
  const CHARSET_INFO  *character_set_results;
229
227
 
230
228
  /* Both charset and collation parts of these variables are important */
231
229
  const CHARSET_INFO    *collation_server;
232
230
  const CHARSET_INFO    *collation_database;
233
 
  const CHARSET_INFO  *collation_connection;
 
231
 
 
232
  inline const CHARSET_INFO  *getCollation(void) 
 
233
  {
 
234
    return collation_database ? collation_database : collation_server;
 
235
  }
234
236
 
235
237
  /* Locale Support */
236
238
  MY_LOCALE *lc_time_names;
1392
1394
    To raise this flag, use my_error().
1393
1395
  */
1394
1396
  inline bool is_error() const { return main_da.is_error(); }
1395
 
  inline const CHARSET_INFO *charset() { return variables.character_set_client; }
 
1397
  inline const CHARSET_INFO *charset() { return default_charset_info; }
1396
1398
  void update_charset();
1397
1399
 
1398
1400
  void change_item_tree(Item **place, Item *new_value)