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
345e8347
Commit
345e8347
authored
Jul 06, 2009
by
Ramil Kalimullin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for bug#42364 reverted.
parent
1621a97f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
15 deletions
+1
-15
mysql-test/r/warnings.result
mysql-test/r/warnings.result
+0
-5
mysql-test/t/warnings.test
mysql-test/t/warnings.test
+0
-7
sql/sql_table.cc
sql/sql_table.cc
+1
-1
tests/mysql_client_test.c
tests/mysql_client_test.c
+0
-2
No files found.
mysql-test/r/warnings.result
View file @
345e8347
...
@@ -313,9 +313,4 @@ ERROR 22001: Data too long for column 'c_tinytext' at row 1
...
@@ -313,9 +313,4 @@ ERROR 22001: Data too long for column 'c_tinytext' at row 1
insert into t2 values(@q);
insert into t2 values(@q);
ERROR 22001: Data too long for column 'c_tinyblob' at row 1
ERROR 22001: Data too long for column 'c_tinyblob' at row 1
drop table t1, t2;
drop table t1, t2;
DROP TABLE t1;
ERROR 42S02: Unknown table 't1'
SHOW ERRORS;
Level Code Message
Error 1051 Unknown table 't1'
End of 5.0 tests
End of 5.0 tests
mysql-test/t/warnings.test
View file @
345e8347
...
@@ -225,11 +225,4 @@ insert into t2 values(@q);
...
@@ -225,11 +225,4 @@ insert into t2 values(@q);
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
#
# Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent table
#
--
error
ER_BAD_TABLE_ERROR
DROP
TABLE
t1
;
SHOW
ERRORS
;
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
sql/sql_table.cc
View file @
345e8347
...
@@ -1995,7 +1995,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
...
@@ -1995,7 +1995,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
pthread_mutex_unlock
(
&
LOCK_open
);
pthread_mutex_unlock
(
&
LOCK_open
);
thd
->
thread_specific_used
|=
tmp_table_deleted
;
thd
->
thread_specific_used
|=
tmp_table_deleted
;
error
=
0
;
error
=
0
;
thd
->
no_warnings_for_error
=
0
;
if
(
wrong_tables
.
length
())
if
(
wrong_tables
.
length
())
{
{
if
(
!
foreign_key_error
)
if
(
!
foreign_key_error
)
...
@@ -2057,6 +2056,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
...
@@ -2057,6 +2056,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
err_with_placeholders:
err_with_placeholders:
unlock_table_names
(
thd
,
tables
,
(
TABLE_LIST
*
)
0
);
unlock_table_names
(
thd
,
tables
,
(
TABLE_LIST
*
)
0
);
pthread_mutex_unlock
(
&
LOCK_open
);
pthread_mutex_unlock
(
&
LOCK_open
);
thd
->
no_warnings_for_error
=
0
;
DBUG_RETURN
(
error
);
DBUG_RETURN
(
error
);
}
}
...
...
tests/mysql_client_test.c
View file @
345e8347
...
@@ -4769,8 +4769,6 @@ static void test_errors()
...
@@ -4769,8 +4769,6 @@ static void test_errors()
result
=
mysql_store_result
(
mysql
);
result
=
mysql_store_result
(
mysql
);
mytest
(
result
);
mytest
(
result
);
DIE_UNLESS
(
mysql_num_rows
(
result
)
==
1
);
(
void
)
my_process_result_set
(
result
);
(
void
)
my_process_result_set
(
result
);
mysql_free_result
(
result
);
mysql_free_result
(
result
);
}
}
...
...
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