Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
2772d9e1
Commit
2772d9e1
authored
Nov 02, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
parents
07978008
aae0caf6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
client/mysql.cc
client/mysql.cc
+2
-0
mysys/my_lock.c
mysys/my_lock.c
+1
-1
No files found.
client/mysql.cc
View file @
2772d9e1
...
...
@@ -2012,6 +2012,8 @@ com_go(String *buffer,char *line __attribute__((unused)))
(
long
)
mysql_num_rows
(
result
),
(
long
)
mysql_num_rows
(
result
)
==
1
?
"row"
:
"rows"
);
end_pager
();
if
(
mysql_errno
(
&
mysql
))
error
=
put_error
(
&
mysql
);
}
}
else
if
(
mysql_affected_rows
(
&
mysql
)
==
~
(
ulonglong
)
0
)
...
...
mysys/my_lock.c
View file @
2772d9e1
...
...
@@ -111,7 +111,7 @@ int my_lock(File fd, int locktype, my_off_t start, my_off_t length,
#elif defined(HAVE_LOCKING)
/* Windows */
{
my_bool
error
=
false
;
my_bool
error
=
FALSE
;
pthread_mutex_lock
(
&
my_file_info
[
fd
].
mutex
);
if
(
MyFlags
&
MY_SEEK_NOT_DONE
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment