database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

cleanup trailing ws

Browse Source
This commit is contained in:
Sergey Vojtovich
2020-02-27 18:04:06 +04:00
parent 127fee998f
commit a346ff353e
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/main/func_misc.result
View File

@ -1642,8 +1642,8 @@ DROP TABLE t1;
# End of 10.4 tests # End of 10.4 tests
# #
# #
# MDEV-10569 Add RELEASE_ALL_LOCKS SQL-function # MDEV-10569 Add RELEASE_ALL_LOCKS SQL-function
# #
# Test function without any locks # Test function without any locks
SELECT RELEASE_ALL_LOCKS(); SELECT RELEASE_ALL_LOCKS();
RELEASE_ALL_LOCKS() RELEASE_ALL_LOCKS()
@ -1655,7 +1655,7 @@ GET_LOCK('l1',10)
SELECT RELEASE_ALL_LOCKS(); SELECT RELEASE_ALL_LOCKS();
RELEASE_ALL_LOCKS() RELEASE_ALL_LOCKS()
1 1
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA; FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
LOCK_MODE LOCK_TYPE TABLE_SCHEMA LOCK_MODE LOCK_TYPE TABLE_SCHEMA
# Test function with multiple locks # Test function with multiple locks
@ -1676,7 +1676,7 @@ GET_LOCK('l14',10),
GET_LOCK('l15',10); GET_LOCK('l15',10);
GET_LOCK('l01',10) GET_LOCK('l02',10) GET_LOCK('l03',10) GET_LOCK('l04',10) GET_LOCK('l05',10) GET_LOCK('l06',10) GET_LOCK('l07',10) GET_LOCK('l08',10) GET_LOCK('l09',10) GET_LOCK('l10',10) GET_LOCK('l11',10) GET_LOCK('l12',10) GET_LOCK('l13',10) GET_LOCK('l14',10) GET_LOCK('l15',10) GET_LOCK('l01',10) GET_LOCK('l02',10) GET_LOCK('l03',10) GET_LOCK('l04',10) GET_LOCK('l05',10) GET_LOCK('l06',10) GET_LOCK('l07',10) GET_LOCK('l08',10) GET_LOCK('l09',10) GET_LOCK('l10',10) GET_LOCK('l11',10) GET_LOCK('l12',10) GET_LOCK('l13',10) GET_LOCK('l14',10) GET_LOCK('l15',10)
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA; FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
LOCK_MODE LOCK_TYPE TABLE_SCHEMA LOCK_MODE LOCK_TYPE TABLE_SCHEMA
MDL_SHARED_NO_WRITE User lock l01 MDL_SHARED_NO_WRITE User lock l01
@ -1697,7 +1697,7 @@ MDL_SHARED_NO_WRITE User lock l15
SELECT RELEASE_ALL_LOCKS(); SELECT RELEASE_ALL_LOCKS();
RELEASE_ALL_LOCKS() RELEASE_ALL_LOCKS()
15 15
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA; FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
LOCK_MODE LOCK_TYPE TABLE_SCHEMA LOCK_MODE LOCK_TYPE TABLE_SCHEMA
# Test function with recursive locks # Test function with recursive locks
@ -1718,7 +1718,7 @@ GET_LOCK('l5',10),
GET_LOCK('l5',10); GET_LOCK('l5',10);
GET_LOCK('l1',10) GET_LOCK('l2',10) GET_LOCK('l2',10) GET_LOCK('l3',10) GET_LOCK('l3',10) GET_LOCK('l3',10) GET_LOCK('l4',10) GET_LOCK('l4',10) GET_LOCK('l4',10) GET_LOCK('l4',10) GET_LOCK('l5',10) GET_LOCK('l5',10) GET_LOCK('l5',10) GET_LOCK('l5',10) GET_LOCK('l5',10) GET_LOCK('l1',10) GET_LOCK('l2',10) GET_LOCK('l2',10) GET_LOCK('l3',10) GET_LOCK('l3',10) GET_LOCK('l3',10) GET_LOCK('l4',10) GET_LOCK('l4',10) GET_LOCK('l4',10) GET_LOCK('l4',10) GET_LOCK('l5',10) GET_LOCK('l5',10) GET_LOCK('l5',10) GET_LOCK('l5',10) GET_LOCK('l5',10)
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA; FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
LOCK_MODE LOCK_TYPE TABLE_SCHEMA LOCK_MODE LOCK_TYPE TABLE_SCHEMA
MDL_SHARED_NO_WRITE User lock l1 MDL_SHARED_NO_WRITE User lock l1
@ -1729,6 +1729,6 @@ MDL_SHARED_NO_WRITE User lock l5
SELECT RELEASE_ALL_LOCKS(); SELECT RELEASE_ALL_LOCKS();
RELEASE_ALL_LOCKS() RELEASE_ALL_LOCKS()
15 15
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA; FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
LOCK_MODE LOCK_TYPE TABLE_SCHEMA LOCK_MODE LOCK_TYPE TABLE_SCHEMA

