← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/handler/ha_innodb.cc

Removed old delclarations/Innodb hack for latin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
1612
1612
 
1613
1613
        data_mysql_default_charset_coll = (ulint)default_charset_info->number;
1614
1614
 
1615
 
        ut_a(DATA_DRIZZLE_LATIN1_SWEDISH_CHARSET_COLL ==
1616
 
                                        my_charset_latin1.number);
1617
 
        ut_a(DATA_DRIZZLE_BINARY_CHARSET_COLL == my_charset_bin.number);
1618
 
 
1619
 
        /* Store the latin1_swedish_ci character ordering table to InnoDB. For
1620
 
        non-latin1_swedish_ci charsets we use the MySQL comparison functions,
1621
 
        and consequently we do not need to know the ordering internally in
1622
 
        InnoDB. */
1623
 
 
1624
 
        ut_a(0 == strcmp((char*)my_charset_latin1.name,
1625
 
                                                (char*)"latin1_swedish_ci"));
1626
 
        memcpy(srv_latin1_ordering, my_charset_latin1.sort_order, 256);
1627
 
 
1628
1615
        /* Since we in this module access directly the fields of a trx
1629
1616
        struct, and due to different headers and flags it might happen that
1630
1617
        mutex_t has a different size in this module and in InnoDB
2513
2500
 
2514
2501
                if (charset_number == default_charset_info->number) {
2515
2502
                        charset = default_charset_info;
2516
 
                } else if (charset_number == my_charset_latin1.number) {
2517
 
                        charset = &my_charset_latin1;
2518
2503
                } else {
2519
2504
                        charset = get_charset(charset_number, MYF(MY_WME));
2520
2505