diff options
| author | Henrik Nord <[email protected]> | 2011-08-25 10:58:33 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-25 10:58:33 +0200 |
| commit | 756a93ca2064b9e0eba3d82a7bd37aeae0f39be1 (patch) | |
| tree | ffbbbfd2749a522c7b1f70ee4f7b1fa0a5e189f3 /lib/odbc/test/mysql.erl | |
| parent | 48eb259aa2d6c7c5d1ddebbfbcefae5e3dafc49c (diff) | |
| parent | d48eaa0731017e5cdadca0af77ac14cd949b6c67 (diff) | |
| download | otp-756a93ca2064b9e0eba3d82a7bd37aeae0f39be1.tar.gz otp-756a93ca2064b9e0eba3d82a7bd37aeae0f39be1.tar.bz2 otp-756a93ca2064b9e0eba3d82a7bd37aeae0f39be1.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'lib/odbc/test/mysql.erl')
| -rw-r--r-- | lib/odbc/test/mysql.erl | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/odbc/test/mysql.erl b/lib/odbc/test/mysql.erl index 49068c4356..c990793213 100644 --- a/lib/odbc/test/mysql.erl +++ b/lib/odbc/test/mysql.erl @@ -26,7 +26,22 @@ %------------------------------------------------------------------------- connection_string() -> - "DSN=MySQL;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';". + case test_server:os_type() of + {unix, linux} -> + "DSN=MySQL;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';"; + {unix, sunos} -> + solaris_str(); + {unix, darwin} -> + "DSN=MySQLMac;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';" + end. + +solaris_str() -> + case erlang:system_info(system_architecture) of + "sparc" ++ _ -> + "DSN=MySQLSolaris10;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';"; + "i386" ++ _ -> + "DSN=MySQLSolaris10i386;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';" + end. %------------------------------------------------------------------------- insert_result() -> |