diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-20 02:06:08 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-20 02:06:08 +0200 |
| commit | 97cd4fb127f4096f2196a71778a15c8183aa7784 (patch) | |
| tree | 025fe4204ddb1d72e14a98b1df497f7329939ebd /mysys | |
| parent | 161942e3cefd8923633e0a7b3b7a9860a95f6fbc (diff) | |
| parent | c2297fb5ecaf2e98b21ae8287535d0b7fbced34b (diff) | |
| download | mariadb-git-97cd4fb127f4096f2196a71778a15c8183aa7784.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
configure.in:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index 87fb7846553..ce44353b065 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -324,7 +324,7 @@ static int add_collation(CHARSET_INFO *cs) if (cs->primary_number == cs->number) cs->state |= MY_CS_PRIMARY; - if (cs->primary_number == cs->number) + if (cs->binary_number == cs->number) cs->state |= MY_CS_BINSORT; if (!(all_charsets[cs->number]->state & MY_CS_COMPILED)) @@ -341,6 +341,8 @@ static int add_collation(CHARSET_INFO *cs) all_charsets[cs->number]->state |= cs->state; } cs->number= 0; + cs->primary_number= 0; + cs->binary_number= 0; cs->name= NULL; cs->state= 0; cs->sort_order= NULL; |