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
53d05f4a
Commit
53d05f4a
authored
Jun 01, 2004
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed compiler warnings
parent
197fcf1e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
libmysqld/Makefile.am
libmysqld/Makefile.am
+0
-1
mysql-test/r/func_gconcat.result
mysql-test/r/func_gconcat.result
+1
-1
sql/share/romanian/errmsg.txt
sql/share/romanian/errmsg.txt
+1
-1
sql/sql_insert.cc
sql/sql_insert.cc
+6
-3
No files found.
libmysqld/Makefile.am
View file @
53d05f4a
...
...
@@ -22,7 +22,6 @@ MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
DEFS
=
-DEMBEDDED_LIBRARY
-DMYSQL_SERVER
\
-DNO_EMBEDDED_ACCESS_CHECKS
\
-DDEFAULT_MYSQL_HOME
=
"
\"
$(MYSQLBASEdir)
\"
"
\
-DDATADIR
=
"
\"
$(MYSQLDATAdir)
\"
"
\
-DSHAREDIR
=
"
\"
$(MYSQLSHAREdir)
\"
"
...
...
mysql-test/r/func_gconcat.result
View file @
53d05f4a
sql/share/romanian/errmsg.txt
View file @
53d05f4a
...
...
@@ -192,7 +192,7 @@ character-set=latin2
"Got error %d during FLUSH_LOGS",
"Got error %d during CHECKPOINT",
"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
"The handler for the table does not support binary table dump",
"Binlog closed while trying to FLUSH MASTER",
"The handler for the table does not support binary table dump",
"Binlog closed while trying to FLUSH MASTER",
"Failed rebuilding the index of dumped table '%-.64s'",
"Error from master: '%-.64s'",
...
...
sql/sql_insert.cc
View file @
53d05f4a
...
...
@@ -1199,7 +1199,8 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg)
/* request for new delayed insert */
if
(
!
(
thd
->
lock
=
mysql_lock_tables
(
thd
,
&
di
->
table
,
1
)))
{
di
->
dead
=
thd
->
killed
=
1
;
// Fatal error
di
->
dead
=
1
;
// Some fatal error
thd
->
killed
=
1
;
}
pthread_cond_broadcast
(
&
di
->
cond_client
);
}
...
...
@@ -1207,7 +1208,8 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg)
{
if
(
di
->
handle_inserts
())
{
di
->
dead
=
thd
->
killed
=
1
;
// Some fatal error
di
->
dead
=
1
;
// Some fatal error
thd
->
killed
=
1
;
}
}
di
->
status
=
0
;
...
...
@@ -1234,7 +1236,8 @@ end:
close_thread_tables
(
thd
);
// Free the table
di
->
table
=
0
;
di
->
dead
=
thd
->
killed
=
1
;
// If error
di
->
dead
=
1
;
// If error
thd
->
killed
=
1
;
pthread_cond_broadcast
(
&
di
->
cond_client
);
// Safety
pthread_mutex_unlock
(
&
di
->
mutex
);
...
...
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