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

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
This commit is contained in:
bell@sanja.is.com.ua
2003-01-29 19:46:11 +02:00
parent 214036a7f6 984fb30f2a
commit 9525a58132
44 changed files with 4732 additions and 4366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -2738,7 +2738,7 @@ mysql_execute_command(THD *thd)
if (user->password.str &&
(strcmp(thd->user,user->user.str) ||
user->host.str &&
my_strcasecmp(my_charset_latin1,
my_strcasecmp(&my_charset_latin1,
user->host.str, thd->host_or_ip)))
{
if (check_access(thd, UPDATE_ACL, "mysql",0,1))
@ -3421,7 +3421,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
/* Convert long CHAR() and VARCHAR columns to TEXT or BLOB */
new_field->sql_type= FIELD_TYPE_BLOB;
sprintf(warn_buff, ER(ER_AUTO_CONVERT), field_name, "CHAR",
(cs == my_charset_bin) ? "BLOB" : "TEXT");
(cs == &my_charset_bin) ? "BLOB" : "TEXT");
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_AUTO_CONVERT,
warn_buff);
/* fall through */