database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Separating CHARSET and COLLATION terms

Browse Source
This commit is contained in:
bar@bar.mysql.r18.ru
2003-01-09 15:37:59 +04:00
parent 4df915a7b5
commit a89df5a096
14 changed files with 270 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_db.cc
View File

@ -676,9 +676,13 @@ int mysqld_show_create_db(THD *thd, const char *dbname,
to=strxmov(to,"`",dbname,"`", NullS);
if (create.table_charset)
to= strxmov(to," /*!40100 DEFAULT CHARACTER SET ",
create.table_charset->name,"*/",NullS);
{
int cl= (create.table_charset->state & MY_CS_PRIMARY) ? 0 : 1;
to= strxmov(to," /*!40100"
" DEFAULT CHARACTER SET ",create.table_charset->csname,
cl ? " COLLATE " : "", cl ? create.table_charset->name : "",
" */",NullS);
}
protocol->store(path, (uint) (to-path));
if (protocol->write())