Skip to content

Commit 701ccf9

Browse files
committed
Address PR TPC-Council#876 follow-up review: redo log capacity + dropdown trim
* src/mysql/mysqlci.tcl (mysql_init, mysql_start): replace the deprecated --innodb-log-file-size with --innodb-redo-log-capacity (supported from MySQL 8.0.30+). MySQL 5.7 is EOL so dropping that path is acceptable. * modules/pipelines-1.0.tm: trim the database dropdown back to the three databases that actually run pipelines today (MySQL, PostgreSQL, MariaDB). Listing Oracle / SQL Server / Db2 there only ever produced the "not yet enabled" banner, so per review feedback they are commented out with a TODO note for re-enablement once build/install support lands. The dbprefix gate at lines 613 and 874 is left intact so direct ?db=ora| mssqls|db2 URLs still render the friendly banner.
1 parent 245c107 commit 701ccf9

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

modules/pipelines-1.0.tm

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,10 +855,16 @@ return
855855

856856
wapp-subst {<div class="aut-form">}
857857

858-
# database chooser
858+
# database chooser — only enabled databases are shown; commercial DBs
859+
# (Oracle / SQL Server / Db2) will be added when build/install support
860+
# lands (currently they would only show "not yet enabled").
859861
wapp-subst {<p><b>Database</b></p>}
860862
wapp-subst "<select class='aut-ctl' name='db' onchange=\"window.location='%html($B)/pipelines?db=' + encodeURIComponent(this.value)\">"
861-
foreach {pfx label} [ list ora Oracle mssqls "SQL Server" db2 Db2 mysql MySQL pg PostgreSQL maria MariaDB ] {
863+
# Future entries to add to the dropdown when supported:
864+
# ora Oracle
865+
# mssqls "SQL Server"
866+
# db2 Db2
867+
foreach {pfx label} [ list mysql MySQL pg PostgreSQL maria MariaDB ] {
862868
set sel ""
863869
if {$dbprefix eq $pfx} { set sel " selected" }
864870
wapp-subst "<option value='%html($pfx)'$sel>%html($label)</option>"

src/mysql/mysqlci.tcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ proc mysql_init {cidict refname} {
722722
if {$want_basedir} {
723723
lappend arglist "--basedir=\"$basedir\""
724724
}
725-
lappend arglist "--innodb-log-file-size=[calc_redo_mb]M"
725+
lappend arglist "--innodb-redo-log-capacity=[calc_redo_mb]M"
726726

727727
# MySQL-specific: mysqld needs --initialize-insecure to perform first-time
728728
# data directory initialization (MariaDB uses scripts/mariadb-install-db
@@ -939,7 +939,7 @@ proc mysql_start {cidict refname} {
939939
if {$want_basedir} {
940940
lappend arglist "--basedir=\"$basedir\""
941941
}
942-
lappend arglist "--innodb-log-file-size=[calc_redo_mb]M"
942+
lappend arglist "--innodb-redo-log-capacity=[calc_redo_mb]M"
943943
# Note: --thread-pool-size is intentionally omitted here. The thread_pool
944944
# plugin is only bundled with MySQL Enterprise Edition; Community builds
945945
# (what cipush compiles from source) abort startup with "Plugin 'thread_pool'

0 commit comments

Comments
 (0)