diff options
| author | unknown <monty@mysql.com> | 2004-02-05 10:22:08 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-05 10:22:08 +0100 |
| commit | 28cb7814e92ac8339f4f2f34f8212b9683b101c7 (patch) | |
| tree | a27a7e48b7584f9668ca17e4d0817c9d817ca9f2 /mysys/charset.c | |
| parent | 4cda0db8675885af649432ac565a92de0fbc8839 (diff) | |
| download | mariadb-git-28cb7814e92ac8339f4f2f34f8212b9683b101c7.tar.gz | |
Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects. Needed for proper fix for bug #2479.
Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
client/mysql.cc:
Print mysql_insert_id() in 'status'
mysys/charset.c:
after merge fixup
sql/item_func.cc:
Code cleanup + new comments
sql/opt_range.cc:
Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects.
sql/opt_range.h:
Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects.
sql/sql_class.cc:
Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
sql/sql_class.h:
Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
sql/sql_select.cc:
Fixed bug when calling 'delete select' in sub selects. (Bug 2479)
(Test case is already commited to global source repository)
Diffstat (limited to 'mysys/charset.c')
| -rw-r--r-- | mysys/charset.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/charset.c b/mysys/charset.c index c0d8b183c17..5bf0ea972a5 100644 --- a/mysys/charset.c +++ b/mysys/charset.c @@ -537,7 +537,6 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags) while we may changing the cs_info_table */ pthread_mutex_lock(&THR_LOCK_charset); - if ((cs= all_charsets[cs_number])) { if (!(cs->state & MY_CS_COMPILED) && !(cs->state & MY_CS_LOADED)) @@ -548,7 +547,6 @@ static CHARSET_INFO *get_internal_charset(uint cs_number, myf flags) cs= (cs->state & MY_CS_AVAILABLE) ? cs : NULL; } pthread_mutex_unlock(&THR_LOCK_charset); - pthread_mutex_unlock(&THR_LOCK_charset); return cs; } |