Skip to content

Commit d17a101

Browse files
zmurzmur
committed
Merge tag 'mysql-5.5.44' into mysql-5.5-cluster-7.2
Conflicts: VERSION mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test sql/ha_ndbcluster_binlog.cc sql/sql_class.cc support-files/mysql.spec.sh
2 parents f61ed98 + 31c803e commit d17a101

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+491
-172
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MYSQL_VERSION_MAJOR=5
22
MYSQL_VERSION_MINOR=5
3-
MYSQL_VERSION_PATCH=43
3+
MYSQL_VERSION_PATCH=44
44
MYSQL_VERSION_EXTRA=-ndb-7.2.21

‎cmake/make_dist.cmake.in‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -93,9 +93,9 @@ IF(NOT GIT_EXECUTABLE)
9393

9494
# Save bison output first.
9595
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
96-
${CMAKE_BINARY_DIR}/sql_yacc.cc COPY_ONLY)
96+
${CMAKE_BINARY_DIR}/sql_yacc.cc COPYONLY)
9797
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.h
98-
${CMAKE_BINARY_DIR}/sql_yacc.h COPY_ONLY)
98+
${CMAKE_BINARY_DIR}/sql_yacc.h COPYONLY)
9999

100100
IF(CMAKE_GENERATOR MATCHES "Makefiles")
101101
# make clean
@@ -107,9 +107,9 @@ IF(NOT GIT_EXECUTABLE)
107107

108108
# Restore bison output
109109
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql_yacc.cc
110-
${CMAKE_BINARY_DIR}/sql/sql_yacc.cc COPY_ONLY)
110+
${CMAKE_BINARY_DIR}/sql/sql_yacc.cc COPYONLY)
111111
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql_yacc.h
112-
${CMAKE_BINARY_DIR}/sql/sql_yacc.h COPY_ONLY)
112+
${CMAKE_BINARY_DIR}/sql/sql_yacc.h COPYONLY)
113113
FILE(REMOVE ${CMAKE_BINARY_DIR}/sql_yacc.cc)
114114
FILE(REMOVE ${CMAKE_BINARY_DIR}/sql_yacc.h)
115115
ENDIF()

‎cmd-line-utils/libedit/el_terminal.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* $NetBSD: terminal.h,v 1.3 2011/07/29 23:44:45 christos Exp $ */
22

33
/*-
4-
* Copyright (c) 1992, 1993
4+
* Copyright (c) 1992, 2015
55
* The Regents of the University of California. All rights reserved.
66
*
77
* This code is derived from software contributed to Berkeley by
@@ -103,7 +103,7 @@ protected int terminal_settc(EditLine *, int, const Char **);
103103
protected intterminal_gettc(EditLine *, int, char **);
104104
protected intterminal_telltc(EditLine *, int, const Char **);
105105
protected intterminal_echotc(EditLine *, int, const Char **);
106-
protected voidterminal_writec(EditLine *, Int);
106+
protected intterminal_writec(EditLine *, Int);
107107
protected intterminal__putc(EditLine *, Int);
108108
protected voidterminal__flush(EditLine *);
109109

‎cmd-line-utils/libedit/emacs.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* $NetBSD: emacs.c,v 1.25 2011/07/29 15:16:33 christos Exp $ */
22

