mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2023-08-22 09:01:34 +03:00
commit f9cc29824b
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/lib/My/Debugger.pm
View file

@ -91,7 +91,7 @@ py
import subprocess,shlex,time
valg=subprocess.Popen(shlex.split("""valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --num-callers=16 --quiet --suppressions=valgrind.supp --vgdb-error=0 {exe} {args} --loose-wait-for-pos-timeout=1500"""))
time.sleep(2)
gdb.execute("target remote | /usr/lib64/valgrind/../../bin/vgdb --pid=" + str(valg.pid))
gdb.execute("target remote | vgdb --pid=" + str(valg.pid))
EEE
pre => sub {
my $debug_libraries_path= "/usr/lib/debug";

7
mysql-test/suite/innodb/r/row_size_error_log_warnings_3.result
View file

@ -51,14 +51,13 @@ set global innodb_compression_level=1;
CREATE TABLE t1(
f1 INT, f2 CHAR(200), f3 CHAR(200),
f4 CHAR(200), f5 CHAR(200), f6 CHAR(200),
f7 CHAR(200), f8 CHAR(200), f9 CHAR(200),
f10 CHAR(200), PRIMARY KEY(f1, f2(20), f3(20), f4(20))
f7 CHAR(200), f8 CHAR(200), f9 CHAR(106),
PRIMARY KEY(f1, f2(20), f3(20), f4(20))
) ROW_FORMAT=COMPRESSED, ENGINE=InnoDB;
INSERT INTO t1 SELECT seq, repeat('a', 200), repeat('b', 200),
repeat('c', 200), repeat('d', 200),
repeat('d', 200), repeat('e', 200),
repeat('e', 200), repeat('f', 200),
repeat('g', 200) FROM seq_1_to_20;
repeat('f', 200), repeat('g', 106) FROM seq_1_to_20;
DROP TABLE t1;
set global innodb_compression_level=default;
CREATE TABLE t1(f1 char(200), f2 char(200), f3 char(200),

7
mysql-test/suite/innodb/t/row_size_error_log_warnings_3.test
View file

@ -49,15 +49,14 @@ set global innodb_compression_level=1;
CREATE TABLE t1(
f1 INT, f2 CHAR(200), f3 CHAR(200),
f4 CHAR(200), f5 CHAR(200), f6 CHAR(200),
f7 CHAR(200), f8 CHAR(200), f9 CHAR(200),
f10 CHAR(200), PRIMARY KEY(f1, f2(20), f3(20), f4(20))
f7 CHAR(200), f8 CHAR(200), f9 CHAR(106),
PRIMARY KEY(f1, f2(20), f3(20), f4(20))
) ROW_FORMAT=COMPRESSED, ENGINE=InnoDB;
INSERT INTO t1 SELECT seq, repeat('a', 200), repeat('b', 200),
repeat('c', 200), repeat('d', 200),
repeat('d', 200), repeat('e', 200),
repeat('e', 200), repeat('f', 200),
repeat('g', 200) FROM seq_1_to_20;
repeat('f', 200), repeat('g', 106) FROM seq_1_to_20;
DROP TABLE t1;
set global innodb_compression_level=default;