Skip to content

Commit 18256bc

Browse files
vuvovavuvova
committed
remove the test for MDEV-22485 that doesn't test MDEV-22485
This reverts commit bc2dc83.
1 parent 1215826 commit 18256bc

File tree

3 files changed

+0
-152
lines changed

3 files changed

+0
-152
lines changed

‎mysql-test/main/mysqlslap.opt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
--sql_mode='NO_ENGINE_SUBSTITUTION'
2-
--log-output=TABLE,FILE --general-log=0 --slow-query-log=0

‎mysql-test/main/mysqlslap.result

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -258,103 +258,3 @@ DROP TABLE t1;
258258
#
259259
# Bug MDEV-15789 (Upstream: #80329): MYSQLSLAP OPTIONS --AUTO-GENERATE-SQL-GUID-PRIMARY and --AUTO-GENERATE-SQL-SECONDARY-INDEXES DONT WORK
260260
#
261-
#
262-
# MDEV-22485: mysqlslap does not use current user as default for connecting to server
263-
#
264-
set @old_general_log=@@global.general_log;
265-
set @old_general_log_file=@@global.general_log_file;
266-
select @old_general_log;
267-
@old_general_log
268-
0
269-
show global variables
270-
where Variable_name = 'general_log' or Variable_name = 'slow_query_log';
271-
Variable_name Value
272-
general_log OFF
273-
slow_query_log OFF
274-
truncate table mysql.general_log;
275-
select * from mysql.general_log;
276-
event_time user_host thread_id server_id command_type argument
277-
set global general_log=ON;
278-
current_user.log;
279-
@@current_user.log
280-
current_user.log
281-
SET GLOBAL general_log_file=general_log.log;
282-
show global variables
283-
where Variable_name = 'general_log' or Variable_name = 'slow_query_log';
284-
Variable_name Value
285-
general_log ON
286-
slow_query_log OFF
287-
flush logs;
288-
create user anel@localhost;
289-
grant all on *.* to anel@localhost;
290-
connect con1,localhost,anel,,;
291-
connection con1;
292-
create table t(t int);
293-
# Run mysqlslap user anel
294-
Benchmark
295-
Average number of seconds to run all queries: X seconds
296-
Minimum number of seconds to run all queries: X seconds
297-
Maximum number of seconds to run all queries: X seconds
298-
Number of clients running queries: 1
299-
Average number of queries per client: 1
300-
301-
flush tables;
302-
select user_host, command_type, argument from mysql.general_log;
303-
user_host command_type argument
304-
root[root] @ localhost [] Query select @@general_log_file
305-
root[root] @ localhost [] Query SET GLOBAL general_log_file=current_user.log
306-
root[root] @ localhost [] Query show global variables
307-
where Variable_name = 'general_log' or Variable_name = 'slow_query_log'
308-
root[root] @ localhost [] Query flush logs
309-
root[root] @ localhost [] Query create user anel@localhost
310-
root[root] @ localhost [] Query grant all on *.* to anel@localhost
311-
[anel] @ localhost [] Connect anel@localhost as anonymous on test
312-
anel[anel] @ localhost [] Query create table t(t int)
313-
[root] @ localhost [] Connect root@localhost as anonymous on
314-
[root] @ localhost [] Connect root@localhost as anonymous on test
315-
root[root] @ localhost [] Query SELECT current_user()
316-
root[root] @ localhost [] Quit
317-
root[root] @ localhost [] Quit
318-
anel[anel] @ localhost [] Query flush tables
319-
anel[anel] @ localhost [] Query select user_host, command_type, argument from mysql.general_log
320-
disconnect con1;
321-
connection default;
322-
# Run mysqlslap user root
323-
Benchmark
324-
Average number of seconds to run all queries: X seconds
325-
Minimum number of seconds to run all queries: X seconds
326-
Maximum number of seconds to run all queries: X seconds
327-
Number of clients running queries: 1
328-
Average number of queries per client: 1
329-
330-
flush tables;
331-
select user_host, command_type, argument from mysql.general_log;
332-
user_host command_type argument
333-
root[root] @ localhost [] Query select @@general_log_file
334-
root[root] @ localhost [] Query SET GLOBAL general_log_file=current_user.log
335-
root[root] @ localhost [] Query show global variables
336-
where Variable_name = 'general_log' or Variable_name = 'slow_query_log'
337-
root[root] @ localhost [] Query flush logs
338-
root[root] @ localhost [] Query create user anel@localhost
339-
root[root] @ localhost [] Query grant all on *.* to anel@localhost
340-
[anel] @ localhost [] Connect anel@localhost as anonymous on test
341-
anel[anel] @ localhost [] Query create table t(t int)
342-
[root] @ localhost [] Connect root@localhost as anonymous on
343-
[root] @ localhost [] Connect root@localhost as anonymous on test
344-
root[root] @ localhost [] Query SELECT current_user()
345-
root[root] @ localhost [] Quit
346-
root[root] @ localhost [] Quit
347-
anel[anel] @ localhost [] Query flush tables
348-
anel[anel] @ localhost [] Query select user_host, command_type, argument from mysql.general_log
349-
anel[anel] @ localhost [] Quit
350-
[root] @ localhost [] Connect root@localhost as anonymous on
351-
[root] @ localhost [] Connect root@localhost as anonymous on test
352-
root[root] @ localhost [] Query SELECT current_user()
353-
root[root] @ localhost [] Quit
354-
root[root] @ localhost [] Quit
355-
root[root] @ localhost [] Query flush tables
356-
root[root] @ localhost [] Query select user_host, command_type, argument from mysql.general_log
357-
drop user anel@localhost;
358-
drop table t;
359-
set global general_log= @old_general_log;
360-
set global general_log_file= @old_general_log_file;

