Skip to content

Commit 6c1b182

Browse files
debugthingsdebugthings
committed
Version 1.0 release candidate check in
Merging this down to master
1 parent a790145 commit 6c1b182

File tree

12 files changed

+407
-234
lines changed

12 files changed

+407
-234
lines changed

‎MySQLTestHarness/Program.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ private static void RunQueries(object StateInfo)
2626
{
2727
for (int i = 0; i < 600; i++)
2828
{
29+
//dotnetuser - MySQL12345!!
2930
using (var conn = new MySql.Data.MySqlClient.MySqlConnection(@"Server=localhost;Database=employees;Uid=root"))
3031
//using (var comm = new MySql.Data.MySqlClient.MySqlCommand(@"SELECT (emp_no * 3.14) + 10, emp_no, first_name, last_name FROM employees", conn))
31-
using (var comm = new MySql.Data.MySqlClient.MySqlCommand(@"SELECT CAST(mysqldotnet_string(""MySQLCustomClass.CustomMySQLClass"", ""MULTI"", first_name, first_name, first_name) AS char) FROM employees.employees", conn))
32+
using (var comm = new MySql.Data.MySqlClient.MySqlCommand(@"SELECT CAST(mysqldotnet_string(""MySQLCustomClass.CustomMySQLClass"", ""MULTI"", first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name, first_name) AS char) FROM employees.employees", conn))
3233
using (var dt = new System.Data.DataTable())
3334
{
3435
comm.CommandTimeout = 600;

‎MySQLUDFInstaller x64/Product.wxs‎

Lines changed: 98 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<?define InstallText57_64="Installs the 64-bit MySQL .NET UDF plugin to the MySQL 5.7 installation directory and the .NET Assemblies into the GAC." ?>
2626
<?define MainDesc="This base package will install the MySQL .NET UDF native plugin as well as the proper host managers and config files."?>
2727

28+
<?define SamplesText="Installs the samples explained in the README file, MySQLCustomClass.dll to get you started." ?>
29+
2830
<Property Id="MYSQLVERSION">
2931
<DirectorySearch Id="Pro" Path="[ProgramFilesFolder]">
3032
<DirectorySearch Id="MySQL" Path="MySQL" />
@@ -36,11 +38,19 @@
3638
<DirectorySearch Id="MySQL64" Path="MySQL" />
3739
</DirectorySearch>
3840
</Property>
41+
3942

4043
<Condition Message="In order to use the MySQL .NET UDF you must have .NET 2.0 or greater installed. Please visit http://www.microsoft.com/net to download the latest version. The installer will exit now.">
4144
<![CDATA[NOT NETFRAMEWORK20 AND NOT NETFRAMEWORK40]]>
4245
</Condition>
4346

47+
<Property Id="HASNET20">
48+
<![CDATA[NETFRAMEWORK20]]>
49+
</Property>
50+
51+
<Property Id="HASNET40">
52+
<![CDATA[NETFRAMEWORK40]]>
53+
</Property>
4454
<!--START 64bit Version Checks-->
4555
<Property Id="MYSQLVERSION64_50">
4656
<DirectorySearchRef Id="MySQL64" Parent="Pro64" Path="MySQL">
@@ -110,20 +120,20 @@
110120
</Feature>
111121

112122
<Feature Id="ProductFeature" Title="MySQL .NET UDF" Level="1" Display="expand" Description="$(var.MainDesc)">
113-
<Feature Id="DotNet20Assemblies" Level="0" Display="hidden" >
123+
<Feature Id="DotNet20Assemblies" Level="1" Display="hidden">
114124
<Component Id="cmp_MySQLHostManager20" Guid="{F158CF0A-C7D3-4521-A376-2E71A0B9A8EB}" Directory="GAC35">
115-
<File Id="fil_MySQLHostManager20" KeyPath="yes" Assembly=".net" Source="C:\Users\James\Source\Repos\mysql_udf\mysql_managed_interface\bin\Debug\MySQLHostManager.dll" />
125+
<File Id="fil_MySQLHostManager20" KeyPath="yes" Assembly=".net" Source="..\mysql_managed_interface\bin\Release\MySQLHostManager.dll" />
116126
</Component>
117-
<Condition Level="1">
118-
<![CDATA[NETFRAMEWORK20]]>
127+
<Condition Level="0">
128+
<![CDATA[NOT HASNET20]]>
119129
</Condition>
120130
</Feature>
121-
<Feature Id="DotNet40Assemblies" Level="0" Display="hidden" >
131+
<Feature Id="DotNet40Assemblies" Level="1" Display="hidden">
122132
<Component Id="cmp_MySQLHostManager40" Guid="{BA5E51B5-5CE0-41C1-93E4-A5D10499B1E4}" Directory="GAC40">
123-
<File Id="fil_MySQLHostManager40" KeyPath="yes" Assembly=".net" Source="C:\Users\James\Source\Repos\mysql_udf\MySQLHostManager40\bin\Debug\MySQLHostManager.dll" />
133+
<File Id="fil_MySQLHostManager40" KeyPath="yes" Assembly=".net" Source="..\MySQLHostManager40\bin\Release\MySQLHostManager.dll" />
124134
</Component>
125-
<Condition Level="1">
126-
<![CDATA[NETFRAMEWORK40]]>
135+
<Condition Level="0">
136+
<![CDATA[NOT HASNET40]]>
127137
</Condition>
128138
</Feature>
129139

@@ -193,6 +203,17 @@
193203

194204
<Condition Level="1"> <![CDATA[NOT MYSQLVERSION OR NOT MYSQLVERSION64]]></Condition>
195205
</Feature>
206+
<Feature Id="MySQL_Samples" Title="Samples" Level="1" Description="$(var.SamplesText)">
207+
<Component Id="cmp_MySQLSamples" Guid="*" Directory="SAMPLES">
208+
<File Id="fil_MySQLCustomClass.dll" Source="..\mysqldotnet_custom\bin\Release\MySQLCustomClass.dll" />
209+
</Component>
210+
<Component Id="cmp_MySQLREADME" Guid="*" Directory="SAMPLES">
211+
<File Id="fil_README.txt" Source="..\README.txt" />
212+
</Component>
213+
<Component Id="cmp_MySQLINSTALLSCRIPT" Guid="*" Directory="SAMPLES">
214+
<File Id="fil_sql_install.sql" Source="..\sql_install.sql" />
215+
</Component>
216+
</Feature>
196217
</Feature>
197218
</Product>
198219

@@ -202,9 +223,12 @@
202223
<Merge Id="VCRedistx86" SourceFile="Microsoft_VC120_CRT_x86.msm" DiskId="1" Language="0"/>
203224
<Merge Id="VCRedistx64" SourceFile="Microsoft_VC120_CRT_x64.msm" DiskId="1" Language="0"/>
204225
<Directory Id="ProgramFilesFolder">
205-
<Directory Id="MYSQLFOLDER" Name="MySQL">
226+
<Directory Id="MYSQLUDFFOLDER" Name="MySQL UDF .NET">
206227
<Directory Id="GAC35" Name="GAC35" />
207228
<Directory Id="GAC40" Name="GAC40" />
229+
<Directory Id="SAMPLES" Name="Samples" />
230+
</Directory>
231+
<Directory Id="MYSQLFOLDER" Name="MySQL">
208232
<Directory Id="MYSQLVER50" Name="MySQL Server 5.0">
209233
<Directory Id="BIN50" Name="bin" />
210234
<Directory Id="LIB50" Name="lib">
@@ -312,90 +336,116 @@
312336
</Fragment>
313337

314338

315-
<Fragment>
316-
<Component Id="cmp_MySQLConfig" Guid="*" Directory="BIN50">
317-
<File Id="fil_mysqld.exe.config" Source="..\mysql_managed_interface\mysqld.exe.config" />
318-
</Component>
319-
<Component Id="cmp_MySQLPlugin" Guid="*" Directory="PLUGIN50">
320-
<File Id="fil_MySQLDotNet.dll" Source="..\x86\Release\MySQLDotNet.dll" />
321-
</Component>
322-
<Component Id="cmp_MySQLPlugin_64" Guid="*" Directory="PLUGIN50_64" Win64="yes" >
323-
<File Id="fil_MySQLDotNet.dll_64" Source="..\x64\Release\MySQLDotNet.dll" />
324-
</Component>
325-
</Fragment>
326339

327340
<Fragment>
328-
<ComponentGroup Id="cmpgrp_MySQL50" Directory="PLUGIN50">
329-
<ComponentRef Id="cmp_MySQLPlugin" />
341+
<ComponentGroup Id="cmpgrp_MySQL50" Directory="PLUGIN50" >
342+
<Component Id="cmp_MySQLPlugin_50" Guid="*" MultiInstance="yes">
343+
<File Id="fil_MySQLDotNet.dll_50" Source="..\x86\Release\MySQLDotNet.dll" />
344+
</Component>
330345
</ComponentGroup>
331346
<ComponentGroup Id="cmpgrp_MySQL50_64" Directory="PLUGIN50_64">
332-
<ComponentRef Id="cmp_MySQLPlugin_64" />
347+
<Component Id="cmp_MySQLPlugin_64_50" Guid="*" Win64="yes" MultiInstance="yes" >
348+
<File Id="fil_MySQLDotNet.dll_64_50" Source="..\x64\Release\MySQLDotNet.dll" />
349+
</Component>
333350
</ComponentGroup>
334351

335352
<ComponentGroup Id="cmpgrp_MySQL50Config" Directory="BIN50">
336-
<ComponentRef Id="cmp_MySQLConfig" />
353+
<Component Id="cmp_MySQLConfig_50" Guid="*" MultiInstance="yes">
354+
<File Id="fil_mysqld.exe.config_50" Source="..\mysql_managed_interface\mysqld.exe.config" />
355+
</Component>
337356
</ComponentGroup>
338357
<ComponentGroup Id="cmpgrp_MySQL50Config_64" Directory="BIN50_64">
339-
<ComponentRef Id="cmp_MySQLConfig" />
358+
<Component Id="cmp_MySQLConfig_50_64" Guid="*" MultiInstance="yes" Win64="yes">
359+
<File Id="fil_mysqld.exe.config_50_64" Source="..\mysql_managed_interface\mysqld.exe.config" />
360+
</Component>
340361
</ComponentGroup>
341362

342-
<ComponentGroup Id="cmpgrp_MySQL51" Directory="PLUGIN51">
343-
<ComponentRef Id="cmp_MySQLPlugin" />
363+
<ComponentGroup Id="cmpgrp_MySQL51" Directory="PLUGIN51" >
364+
<Component Id="cmp_MySQLPlugin_51" Guid="*" MultiInstance="yes">
365+
<File Id="fil_MySQLDotNet.dll_51" Source="..\x86\Release\MySQLDotNet.dll" />
366+
</Component>
344367
</ComponentGroup>
345368
<ComponentGroup Id="cmpgrp_MySQL51_64" Directory="PLUGIN51_64">
346-
<ComponentRef Id="cmp_MySQLPlugin_64" />
369+
<Component Id="cmp_MySQLPlugin_64_51" Guid="*" Win64="yes" MultiInstance="yes" >
370+
<File Id="fil_MySQLDotNet.dll_64_51" Source="..\x64\Release\MySQLDotNet.dll" />
371+
</Component>
347372
</ComponentGroup>
348373

349374
<ComponentGroup Id="cmpgrp_MySQL51Config" Directory="BIN51">
350-
<ComponentRef Id="cmp_MySQLConfig" />
375+
<Component Id="cmp_MySQLConfig_51" Guid="*" MultiInstance="yes">
376+
<File Id="fil_mysqld.exe.config_51" Source="..\mysql_managed_interface\mysqld.exe.config" />
377+
</Component>
351378
</ComponentGroup>
352379
<ComponentGroup Id="cmpgrp_MySQL51Config_64" Directory="BIN51_64">
353-
<ComponentRef Id="cmp_MySQLConfig" />
380+
<Component Id="cmp_MySQLConfig_51_64" Guid="*" MultiInstance="yes" Win64="yes">
381+
<File Id="fil_mysqld.exe.config_51_64" Source="..\mysql_managed_interface\mysqld.exe.config" />
382+
</Component>
354383
</ComponentGroup>
355384

356-
<ComponentGroup Id="cmpgrp_MySQL55" Directory="PLUGIN55">
357-
<ComponentRef Id="cmp_MySQLPlugin" />
385+
<ComponentGroup Id="cmpgrp_MySQL55" Directory="PLUGIN55" >
386+
<Component Id="cmp_MySQLPlugin_55" Guid="*" MultiInstance="yes">
387+
<File Id="fil_MySQLDotNet.dll_55" Source="..\x86\Release\MySQLDotNet.dll" />
388+
</Component>
358389
</ComponentGroup>
359390
<ComponentGroup Id="cmpgrp_MySQL55_64" Directory="PLUGIN55_64">
360-
<ComponentRef Id="cmp_MySQLPlugin_64" />
391+
<Component Id="cmp_MySQLPlugin_64_55" Guid="*" Win64="yes" MultiInstance="yes" >
392+
<File Id="fil_MySQLDotNet.dll_64_55" Source="..\x64\Release\MySQLDotNet.dll" />
393+
</Component>
361394
</ComponentGroup>
362395

363396
<ComponentGroup Id="cmpgrp_MySQL55Config" Directory="BIN55">
364-
<ComponentRef Id="cmp_MySQLConfig" />
397+
<Component Id="cmp_MySQLConfig_55" Guid="*" MultiInstance="yes">
398+
<File Id="fil_mysqld.exe.config_55" Source="..\mysql_managed_interface\mysqld.exe.config" />
399+
</Component>
365400
</ComponentGroup>
366401
<ComponentGroup Id="cmpgrp_MySQL55Config_64" Directory="BIN55_64">
367-
<ComponentRef Id="cmp_MySQLConfig" />
402+
<Component Id="cmp_MySQLConfig_55_64" Guid="*" MultiInstance="yes" Win64="yes">
403+
<File Id="fil_mysqld.exe.config_55_64" Source="..\mysql_managed_interface\mysqld.exe.config" />
404+
</Component>
368405
</ComponentGroup>
369406

370-
371-
<ComponentGroup Id="cmpgrp_MySQL56" Directory="PLUGIN56">
372-
<ComponentRef Id="cmp_MySQLPlugin" />
407+
<ComponentGroup Id="cmpgrp_MySQL56" Directory="PLUGIN56" >
408+
<Component Id="cmp_MySQLPlugin_56" Guid="*" MultiInstance="yes">
409+
<File Id="fil_MySQLDotNet.dll_56" Source="..\x86\Release\MySQLDotNet.dll" />
410+
</Component>
373411
</ComponentGroup>
374412
<ComponentGroup Id="cmpgrp_MySQL56_64" Directory="PLUGIN56_64">
375-
<ComponentRef Id="cmp_MySQLPlugin_64" />
413+
<Component Id="cmp_MySQLPlugin_64_56" Guid="*" Win64="yes" MultiInstance="yes" >
414+
<File Id="fil_MySQLDotNet.dll_64_56" Source="..\x64\Release\MySQLDotNet.dll" />
415+
</Component>
376416
</ComponentGroup>
377417

378418
<ComponentGroup Id="cmpgrp_MySQL56Config" Directory="BIN56">
379-
<ComponentRef Id="cmp_MySQLConfig" />
419+
<Component Id="cmp_MySQLConfig_56" Guid="*" MultiInstance="yes">
420+
<File Id="fil_mysqld.exe.config_56" Source="..\mysql_managed_interface\mysqld.exe.config" />
421+
</Component>
380422
</ComponentGroup>
381423
<ComponentGroup Id="cmpgrp_MySQL56Config_64" Directory="BIN56_64">
382-
<ComponentRef Id="cmp_MySQLConfig" />
424+
<Component Id="cmp_MySQLConfig_56_64" Guid="*" MultiInstance="yes" Win64="yes">
425+
<File Id="fil_mysqld.exe.config_56_64" Source="..\mysql_managed_interface\mysqld.exe.config" />
426+
</Component>
383427
</ComponentGroup>
384428

385-
386-
<ComponentGroup Id="cmpgrp_MySQL57" Directory="PLUGIN57">
387-
<ComponentRef Id="cmp_MySQLPlugin" />
429+
<ComponentGroup Id="cmpgrp_MySQL57" Directory="PLUGIN57" >
430+
<Component Id="cmp_MySQLPlugin_57" Guid="*" MultiInstance="yes">
431+
<File Id="fil_MySQLDotNet.dll_57" Source="..\x86\Release\MySQLDotNet.dll" />
432+
</Component>
388433
</ComponentGroup>
389434
<ComponentGroup Id="cmpgrp_MySQL57_64" Directory="PLUGIN57_64">
390-
<ComponentRef Id="cmp_MySQLPlugin_64" />
435+
<Component Id="cmp_MySQLPlugin_64_57" Guid="*" Win64="yes" MultiInstance="yes" >
436+
<File Id="fil_MySQLDotNet.dll_64_57" Source="..\x64\Release\MySQLDotNet.dll" />
437+
</Component>
391438
</ComponentGroup>
392439

393440
<ComponentGroup Id="cmpgrp_MySQL57Config" Directory="BIN57">
394-
<ComponentRef Id="cmp_MySQLConfig" />
441+
<Component Id="cmp_MySQLConfig_57" Guid="*" MultiInstance="yes">
442+
<File Id="fil_mysqld.exe.config_57" Source="..\mysql_managed_interface\mysqld.exe.config" />
443+
</Component>
395444
</ComponentGroup>
396445
<ComponentGroup Id="cmpgrp_MySQL57Config_64" Directory="BIN57_64">
397-
<ComponentRef Id="cmp_MySQLConfig" />
446+
<Component Id="cmp_MySQLConfig_57_64" Guid="*" MultiInstance="yes" Win64="yes">
447+
<File Id="fil_mysqld.exe.config_57_64" Source="..\mysql_managed_interface\mysqld.exe.config" />
448+
</Component>
398449
</ComponentGroup>
399-
400450
</Fragment>
401451
</Wix>

0 commit comments

Comments
 (0)