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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
0831699f
Commit
0831699f
authored
Dec 31, 2006
by
holyfoot/hf@mysql.com/hfmain.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/d2/hf/clean/my41-clean
into mysql.com:/d2/hf/common/my41-common
parents
d9b9778e
f83bedab
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
1 deletion
+14
-1
libmysqld/examples/test-run
libmysqld/examples/test-run
+1
-1
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+4
-0
mysql-test/t/delayed.test
mysql-test/t/delayed.test
+2
-0
mysql-test/t/innodb.test
mysql-test/t/innodb.test
+3
-0
sql/item_func.cc
sql/item_func.cc
+4
-0
No files found.
libmysqld/examples/test-run
View file @
0831699f
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
top_builddir
=
../..
top_builddir
=
../..
mysql_test_dir
=
$top_builddir
/mysql-test
mysql_test_dir
=
$top_builddir
/mysql-test
examples
=
$top_builddir
/libmysqld/examples
examples
=
$top_builddir
/libmysqld/examples
mysqltest
=
$examples
/mysqltest
mysqltest
=
$examples
/mysqltest
_embedded
datadir
=
$mysql_test_dir
/var/master-data
datadir
=
$mysql_test_dir
/var/master-data
test_data_dir
=
test
test_data_dir
=
test
gdb
=
0
gdb
=
0
...
...
libmysqld/lib_sql.cc
View file @
0831699f
...
@@ -521,6 +521,7 @@ void *create_embedded_thd(int client_flag)
...
@@ -521,6 +521,7 @@ void *create_embedded_thd(int client_flag)
thd
->
set_time
();
thd
->
set_time
();
thd
->
init_for_queries
();
thd
->
init_for_queries
();
thd
->
client_capabilities
=
client_flag
;
thd
->
client_capabilities
=
client_flag
;
thd
->
real_id
=
(
pthread_t
)
thd
;
thd
->
db
=
NULL
;
thd
->
db
=
NULL
;
thd
->
db_length
=
0
;
thd
->
db_length
=
0
;
...
@@ -819,6 +820,9 @@ void Protocol_simple::prepare_for_resend()
...
@@ -819,6 +820,9 @@ void Protocol_simple::prepare_for_resend()
DBUG_ENTER
(
"send_data"
);
DBUG_ENTER
(
"send_data"
);
if
(
!
thd
->
mysql
)
// bootstrap file handling
DBUG_VOID_RETURN
;
if
(
!
data
)
if
(
!
data
)
{
{
if
(
!
(
data
=
(
MYSQL_DATA
*
)
my_malloc
(
sizeof
(
MYSQL_DATA
),
if
(
!
(
data
=
(
MYSQL_DATA
*
)
my_malloc
(
sizeof
(
MYSQL_DATA
),
...
...
mysql-test/t/delayed.test
View file @
0831699f
# delayed works differently in embedded server
--
source
include
/
not_embedded
.
inc
#
#
# test of DELAYED insert and timestamps
# test of DELAYED insert and timestamps
# (Can't be tested with purify :( )
# (Can't be tested with purify :( )
...
...
mysql-test/t/innodb.test
View file @
0831699f
...
@@ -1299,6 +1299,7 @@ drop table test_checksum;
...
@@ -1299,6 +1299,7 @@ drop table test_checksum;
set
foreign_key_checks
=
0
;
set
foreign_key_checks
=
0
;
create
table
t2
(
a
int
primary
key
,
b
int
,
foreign
key
(
b
)
references
t1
(
a
))
engine
=
innodb
;
create
table
t2
(
a
int
primary
key
,
b
int
,
foreign
key
(
b
)
references
t1
(
a
))
engine
=
innodb
;
--
replace_result
\\
/
$MYSQL_TEST_DIR
.
/
var
/
master
-
data
/
/
--
error
1005
--
error
1005
create
table
t1
(
a
char
(
10
)
primary
key
,
b
varchar
(
20
))
engine
=
innodb
;
create
table
t1
(
a
char
(
10
)
primary
key
,
b
varchar
(
20
))
engine
=
innodb
;
set
foreign_key_checks
=
1
;
set
foreign_key_checks
=
1
;
...
@@ -1309,6 +1310,7 @@ drop table t2;
...
@@ -1309,6 +1310,7 @@ drop table t2;
set
foreign_key_checks
=
0
;
set
foreign_key_checks
=
0
;
create
table
t1
(
a
varchar
(
10
)
primary
key
)
engine
=
innodb
DEFAULT
CHARSET
=
latin1
;
create
table
t1
(
a
varchar
(
10
)
primary
key
)
engine
=
innodb
DEFAULT
CHARSET
=
latin1
;
--
replace_result
\\
/
$MYSQL_TEST_DIR
.
/
var
/
master
-
data
/
/
--
error
1005
--
error
1005
create
table
t2
(
a
varchar
(
10
),
foreign
key
(
a
)
references
t1
(
a
))
engine
=
innodb
DEFAULT
CHARSET
=
utf8
;
create
table
t2
(
a
varchar
(
10
),
foreign
key
(
a
)
references
t1
(
a
))
engine
=
innodb
DEFAULT
CHARSET
=
utf8
;
set
foreign_key_checks
=
1
;
set
foreign_key_checks
=
1
;
...
@@ -1338,6 +1340,7 @@ drop table t2,t1;
...
@@ -1338,6 +1340,7 @@ drop table t2,t1;
set
foreign_key_checks
=
0
;
set
foreign_key_checks
=
0
;
create
table
t2
(
a
varchar
(
10
),
foreign
key
(
a
)
references
t1
(
a
))
engine
=
innodb
DEFAULT
CHARSET
=
latin1
;
create
table
t2
(
a
varchar
(
10
),
foreign
key
(
a
)
references
t1
(
a
))
engine
=
innodb
DEFAULT
CHARSET
=
latin1
;
create
table
t3
(
a
varchar
(
10
)
primary
key
)
engine
=
innodb
DEFAULT
CHARSET
=
utf8
;
create
table
t3
(
a
varchar
(
10
)
primary
key
)
engine
=
innodb
DEFAULT
CHARSET
=
utf8
;
--
replace_result
\\
/
$MYSQL_TEST_DIR
.
/
var
/
master
-
data
/
/
--
error
1025
--
error
1025
rename
table
t3
to
t1
;
rename
table
t3
to
t1
;
set
foreign_key_checks
=
1
;
set
foreign_key_checks
=
1
;
...
...
sql/item_func.cc
View file @
0831699f
...
@@ -2239,7 +2239,11 @@ longlong Item_func_release_lock::val_int()
...
@@ -2239,7 +2239,11 @@ longlong Item_func_release_lock::val_int()
}
}
else
else
{
{
#ifdef EMBEDDED_LIBRARY
if
(
ull
->
locked
&&
pthread_equal
(
current_thd
->
real_id
,
ull
->
thread
))
#else
if
(
ull
->
locked
&&
pthread_equal
(
pthread_self
(),
ull
->
thread
))
if
(
ull
->
locked
&&
pthread_equal
(
pthread_self
(),
ull
->
thread
))
#endif
{
{
result
=
1
;
// Release is ok
result
=
1
;
// Release is ok
item_user_lock_release
(
ull
);
item_user_lock_release
(
ull
);
...
...
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