‎mysql-test/main/mysqlslap.test

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -88,54 +88,3 @@ DROP TABLE t1;
8888
--exec $MYSQL_SLAP --concurrency=1 --silent --iterations=1 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --auto-generate-sql-guid-primary --create-schema=slap
8989

9090
--exec $MYSQL_SLAP --concurrency=1 --silent --iterations=1 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --auto-generate-sql-secondary-indexes=1 --create-schema=slap
91-
92-
--echo #
93-
--echo # MDEV-22485: mysqlslap does not use current user as default for connecting to server
94-
--echo #
95-
--disable_ps_protocol
96-
set @old_general_log=@@global.general_log;
97-
set @old_general_log_file=@@global.general_log_file;
98-
select @old_general_log;
99-
100-
show global variables
101-
where Variable_name = 'general_log' or Variable_name = 'slow_query_log';
102-
truncate table mysql.general_log;
103-
# empty log at the beginning
104-
select * from mysql.general_log;
105-
106-
set global general_log=ON;
107-
--replace_regex /[\/\w:](?!.log).*/current_user.log/
108-
select @@general_log_file;
109-
--replace_regex /=.+"/=general_log.log/
110-
--let $gen_log_file=$MYSQLTEST_VARDIR/tmp/general_log.log
111-
--replace_regex /".+"/general_log.log/
112-
--eval SET GLOBAL general_log_file="$gen_log_file"
113-
show global variables
114-
where Variable_name = 'general_log' or Variable_name = 'slow_query_log';
115-
flush logs;
116-
create user anel@localhost;
117-
grant all on *.* to anel@localhost;
118-
connect con1,localhost,anel,,;
119-
connection con1;
120-
create table t(t int);
121-
--echo # Run mysqlslap user anel
122-
--replace_regex /\d[.]\d+/X/
123-
--exec $MYSQL_SLAP --create-schema=test --query="SELECT current_user()" --concurrency=1 --iterations=1
124-
flush tables;
125-
--replace_regex /".+/current_user.log/ /[::1]//
126-
select user_host, command_type, argument from mysql.general_log;
127-
disconnect con1;
128-
129-
connection default;
130-
--echo # Run mysqlslap user root
131-
--replace_regex /\d[.]\d+/X/
132-
--exec $MYSQL_SLAP --create-schema=test --query="SELECT current_user()" --concurrency=1 --iterations=1
133-
flush tables;
134-
#--exec $MYSQL_SLAP --concurrency=1 --silent --iterations=1 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --auto-generate-sql-guid-primary --create-schema=slap
135-
--replace_regex /".+/current_user.log/ /[::1]//
136-
select user_host, command_type, argument from mysql.general_log;
137-
drop user anel@localhost;
138-
drop table t;
139-
set global general_log= @old_general_log;
140-
set global general_log_file= @old_general_log_file;
141-
--enable_ps_protocol

0 commit comments

Comments
 (0)