Skip to content

Commit 24748b0

Browse files
committed
Bug#35721255 Bump the trunk version number from 8.2 to 8.3
Change-Id: Icbbf731044cc9b1cc077b0cfd1fce9a886fc21e7
1 parent d1b5f62 commit 24748b0

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

MYSQL_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MYSQL_VERSION_MAJOR=8
2-
MYSQL_VERSION_MINOR=2
2+
MYSQL_VERSION_MINOR=3
33
MYSQL_VERSION_PATCH=0
44
MYSQL_VERSION_EXTRA=

mysql-test/suite/x/r/upgrade.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ include/assert_error_log_sequence.inc [server: 1, pattern: SAVEPOS]
1111
# restart: --datadir=DATADIR
1212

1313
## b) Confirm that X Plugin "accepting" logs are printed after upgrade.
14-
include/assert_error_log_sequence.inc [server: 1, pattern: System.*Server upgrade from '50700' to '802..' started.
15-
System.*Server upgrade from '50700' to '802..' completed.
14+
include/assert_error_log_sequence.inc [server: 1, pattern: System.*Server upgrade from '50700' to '803..' started.
15+
System.*Server upgrade from '50700' to '803..' completed.
1616
System.*X Plugin ready for connections. Bind-address: .* port: ]
1717

1818
## Cleanup: restart the server and restore the default database.

mysql-test/suite/x/t/upgrade.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ source include/restart_mysqld.inc;
3030
disable_query_log;
3131
CREATE SCHEMA mtr;
3232
enable_query_log;
33-
let $error_pattern =System.*Server upgrade from '50700' to '802..' started.
34-
System.*Server upgrade from '50700' to '802..' completed.
33+
let $error_pattern =System.*Server upgrade from '50700' to '803..' started.
34+
System.*Server upgrade from '50700' to '803..' completed.
3535
System.*X Plugin ready for connections. Bind-address: .* port: ;
3636

3737
let $ignore_line_count=0;

storage/ndb/src/common/util/version.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ struct NdbUpGradeCompatible {
9797
};
9898

9999
struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
100+
{ MAKE_VERSION(8,3,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range }, /* 7.0 <-> 8.3 */
100101
{ MAKE_VERSION(8,2,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range }, /* 7.0 <-> 8.2 */
101102
{ MAKE_VERSION(8,1,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range }, /* 7.0 <-> 8.1 */
102103
{ MAKE_VERSION(8,0,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range }, /* 7.0 <-> 8.0 */

0 commit comments

Comments
 (0)