database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

after merge fixes

Browse Source 
innobase/os/os0file.c:
  after merge fix
sql/ha_innodb.cc:
  after merge fix
sql/sql_select.cc:
  after merge fix (The patch for 4.0 didn't make sence in 4.1)
This commit is contained in:
unknown
2004-06-02 12:13:49 +03:00
parent 5bf17d04f5
commit b94f62f766
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
innobase/os/os0file.c
View File

@@ -539,7 +539,7 @@ os_file_opendir(
if (dir == INVALID_HANDLE_VALUE) {
if (error_is_fatal) {
os_file_handle_error(NULL, dirname, "opendir");
os_file_handle_error(dirname, "opendir");
}
return(NULL);
@@ -550,7 +550,7 @@ os_file_opendir(
dir = opendir(dirname);
if (dir == NULL && error_is_fatal) {
os_file_handle_error(0, dirname, "opendir");
os_file_handle_error(dirname, "opendir");
}
return(dir);
@@ -733,7 +733,7 @@ os_file_create_directory(
if (!(rcode != 0 ||
(GetLastError() == ERROR_FILE_EXISTS && !fail_if_exists))) {
/* failure */
os_file_handle_error(NULL, pathname, "CreateDirectory");
os_file_handle_error(Npathname, "CreateDirectory");
return(FALSE);
}
@@ -746,7 +746,7 @@ os_file_create_directory(
if (!(rcode == 0 || (errno == EEXIST && !fail_if_exists))) {
/* failure */
os_file_handle_error(0, pathname, "mkdir");
os_file_handle_error(pathname, "mkdir");
return(FALSE);
}
@@ -1274,7 +1274,7 @@ loop:
ret = unlink((const char*)name);
if (ret != 0 && errno != ENOENT) {
os_file_handle_error(0, name, "delete");
os_file_handle_error(name, "delete");
return(FALSE);
}
@@ -1336,7 +1336,7 @@ loop:
ret = unlink((const char*)name);
if (ret != 0) {
os_file_handle_error(0, name, "delete");
os_file_handle_error(name, "delete");
return(FALSE);
}
@@ -1366,7 +1366,7 @@ os_file_rename(
return(TRUE);
}
os_file_handle_error(NULL, oldpath, "rename");
os_file_handle_error(oldpath, "rename");
return(FALSE);
#else
@@ -1375,7 +1375,7 @@ os_file_rename(
ret = rename((const char*)oldpath, (const char*)newpath);
if (ret != 0) {
os_file_handle_error(0, oldpath, "rename");
os_file_handle_error(oldpath, "rename");
return(FALSE);
}

4
sql/ha_innodb.cc
View File

@@ -4677,8 +4677,8 @@ ha_innobase::start_stmt(
ut_error;
}
if (thd->lex.sql_command == SQLCOM_SELECT
&& thd->lex.lock_option == TL_READ) {
if (thd->lex->sql_command == SQLCOM_SELECT
&& thd->lex->lock_option == TL_READ) {
/* For other than temporary tables, we obtain
no lock for consistent read (plain SELECT) */

4
sql/sql_select.cc
View File

@@ -6463,11 +6463,7 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
if (error > 0)
DBUG_RETURN(-1); /* purecov: inspected */
if (end_of_records)
{
if (!error)
join->send_records++;
DBUG_RETURN(0);
}
if (join->send_records >= join->unit->select_limit_cnt &&
join->do_send_rows)
{