diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-03 09:26:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-03 09:26:54 +0300 |
| commit | c3752cef3c34589ea95a7ab66cff3dd5b11290d5 (patch) | |
| tree | c7b8eb21dedd3139dacf2c0a12bed6e362afa1d9 /sql/sql_test.cc | |
| parent | 56ae0adee35c1bc053711a8579857e6b0301eb80 (diff) | |
| parent | 2a93e632b1676b6df3dde150888d6428a57f8399 (diff) | |
| download | mariadb-git-c3752cef3c34589ea95a7ab66cff3dd5b11290d5.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 6f144cbcf33..0e73bfd7737 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -388,10 +388,10 @@ void print_sjm(SJ_MATERIALIZATION_INFO *sjm) /* Debugging help: force List<...>::elem function not be removed as unused. */ -Item* (List<Item>:: *dbug_list_item_elem_ptr)(uint)= &List<Item>::elem; -Item_equal* (List<Item_equal>:: *dbug_list_item_equal_elem_ptr)(uint)= +Item* (List<Item>::*dbug_list_item_elem_ptr)(uint)= &List<Item>::elem; +Item_equal* (List<Item_equal>::*dbug_list_item_equal_elem_ptr)(uint)= &List<Item_equal>::elem; -TABLE_LIST* (List<TABLE_LIST>:: *dbug_list_table_list_elem_ptr)(uint) = +TABLE_LIST* (List<TABLE_LIST>::*dbug_list_table_list_elem_ptr)(uint) = &List<TABLE_LIST>::elem; #endif |