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
512e4b5e
Commit
512e4b5e
authored
17 years ago
by
joerg@trift2
Browse files
Options
Browse Files
Download
Plain Diff
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
parents
39e900e5
79677b75
Branches unavailable
Tags unavailable
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
5 deletions
+29
-5
configure.in
configure.in
+12
-4
libmysql/libmysql.c
libmysql/libmysql.c
+15
-0
sql/field.cc
sql/field.cc
+1
-0
sql/field.h
sql/field.h
+1
-1
No files found.
configure.in
View file @
512e4b5e
...
...
@@ -71,14 +71,22 @@ AC_SUBST(AVAILABLE_LANGUAGES)
# Canonicalize the configuration name.
SYSTEM_TYPE
=
"
$host_vendor
-
$host_os
"
MACHINE_TYPE
=
"
$host_cpu
"
# Check whether --with-system-type or --without-system-type was given.
AC_ARG_WITH
(
system-type,
[
--with-system-type
Set the system
type
, like
"sun-solaris10"
]
,
[
SYSTEM_TYPE
=
"
$withval
"
]
,
[
SYSTEM_TYPE
=
"
$host_vendor
-
$host_os
"
])
AC_ARG_WITH
(
machine-type,
[
--with-machine-type
Set the machine
type
, like
"powerpc"
]
,
[
MACHINE_TYPE
=
"
$withval
"
]
,
[
MACHINE_TYPE
=
"
$host_cpu
"
])
AC_SUBST
(
SYSTEM_TYPE
)
AC_DEFINE_UNQUOTED
([
SYSTEM_TYPE],
[
"
$SYSTEM_TYPE
"
]
,
[
Name of system, eg solaris]
)
[
Name of system, eg s
un-s
olaris]
)
AC_SUBST
(
MACHINE_TYPE
)
AC_DEFINE_UNQUOTED
([
MACHINE_TYPE],
[
"
$MACHINE_TYPE
"
]
,
[
Machine
type
name, eg s
un10
]
)
[
Machine
type
name, eg s
parc
]
)
# Detect intel x86 like processor
BASE_MACHINE_TYPE
=
$MACHINE_TYPE
...
...
This diff is collapsed.
Click to expand it.
libmysql/libmysql.c
View file @
512e4b5e
...
...
@@ -168,8 +168,23 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
}
/*
Free all memory and resources used by the client library
NOTES
When calling this there should not be any other threads using
the library.
To make things simpler when used with windows dll's (which calls this
function automaticly), it's safe to call this function multiple times.
*/
void
STDCALL
mysql_server_end
()
{
if
(
!
mysql_client_init
)
return
;
#ifdef EMBEDDED_LIBRARY
end_embedded_server
();
#endif
...
...
This diff is collapsed.
Click to expand it.
sql/field.cc
View file @
512e4b5e
...
...
@@ -6457,6 +6457,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
is 2.
****************************************************************************/
const
uint
Field_varstring
::
MAX_SIZE
=
UINT_MAX16
;
int
Field_varstring
::
store
(
const
char
*
from
,
uint
length
,
CHARSET_INFO
*
cs
)
{
...
...
This diff is collapsed.
Click to expand it.
sql/field.h
View file @
512e4b5e
...
...
@@ -1183,7 +1183,7 @@ class Field_varstring :public Field_longstr {
The maximum space available in a Field_varstring, in bytes. See
length_bytes.
*/
static
const
uint
MAX_SIZE
=
UINT_MAX16
;
static
const
uint
MAX_SIZE
;
/* Store number of bytes used to store length (1 or 2) */
uint32
length_bytes
;
Field_varstring
(
uchar
*
ptr_arg
,
...
...
This diff is collapsed.
Click to expand it.
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