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
27095a24
Commit
27095a24
authored
Nov 12, 2011
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Plain Diff
5.1 merge
parents
755cd443
5c7aa5f2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
plugin/feedback/utils.cc
plugin/feedback/utils.cc
+9
-8
sql-common/my_time.c
sql-common/my_time.c
+1
-1
sql/records.cc
sql/records.cc
+1
-1
storage/xtradb/handler/ha_innodb.cc
storage/xtradb/handler/ha_innodb.cc
+1
-1
No files found.
plugin/feedback/utils.cc
View file @
27095a24
...
@@ -188,24 +188,24 @@ int fill_plugin_version(THD *thd, TABLE_LIST *tables)
...
@@ -188,24 +188,24 @@ int fill_plugin_version(THD *thd, TABLE_LIST *tables)
*/
*/
static
ulonglong
my_getphysmem
()
static
ulonglong
my_getphysmem
()
{
{
#ifdef _WIN32
MEMORYSTATUSEX
memstatus
;
memstatus
.
dwLength
=
sizeof
(
memstatus
);
GlobalMemoryStatusEx
(
&
memstatus
);
return
memstatus
.
ullTotalPhys
;
#else
ulonglong
pages
=
0
;
ulonglong
pages
=
0
;
#ifdef _SC_PHYS_PAGES
#ifdef _SC_PHYS_PAGES
pages
=
sysconf
(
_SC_PHYS_PAGES
);
pages
=
sysconf
(
_SC_PHYS_PAGES
);
#else
return
0
;
#endif
#endif
#ifdef _SC_PAGESIZE
#ifdef _SC_PAGESIZE
return
pages
*
sysconf
(
_SC_PAGESIZE
);
return
pages
*
sysconf
(
_SC_PAGESIZE
);
#endif
#ifdef _WIN32
MEMORYSTATUSEX
memstatus
;
memstatus
.
dwLength
=
sizeof
(
memstatus
);
GlobalMemoryStatusEx
(
&
memstatus
);
return
memstatus
.
ullTotalPhys
;
#else
#else
return
pages
*
my_getpagesize
();
return
pages
*
my_getpagesize
();
#endif
#endif
#endif
}
}
/* get the number of (online) CPUs */
/* get the number of (online) CPUs */
...
@@ -356,6 +356,7 @@ int fill_misc_data(THD *thd, TABLE_LIST *tables)
...
@@ -356,6 +356,7 @@ int fill_misc_data(THD *thd, TABLE_LIST *tables)
INSERT1
(
"Cpu_count"
,
(
my_getncpus
(),
UNSIGNED
));
INSERT1
(
"Cpu_count"
,
(
my_getncpus
(),
UNSIGNED
));
#endif
#endif
INSERT1
(
"Mem_total"
,
(
my_getphysmem
(),
UNSIGNED
));
INSERT1
(
"Mem_total"
,
(
my_getphysmem
(),
UNSIGNED
));
INSERT1
(
"Now"
,
(
thd
->
query_start
(),
UNSIGNED
));
return
0
;
return
0
;
}
}
...
...
sql-common/my_time.c
View file @
27095a24
...
@@ -337,7 +337,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
...
@@ -337,7 +337,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
{
{
if
(
str
[
0
]
==
'p'
||
str
[
0
]
==
'P'
)
if
(
str
[
0
]
==
'p'
||
str
[
0
]
==
'P'
)
add_hours
=
12
;
add_hours
=
12
;
else
if
(
str
[
0
]
!=
'a'
||
str
[
0
]
!=
'A'
)
else
if
(
str
[
0
]
!=
'a'
&&
str
[
0
]
!=
'A'
)
continue
;
/* Not AM/PM */
continue
;
/* Not AM/PM */
str
+=
2
;
/* Skip AM/PM */
str
+=
2
;
/* Skip AM/PM */
/* Skip space after AM/PM */
/* Skip space after AM/PM */
...
...
sql/records.cc
View file @
27095a24
...
@@ -627,7 +627,7 @@ static int rr_cmp(uchar *a,uchar *b)
...
@@ -627,7 +627,7 @@ static int rr_cmp(uchar *a,uchar *b)
if
(
a
[
4
]
!=
b
[
4
])
if
(
a
[
4
]
!=
b
[
4
])
return
(
int
)
a
[
4
]
-
(
int
)
b
[
4
];
return
(
int
)
a
[
4
]
-
(
int
)
b
[
4
];
if
(
a
[
5
]
!=
b
[
5
])
if
(
a
[
5
]
!=
b
[
5
])
return
(
int
)
a
[
1
]
-
(
int
)
b
[
5
];
return
(
int
)
a
[
5
]
-
(
int
)
b
[
5
];
if
(
a
[
6
]
!=
b
[
6
])
if
(
a
[
6
]
!=
b
[
6
])
return
(
int
)
a
[
6
]
-
(
int
)
b
[
6
];
return
(
int
)
a
[
6
]
-
(
int
)
b
[
6
];
return
(
int
)
a
[
7
]
-
(
int
)
b
[
7
];
return
(
int
)
a
[
7
]
-
(
int
)
b
[
7
];
...
...
storage/xtradb/handler/ha_innodb.cc
View file @
27095a24
...
@@ -6972,7 +6972,7 @@ ha_innobase::create(
...
@@ -6972,7 +6972,7 @@ ha_innobase::create(
if
(
srv_file_per_table
if
(
srv_file_per_table
&&
!
mysqld_embedded
&&
!
mysqld_embedded
&&
(
!
create_info
->
options
&
HA_LEX_CREATE_TMP_TABLE
))
{
&&
!
(
create_info
->
options
&
HA_LEX_CREATE_TMP_TABLE
))
{
if
((
name
[
1
]
==
':'
)
if
((
name
[
1
]
==
':'
)
||
(
name
[
0
]
==
'\\'
&&
name
[
1
]
==
'\\'
))
{
||
(
name
[
0
]
==
'\\'
&&
name
[
1
]
==
'\\'
))
{
...
...
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