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
6f279f40
Commit
6f279f40
authored
Nov 30, 2010
by
Michael Widenius
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge with 5.1-release
parents
0906d9e9
d54f869f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
configure.in
configure.in
+1
-0
mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
+1
-0
mysys/charset.c
mysys/charset.c
+2
-0
storage/xtradb/srv/srv0srv.c
storage/xtradb/srv/srv0srv.c
+3
-3
No files found.
configure.in
View file @
6f279f40
...
@@ -123,6 +123,7 @@ then
...
@@ -123,6 +123,7 @@ then
fi
fi
# Whether the maintainer mode should be enabled.
# Whether the maintainer mode should be enabled.
# Note that this uses $with_debug and $with_valgrind
MY_MAINTAINER_MODE
MY_MAINTAINER_MODE
# Canonicalize the configuration name.
# Canonicalize the configuration name.
...
...
mysql-test/suite/innodb_plugin/t/innodb_bug56680.test
View file @
6f279f40
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
# Bug #56680 InnoDB may return wrong results from a case-insensitive index
# Bug #56680 InnoDB may return wrong results from a case-insensitive index
#
#
--
source
include
/
have_innodb_plugin
.
inc
--
source
include
/
have_innodb_plugin
.
inc
--
source
include
/
not_valgrind
.
inc
--
disable_query_log
--
disable_query_log
SET
@
tx_isolation_orig
=
@@
tx_isolation
;
SET
@
tx_isolation_orig
=
@@
tx_isolation
;
...
...
mysys/charset.c
View file @
6f279f40
...
@@ -202,6 +202,7 @@ static my_bool simple_cs_is_full(CHARSET_INFO *cs)
...
@@ -202,6 +202,7 @@ static my_bool simple_cs_is_full(CHARSET_INFO *cs)
}
}
#if defined(HAVE_UCA_COLLATIONS) && (defined(HAVE_CHARSET_ucs2) || defined(HAVE_CHARSET_utf8))
static
void
static
void
copy_uca_collation
(
CHARSET_INFO
*
to
,
CHARSET_INFO
*
from
)
copy_uca_collation
(
CHARSET_INFO
*
to
,
CHARSET_INFO
*
from
)
{
{
...
@@ -215,6 +216,7 @@ copy_uca_collation(CHARSET_INFO *to, CHARSET_INFO *from)
...
@@ -215,6 +216,7 @@ copy_uca_collation(CHARSET_INFO *to, CHARSET_INFO *from)
to
->
state
|=
MY_CS_AVAILABLE
|
MY_CS_LOADED
|
to
->
state
|=
MY_CS_AVAILABLE
|
MY_CS_LOADED
|
MY_CS_STRNXFRM
|
MY_CS_UNICODE
;
MY_CS_STRNXFRM
|
MY_CS_UNICODE
;
}
}
#endif
static
int
add_collation
(
CHARSET_INFO
*
cs
)
static
int
add_collation
(
CHARSET_INFO
*
cs
)
...
...
storage/xtradb/srv/srv0srv.c
View file @
6f279f40
...
@@ -1125,7 +1125,7 @@ srv_conc_enter_innodb_timer_based(trx_t* trx)
...
@@ -1125,7 +1125,7 @@ srv_conc_enter_innodb_timer_based(trx_t* trx)
enter_innodb_with_tickets
(
trx
);
enter_innodb_with_tickets
(
trx
);
return
;
return
;
}
}
os_atomic_increment_lint
(
&
srv_conc_n_threads
,
-
1
);
(
void
)
os_atomic_increment_lint
(
&
srv_conc_n_threads
,
-
1
);
}
}
if
(
!
has_yielded
)
if
(
!
has_yielded
)
{
{
...
@@ -1155,7 +1155,7 @@ srv_conc_enter_innodb_timer_based(trx_t* trx)
...
@@ -1155,7 +1155,7 @@ srv_conc_enter_innodb_timer_based(trx_t* trx)
static
void
static
void
srv_conc_exit_innodb_timer_based
(
trx_t
*
trx
)
srv_conc_exit_innodb_timer_based
(
trx_t
*
trx
)
{
{
os_atomic_increment_lint
(
&
srv_conc_n_threads
,
-
1
);
(
void
)
os_atomic_increment_lint
(
&
srv_conc_n_threads
,
-
1
);
trx
->
declared_to_be_inside_innodb
=
FALSE
;
trx
->
declared_to_be_inside_innodb
=
FALSE
;
trx
->
n_tickets_to_enter_innodb
=
0
;
trx
->
n_tickets_to_enter_innodb
=
0
;
return
;
return
;
...
@@ -1362,7 +1362,7 @@ srv_conc_force_enter_innodb(
...
@@ -1362,7 +1362,7 @@ srv_conc_force_enter_innodb(
ut_ad
(
srv_conc_n_threads
>=
0
);
ut_ad
(
srv_conc_n_threads
>=
0
);
#ifdef HAVE_ATOMIC_BUILTINS
#ifdef HAVE_ATOMIC_BUILTINS
if
(
srv_thread_concurrency_timer_based
)
{
if
(
srv_thread_concurrency_timer_based
)
{
os_atomic_increment_lint
(
&
srv_conc_n_threads
,
1
);
(
void
)
os_atomic_increment_lint
(
&
srv_conc_n_threads
,
1
);
trx
->
declared_to_be_inside_innodb
=
TRUE
;
trx
->
declared_to_be_inside_innodb
=
TRUE
;
trx
->
n_tickets_to_enter_innodb
=
1
;
trx
->
n_tickets_to_enter_innodb
=
1
;
return
;
return
;
...
...
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