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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
655d344b
Commit
655d344b
authored
Aug 18, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
parents
eda1afe2
55fb3cae
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
server-tools/instance-manager/instance.cc
server-tools/instance-manager/instance.cc
+0
-1
sql/item_geofunc.cc
sql/item_geofunc.cc
+1
-1
No files found.
server-tools/instance-manager/instance.cc
View file @
655d344b
...
...
@@ -512,7 +512,6 @@ int Instance::stop()
*/
waitchild
=
options
.
shutdown_delay_val
;
}
}
kill_instance
(
SIGTERM
);
/* sleep on condition to wait for SIGCHLD */
...
...
sql/item_geofunc.cc
View file @
655d344b
...
...
@@ -27,7 +27,7 @@
Field
*
Item_geometry_func
::
tmp_table_field
(
TABLE
*
t_arg
)
{
return
new
Field_geom
(
max_length
,
maybe_null
,
name
,
t_arg
,
return
new
Field_geom
(
max_length
,
maybe_null
,
name
,
t_arg
->
s
,
(
Field
::
geometry_type
)
get_geometry_type
());
}
...
...
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