database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug 1350 fix

Browse Source
This commit is contained in:
unknown
2003-09-22 11:11:36 +05:00
parent d298968073
commit c8cf1e4eae
5 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_show.cc
View File

@ -1497,11 +1497,15 @@ int mysqld_show_collations(THD *thd, const char *wild)
for ( cs= all_charsets ; cs < all_charsets+255 ; cs++ )
{
CHARSET_INFO **cl;
if (!cs[0] || !(cs[0]->state & MY_CS_AVAILABLE) ||
!(cs[0]->state & MY_CS_PRIMARY))
continue;
for ( cl= all_charsets; cl < all_charsets+255 ;cl ++)
{
if (!cs[0] || !cl[0] || !my_charset_same(cs[0],cl[0]) || !(cs[0]->state & MY_CS_PRIMARY))
if (!cl[0] || !(cl[0]->state & MY_CS_AVAILABLE) ||
!my_charset_same(cs[0],cl[0]))
continue;
if (cs[0] && !(wild && wild[0] &&
if (!(wild && wild[0] &&
wild_case_compare(system_charset_info,cl[0]->name,wild)))
{
if (write_collation(protocol, cl[0]))
@ -1545,8 +1549,10 @@ int mysqld_show_charsets(THD *thd, const char *wild)
for ( cs= all_charsets ; cs < all_charsets+255 ; cs++ )
{
if (cs[0] && (cs[0]->state & MY_CS_PRIMARY) && !(wild && wild[0] &&
wild_case_compare(system_charset_info,cs[0]->name,wild)))
if (cs[0] && (cs[0]->state & MY_CS_PRIMARY) &&
(cs[0]->state & MY_CS_AVAILABLE) &&
!(wild && wild[0] &&
wild_case_compare(system_charset_info,cs[0]->csname,wild)))
{
if (write_charset(protocol, cs[0]))
goto err;