← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/collation_dictionary/collations.cc

  • Committer: pcrews
  • Date: 2011-05-24 17:36:24 UTC
  • mfrom: (1099.4.232 drizzle)
  • Revision ID: pcrews@lucid32-20110524173624-mwr1bvq6fa1r01ao
Updated translations + 2011.05.18 tarball tag

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/collation_dictionary/collations.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
22
 
#include "plugin/collation_dictionary/dictionary.h"
 
21
#include <config.h>
 
22
#include <plugin/collation_dictionary/dictionary.h>
23
23
 
24
24
using namespace std;
25
25
using namespace drizzled;
52
52
 
53
53
bool CollationsTool::Generator::check()
54
54
{
55
 
  const CHARSET_INFO *tmp_cs= character_set();
56
 
  const CHARSET_INFO *tmp_cl= collation();
 
55
  const charset_info_st *tmp_cs= character_set();
 
56
  const charset_info_st *tmp_cl= collation();
57
57
 
58
58
  if (not tmp_cl || 
59
59
      not (tmp_cl->state & MY_CS_AVAILABLE) ||
117
117
 
118
118
void CollationsTool::Generator::fill()
119
119
{
120
 
  const CHARSET_INFO *tmp_cs= character_set();
121
 
  const CHARSET_INFO *tmp_cl= collation_iter[0];
 
120
  const charset_info_st *tmp_cs= character_set();
 
121
  const charset_info_st *tmp_cl= collation_iter[0];
122
122
 
123
123
  assert(tmp_cs);
124
124
  assert(tmp_cl);