1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- More "local" code in show_explain.test

Browse Source 
- Better comments
- Make unittest compile on Windows
This commit is contained in:
Sergey Petrunya 2012-06-30 06:05:06 +04:00
parent b9093d370b
commit 00ff7345fa
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/show_explain.result
View File

@ -735,6 +735,7 @@ grant ALL on test.* to test2@localhost;
# #
# First, make sure that user 'test2' cannot do SHOW EXPLAIN on us # First, make sure that user 'test2' cannot do SHOW EXPLAIN on us
# #
set @show_explain_probe_select_id=1;
set debug_dbug='d,show_explain_probe_join_exec_start'; set debug_dbug='d,show_explain_probe_join_exec_start';
select * from t0 where a < 3; select * from t0 where a < 3;
show explain for $thr2; show explain for $thr2;
@ -759,6 +760,7 @@ set debug_dbug='';
# Now, grant test2 a PROCESSLIST permission, and see that he's able to observe us # Now, grant test2 a PROCESSLIST permission, and see that he's able to observe us
# #
grant process on *.* to test2@localhost; grant process on *.* to test2@localhost;
set @show_explain_probe_select_id=1;
set debug_dbug='d,show_explain_probe_join_exec_start'; set debug_dbug='d,show_explain_probe_join_exec_start';
select * from t0 where a < 3; select * from t0 where a < 3;
show explain for $thr2; show explain for $thr2;

2
mysql-test/t/show_explain.test
View File

@ -739,6 +739,7 @@ connection con1;
--echo # --echo #
--echo # First, make sure that user 'test2' cannot do SHOW EXPLAIN on us --echo # First, make sure that user 'test2' cannot do SHOW EXPLAIN on us
--echo # --echo #
set @show_explain_probe_select_id=1;
set debug_dbug='d,show_explain_probe_join_exec_start'; set debug_dbug='d,show_explain_probe_join_exec_start';
send send
select * from t0 where a < 3; select * from t0 where a < 3;
@ -772,6 +773,7 @@ grant process on *.* to test2@localhost;
connect (con2, localhost, test2,,); connect (con2, localhost, test2,,);
connection con1; connection con1;
set @show_explain_probe_select_id=1;
set debug_dbug='d,show_explain_probe_join_exec_start'; set debug_dbug='d,show_explain_probe_join_exec_start';
send send
select * from t0 where a < 3; select * from t0 where a < 3;

6
sql/my_apc.cc
View File

@ -22,11 +22,7 @@
#endif #endif
/* /* For standalone testing of APC system, see unittest/sql/my_apc-t.cc */
Standalone testing:
g++ -c -DMY_APC_STANDALONE -g -I.. -I../include -o my_apc.o my_apc.cc
g++ -L../mysys -L../dbug -L../strings my_apc.o -lmysys -ldbug -lmystrings -lpthread -lrt
*/
/* /*

6
sql/my_apc.h
View File

@ -34,7 +34,9 @@
*/ */
/* /*
Target for asynchronous procedue calls (APCs). Target for asynchronous procedure calls (APCs).
- A target is running in some particular thread,
- One can make calls to it from other threads.
*/ */
class Apc_target class Apc_target
{ {
@ -113,5 +115,3 @@ private:
} }
}; };
///////////////////////////////////////////////////////////////////////

1
unittest/sql/my_apc-t.cc
View File

@ -84,6 +84,7 @@ void *test_apc_service_thread(void *ptr)
mysql_mutex_destroy(&target_mutex); mysql_mutex_destroy(&target_mutex);
my_thread_end(); my_thread_end();
pthread_exit(0); pthread_exit(0);
return NULL;
} }