diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-02-20 11:21:12 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-02-20 11:21:12 +0200 |
| commit | 46a07dbc5f527be5011c50422683f376d5ed5d22 (patch) | |
| tree | cea10e2c6b0a4f1dd9069a472481dda3c1cd9ed3 /sql/ha_innodb.cc | |
| parent | 6226e45b7b1537ebd24277a5ceb3c874c57aff3e (diff) | |
| download | mariadb-git-46a07dbc5f527be5011c50422683f376d5ed5d22.tar.gz | |
rem0cmp.c, data0type.c, data0type.ic, data0type.h, ha_innodb.cc:
Remove the now redundant flag DATA_NONLATIN1; better comments
sql/ha_innodb.cc:
Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/include/data0type.h:
Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/include/data0type.ic:
Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/data/data0type.c:
Remove the now redundant flag DATA_NONLATIN1; better comments
innobase/rem/rem0cmp.c:
Remove the now redundant flag DATA_NONLATIN1; better comments
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 53e0d5aca61..40ba7ab1cef 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -755,11 +755,6 @@ innobase_init(void) srv_set_thread_priorities = TRUE; srv_query_thread_priority = QUERY_PRIOR; } - - /* Store the default charset-collation number of this MySQL - installation */ - - data_mysql_default_charset_coll = (ulint)default_charset_info->number; /* Set InnoDB initialization parameters according to the values read from MySQL .cnf file */ @@ -875,6 +870,14 @@ innobase_init(void) srv_print_verbose_log = mysql_embedded ? 0 : 1; + /* Store the default charset-collation number of this MySQL + installation */ + + data_mysql_default_charset_coll = (ulint)default_charset_info->number; + + data_mysql_latin1_swedish_charset_coll = + (ulint)my_charset_latin1.number; + /* Store the latin1_swedish_ci character ordering table to InnoDB. For non-latin1_swedish_ci charsets we use the MySQL comparison functions, and consequently we do not need to know the ordering internally in @@ -3260,7 +3263,6 @@ create_table_def( ulint nulls_allowed; ulint unsigned_type; ulint binary_type; - ulint nonlatin1_type; ulint charset_no; ulint i; @@ -3290,17 +3292,8 @@ create_table_def( unsigned_type = 0; } - if (col_type == DATA_BLOB - && strcmp(field->charset()->name, - "latin1_swedish_ci") != 0) { - nonlatin1_type = DATA_NONLATIN1; - } else { - nonlatin1_type = 0; - } - if (field->binary()) { binary_type = DATA_BINARY_TYPE; - nonlatin1_type = 0; } else { binary_type = 0; } @@ -3319,7 +3312,7 @@ create_table_def( col_type, dtype_form_prtype( (ulint)field->type() | nulls_allowed | unsigned_type - | nonlatin1_type | binary_type, + | binary_type, + charset_no), field->pack_length(), 0); } |