← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Andrey Hristov
  • Date: 2008-08-06 00:04:45 UTC
  • mto: (264.1.5 codestyle)
  • mto: This revision was merged to the branch mainline in revision 266.
  • Revision ID: ahristov@mysql.com-20080806000445-84urmltikgwk9v5d
Constify the usage of CHARSET_INFO almost to the last place in the code.
99% of the parameters are const CHARSET_INFO * const cs.
Wherever possible stack variables are also double consted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
2507
2507
        unsigned int    b_length)       /* in: data field length,
2508
2508
                                        not UNIV_SQL_NULL */
2509
2509
{
2510
 
        CHARSET_INFO*           charset;
 
2510
        const CHARSET_INFO*     charset;
2511
2511
        enum_field_types        mysql_tp;
2512
2512
        int                     ret;
2513
2513
 
2741
2741
                        byte*   data;
2742
2742
                        ulint   key_len;
2743
2743
                        ulint   true_len;
2744
 
                        CHARSET_INFO*   cs;
 
2744
                        const CHARSET_INFO*     cs;
2745
2745
                        int     error=0;
2746
2746
 
2747
2747
                        key_len = key_part->length;
2800
2800
 
2801
2801
                } else if (mysql_type == DRIZZLE_TYPE_BLOB) {
2802
2802
 
2803
 
                        CHARSET_INFO*   cs;
 
2803
                        const CHARSET_INFO*     cs;
2804
2804
                        ulint           key_len;
2805
2805
                        ulint           true_len;
2806
2806
                        int             error=0;
7458
7458
{
7459
7459
        ulint char_length;      /* character length in bytes */
7460
7460
        ulint n_chars;          /* number of characters in prefix */
7461
 
        CHARSET_INFO* charset;  /* charset used in the field */
 
7461
        const CHARSET_INFO* charset;    /* charset used in the field */
7462
7462
 
7463
7463
        charset = get_charset((uint) charset_id, MYF(MY_WME));
7464
7464