33
/*-
4-
* Copyright (c) 1992, 1993
4+
* Copyright (c) 1992, 2015
55
* The Regents of the University of California. All rights reserved.
66
*
77
* This code is derived from software contributed to Berkeley by
@@ -58,8 +58,10 @@ em_delete_or_list(EditLine *el, Int c)
5858
/* if I'm at the end */
5959
if (el->el_line.cursor == el->el_line.buffer) {
6060
/* and the beginning */
61-
terminal_writec(el, c);/* then do an EOF */
62-
return CC_EOF;
61+
if(!(terminal_writec(el, c)))/* then do an EOF */
62+
return CC_EOF;
63+
else
64+
return CC_ERROR;
6365
} else {
6466
/*
6567
* Here we could list completions, but it is an

‎cmd-line-utils/libedit/terminal.c‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* $NetBSD: terminal.c,v 1.10 2011/10/04 15:27:04 christos Exp $ */
22

33
/*-
4-
* Copyright (c) 1992, 1993
4+
* Copyright (c) 1992, 2015
55
* The Regents of the University of California. All rights reserved.
66
*
77
* This code is derived from software contributed to Berkeley by
@@ -1271,14 +1271,19 @@ terminal__flush(EditLine *el)
12711271
/* terminal_writec():
12721272
* Write the given character out, in a human readable form
12731273
*/
1274-
protected void
1274+
protected int
12751275
terminal_writec(EditLine *el, Int c)
12761276
{
12771277
Char visbuf[VISUAL_WIDTH_MAX +1];
12781278
ssize_t vcnt = ct_visual_char(visbuf, VISUAL_WIDTH_MAX, c);
1279-
visbuf[vcnt] = '\0';
1280-
terminal_overwrite(el, visbuf, (size_t)vcnt);
1281-
terminal__flush(el);
1279+
if(vcnt == -1)
1280+
return 1; /* Error due to insufficient space */
1281+
else {
1282+
visbuf[vcnt] = '\0';
1283+
terminal_overwrite(el, visbuf, (size_t)vcnt);
1284+
terminal__flush(el);
1285+
return 0;
1286+
}
12821287
}
12831288

12841289

‎cmd-line-utils/libedit/vi.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* $NetBSD: vi.c,v 1.41 2011/10/04 15:27:04 christos Exp $ */
22

33
/*-
4-
* Copyright (c) 1992, 1993
4+
* Copyright (c) 1992, 2015
55
* The Regents of the University of California. All rights reserved.
66
*
77
* This code is derived from software contributed to Berkeley by
@@ -607,8 +607,10 @@ vi_list_or_eof(EditLine *el, Int c)
607607

608608
if (el->el_line.cursor == el->el_line.lastchar) {
609609
if (el->el_line.cursor == el->el_line.buffer) {
610-
terminal_writec(el, c);/* then do a EOF */
611-
return CC_EOF;
610+
if(!(terminal_writec(el, c)))/* then do a EOF */
611+
return CC_EOF;
612+
else
613+
return CC_ERROR;
612614
} else {
613615
/*
614616
* Here we could list completions, but it is an

‎mysql-test/r/partition_innodb.result‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -365,33 +365,33 @@ DROP TABLE t1;
365365
create table t1 (a int) engine=innodb partition by hash(a) ;
366366
show table status like 't1';
367367
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
368-
t1 InnoDB 10 Compact 2 8192 16384 0 0 # NULLNULLNULL NULL latin1_swedish_ci NULL partitioned
368+
t1 InnoDB 10 Compact 2 8192 16384 0 0 # NULL#NULL NULL latin1_swedish_ci NULL partitioned
369369
drop table t1;
370370
create table t1 (a int)
371371
engine = innodb
372372
partition by key (a);
373373
show table status;
374374
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
375-
t1 InnoDB 10 Compact 2 8192 16384 0 0 # NULLNULLNULL NULL latin1_swedish_ci NULL partitioned
375+
t1 InnoDB 10 Compact 2 8192 16384 0 0 # NULL#NULL NULL latin1_swedish_ci NULL partitioned
376376
insert into t1 values (0), (1), (2), (3);
377377
show table status;
378378
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
379-
t1 InnoDB 10 Compact 4 4096 16384 0 0 # NULLNULLNULL NULL latin1_swedish_ci NULL partitioned
379+
t1 InnoDB 10 Compact 4 4096 16384 0 0 # NULL#NULL NULL latin1_swedish_ci NULL partitioned
380380
drop table t1;
381381
create table t1 (a int auto_increment primary key)
382382
engine = innodb
383383
partition by key (a);
384384
show table status;
385385
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
386-
t1 InnoDB 10 Compact 2 8192 16384 0 0 # 1NULLNULL NULL latin1_swedish_ci NULL partitioned
386+
t1 InnoDB 10 Compact 2 8192 16384 0 0 # 1#NULL NULL latin1_swedish_ci NULL partitioned
387387
insert into t1 values (NULL), (NULL), (NULL), (NULL);
388388
show table status;
389389
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
390-
t1 InnoDB 10 Compact 4 4096 16384 0 0 # 5NULLNULL NULL latin1_swedish_ci NULL partitioned
390+
t1 InnoDB 10 Compact 4 4096 16384 0 0 # 5#NULL NULL latin1_swedish_ci NULL partitioned
391391
insert into t1 values (NULL), (NULL), (NULL), (NULL);
392392
show table status;
393393
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
394-
t1 InnoDB 10 Compact 8 2048 16384 0 0 # 9NULLNULL NULL latin1_swedish_ci NULL partitioned
394+
t1 InnoDB 10 Compact 8 2048 16384 0 0 # 9#NULL NULL latin1_swedish_ci NULL partitioned
395395
drop table t1;
396396
create table t1 (a int)
397397
partition by key (a)
@@ -572,3 +572,14 @@ a b
572572
1 2
573573
0 1
574574
DROP TABLE t1;
575+
#
576+
# Bug #17299181 CREATE_TIME AND UPDATE_TIME ARE
577+
# WRONG FOR PARTITIONED TABLES
578+
#
579+
CREATE TABLE t1 (a int, PRIMARY KEY (a)) ENGINE=InnoDB
580+
PARTITION BY HASH (a) PARTITIONS 2;
581+
SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE
582+
CREATE_TIME IS NOT NULL AND TABLE_NAME='t1';
583+
COUNT(*)
584+
1
585+
DROP TABLE t1;

‎mysql-test/r/ps_grant.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ current_user()
1818
second_user@localhost
1919
show grants for current_user();
2020
Grants for second_user@localhost
21-
GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
21+
GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD <secret>
2222
GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
2323
prepare s_t9 from 'select c1 as my_col
2424
from t9 where c1= 1' ;
@@ -42,7 +42,7 @@ GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
4242
GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
4343
show grants for second_user@localhost ;
4444
Grants for second_user@localhost
45-
GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
45+
GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD <secret>
4646
GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
4747
GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
4848
prepare s_t1 from 'select a as my_col from t1' ;
@@ -63,7 +63,7 @@ GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE
6363
GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
6464
show grants for second_user@localhost ;
6565
Grants for second_user@localhost
66-
GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
66+
GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD <secret>
6767
GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
6868
execute s_t1 ;
6969
ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'

‎mysql-test/suite/funcs_1/r/innodb_trig_03.result‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ current_user
189189
test_yesprivs@localhost
190190
show grants;
191191
Grants for test_yesprivs@localhost
192-
GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
192+
GRANT UPDATE, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
193193
create trigger trg4a_2 before INSERT on t1 for each row
194194
set new.f1 = 'trig 3.5.3.7-2a';
195195
insert into t1 (f1) values ('insert 3.5.3.7-2b');
@@ -220,7 +220,7 @@ GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49
220220
GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
221221
show grants;
222222
Grants for test_noprivs@localhost
223-
GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
223+
GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
224224
GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
225225
use priv_db;
226226
create trigger trg4b_1 before UPDATE on t1 for each row
@@ -247,7 +247,7 @@ trig 3.5.3.7-2a
247247
drop trigger trg4b_1;
248248
show grants;
249249
Grants for test_yesprivs@localhost
250-
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
250+
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
251251
GRANT UPDATE ON `priv_db`.* TO 'test_yesprivs'@'localhost'
252252
use priv_db;
253253
create trigger trg4b_2 before UPDATE on t1 for each row
@@ -292,7 +292,7 @@ GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49
292292
GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
293293
show grants;
294294
Grants for test_noprivs@localhost
295-
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
295+
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
296296
GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
297297
use priv_db;
298298
create trigger trg4c_1 before INSERT on t1 for each row
@@ -311,7 +311,7 @@ trig 3.5.3.7-2b
311311
drop trigger trg4c_1;
312312
show grants;
313313
Grants for test_yesprivs@localhost
314-
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
314+
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
315315
GRANT UPDATE ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
316316
use priv_db;
317317
create trigger trg4c_2 before INSERT on t1 for each row
@@ -345,7 +345,7 @@ Grants for test_noprivs@%
345345
GRANT TRIGGER ON *.* TO 'test_noprivs'@'%'
346346
show grants;
347347
Grants for test_noprivs@localhost
348-
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
348+
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
349349
GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
350350
use priv_db;
351351
create trigger trg4d_1 before INSERT on t1 for each row
@@ -365,7 +365,7 @@ trig 3.5.3.7-2c
365365
drop trigger trg4d_1;
366366
show grants;
367367
Grants for test_yesprivs@localhost
368-
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
368+
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
369369
GRANT UPDATE (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
370370
use priv_db;
371371
create trigger trg4d_2 before INSERT on t1 for each row
@@ -422,7 +422,7 @@ current_user
422422
test_yesprivs@localhost
423423
show grants;
424424
Grants for test_yesprivs@localhost
425-
GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
425+
GRANT SELECT, TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
426426
create trigger trg5a_2 before INSERT on t1 for each row
427427
set @test_var= new.f1;
428428
set @test_var= 'before trig 3.5.3.8-2a';
@@ -454,7 +454,7 @@ GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49
454454
GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
455455
show grants;
456456
Grants for test_noprivs@localhost
457-
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
457+
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
458458
GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'
459459
use priv_db;
460460
create trigger trg5b_1 before UPDATE on t1 for each row
@@ -472,7 +472,7 @@ before trig 3.5.3.8-1b
472472
drop trigger trg5b_1;
473473
show grants;
474474
Grants for test_yesprivs@localhost
475-
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
475+
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
476476
GRANT SELECT ON `priv_db`.* TO 'test_yesprivs'@'localhost'
477477
use priv_db;
478478
create trigger trg5b_2 before UPDATE on t1 for each row
@@ -507,7 +507,7 @@ GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49
507507
GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
508508
show grants;
509509
Grants for test_noprivs@localhost
510-
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
510+
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
511511
GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
512512
use priv_db;
513513
create trigger trg5c_1 before INSERT on t1 for each row
@@ -521,7 +521,7 @@ before trig 3.5.3.8-1c
521521
drop trigger trg5c_1;
522522
show grants;
523523
Grants for test_yesprivs@localhost
524-
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
524+
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
525525
GRANT SELECT ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
526526
use priv_db;
527527
create trigger trg5c_2 before INSERT on t1 for each row
@@ -551,7 +551,7 @@ GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C497
551551
GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
552552
show grants;
553553
Grants for test_noprivs@localhost
554-
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
554+
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
555555
GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'
556556
use priv_db;
557557
create trigger trg5d_1 before INSERT on t1 for each row
@@ -565,7 +565,7 @@ before trig 3.5.3.8-1d
565565
drop trigger trg5d_1;
566566
show grants;
567567
Grants for test_yesprivs@localhost
568-
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
568+
GRANT TRIGGER ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
569569
GRANT SELECT (f1) ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
570570
use priv_db;
571571
create trigger trg5d_2 before INSERT on t1 for each row

‎mysql-test/suite/funcs_1/r/innodb_trig_03e.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ current_user
139139
test_yesprivs@localhost
140140
show grants for test_yesprivs@localhost;
141141
Grants for test_yesprivs@localhost
142-
GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
142+
GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
143143
GRANT SELECT, UPDATE, TRIGGER ON `priv_db`.* TO 'test_yesprivs'@'localhost'
144144
drop trigger trg1_2;
145145
ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
@@ -387,7 +387,7 @@ current_user
387387
test_yesprivs@localhost
388388
show grants for test_yesprivs@localhost;
389389
Grants for test_yesprivs@localhost
390-
GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
390+
GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
391391
GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
392392
drop trigger trg1_2;
393393
select current_user;
@@ -1266,7 +1266,7 @@ current_user
12661266
test_yesprivs@localhost
12671267
show grants;
12681268
Grants for test_yesprivs@localhost
1269-
GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
1269+
GRANT USAGE ON *.* TO 'test_yesprivs'@'localhost' IDENTIFIED BY PASSWORD <secret>
12701270
GRANT TRIGGER ON `priv_db`.* TO 'test_yesprivs'@'localhost' WITH GRANT OPTION
12711271
GRANT SELECT, INSERT, UPDATE, TRIGGER ON `priv_db`.`t1` TO 'test_yesprivs'@'localhost'
12721272
create definer=not_ex_user@localhost trigger trg1_3

0 commit comments

Comments
 (0)