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

Merge mysql.com:/home/cps/mysql/trees/mysql-4.1

Browse Source 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
This commit is contained in:
petr@mysql.com
2005-04-14 01:57:52 +04:00
parent f7d89dd468 75cfee68fb
commit da9a6aecad
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mysys/default.c
View File

@@ -513,15 +513,16 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
/* trim trailing whitespace from directory name */
end= ptr + strlen(ptr) - 1;
/*
This would work fine even if no whitespaces are met
since fgets() stores the newline character in the buffer
*/
for (; my_isspace(&my_charset_latin1, *(end - 1)); end--)
{}
end[0]= 0;
/* fgets() stores the newline character in the buffer */
if ((end[0] == '\n') || (end[0] == '\r') ||
my_isspace(&my_charset_latin1, end[0]))
{
for (; my_isspace(&my_charset_latin1, *(end - 1)); end--)
{}
end[0]= 0;
}
/* print error msg if there is nothing after !inludedir directive */
/* print error msg if there is nothing after !includedir directive */
if (end == ptr)
{
fprintf(stderr,
@@ -539,7 +540,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
search_file= search_dir->dir_entry + i;
ext= fn_ext(search_file->name);
/* check extenstion */
/* check extension */
for (tmp_ext= (char**) f_extensions; *tmp_ext; *tmp_ext++)
{
if (!strcmp(ext, *tmp_ext))
@@ -587,6 +588,14 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
continue;
}
else
if (recursion_level >= max_recursion_level)
{
fprintf(stderr,
"warning: skipping !include directive as maximum include"
"recursion level was reached in file %s at line %d\n",
name, line);
}
if (*ptr == '[') /* Group name */
{

3
sql/ha_innodb.cc
View File

@@ -6136,7 +6136,8 @@ ha_innobase::store_lock(
(lock_type == TL_READ_HIGH_PRIORITY && thd->in_lock_tables) ||
lock_type == TL_READ_WITH_SHARED_LOCKS ||
lock_type == TL_READ_NO_INSERT ||
thd->lex->sql_command != SQLCOM_SELECT) {
(thd->lex->sql_command != SQLCOM_SELECT
&& lock_type != TL_IGNORE)) {
/* The OR cases above are in this order:
1) MySQL is doing LOCK TABLES ... READ LOCAL, or