database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

CONVERT class was removed

Browse Source
This commit is contained in:
unknown
2003-03-18 17:01:32 +04:00
parent 3ccd93c704
commit 3f6a00d1ac
18 changed files with 68 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_cache.cc
View File

@ -778,11 +778,8 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
most significant bit - CLIENT_LONG_FLAG,
other - charset number (0 no charset convertion)
*/
if (thd->variables.convert_set != 0)
{
flags|= (byte) thd->variables.convert_set->number();
DBUG_ASSERT(thd->variables.convert_set->number() < 128);
}
flags|= (byte) thd->charset()->number;
DBUG_ASSERT(thd->charset()->number < 128);
tot_length=thd->query_length+thd->db_length+2;
thd->query[tot_length-1] = (char) flags;
@ -935,11 +932,8 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length)
Other - charset number (0 no charset convertion)
*/
flags = (thd->client_capabilities & CLIENT_LONG_FLAG ? 0x80 : 0);
if (thd->variables.convert_set != 0)
{
flags |= (byte) thd->variables.convert_set->number();
DBUG_ASSERT(thd->variables.convert_set->number() < 128);
}
flags |= (byte) thd->charset()->number;
DBUG_ASSERT(thd->charset()->number < 128);
sql[tot_length-1] = (char) flags;
query_block = (Query_cache_block *) hash_search(&queries, (byte*) sql,
tot_length);