1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

after merge fix

Browse Source
This commit is contained in:
gluh@mysql.com/gluh.(none) 2006-09-28 18:00:44 +05:00
parent b7e59b7085
commit 353c5bd154
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/log.h
View File

@ -177,7 +177,7 @@ public:
pthread_mutex_t LOCK_log; pthread_mutex_t LOCK_log;
char *name; char *name;
char log_file_name[FN_REFLEN]; char log_file_name[FN_REFLEN];
char time_buff[20], db[NAME_BYTE_LEN + 1]; char time_buff[20], db[NAME_LEN + 1];
bool write_error, inited; bool write_error, inited;
IO_CACHE log_file; IO_CACHE log_file;
enum_log_type log_type; enum_log_type log_type;

4
sql/sp.cc
View File

@ -414,8 +414,8 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
sp_rcontext *old_spcont= thd->spcont; sp_rcontext *old_spcont= thd->spcont;
char definer_user_name_holder[USERNAME_LENGTH + 1]; char definer_user_name_holder[USERNAME_LENGTH + 1];
LEX_STRING_WITH_INIT definer_user_name(definer_user_name_holder, LEX_STRING definer_user_name= { definer_user_name_holder,
USERNAME_LENGTH); USERNAME_LENGTH };
char definer_host_name_holder[HOSTNAME_LENGTH + 1]; char definer_host_name_holder[HOSTNAME_LENGTH + 1];
LEX_STRING definer_host_name= { definer_host_name_holder, HOSTNAME_LENGTH }; LEX_STRING definer_host_name= { definer_host_name_holder, HOSTNAME_LENGTH };

2
sql/sp_head.cc
View File

@ -2011,7 +2011,7 @@ void
sp_head::set_definer(const char *definer, uint definerlen) sp_head::set_definer(const char *definer, uint definerlen)
{ {
char user_name_holder[USERNAME_LENGTH + 1]; char user_name_holder[USERNAME_LENGTH + 1];
LEX_STRING_WITH_INIT user_name(user_name_holder, USERNAME_LENGTH); LEX_STRING user_name= { user_name_holder, USERNAME_LENGTH };
char host_name_holder[HOSTNAME_LENGTH + 1]; char host_name_holder[HOSTNAME_LENGTH + 1];
LEX_STRING host_name= { host_name_holder, HOSTNAME_LENGTH }; LEX_STRING host_name= { host_name_holder, HOSTNAME_LENGTH };

1
sql/table.cc
View File

@ -2277,7 +2277,6 @@ bool check_db_name(char *name)
name += len; name += len;
continue; continue;
} }
name_length++;
} }
#else #else
last_char_is_space= *name==' '; last_char_is_space= *name==' ';