22
mysql-test/main/func_misc.test
View File

@ -1280,8 +1280,8 @@ DROP TABLE t1;
--echo # --echo #
--echo # --echo #
--echo # MDEV-10569 Add RELEASE_ALL_LOCKS SQL-function --echo # MDEV-10569 Add RELEASE_ALL_LOCKS SQL-function
--echo # --echo #
--echo # Test function without any locks --echo # Test function without any locks
SELECT RELEASE_ALL_LOCKS(); SELECT RELEASE_ALL_LOCKS();
@ -1289,9 +1289,9 @@ SELECT RELEASE_ALL_LOCKS();
--echo # Test function with one lock only --echo # Test function with one lock only
SELECT GET_LOCK('l1',10); SELECT GET_LOCK('l1',10);
SELECT RELEASE_ALL_LOCKS(); SELECT RELEASE_ALL_LOCKS();
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA; FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
--echo # Test function with multiple locks --echo # Test function with multiple locks
SELECT GET_LOCK('l01',10), SELECT GET_LOCK('l01',10),
GET_LOCK('l02',10), GET_LOCK('l02',10),
@ -1307,11 +1307,11 @@ SELECT GET_LOCK('l01',10),
GET_LOCK('l12',10), GET_LOCK('l12',10),
GET_LOCK('l13',10), GET_LOCK('l13',10),
GET_LOCK('l14',10), GET_LOCK('l14',10),
GET_LOCK('l15',10); GET_LOCK('l15',10);
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA; FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
SELECT RELEASE_ALL_LOCKS(); SELECT RELEASE_ALL_LOCKS();
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA; FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
--echo # Test function with recursive locks --echo # Test function with recursive locks
@ -1329,9 +1329,9 @@ SELECT GET_LOCK('l1',10),
GET_LOCK('l5',10), GET_LOCK('l5',10),
GET_LOCK('l5',10), GET_LOCK('l5',10),
GET_LOCK('l5',10), GET_LOCK('l5',10),
GET_LOCK('l5',10); GET_LOCK('l5',10);
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA; FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;
SELECT RELEASE_ALL_LOCKS(); SELECT RELEASE_ALL_LOCKS();
SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA SELECT LOCK_MODE, LOCK_TYPE, TABLE_SCHEMA
FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA; FROM information_schema.metadata_lock_info WHERE thread_id>0 ORDER BY TABLE_SCHEMA;

2
sql/item_func.h
View File

@ -2692,7 +2692,7 @@ class Item_func_get_lock final :public Item_func_lock
}; };
class Item_func_release_all_locks final :public Item_func_lock class Item_func_release_all_locks final :public Item_func_lock
{ {
public: public:
Item_func_release_all_locks(THD *thd): Item_func_lock(thd) Item_func_release_all_locks(THD *thd): Item_func_lock(thd)