Skip to content

Commit 399d012

Browse files
committed
MDEV-19922 Old version of heidisql in mariadb installer
Upgrade HeidiSQL to 10.2
1 parent ecd8f44 commit 399d012

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

win/packaging/heidisql.cmake

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SET(HEIDISQL_BASE_NAME "HeidiSQL_9.5_Portable")
1+
SET(HEIDISQL_BASE_NAME "HeidiSQL_10.2_32_Portable")
22
SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip")
33
SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}")
44
SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME})
@@ -12,12 +12,5 @@ IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP})
1212
)
1313
ENDIF()
1414

15-
SET(LIBMYSQLDLL_SOURCE ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll)
16-
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
17-
# Use our libmysql if it is 32 bit.
18-
IF(LIBMYSQL_LOCATION)
19-
SET(LIBMYSQLDLL_SOURCE "${LIBMYSQL_LOCATION}")
20-
ENDIF()
21-
ENDIF()
2215
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi)
2316
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi)

win/packaging/heidisql.wxi.in

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Win64="no"
99
/>
1010
</Property>
11+
<?define pluginlist=auth_gssapi_client.dll;mysql_clear_password.dll;sha256_password.dll;caching_sha2_password.dll;pvio_npipe.dll;dialog.dll;pvio_shmem.dll?>
1112
<DirectoryRef Id="MariaDBShared">
1213
<Directory Id="D.HeidiSQL" Name="HeidiSQL">
1314
<Component Id="component.HeidiSQL" Guid="96ea3879-5320-4098-8f26-2f655d2f716c" Win64="no">
@@ -35,7 +36,9 @@
3536
<Component Id="component.HeidiSQL_libmysql.dll" Guid="*" Win64="no">
3637
<File Id="heidisql.libmysql.dll" Name="libmysql.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql.dll" />
3738
</Component>
38-
39+
<Component Id="component.HeidiSQL_libmariadb.dll" Guid="*" Win64="no">
40+
<File Id="heidisql.libmariadb.dll" Name="libmariadb.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmariadb.dll" />
41+
</Component>
3942
<Component Id="component.HeidiSQL_libeay32.dll" Guid="*" Win64="no">
4043
<File Id="heidisql.libeay32.dll" Name="libeay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libeay32.dll" />
4144
</Component>
@@ -53,12 +56,11 @@
5356
</Component>
5457

5558
<Directory Id="D.HeidiSQL.plugins" Name="plugins">
56-
<Component Id="component.HeidiSQL_dialog.dll" Guid="*" Win64="no">
57-
<File Id="heidisql.dialog.dll" Name="dialog.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\dialog.dll" />
58-
</Component>
59-
<Component Id="component.HeidiSQL_auth_gssapi_client.dll" Guid="*" Win64="no">
60-
<File Id="heidisql.auth_gssapi_client.dll" Name="auth_gssapi_client.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\auth_gssapi_client.dll" />
59+
<?foreach dll in $(var.pluginlist) ?>
60+
<Component Id="component.HeidiSQL_$(var.dll)" Guid="*" Win64="no">
61+
<File Id="heidisql.$(var.dll)" Name="$(var.dll)" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\$(var.dll)" />
6162
</Component>
63+
<?endforeach?>
6264
</Directory>
6365

6466
<Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no">
@@ -73,13 +75,15 @@
7375
<ComponentRef Id="component.HeidiSQL"/>
7476
<ComponentRef Id="component.HeidiSQL_MenuShortcut"/>
7577
<ComponentRef Id="component.HeidiSQL_libmysql.dll"/>
78+
<ComponentRef Id="component.HeidiSQL_libmariadb.dll"/>
7679
<ComponentRef Id="component.HeidiSQL_libeay32.dll" />
7780
<ComponentRef Id="component.HeidiSQL_libpq.dll" />
7881
<ComponentRef Id="component.HeidiSQL_ssleay32.dll" />
7982
<ComponentRef Id="component.HeidiSQL_libintl_8.dll" />
8083
<ComponentRef Id="component.HeidiSQL_libiconv_2.dll" />
81-
<ComponentRef Id="component.HeidiSQL_dialog.dll" />
82-
<ComponentRef Id="component.HeidiSQL_auth_gssapi_client.dll" />
84+
<?foreach dll in $(var.pluginlist)?>
85+
<ComponentRef Id="component.HeidiSQL_$(var.dll)" />
86+
<?endforeach?>
8387
<ComponentRef Id="component.HeidiSQL_CleanupSettings"/>
8488
</ComponentGroup>
8589
</Include>

0 commit comments

Comments
 (0)