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
1c19f191
Commit
1c19f191
authored
Jul 17, 2007
by
joerg@trift2
Browse files
Options
Browse Files
Download
Plain Diff
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
parents
948ba7b7
f4e73e7c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
6 deletions
+17
-6
configure.in
configure.in
+12
-4
server-tools/instance-manager/listener.cc
server-tools/instance-manager/listener.cc
+3
-1
sql/field.cc
sql/field.cc
+1
-0
sql/field.h
sql/field.h
+1
-1
No files found.
configure.in
View file @
1c19f191
...
@@ -100,14 +100,22 @@ AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS], ["$NDB_VERSION_STATUS"],
...
@@ -100,14 +100,22 @@ AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS], ["$NDB_VERSION_STATUS"],
# Canonicalize the configuration name.
# 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_SUBST
(
SYSTEM_TYPE
)
AC_DEFINE_UNQUOTED
([
SYSTEM_TYPE],
[
"
$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_SUBST
(
MACHINE_TYPE
)
AC_DEFINE_UNQUOTED
([
MACHINE_TYPE],
[
"
$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
# Detect intel x86 like processor
BASE_MACHINE_TYPE
=
$MACHINE_TYPE
BASE_MACHINE_TYPE
=
$MACHINE_TYPE
...
...
server-tools/instance-manager/listener.cc
View file @
1c19f191
...
@@ -67,7 +67,7 @@ class Listener_thread: public Listener_thread_args
...
@@ -67,7 +67,7 @@ class Listener_thread: public Listener_thread_args
~
Listener_thread
();
~
Listener_thread
();
void
run
();
void
run
();
private:
private:
static
const
int
LISTEN_BACK_LOG_SIZE
=
5
;
/* standard backlog size */
static
const
int
LISTEN_BACK_LOG_SIZE
;
ulong
total_connection_count
;
ulong
total_connection_count
;
Thread_info
thread_info
;
Thread_info
thread_info
;
...
@@ -80,6 +80,8 @@ class Listener_thread: public Listener_thread_args
...
@@ -80,6 +80,8 @@ class Listener_thread: public Listener_thread_args
int
create_unix_socket
(
struct
sockaddr_un
&
unix_socket_address
);
int
create_unix_socket
(
struct
sockaddr_un
&
unix_socket_address
);
};
};
const
int
Listener_thread
::
LISTEN_BACK_LOG_SIZE
=
5
;
/* standard backlog size */
Listener_thread
::
Listener_thread
(
const
Listener_thread_args
&
args
)
:
Listener_thread
::
Listener_thread
(
const
Listener_thread_args
&
args
)
:
Listener_thread_args
(
args
.
thread_registry
,
args
.
options
,
args
.
user_map
,
Listener_thread_args
(
args
.
thread_registry
,
args
.
options
,
args
.
user_map
,
...
...
sql/field.cc
View file @
1c19f191
...
@@ -6270,6 +6270,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
...
@@ -6270,6 +6270,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
is 2.
is 2.
****************************************************************************/
****************************************************************************/
const
uint
Field_varstring
::
MAX_SIZE
=
UINT_MAX16
;
int
Field_varstring
::
store
(
const
char
*
from
,
uint
length
,
CHARSET_INFO
*
cs
)
int
Field_varstring
::
store
(
const
char
*
from
,
uint
length
,
CHARSET_INFO
*
cs
)
{
{
...
...
sql/field.h
View file @
1c19f191
...
@@ -1116,7 +1116,7 @@ class Field_varstring :public Field_longstr {
...
@@ -1116,7 +1116,7 @@ class Field_varstring :public Field_longstr {
The maximum space available in a Field_varstring, in bytes. See
The maximum space available in a Field_varstring, in bytes. See
length_bytes.
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) */
/* Store number of bytes used to store length (1 or 2) */
uint32
length_bytes
;
uint32
length_bytes
;
Field_varstring
(
char
*
ptr_arg
,
Field_varstring
(
char
*
ptr_arg
,
...
...
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