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
7d7524d9
Commit
7d7524d9
authored
Jul 06, 2007
by
jani@labbari.dsl.inet.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
parents
825570f5
e5d06603
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
2 deletions
+41
-2
.bzrignore
.bzrignore
+3
-0
libmysql/libmysql.c
libmysql/libmysql.c
+15
-0
mysql-test/r/innodb_mysql.result
mysql-test/r/innodb_mysql.result
+8
-0
mysql-test/t/innodb_mysql.test
mysql-test/t/innodb_mysql.test
+14
-1
sql/ha_innodb.cc
sql/ha_innodb.cc
+1
-1
No files found.
.bzrignore
View file @
7d7524d9
...
...
@@ -1341,3 +1341,6 @@ win/vs71cache.txt
win/vs8cache.txt
zlib/*.ds?
zlib/*.vcproj
debian/control
debian/defs.mk
include/abi_check
libmysql/libmysql.c
View file @
7d7524d9
...
...
@@ -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
...
...
mysql-test/r/innodb_mysql.result
View file @
7d7524d9
...
...
@@ -661,6 +661,14 @@ UPDATE t3 SET a = 'us' WHERE a = 'uk';
SELECT * FROM t3 WHERE a = 'uk';
a
DROP TABLE t1,t2,t3;
create table t1 (a int) engine=innodb;
select * from t2;
ERROR 42S02: Table 'test.t2' doesn't exist
drop table t1;
drop table t2;
ERROR 42S02: Unknown table 't2'
create table t2 (a int);
drop table t2;
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
CREATE TABLE t2 (a INT) ENGINE=InnoDB;
switch to connection c1
...
...
mysql-test/t/innodb_mysql.test
View file @
7d7524d9
...
...
@@ -636,6 +636,20 @@ SELECT * FROM t3 WHERE a = 'uk';
DROP
TABLE
t1
,
t2
,
t3
;
#
# Test bug when trying to drop data file which no InnoDB directory entry
#
create
table
t1
(
a
int
)
engine
=
innodb
;
copy_file
$MYSQLTEST_VARDIR
/
master
-
data
/
test
/
t1
.
frm
$MYSQLTEST_VARDIR
/
master
-
data
/
test
/
t2
.
frm
;
--
error
1146
select
*
from
t2
;
drop
table
t1
;
--
error
1051
drop
table
t2
;
create
table
t2
(
a
int
);
drop
table
t2
;
#
# Bug #29154: LOCK TABLES is not atomic when >1 InnoDB tables are locked
...
...
@@ -670,5 +684,4 @@ DISCONNECT c1;
DISCONNECT
c2
;
DROP
TABLE
t1
,
t2
;
--
echo
End
of
5.0
tests
sql/ha_innodb.cc
View file @
7d7524d9
...
...
@@ -504,7 +504,7 @@ convert_error_code_to_mysql(
}
else
if
(
error
==
(
int
)
DB_TABLE_NOT_FOUND
)
{
return
(
HA_ERR_
KEY_NOT_FOUND
);
return
(
HA_ERR_
NO_SUCH_TABLE
);
}
else
if
(
error
==
(
int
)
DB_TOO_BIG_RECORD
)
{
...
...
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