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
eadb86d5
Commit
eadb86d5
authored
Aug 22, 2005
by
serg@sergbook.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
after pull cleanup
parent
d9e3ad09
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
44 additions
and
1050 deletions
+44
-1050
configure.in
configure.in
+1
-1
mysql-test/r/rpl_drop_db.result
mysql-test/r/rpl_drop_db.result
+17
-1017
mysql-test/t/rpl_drop_db.test
mysql-test/t/rpl_drop_db.test
+17
-14
sql/sql_db.cc
sql/sql_db.cc
+9
-12
sql/sql_table.cc
sql/sql_table.cc
+0
-3
sql/table.h
sql/table.h
+0
-3
No files found.
configure.in
View file @
eadb86d5
...
...
@@ -118,7 +118,7 @@ AC_SUBST(SAVE_LDFLAGS)
AC_SUBST
(
SAVE_CXXLDFLAGS
)
AC_SUBST
(
CXXLDFLAGS
)
AC_PREREQ
(
2.5
7
)
dnl Minimum Autoconf version required.
AC_PREREQ
(
2.5
2
)
dnl Minimum Autoconf version required.
#AC_ARG_PROGRAM # Automaticly invoked by AM_INIT_AUTOMAKE
AM_SANITY_CHECK
...
...
mysql-test/r/rpl_drop_db.result
View file @
eadb86d5
This diff is collapsed.
Click to expand it.
mysql-test/t/rpl_drop_db.test
View file @
eadb86d5
...
...
@@ -5,30 +5,33 @@
connection
master
;
--
disable_warnings
drop
database
if
exists
d
1
;
drop
database
if
exists
mysqltest
1
;
--
enable_warnings
create
database
d
1
;
create
table
d
1
.
t1
(
n
int
);
insert
into
d
1
.
t1
values
(
1
);
select
*
from
d1
.
t1
into
outfile
'd
1/f1.txt'
;
create
table
d
1
.
t2
(
n
int
);
create
table
d
1
.
t3
(
n
int
);
create
database
mysqltest
1
;
create
table
mysqltest
1
.
t1
(
n
int
);
insert
into
mysqltest
1
.
t1
values
(
1
);
select
*
from
mysqltest1
.
t1
into
outfile
'mysqltest
1/f1.txt'
;
create
table
mysqltest
1
.
t2
(
n
int
);
create
table
mysqltest
1
.
t3
(
n
int
);
--
error
1010
drop
database
d
1
;
use
d
1
;
drop
database
mysqltest
1
;
use
mysqltest
1
;
show
tables
;
# test the branch of the code that deals with the query buffer overflow
--
disable_query_log
let
$
1
=
1000
;
while
(
$
1
)
{
eval
create
table
d
1
.
t
$
1
(
n
int
);
eval
create
table
mysqltest
1
.
t
$
1
(
n
int
);
dec
$
1
;
}
--
enable_query_log
--
error
1010
drop
database
d
1
;
use
d
1
;
drop
database
mysqltest
1
;
use
mysqltest
1
;
show
tables
;
use
test
;
create
table
t1
(
n
int
);
...
...
@@ -36,7 +39,7 @@ insert into t1 values (1234);
sync_slave_with_master
;
connection
slave
;
use
d
1
;
use
mysqltest
1
;
show
tables
;
use
test
;
select
*
from
t1
;
...
...
@@ -48,5 +51,5 @@ sync_slave_with_master;
#cleanup
connection
slave
;
stop
slave
;
system
rm
-
rf
var
/
master
-
data
/
d
1
;
system
rm
-
rf
var
/
master
-
data
/
mysqltest
1
;
sql/sql_db.cc
View file @
eadb86d5
...
...
@@ -708,9 +708,6 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
for
(
tbl
=
dropped_tables
;
tbl
;
tbl
=
tbl
->
next
)
{
if
(
!
tbl
->
was_dropped
)
continue
;
/* 3 for the quotes and the comma*/
uint
tbl_name_len
=
strlen
(
tbl
->
real_name
)
+
3
;
if
(
p
+
tbl_name_len
+
1
>=
p_end
)
...
...
sql/sql_table.cc
View file @
eadb86d5
...
...
@@ -220,7 +220,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
for
(
table
=
tables
;
table
;
table
=
table
->
next
)
{
char
*
db
=
table
->
db
;
table
->
was_dropped
=
0
;
mysql_ha_flush
(
thd
,
table
,
MYSQL_HA_CLOSE_FINAL
);
if
(
!
close_temporary_table
(
thd
,
db
,
table
->
real_name
))
{
...
...
@@ -281,8 +280,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
wrong_tables
.
append
(
','
);
wrong_tables
.
append
(
String
(
table
->
real_name
,
system_charset_info
));
}
else
table
->
was_dropped
=
1
;
}
thd
->
tmp_table_used
=
tmp_table_deleted
;
error
=
0
;
...
...
sql/table.h
View file @
eadb86d5
...
...
@@ -235,9 +235,6 @@ typedef struct st_table_list
bool
cacheable_table
;
/* stop PS caching */
/* used in multi-upd privelege check */
bool
table_in_update_from_clause
;
/* used for proper partially successful DROP DATABASE binlogging */
bool
was_dropped
;
}
TABLE_LIST
;
typedef
struct
st_changed_table_list
...
...
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