Merge remote branch 'upstream/dev' into dev

14 files changed, 669 insertions, 382 deletions

diff --git a/lib/odbc/test/Makefile b/lib/odbc/test/Makefile
index ec2bcc67b5..bc6449242e 100644
--- a/lib/odbc/test/Makefile
+++ b/lib/odbc/test/Makefile
@@ -34,7 +34,8 @@ MODULES= \
 	odbc_test_lib \
 	oracle \
 	sqlserver \
-	postgres
+	postgres  \
+	mysql
 
 EBIN = .
 
diff --git a/lib/odbc/test/mysql.erl b/lib/odbc/test/mysql.erl
new file mode 100644
index 0000000000..76ffd3ecc9
--- /dev/null
+++ b/lib/odbc/test/mysql.erl
@@ -0,0 +1,266 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2011. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(mysql).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+%-------------------------------------------------------------------------
+connection_string() ->
+    "DSN=MySQL;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';".
+
+%-------------------------------------------------------------------------
+insert_result() ->
+    {selected,["ID","DATA"],[{1,"bar"}]}.
+
+update_result() ->
+    {selected,["ID","DATA"],[{1,"foo"}]}.
+
+selected_ID(N, next) ->
+    {selected,["ID"],[{N}]};
+
+selected_ID(_, _) ->
+    {error, driver_does_not_support_function}.
+
+selected_next_N(1)->
+    {selected,["ID"],
+     [{1},
+      {2},
+      {3}]};
+
+selected_next_N(2)->
+    {selected,["ID"],
+     [{4},
+      {5}]}.
+
+selected_relative_N(_)->
+    {error, driver_does_not_support_function}.
+
+selected_absolute_N(_)->
+    {error, driver_does_not_support_function}.
+
+selected_list_rows() ->
+    {selected,["ID", "DATA"],[[1, "bar"],[2,"foo"]]}.
+
+first_list_rows() ->
+    {error, driver_does_not_support_function}.
+last_list_rows() ->
+    {error, driver_does_not_support_function}.
+prev_list_rows() ->
+    {error, driver_does_not_support_function}.
+next_list_rows() ->
+    {selected,["ID","DATA"],[[1,"bar"]]}.
+
+multiple_select()->
+    [{selected,["ID", "DATA"],[{1, "bar"},{2, "foo"}]},
+     {selected,["ID"],[{"foo"}]}].
+
+multiple_mix()->
+    [{updated, 1},{updated, 1},
+     {selected,["ID", "DATA"],[{1, "foobar"},{2, "foo"}]},
+     {updated, 1}, {selected,["DATA"],[{"foo"}]}].
+
+%-------------------------------------------------------------------------
+var_char_min() ->
+    0.
+var_char_max() ->
+    65535.
+
+create_var_char_table(Size) ->
+    " (FIELD varchar(" ++ integer_to_list(Size) ++ "))".
+
+%-------------------------------------------------------------------------
+text_min() ->
+    1.
+text_max() ->
+   2147483646. % 2147483647. %% 2^31 - 1
+
+create_text_table() ->
+    " (FIELD text)".
+
+%-------------------------------------------------------------------------
+create_unicode_table() ->
+    " (FIELD text)".
+
+%-------------------------------------------------------------------------
+create_timestamp_table() ->
+    " (FIELD TIMESTAMP)".
+
+%-------------------------------------------------------------------------
+tiny_int_min() ->
+    -128.
+tiny_int_max() ->
+    127.
+
+create_tiny_int_table() ->
+     " (FIELD tinyint)".
+
+tiny_int_min_selected() ->
+    {selected,["FIELD"],[{tiny_int_min()}]}.
+
+tiny_int_max_selected() ->
+    {selected,["FIELD"], [{tiny_int_max()}]}.
+
+%-------------------------------------------------------------------------
+small_int_min() ->
+    -32768.
+small_int_max() ->
+    32767.
+
+create_small_int_table() ->
+     " (FIELD smallint)".
+
+small_int_min_selected() ->
+    {selected,["FIELD"],[{-32768}]}.
+
+small_int_max_selected() ->
+    {selected,["FIELD"], [{32767}]}.
+
+%-------------------------------------------------------------------------
+int_min() ->
+   -2147483648.
+int_max() ->
+    2147483647.
+
+create_int_table() ->
+     " (FIELD int)".
+
+int_min_selected() ->
+    {selected,["FIELD"],[{-2147483648}]}.
+
+int_max_selected() ->
+    {selected,["FIELD"], [{2147483647}]}.
+
+%-------------------------------------------------------------------------
+big_int_min() ->
+    -9223372036854775808.
+
+big_int_max() ->
+    9223372036854775807.
+
+create_big_int_table() ->
+     " (FIELD bigint )".
+
+big_int_min_selected() ->
+    {selected,["FIELD"], [{"-9223372036854775808"}]}.
+
+big_int_max_selected() ->
+    {selected,["FIELD"], [{"9223372036854775807"}]}.
+
+%-------------------------------------------------------------------------
+bit_false() ->
+    0.
+bit_true() ->
+    1.
+
+create_bit_table() ->
+     " (FIELD bit)".
+
+bit_false_selected() ->
+    {selected,["FIELD"],[{"0"}]}.
+
+bit_true_selected() ->
+    {selected,["FIELD"], [{"1"}]}.
+
+%-------------------------------------------------------------------------
+
+%% Do not test float min/max as value is only theoretical defined in
+%% mysql and may vary depending on hardware.
+
+create_float_table() ->
+    " (FIELD float)".
+
+float_zero_selected() ->
+    {selected,["FIELD"],[{0.00000e+0}]}.
+
+%-------------------------------------------------------------------------
+real_min() ->
+    -3.40e+38.
+real_max() ->
+    3.40e+38.
+
+real_underflow() ->
+    "-3.41e+38".
+
+real_overflow() ->
+    "3.41e+38".
+
+create_real_table() ->
+    " (FIELD real)".
+
+real_zero_selected() ->
+    {selected,["FIELD"],[{0.00000e+0}]}.
+
+%-------------------------------------------------------------------------
+param_select_small_int() ->
+    {selected,["FIELD"],[{1}, {2}]}.
+
+param_select_int() ->
+    Int = small_int_max() + 1,
+    {selected,["FIELD"],[{1}, {Int}]}.
+
+param_select_decimal() ->
+    {selected,["FIELD"],[{1},{2}]}.
+
+param_select_numeric() ->
+    {selected,["FIELD"],[{1},{2}]}.
+
+param_select_float() ->
+    {selected,["FIELD"],[{1.30000},{1.20000}]}.
+
+param_select_real() ->
+    {selected,["FIELD"],[{1.30000},{1.20000}]}.
+
+param_select_double() ->
+    {selected,["FIELD"],[{1.30000},{1.20000}]}.
+
+param_select_mix() ->
+    {selected,["ID","DATA"],[{1, "foo"}, {2, "bar"}]}.
+
+param_update() ->
+    {selected,["ID","DATA"],[{1, "foobar"}, {2, "foobar"}, {3, "baz"}]}.
+
+param_delete() ->
+    {selected,["ID","DATA"],[{3, "baz"}]}.
+
+param_select() ->
+    {selected,["ID","DATA"],[{1, "foo"},{3, "foo"}]}.
+
+%-------------------------------------------------------------------------
+describe_integer() ->
+    {ok,[{"myint1",sql_smallint},
+	 {"myint2",sql_integer},
+	 {"myint3",sql_integer}]}.
+
+describe_string() ->
+    {ok,[{"str1",{sql_char,10}},
+	 {"str2",{sql_char,10}},
+	 {"str3",{sql_varchar,10}},
+	 {"str4",{sql_varchar,10}}]}.
+
+describe_floating() ->
+     {ok,[{"f",sql_real},{"r",sql_double},{"d",sql_double}]}.
+describe_dec_num() ->
+    {ok,[{"mydec",{sql_decimal,9,3}},{"mynum",{sql_decimal,9,2}}]}.
+
+describe_timestamp() ->
+    {ok, [{"FIELD", sql_timestamp}]}.
diff --git a/lib/odbc/test/odbc.dynspec b/lib/odbc/test/odbc.dynspec
deleted file mode 100644
index bb15edceed..0000000000
--- a/lib/odbc/test/odbc.dynspec
+++ /dev/null
@@ -1,31 +0,0 @@
-%% -*- erlang -*-
-%% You can test this file using this command.
-%%    file:script("odbc.dynspec", [{'Os',"Unix"}]).
-
-Exists =
-fun() ->
-	case code:lib_dir(odbc) of
-	    {error,bad_name} ->
-		false;
-	    P ->
-		%% Make sure that the odbc directory really
-		%% contains the application (and not only documentation).
-		case filelib:is_file(filename:join(P, "ebin/odbc.beam")) of
-		    false -> false;
-		    true ->
-			%% We know that we don't have any odbc libraries
-			%% installed on this computer.
-			{ok,Host} = inet:gethostname(),
-			Host =/= "netsim200"
-		end
-	end
-end,
-case Exists() of
-    false ->
-	NoOdbc = "No odbc application",
-	[{skip, {odbc_connect_SUITE, NoOdbc}},
-	 {skip, {odbc_data_type_SUITE, NoOdbc}},
-	 {skip, {odbc_query_SUITE, NoOdbc}}];
-    true ->
-	[]
-end.
diff --git a/lib/odbc/test/odbc.spec b/lib/odbc/test/odbc.spec
index edaf821c91..653f1a780e 100644
--- a/lib/odbc/test/odbc.spec
+++ b/lib/odbc/test/odbc.spec
@@ -1,25 +1 @@
 {suites,"../odbc_test",all}.
-{skip_cases,"../odbc_test",odbc_data_type_SUITE,
-            [varchar_upper_limit],
-            "Known bug in database"}.
-{skip_cases,"../odbc_test",odbc_data_type_SUITE,
-            [text_upper_limit],
-            "Consumes too much resources"}.
-{skip_cases,"../odbc_test",odbc_data_type_SUITE,
-            [bit_true],
-            "Not supported by driver"}.
-{skip_cases,"../odbc_test",odbc_data_type_SUITE,
-            [bit_false],
-            "Not supported by driver"}.
-{skip_cases,"../odbc_test",odbc_query_SUITE,
-            [multiple_select_result_sets],
-            "Not supported by driver"}.
-{skip_cases,"../odbc_test",odbc_query_SUITE,
-            [multiple_mix_result_sets],
-            "Not supported by driver"}.
-{skip_cases,"../odbc_test",odbc_query_SUITE,
-            [multiple_result_sets_error],
-            "Not supported by driver"}.
-{skip_cases,"../odbc_test",odbc_query_SUITE,
-            [param_insert_tiny_int],
-            "Not supported by driver"}.
diff --git a/lib/odbc/test/odbc.spec.win b/lib/odbc/test/odbc.spec.win
deleted file mode 100644
index 1fd349d2c3..0000000000
--- a/lib/odbc/test/odbc.spec.win
+++ /dev/null
@@ -1,5 +0,0 @@
-{topcase, {dir, "../odbc_test"}}.
-{skip, {odbc_data_type_SUITE, big_int_lower_limit, "Not supported by sqlserver 7.0"}}.
-{skip, {odbc_data_type_SUITE, big_int_upper_limit, "Not supported by sqlserver7.0"}}.
-{skip, {odbc_data_type_SUITE, text_upper_limit, "Consumes too much resources"}}.
-
diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 6a2268f40e..e59be772e3 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -77,14 +77,18 @@ end_per_group(_GroupName, Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    application:start(odbc),  
-    case catch odbc:connect(?RDBMS:connection_string(), 
-		      [{auto_commit, off}]) of
-	{ok, Ref} ->
-	    odbc:disconnect(Ref),
-	    [{tableName, odbc_test_lib:unique_table_name()} | Config];
-	_  ->
-	    {skip, "ODBC is not properly setup"}
+    case (catch odbc:start()) of
+	ok ->
+	    case catch odbc:connect(?RDBMS:connection_string(),
+				    [{auto_commit, off}] ++ odbc_test_lib:platform_options()) of
+		{ok, Ref} ->
+		    odbc:disconnect(Ref),
+		    [{tableName, odbc_test_lib:unique_table_name()} | Config];
+		_  ->
+		    {skip, "ODBC is not properly setup"}
+	    end;
+	_ ->
+	    {skip,"ODBC not startable"}
     end.	    
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
@@ -93,8 +97,7 @@ init_per_suite(Config) ->
 %% Description: Cleanup after the whole suite
 %%--------------------------------------------------------------------
 end_per_suite(_Config) ->
-    application:stop(odbc),
-    ok.
+    application:stop(odbc).
 
 %%--------------------------------------------------------------------
 %% Function: init_per_testcase(Case, Config) -> Config
@@ -124,15 +127,13 @@ init_per_testcase(_TestCase, Config) ->
 %% Description: Cleanup after each test case
 %%--------------------------------------------------------------------
 end_per_testcase(_TestCase, Config) ->
-     %% Clean up if needed 
     Table = ?config(tableName, Config),
-    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), []),
-    Result = odbc:sql_query(Ref, "DROP TABLE " ++ Table), 
+    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
+    Result = odbc:sql_query(Ref, "DROP TABLE " ++ Table),
     io:format("Drop table: ~p ~p~n", [Table, Result]),
     odbc:disconnect(Ref),
     Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
+    test_server:timetrap_cancel(Dog).
 
 %%-------------------------------------------------------------------------
 %% Test cases starts here.
@@ -142,13 +143,15 @@ commit(doc)->
 commit(suite) -> [];
 commit(Config)  ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), 
-			      [{auto_commit, off}]),
+			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
 
     Table = ?config(tableName, Config),
+    TransStr = transaction_support_str(?RDBMS),
+
     {updated, _} = 
 	odbc:sql_query(Ref, 
 		       "CREATE TABLE " ++ Table ++
-		       " (ID integer, DATA varchar(10))"),
+		       " (ID integer, DATA varchar(10))" ++ TransStr),
 
     {updated, 1} = 
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(1,'bar')"),
@@ -173,50 +176,47 @@ commit(Config)  ->
     {'EXIT', {function_clause, _}} = 
 	(catch odbc:commit(Ref, commit, -1)),
 
-    ok = odbc:disconnect(Ref),
-
-    ok.
+    ok = odbc:disconnect(Ref).
 %%-------------------------------------------------------------------------
 
 rollback(doc)->
     ["Test the use of explicit rollback"];
 rollback(suite) -> [];
 rollback(Config)  ->
-    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), 
-			      [{auto_commit, off}]),
+    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
+			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
 
     Table = ?config(tableName, Config),
 
-    {updated, _} = 
-	odbc:sql_query(Ref, 
+    TransStr = transaction_support_str(?RDBMS),
+
+    {updated, _} =
+	odbc:sql_query(Ref,
 		       "CREATE TABLE " ++ Table ++
-		       " (ID integer, DATA varchar(10))"),
-    {updated, 1} = 
+			   " (ID integer, DATA varchar(10))" ++ TransStr),
+    {updated, 1} =
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++ " VALUES(1,'bar')"),
     ok = odbc:commit(Ref, commit),
 
-    {updated, 1} = 
+    {updated, 1} =
 	odbc:sql_query(Ref, "UPDATE " ++ Table ++
-		       " SET DATA = 'foo' WHERE ID = 1"),
+			   " SET DATA = 'foo' WHERE ID = 1"),
     ok = odbc:commit(Ref, rollback),
     InsertResult = ?RDBMS:insert_result(),
-    InsertResult = 
+    InsertResult =
 	odbc:sql_query(Ref, "SELECT * FROM " ++ Table),
-
-    {updated, 1} = 
+    {updated, 1} =
 	odbc:sql_query(Ref, "UPDATE " ++ Table ++
-		       " SET DATA = 'foo' WHERE ID = 1"),
+			   " SET DATA = 'foo' WHERE ID = 1"),
     ok = odbc:commit(Ref, rollback, ?TIMEOUT),
     InsertResult = ?RDBMS:insert_result(),
-    InsertResult = 
+    InsertResult =
 	odbc:sql_query(Ref, "SELECT * FROM " ++ Table),
 
+    {'EXIT', {function_clause, _}} =
+	(catch odbc:commit(Ref, rollback, -1)),
 
-    {'EXIT', {function_clause, _}} = 
-	(catch odbc:commit(Ref, rollback, -1)), 
-
-    ok = odbc:disconnect(Ref),
-    ok.
+    ok = odbc:disconnect(Ref).
 
 %%-------------------------------------------------------------------------
 not_explicit_commit(doc) ->
@@ -224,20 +224,20 @@ not_explicit_commit(doc) ->
 not_explicit_commit(suite) -> [];
 not_explicit_commit(_Config) ->
     {ok, Ref} = 
-	odbc:connect(?RDBMS:connection_string(), [{auto_commit, on}]),
+	odbc:connect(?RDBMS:connection_string(), [{auto_commit, on}] ++
+		    odbc_test_lib:platform_options()),
     {error, _} = odbc:commit(Ref, commit),
-    ok = odbc:disconnect(Ref),
-    ok.
+    ok = odbc:disconnect(Ref).
 
 %%-------------------------------------------------------------------------
 not_exist_db(doc) ->
     ["Tests valid data format but invalid data in the connection parameters."];
 not_exist_db(suite) -> [];
 not_exist_db(_Config)  ->
-    {error, _} = odbc:connect("DSN=foo;UID=bar;PWD=foobar", []),
+    {error, _} = odbc:connect("DSN=foo;UID=bar;PWD=foobar",
+			      odbc_test_lib:platform_options()),
     %% So that the odbc control server can be stoped "in the correct way"
-    test_server:sleep(100),
-    ok.
+    test_server:sleep(100).
 
 %%-------------------------------------------------------------------------
 no_c_node(doc) ->
@@ -252,7 +252,8 @@ no_c_node(_Config) ->
     FileName2 = filename:nativename(filename:join(Dir, "odbcsrv")),
     ok = file:rename(FileName1, FileName2),
     Result = 
-	case catch odbc:connect(?RDBMS:connection_string(), []) of
+	case catch odbc:connect(?RDBMS:connection_string(),
+				odbc_test_lib:platform_options()) of
 	    {error, port_program_executable_not_found} ->
 		ok;
 	    Else ->
@@ -267,7 +268,7 @@ port_dies(doc) ->
     "Tests what happens if the port program dies";
 port_dies(suite) -> [];
 port_dies(_Config) ->
-    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), []),
+    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     {status, _} = process_info(Ref, status),   
     process_flag(trap_exit, true),
     Port = lists:last(erlang:ports()),      
@@ -275,26 +276,23 @@ port_dies(_Config) ->
     %% Wait for exit_status from port 5000 ms (will not get a exit
     %% status in this case), then wait a little longer to make sure
     %% the port and the controlprocess has had time to terminate.
-    test_server:sleep(7000), 
-    undefined = process_info(Ref, status),   
-    ok.
+    test_server:sleep(10000),
+    undefined = process_info(Ref, status).
 
 %%-------------------------------------------------------------------------
 control_process_dies(doc) ->
     "Tests what happens if the Erlang control process dies";
 control_process_dies(suite) -> [];
 control_process_dies(_Config) ->
-    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), []),
+    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     process_flag(trap_exit, true),
     Port = lists:last(erlang:ports()),      
     {connected, Ref} = erlang:port_info(Port, connected),  
     exit(Ref, kill),
-    test_server:sleep(100),
-    undefined = erlang:port_info(Port, connected),   
+    test_server:sleep(500),
+    undefined = erlang:port_info(Port, connected).
     %% Check for c-program still running, how?
-    ok.
 
-%%-------------------------------------------------------------------------
 
 %%-------------------------------------------------------------------------
 client_dies_normal(doc) ->
@@ -319,7 +317,7 @@ client_dies_normal(Config) when is_list(Config) ->
     end.
 
 client_normal(Pid) ->
-    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), []),
+    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     Pid ! {dbRef, Ref},
     receive 
 	continue ->
@@ -351,7 +349,7 @@ client_dies_timeout(Config) when is_list(Config) ->
     end.
 
 client_timeout(Pid) ->
-    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), []),
+    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     Pid ! {dbRef, Ref},
     receive 
 	continue ->
@@ -383,7 +381,7 @@ client_dies_error(Config) when is_list(Config) ->
     end.
 
 client_error(Pid) ->
-    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), []),
+    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     Pid ! {dbRef, Ref},
     receive 
 	continue ->
@@ -398,7 +396,10 @@ connect_timeout(doc) ->
 connect_timeout(suite) -> [];
 connect_timeout(Config) when is_list(Config) ->
     {'EXIT',timeout} = (catch odbc:connect(?RDBMS:connection_string(),
-					   [{timeout, 0}])),
+					   [{timeout, 0}] ++
+					       odbc_test_lib:platform_options())),
+    %% Need to return ok here "{'EXIT',timeout} return value" will
+    %% be interpreted as that the testcase has timed out.
     ok.
 %%-------------------------------------------------------------------------
 timeout(doc) ->
@@ -411,10 +412,12 @@ timeout(Config)  when is_list(Config) ->
 			      [{auto_commit, off}]),
     Table = ?config(tableName, Config),
 
+    TransStr = transaction_support_str(?RDBMS),
+
     {updated, _} = 
 	odbc:sql_query(Ref, 
 		       "CREATE TABLE " ++ Table ++
-		       " (ID integer, DATA varchar(10), PRIMARY KEY(ID))"),
+		       " (ID integer, DATA varchar(10), PRIMARY KEY(ID))" ++ TransStr),
 
     {updated, 1} = 
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++ " VALUES(1,'bar')"),
@@ -446,14 +449,12 @@ timeout(Config)  when is_list(Config) ->
     ["DATA"] = odbc_test_lib:to_upper(Fields),
 
     ok = odbc:commit(Ref, commit),
-    ok = odbc:disconnect(Ref),
-    ok.
-
+    ok = odbc:disconnect(Ref).
 
 update_table_timeout(Table, TimeOut, Pid) ->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
-			      [{auto_commit, off}]),
+			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
     UpdateQuery = "UPDATE " ++ Table ++ " SET DATA = 'foobar' WHERE ID = 1",
 
     case catch odbc:sql_query(Ref, UpdateQuery, TimeOut) of
@@ -474,15 +475,16 @@ update_table_timeout(Table, TimeOut, Pid) ->
 	odbc:sql_query(Ref, "SELECT DATA FROM " ++ Table ++ " WHERE ID = 2"),
     ["DATA"] = odbc_test_lib:to_upper(Fields),
 
-    {updated, 1} = odbc:sql_query(Ref, UpdateQuery, TimeOut),
+    %% Do not check {updated, 1} as some drivers will return 0
+    %% even though the update is done, which is checked by the test
+    %% case when the altered message is recived.
+    {updated, _} = odbc:sql_query(Ref, UpdateQuery, TimeOut),
 
     ok = odbc:commit(Ref, commit),
 
     Pid ! altered,
 
-    ok = odbc:disconnect(Ref),
-
-    ok.
+    ok = odbc:disconnect(Ref).
 %%-------------------------------------------------------------------------
 many_timeouts(doc) ->
     ["Tests that many consecutive timeouts lead to that the connection "
@@ -490,14 +492,15 @@ many_timeouts(doc) ->
 many_timeouts(suite) -> [];
 many_timeouts(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
-			      [{auto_commit, off}]),
+			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
 
     Table = ?config(tableName, Config),
+    TransStr = transaction_support_str(?RDBMS),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
 		       "CREATE TABLE " ++ Table ++
-		       " (ID integer, DATA varchar(10), PRIMARY KEY(ID))"),
+		       " (ID integer, DATA varchar(10), PRIMARY KEY(ID))" ++ TransStr),
 
     {updated, 1} = 
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++ " VALUES(1,'bar')"),
@@ -517,22 +520,20 @@ many_timeouts(Config) when is_list(Config) ->
     end,
 
     ok = odbc:commit(Ref, commit),
-    ok = odbc:disconnect(Ref),
-    ok.
+    ok = odbc:disconnect(Ref).
 
 
 update_table_many_timeouts(Table, TimeOut, Pid) ->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
-			      [{auto_commit, off}]),
+			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
     UpdateQuery = "UPDATE " ++ Table ++ " SET DATA = 'foobar' WHERE ID = 1",
 
     ok = loop_many_timouts(Ref, UpdateQuery, TimeOut),
 
     Pid ! many_timeouts_occurred, 
 
-    ok = odbc:disconnect(Ref),
-    ok.
+    ok = odbc:disconnect(Ref).
 
 
 loop_many_timouts(Ref, UpdateQuery, TimeOut) ->
@@ -546,18 +547,19 @@ loop_many_timouts(Ref, UpdateQuery, TimeOut) ->
     end.
 %%-------------------------------------------------------------------------
 timeout_reset(doc) ->
-    ["Check that the number of consecutive timouts is reset to 0 when " 
+    ["Check that the number of consecutive timouts is reset to 0 when "
      "a successful call to the database is made."];
 timeout_reset(suite) -> [];
 timeout_reset(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
-			      [{auto_commit, off}]),
+			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
     Table = ?config(tableName, Config),
+    TransStr = transaction_support_str(?RDBMS),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
 		       "CREATE TABLE " ++ Table ++
-		       " (ID integer, DATA varchar(10), PRIMARY KEY(ID))"),
+		       " (ID integer, DATA varchar(10), PRIMARY KEY(ID))" ++  TransStr),
 
     {updated, 1} = 
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++ " VALUES(1,'bar')"),
@@ -593,13 +595,12 @@ timeout_reset(Config) when is_list(Config) ->
     ["DATA"] = odbc_test_lib:to_upper(Fields),
 
     ok = odbc:commit(Ref, commit),
-    ok = odbc:disconnect(Ref),
-    ok.
+    ok = odbc:disconnect(Ref).
 
 update_table_timeout_reset(Table, TimeOut, Pid) ->
 
     {ok, Ref} = odbc:connect(?RDBMS:connection_string(),
-			     [{auto_commit, off}]),
+			     [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
     UpdateQuery = "UPDATE " ++ Table ++ " SET DATA = 'foobar' WHERE ID = 1",
 
     ok = loop_timout_reset(Ref, UpdateQuery, TimeOut, 
@@ -616,15 +617,16 @@ update_table_timeout_reset(Table, TimeOut, Pid) ->
 	odbc:sql_query(Ref, "SELECT DATA FROM " ++ Table ++ " WHERE ID = 2"),
     ["DATA"] = odbc_test_lib:to_upper(Fields),
 
-    {updated,1} = odbc:sql_query(Ref, UpdateQuery, TimeOut),
+    %% Do not check {updated, 1} as some drivers will return 0
+    %% even though the update is done, which is checked by the test
+    %% case when the altered message is recived.
+    {updated, _} = odbc:sql_query(Ref, UpdateQuery, TimeOut),
 
     ok = odbc:commit(Ref, commit),
 
     Pid ! altered,
 
-    ok = odbc:disconnect(Ref),
-
-    ok.
+    ok = odbc:disconnect(Ref).
 
 loop_timout_reset(_, _, _, 0) ->
     ok;
@@ -648,13 +650,14 @@ disconnect_on_timeout(suite) -> [];
 disconnect_on_timeout(Config) when is_list(Config) ->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
-			      [{auto_commit, off}]),
+			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
     Table = ?config(tableName, Config),
+    TransStr = transaction_support_str(?RDBMS),
 
     {updated, _} = 
 	odbc:sql_query(Ref, 
 		       "CREATE TABLE " ++ Table ++
-		       " (ID integer, DATA varchar(10), PRIMARY KEY(ID))"),
+		       " (ID integer, DATA varchar(10), PRIMARY KEY(ID))" ++ TransStr),
 
     {updated, 1} = 
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++ " VALUES(1,'bar')"),
@@ -678,7 +681,7 @@ disconnect_on_timeout(Config) when is_list(Config) ->
 update_table_disconnect_on_timeout(Table, TimeOut, Pid) ->
 
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
-			      [{auto_commit, off}]),
+			      [{auto_commit, off}] ++ odbc_test_lib:platform_options()),
     UpdateQuery = "UPDATE " ++ Table ++ " SET DATA = 'foobar' WHERE ID = 1",
 
     case catch odbc:sql_query(Ref, UpdateQuery, TimeOut) of
@@ -695,7 +698,7 @@ connection_closed(doc) ->
      " use a connection that has been closed"];
 connection_closed(suite) -> [];
 connection_closed(Config) when is_list(Config) ->
-    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), []),
+    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
 
     Table = ?config(tableName, Config), 
     {updated, _} = 
@@ -714,8 +717,7 @@ connection_closed(Config) when is_list(Config) ->
     {error, connection_closed} = odbc:next(Ref),
     {error, connection_closed} = odbc:prev(Ref),
     {error, connection_closed} = odbc:select(Ref, next, 3),
-    {error, connection_closed} = odbc:commit(Ref, commit),
-    ok.
+    {error, connection_closed} = odbc:commit(Ref, commit).
 
 %%-------------------------------------------------------------------------
 disable_scrollable_cursors(doc) ->
@@ -753,8 +755,7 @@ disable_scrollable_cursors(Config) when is_list(Config) ->
     {error, scrollable_cursors_disabled} =
 	odbc:select(Ref, {absolute, 2}, 5),
 
-    {selected, _ColNames,[]} = odbc:select(Ref, next, 1),
-    ok.
+    {selected, _ColNames,[]} = odbc:select(Ref, next, 1).
 
 %%-------------------------------------------------------------------------
 return_rows_as_lists(doc)->
@@ -763,7 +764,7 @@ return_rows_as_lists(doc)->
 return_rows_as_lists(suite) -> [];
 return_rows_as_lists(Config) when is_list(Config) ->
     {ok, Ref} =  odbc:connect(?RDBMS:connection_string(),
-			      [{tuple_row, off}]),
+			      [{tuple_row, off}] ++ odbc_test_lib:platform_options()),
 
     Table = ?config(tableName, Config),
 
@@ -784,16 +785,21 @@ return_rows_as_lists(Config) when is_list(Config) ->
 
     {ok, _} = odbc:select_count(Ref, "SELECT * FROM " ++ Table),
 
-    First = ?RDBMS:first_list_rows(),
-    Last =  ?RDBMS:last_list_rows(),
-    Prev = ?RDBMS:prev_list_rows(),
-    Next = ?RDBMS:next_list_rows(),
-
-    Last = odbc:last(Ref),
-    Prev = odbc:prev(Ref),
-    First = odbc:first(Ref),
-    Next = odbc:next(Ref),
-    ok.   
+    case proplists:get_value(scrollable_cursors, odbc_test_lib:platform_options()) of
+	off ->
+	    Next = ?RDBMS:next_list_rows(),
+	    Next = odbc:next(Ref);
+	_ ->
+	    First = ?RDBMS:first_list_rows(),
+	    Last =  ?RDBMS:last_list_rows(),
+	    Prev = ?RDBMS:prev_list_rows(),
+	    Next = ?RDBMS:next_list_rows(),
+
+	    Last = odbc:last(Ref),
+	    Prev = odbc:prev(Ref),
+	    First = odbc:first(Ref),
+	    Next = odbc:next(Ref)
+    end.
 
 %%-------------------------------------------------------------------------
 
@@ -802,22 +808,27 @@ api_missuse(doc)->
 api_missuse(suite) -> [];
 api_missuse(Config) when is_list(Config)->
 
-    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), []),
+    {ok, Ref} =  odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     %% Serious programming fault, connetion will be shut down 
     gen_server:call(Ref, {self(), foobar, 10}, infinity),
     test_server:sleep(10),
     undefined = process_info(Ref, status),
 
-    {ok, Ref2} =  odbc:connect(?RDBMS:connection_string(), []),
+    {ok, Ref2} =  odbc:connect(?RDBMS:connection_string(),
+			       odbc_test_lib:platform_options()),
     %% Serious programming fault, connetion will be shut down 
     gen_server:cast(Ref2, {self(), foobar, 10}),
     test_server:sleep(10),
     undefined = process_info(Ref2, status),
 
-    {ok, Ref3} =  odbc:connect(?RDBMS:connection_string(), []),
+    {ok, Ref3} =  odbc:connect(?RDBMS:connection_string(),
+			       odbc_test_lib:platform_options()),
     %% Could be an innocent misstake the connection lives. 
     Ref3 ! foobar, 
     test_server:sleep(10),
-    {status, _} = process_info(Ref3, status),
-    ok.
+    {status, _} = process_info(Ref3, status).
 
+transaction_support_str(mysql) ->
+    "ENGINE = InnoDB";
+transaction_support_str(_) ->
+    "".
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index bfb1e4b329..84c99e183b 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -44,24 +44,29 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     case odbc_test_lib:odbc_check() of
 	ok ->
-	    [{group, char}, {group, int}, {group, floats},
+	    [{group, char},{group, fixed_char}, {group, binary_char},
+	     {group, fixed_binary_char},
+	     {group, int}, {group, floats},
 	     {group, dec_and_num}, timestamp];
 	Other -> {skip, Other}
     end.
 
 groups() -> 
     [{char, [],
-      [char_fixed_lower_limit, char_fixed_upper_limit,
-       char_fixed_padding, varchar_lower_limit,
+      [varchar_lower_limit,
        varchar_upper_limit, varchar_no_padding,
        text_lower_limit, text_upper_limit, unicode]},
+     {fixed_char, [],
+      [char_fixed_lower_limit, char_fixed_upper_limit,
+       char_fixed_padding]},
      {binary_char, [],
-      [binary_char_fixed_lower_limit,
-       binary_char_fixed_upper_limit,
-       binary_char_fixed_padding, binary_varchar_lower_limit,
+      [binary_varchar_lower_limit,
        binary_varchar_upper_limit, binary_varchar_no_padding,
        binary_text_lower_limit, binary_text_upper_limit,
        unicode]},
+     {fixed_binary_char, [], [binary_char_fixed_lower_limit,
+			      binary_char_fixed_upper_limit,
+			      binary_char_fixed_padding]},
      {int, [],
       [tiny_int_lower_limit, tiny_int_upper_limit,
        small_int_lower_limit, small_int_upper_limit,
@@ -74,6 +79,15 @@ groups() ->
       [dec_long, dec_double, dec_bignum, num_long, num_double,
        num_bignum]}].
 
+init_per_group(GroupName, Config) when GroupName == fixed_char;
+				       GroupName == fixed_binary_char ->
+    case ?RDBMS of
+	mysql ->
+	    {skip, "No supported by MYSQL"};
+	_ ->
+	    Config
+    end;
+
 init_per_group(_GroupName, Config) ->
     Config.
 
@@ -92,8 +106,12 @@ end_per_group(_GroupName, Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    application:start(odbc),
-    [{tableName, odbc_test_lib:unique_table_name()} | Config].
+    case (catch odbc:start()) of
+	ok ->
+	    [{tableName, odbc_test_lib:unique_table_name()} | Config];
+	_ ->
+	    {skip, "ODBC not startable"}
+    end.
 
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
@@ -117,22 +135,69 @@ end_per_suite(_Config) ->
 %% Note: This function is free to add any key/value pairs to the Config
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
+init_per_testcase(Case, Config) when Case == varchar_upper_limit;
+				     Case == binary_varchar_upper_limit;
+				     Case == varchar_no_padding;
+				     Case == binary_varchar_no_padding ->
+    case is_fixed_upper_limit(?RDBMS) of
+	true ->
+	    common_init_per_testcase(Case, Config);
+	false ->
+	    {skip, "Upper limit is not fixed in" ++ atom_to_list(?RDBMS)}
+    end;
+
+init_per_testcase(text_upper_limit, _Config) ->
+    {skip, "Consumes too much resources"};
+
+init_per_testcase(Case, Config) when Case == bit_true; Case == bit_false ->
+    case is_supported_bit(?RDBMS) of
+	true ->
+	    common_init_per_testcase(Case, Config);
+	false ->
+	    {skip, "Not supported by driver"}
+    end;
+
+init_per_testcase(param_insert_tiny_int = Case, Config) ->
+    case is_supported_tinyint(?RDBMS) of
+	true ->
+	    common_init_per_testcase(Case, Config);
+	false ->
+	    {skip, "Not supported by driver"}
+    end;
 init_per_testcase(Case, Config) ->
+    common_init_per_testcase(Case, Config).
+
+common_init_per_testcase(Case, Config) ->
+    PlatformOptions = odbc_test_lib:platform_options(),
     case atom_to_list(Case) of
 	"binary" ++ _  ->
 	    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), 
-				     [{binary_strings, on}]);
+				     [{binary_strings, on}] ++ PlatformOptions);
 	"unicode" ->
 	    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), 
-				     [{binary_strings, on}]);
+				     [{binary_strings, on}] ++ PlatformOptions);
 	_ ->
-	    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), [])
+	    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), PlatformOptions)
     end,
+    odbc_test_lib:strict(Ref, ?RDBMS),
     Dog = test_server:timetrap(?default_timeout),
     Temp = lists:keydelete(connection_ref, 1, Config),
     NewConfig = lists:keydelete(watchdog, 1, Temp),
     [{watchdog, Dog}, {connection_ref, Ref} | NewConfig].
 
+is_fixed_upper_limit(mysql) ->
+    false;
+is_fixed_upper_limit(_) ->
+    true.
+is_supported_tinyint(sqlserver) ->
+    true;
+is_supported_tinyint(_) ->
+    false.
+is_supported_bit(sqlserver) ->
+    true;
+is_supported_bit(_) ->
+     false.
+
 %%--------------------------------------------------------------------
 %% Function: end_per_testcase(Case, Config) -> _
 %% Case - atom()
@@ -146,7 +211,7 @@ end_per_testcase(_TestCase, Config) ->
     ok = odbc:disconnect(Ref),
     %% Clean up if needed 
     Table = ?config(tableName, Config),
-    {ok, NewRef} = odbc:connect(?RDBMS:connection_string(), []),
+    {ok, NewRef} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     odbc:sql_query(NewRef, "DROP TABLE " ++ Table), 
     odbc:disconnect(NewRef),
     Dog = ?config(watchdog, Config),
@@ -169,18 +234,18 @@ char_fixed_lower_limit(Config) when is_list(Config) ->
     {error, _} = 
 	odbc:sql_query(Ref, 
 		       "CREATE TABLE " ++ Table ++    
-		       ?RDBMS:create_fixed_char_table(
+			   ?RDBMS:create_fixed_char_table(
 			  (?RDBMS:fixed_char_min() - 1))), 
     %% Lower limit
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
-		       ?RDBMS:create_fixed_char_table(
-			  ?RDBMS:fixed_char_min())), 
+			   ?RDBMS:create_fixed_char_table(
+			      ?RDBMS:fixed_char_min())),
 
     %% Right length data
     {updated, _} =  
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++
-		       "'" ++ string:chars($a, ?RDBMS:fixed_char_min())
+			   "'" ++ string:chars($a, ?RDBMS:fixed_char_min())
 		       ++ "')"),
     %% Select data
     {selected, Fields,[{"a"}]} =
@@ -191,11 +256,11 @@ char_fixed_lower_limit(Config) when is_list(Config) ->
     %% Too long data
     {error, _}  =  
 	odbc:sql_query(Ref,"INSERT INTO " ++ Table ++" VALUES(" ++
-		       "'" ++ string:chars($a, 
-					   (?RDBMS:fixed_char_min()
-					    + 1)) 
-		       ++ "')"),		
-    ok.
+			   "'" ++ string:chars($a,
+					       (?RDBMS:fixed_char_min()
+						+ 1))
+		       ++ "')").
+
 %%-------------------------------------------------------------------------
 
 char_fixed_upper_limit(doc) ->
@@ -243,8 +308,7 @@ char_fixed_upper_limit(Config) when is_list(Config) ->
 	    {error, _} =
 		odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++  
 			       ?RDBMS:create_fixed_char_table(
-				  (?RDBMS:fixed_char_max() + 1))), 
-	    ok
+				  (?RDBMS:fixed_char_max() + 1)))
     end.
 
 %%-------------------------------------------------------------------------
@@ -261,20 +325,20 @@ char_fixed_padding(Config) when is_list(Config) ->
     %% Data should be padded with blanks
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
-		       ?RDBMS:create_fixed_char_table(
-			  ?RDBMS:fixed_char_max())), 
+			   ?RDBMS:create_fixed_char_table(
+			      ?RDBMS:fixed_char_max())),
 
-    {updated, _} =  
+    {updated, _} =
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
-		       "'" ++ string:chars($a, 
-					   ?RDBMS:fixed_char_min())
+			   "'" ++ string:chars($a,
+					       ?RDBMS:fixed_char_min())
 		       ++ "')"),
 
     {selected, Fields, [{CharStr}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     true = length(CharStr) == ?RDBMS:fixed_char_max(),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields),
-    ok.
+	    ["FIELD"] = odbc_test_lib:to_upper(Fields).
+
 %%-------------------------------------------------------------------------
 
 varchar_lower_limit(doc) ->
@@ -287,33 +351,33 @@ varchar_lower_limit(Config) when is_list(Config) ->
 
     %% Below limit
     {error, _} = 
-	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
-		       ?RDBMS:create_var_char_table(
-			  ?RDBMS:var_char_min() - 1)), 
+	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++
+			   ?RDBMS:create_var_char_table(
+			      ?RDBMS:var_char_min() - 1)),
     %% Lower limit
     {updated, _} =  % Value == 0 || -1 driver dependent!
 	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
-		       ?RDBMS:create_var_char_table(
-			  ?RDBMS:var_char_min())), 
+				   ?RDBMS:create_var_char_table(
+				      ?RDBMS:var_char_min())),
+
+    Str = string:chars($a, ?RDBMS:var_char_min()),
 
     %% Right length data
     {updated, _} =  
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
-		       "'" ++ string:chars($a, ?RDBMS:var_char_min())
-		       ++ "')"),
+			   "'" ++ Str ++ "')"),
     %% Select data
-    {selected, Fields, [{"a"}]} =
+    {selected, Fields, [{Str}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     
     ["FIELD"] = odbc_test_lib:to_upper(Fields),
 
-    %% Too long data
-    {error, _} =  
-	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
-		       "'" ++ string:chars($a, 
-					   (?RDBMS:var_char_min()+1)) 
-		       ++ "')"),		
-    ok.
+    %% Too long datae
+    {error, _} =
+		odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++
+				   "'" ++ string:chars($a,
+						       (?RDBMS:var_char_min()+1))
+			       ++ "')").
 
 %%-------------------------------------------------------------------------
 
@@ -389,8 +453,7 @@ varchar_no_padding(Config) when is_list(Config) ->
     {selected, Fields, [{CharStr}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     true = length(CharStr) /= ?RDBMS:var_char_max(),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields),
-    ok.
+    ["FIELD"] = odbc_test_lib:to_upper(Fields).
 
 %%-------------------------------------------------------------------------
 
@@ -413,8 +476,7 @@ text_lower_limit(Config) when is_list(Config) ->
 
     {selected, Fields, [{"a"}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields),
-    ok.
+    ["FIELD"] = odbc_test_lib:to_upper(Fields).
 
 %%-------------------------------------------------------------------------
 
@@ -444,8 +506,7 @@ text_upper_limit(Config) when is_list(Config) ->
 %%     {error, _} =  
 %% 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 %% 		       "'" ++ string:chars($a, (?RDBMS:text_max()+1)) 
-%% 		       ++ "')"),		
-%%     ok.
+%% 		       ++ "')").
 
 %%-------------------------------------------------------------------------
 
@@ -469,13 +530,18 @@ binary_char_fixed_lower_limit(Config) when is_list(Config) ->
 		       ?RDBMS:create_fixed_char_table(
 			  ?RDBMS:fixed_char_min())), 
 
+    Str = string:chars($a, ?RDBMS:fixed_char_min()),
+
     %% Right length data
     {updated, _} =  
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++
-		       "'" ++ string:chars($a, ?RDBMS:fixed_char_min())
+		       "'" ++ Str
 		       ++ "')"),
+
+    Bin = list_to_binary(Str),
+
     %% Select data
-    {selected, Fields,[{<<"a">>}]} =
+    {selected, Fields,[{Bin}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
 
     ["FIELD"] = odbc_test_lib:to_upper(Fields),
@@ -486,8 +552,7 @@ binary_char_fixed_lower_limit(Config) when is_list(Config) ->
 		       "'" ++ string:chars($a, 
 					   (?RDBMS:fixed_char_min()
 					    + 1)) 
-		       ++ "')"),		
-    ok.
+		       ++ "')").
 %%-------------------------------------------------------------------------
 
 binary_char_fixed_upper_limit(doc) ->
@@ -565,8 +630,8 @@ binary_char_fixed_padding(Config) when is_list(Config) ->
     {selected, Fields, [{CharBin}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     true = size(CharBin) == ?RDBMS:fixed_char_max(),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields),
-    ok.
+    ["FIELD"] = odbc_test_lib:to_upper(Fields).
+
 %%-------------------------------------------------------------------------
 
 binary_varchar_lower_limit(doc) ->
@@ -588,13 +653,17 @@ binary_varchar_lower_limit(Config) when is_list(Config) ->
 		       ?RDBMS:create_var_char_table(
 			  ?RDBMS:var_char_min())), 
 
+    Str = string:chars($a, ?RDBMS:var_char_min()),
+
     %% Right length data
     {updated, _} =  
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
-		       "'" ++ string:chars($a, ?RDBMS:var_char_min())
+		       "'" ++ Str
 		       ++ "')"),
+    BinStr = list_to_binary(Str),
+
     %% Select data
-    {selected, Fields, [{<<"a">>}]} =
+    {selected, Fields, [{BinStr}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     
     ["FIELD"] = odbc_test_lib:to_upper(Fields),
@@ -604,8 +673,7 @@ binary_varchar_lower_limit(Config) when is_list(Config) ->
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 		       "'" ++ string:chars($a, 
 					   (?RDBMS:var_char_min()+1)) 
-		       ++ "')"),		
-    ok.
+		       ++ "')").
 
 %%-------------------------------------------------------------------------
 
@@ -654,8 +722,7 @@ binary_varchar_upper_limit(Config) when is_list(Config) ->
 	    {error, _} =
 		odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
 			       ?RDBMS:create_var_char_table(
-				  (?RDBMS:var_char_max() + 1))),
-	    ok
+				  (?RDBMS:var_char_max() + 1)))
     end.
 %%-------------------------------------------------------------------------
 
@@ -681,8 +748,7 @@ binary_varchar_no_padding(Config) when is_list(Config) ->
     {selected, Fields, [{CharBin}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
     true = size(CharBin) /= ?RDBMS:var_char_max(),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields),
-    ok.
+    ["FIELD"] = odbc_test_lib:to_upper(Fields).
 
 %%-------------------------------------------------------------------------
 
@@ -705,8 +771,7 @@ binary_text_lower_limit(Config) when is_list(Config) ->
 
     {selected, Fields, [{<<"a">>}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields),
-    ok.
+    ["FIELD"] = odbc_test_lib:to_upper(Fields).
 
 %%-------------------------------------------------------------------------
 
@@ -736,11 +801,7 @@ binary_text_upper_limit(Config) when is_list(Config) ->
 %%     {error, _} =  
 %% 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 %% 		       "'" ++ string:chars($a, (?RDBMS:text_max()+1)) 
-%% 		       ++ "')"),		
-%%     ok.
-
-
-%%-------------------------------------------------------------------------
+%% 		       ++ "')").
 
 
 %%-------------------------------------------------------------------------
@@ -774,8 +835,7 @@ tiny_int_lower_limit(Config) when is_list(Config) ->
 		odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 			       "'" ++ integer_to_list(?RDBMS:tiny_int_min() 
 						      - 1)
-			       ++ "')"),
-	    ok
+			       ++ "')")
     end.
 
 %%-------------------------------------------------------------------------
@@ -809,8 +869,7 @@ tiny_int_upper_limit(Config) when is_list(Config) ->
 		odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 			       "'" ++ integer_to_list(?RDBMS:tiny_int_max()
 						      + 1)
-			       ++ "')"),
-	    ok
+			       ++ "')")
     end.
 
 %%-------------------------------------------------------------------------
@@ -840,8 +899,7 @@ small_int_lower_limit(Config) when is_list(Config) ->
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 		       "'"  ++ integer_to_list(?RDBMS:small_int_min()
 					       - 1)
-		       ++ "')"),
-    ok.
+		       ++ "')").
 
 %%-------------------------------------------------------------------------
 
@@ -870,8 +928,7 @@ small_int_upper_limit(Config) when is_list(Config) ->
 	odbc:sql_query(Ref,"INSERT INTO " ++ Table ++" VALUES(" ++  
 		       "'" ++ integer_to_list(?RDBMS:small_int_max() 
 					      + 1)
-		       ++ "')"),
-    ok.
+		       ++ "')").
 
 %%-------------------------------------------------------------------------
 int_lower_limit(doc) ->
@@ -898,8 +955,7 @@ int_lower_limit(Config) when is_list(Config) ->
     {error, _} =  
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 		       "'" ++ integer_to_list(?RDBMS:int_min() - 1)
-		       ++ "')"),
-    ok.
+		       ++ "')").
 
 %%-------------------------------------------------------------------------
 
@@ -927,8 +983,7 @@ int_upper_limit(Config) when is_list(Config) ->
     {error, _} =  
 	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 		       "'" ++ integer_to_list(?RDBMS:int_max() + 1)
-		       ++ "')"),    
-    ok.
+		       ++ "')").
 
 
 %%-------------------------------------------------------------------------
@@ -957,8 +1012,7 @@ big_int_lower_limit(Config) when is_list(Config) ->
  	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 		       "'" ++ integer_to_list(?RDBMS:big_int_min() 
 					      - 1)
-		       ++ "')"),
-    ok.
+		       ++ "')").
 
 %%-------------------------------------------------------------------------
 
@@ -987,8 +1041,7 @@ big_int_upper_limit(Config) when is_list(Config) ->
  	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 		       "'" ++ integer_to_list(?RDBMS:big_int_max() 
 					      + 1)
-		       ++ "')"),
-    ok.
+		       ++ "')").
 %%-------------------------------------------------------------------------
 
 bit_false(doc) ->
@@ -1020,8 +1073,7 @@ bit_false(Config) when is_list(Config) ->
 	    {error, _} =  
 		odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 			       "'" ++ integer_to_list(-1)
-			       ++ "')"),
-	    ok
+			       ++ "')")
     end.
 
 %%-------------------------------------------------------------------------
@@ -1056,14 +1108,10 @@ bit_true(Config) when is_list(Config) ->
 	    {error, _} =  
 		odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
 			       "'" ++ integer_to_list(-1)
-			       ++ "')"),
-	    ok
+			       ++ "')")
     end.
 
 %%-------------------------------------------------------------------------
-
-
-%%-------------------------------------------------------------------------
 float_lower_limit(doc) ->
     [""];
 float_lower_limit(suite) ->
@@ -1073,44 +1121,45 @@ float_lower_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
 
-    {updated, _} =  % Value == 0 || -1 driver dependent!
-	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
-		       ?RDBMS:create_float_table()), 
-
-    {updated, _} =  
-	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
-		       "'" ++ float_to_list(
-				?RDBMS:float_min())
-		       ++ "')"),
-    {selected,[_ColName],[{MinFloat}]} = 
-	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-
-    true = ?RDBMS:float_min() == MinFloat,
-
     case ?RDBMS of
-	oracle ->
-	    {updated, _} =  % Value == 0 || -1 driver dependent!
-		odbc:sql_query(Ref, "DROP TABLE " ++ Table), 
-
+	mysql ->
+	    {skip, "Not clearly defined in MYSQL"};
+	_ ->
 	    {updated, _} =  % Value == 0 || -1 driver dependent!
 		odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
-			       ?RDBMS:create_float_table()), 
+				   ?RDBMS:create_float_table()),
 
 	    {updated, _} =  
-		odbc:sql_query(Ref, 
-			       "INSERT INTO " ++ Table ++" VALUES(" ++ 
-			       ?RDBMS:float_underflow() ++ ")"),
-
-	    SelectResult = ?RDBMS:float_zero_selected(),
-	    SelectResult =
-		odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table);
-	_ ->
-	    {error, _} =  
 		odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
-			       ?RDBMS:float_underflow() ++ ")")
-    end,
-    ok.
+				   "'" ++ float_to_list(
+					    ?RDBMS:float_min())
+			       ++ "')"),
+	    {selected,[_ColName],[{MinFloat}]} =
+		odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
 
+	    true = ?RDBMS:float_min() == MinFloat,
+
+	    case ?RDBMS of
+		oracle ->
+		    {updated, _} =  % Value == 0 || -1 driver dependent!
+			odbc:sql_query(Ref, "DROP TABLE " ++ Table),
+
+		    {updated, _} =  % Value == 0 || -1 driver dependent!
+			odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++
+					   ?RDBMS:create_float_table()),
+		    {updated, _} =
+			odbc:sql_query(Ref,
+				       "INSERT INTO " ++ Table ++" VALUES(" ++
+				       ?RDBMS:float_underflow() ++ ")"),
+		    SelectResult = ?RDBMS:float_zero_selected(),
+		    SelectResult =
+			odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table);
+		_ ->
+		    {error, _} =
+			odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++
+					   ?RDBMS:float_underflow() ++ ")")
+	    end
+    end.
 
 %%-------------------------------------------------------------------------
 float_upper_limit(doc) ->
@@ -1121,26 +1170,28 @@ float_upper_limit(Config) when is_list(Config) ->
     Ref = ?config(connection_ref, Config),   
     Table = ?config(tableName, Config),
 
-    {updated, _} =  % Value == 0 || -1 driver dependent!
-	odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++ 
-		       ?RDBMS:create_float_table()), 
-
-    {updated, _} =  
-	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
-		       "'" ++ float_to_list(
-				?RDBMS:float_max())
-		       ++ "')"),
-
+    case ?RDBMS of
+	mysql ->
+	    {skip, "Not clearly defined in MYSQL"};
+	_->
+	    {updated, _} =  % Value == 0 || -1 driver dependent!
+		odbc:sql_query(Ref,  "CREATE TABLE " ++ Table ++
+				   ?RDBMS:create_float_table()),
 
-    {selected,[_ColName],[{MaxFloat}]}
-	= odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
+	    {updated, _} =
+		odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++
+				   "'" ++ float_to_list(
+					    ?RDBMS:float_max())
+			       ++ "')"),
+	    {selected,[_ColName],[{MaxFloat}]}
+		= odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
 
-    true = ?RDBMS:float_max() == MaxFloat,
+	    true = ?RDBMS:float_max() == MaxFloat,
 
-    {error, _} =  
-	odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++ 
-		       ?RDBMS:float_overflow() ++ ")"),
-    ok.
+	    {error, _} =
+		odbc:sql_query(Ref, "INSERT INTO " ++ Table ++" VALUES(" ++
+				   ?RDBMS:float_overflow() ++ ")")
+    end.
 
 %%-------------------------------------------------------------------------
 float_zero(doc) ->
@@ -1160,8 +1211,7 @@ float_zero(Config) when is_list(Config) ->
 
     SelectResult = ?RDBMS:float_zero_selected(),
     SelectResult =
-	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-    ok.
+	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table).
 %%-------------------------------------------------------------------------
 real_zero(doc) ->
     ["Test the real value zero."];
@@ -1185,10 +1235,8 @@ real_zero(Config) when is_list(Config) ->
 
 	    SelectResult = ?RDBMS:real_zero_selected(),
 	    SelectResult =
-		odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-	    ok
+		odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table)
     end.
-%%-------------------------------------------------------------------------
 %%------------------------------------------------------------------------
 dec_long(doc) ->
     [""];
@@ -1207,8 +1255,7 @@ dec_long(Config) when is_list(Config) ->
 
     {selected, Fields, [{2}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields),
-    ok.
+    ["FIELD"] = odbc_test_lib:to_upper(Fields).
 %%------------------------------------------------------------------------
 dec_double(doc) ->
     [""];
@@ -1255,8 +1302,7 @@ dec_double(Config) when is_list(Config) ->
 
     {selected, Fields2, [{1.60000}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields2),
-    ok.
+    ["FIELD"] = odbc_test_lib:to_upper(Fields2).
 
 %%------------------------------------------------------------------------
 dec_bignum(doc) ->
@@ -1289,8 +1335,7 @@ dec_bignum(Config) when is_list(Config) ->
 
     {selected, Fields1, [{"1.6"}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields1),
-    ok.
+    ["FIELD"] = odbc_test_lib:to_upper(Fields1).
 %%------------------------------------------------------------------------
 num_long(doc) ->
     [""];
@@ -1309,8 +1354,7 @@ num_long(Config) when is_list(Config) ->
 
     {selected, Fields, [{2}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields),
-    ok.
+    ["FIELD"] = odbc_test_lib:to_upper(Fields).
 %%------------------------------------------------------------------------
 num_double(doc) ->
     [""];
@@ -1356,8 +1400,7 @@ num_double(Config) when is_list(Config) ->
 
     {selected, Fields2, [{1.6000}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-     ["FIELD"] = odbc_test_lib:to_upper(Fields2),
-    ok.
+     ["FIELD"] = odbc_test_lib:to_upper(Fields2).
 %%------------------------------------------------------------------------
 num_bignum(doc) ->
     [""];
@@ -1389,8 +1432,7 @@ num_bignum(Config) when is_list(Config) ->
 
     {selected, Fields1, [{"1.6"}]} =
 	odbc:sql_query(Ref,"SELECT FIELD FROM " ++ Table),
-    ["FIELD"] = odbc_test_lib:to_upper(Fields1),
-    ok.
+    ["FIELD"] = odbc_test_lib:to_upper(Fields1).
 
 %%------------------------------------------------------------------------
 unicode(doc) ->
@@ -1422,6 +1464,8 @@ unicode(Config) when is_list(Config) ->
 	    w_char_support_win(Ref, Table, Latin1Data);
 	postgres ->
 	    direct_utf8(Ref, Table, Latin1Data);
+	mysql ->
+	    direct_utf8(Ref, Table, Latin1Data);
 	oracle ->
 	    {skip, "not currently supported"}
     end.
diff --git a/lib/odbc/test/odbc_query_SUITE.erl b/lib/odbc/test/odbc_query_SUITE.erl
index 8b8d1e7a40..76a214d553 100644
--- a/lib/odbc/test/odbc_query_SUITE.erl
+++ b/lib/odbc/test/odbc_query_SUITE.erl
@@ -43,19 +43,22 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     case odbc_test_lib:odbc_check() of
 	ok ->
-	    [sql_query, first, last, next, prev, select_count,
+	    [sql_query, next, {group, scrollable_cursors}, select_count,
 	     select_next, select_relative, select_absolute,
 	     create_table_twice, delete_table_twice, duplicate_key,
 	     not_connection_owner, no_result_set, query_error,
-	     multiple_select_result_sets, multiple_mix_result_sets,
-	     multiple_result_sets_error,
+	     {group, multiple_result_sets},
 	     {group, parameterized_queries}, {group, describe_table},
 	     delete_nonexisting_row];
 	Other -> {skip, Other}
     end.
 
 groups() -> 
-    [{parameterized_queries, [],
+    [{multiple_result_sets, [], [multiple_select_result_sets,
+                                 multiple_mix_result_sets,
+                                 multiple_result_sets_error]},
+     {scrollable_cursors, [],  [first, last, prev]},
+     {parameterized_queries, [],
       [{group, param_integers}, param_insert_decimal,
        param_insert_numeric, {group, param_insert_string},
        param_insert_float, param_insert_real,
@@ -72,15 +75,26 @@ groups() ->
       [describe_integer, describe_string, describe_floating,
        describe_dec_num, describe_no_such_table]}].
 
-init_per_group(_GroupName, Config) ->
+init_per_group(multiple_result_sets, Config) ->
+    case is_supported_multiple_resultsets(?RDBMS) of
+	true ->
+	    Config;
+	false ->
+	    {skip, "Not supported by " ++ atom_to_list(?RDBMS) ++ "driver"}
+    end;
+init_per_group(scrollable_cursors, Config) ->
+    case proplists:get_value(scrollable_cursors, odbc_test_lib:platform_options()) of
+	off ->
+	    {skip, "Not supported by driver"};
+	_ ->
+	    Config
+    end;
+init_per_group(_,Config) ->
     Config.
 
 end_per_group(_GroupName, Config) ->
     Config.
 
-					  
-
-
 %%--------------------------------------------------------------------
 %% Function: init_per_suite(Config) -> Config
 %% Config - [tuple()]
@@ -91,8 +105,12 @@ end_per_group(_GroupName, Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) when is_list(Config) ->
-    application:start(odbc),
-    [{tableName, odbc_test_lib:unique_table_name()}| Config].
+    case (catch odbc:start()) of
+	ok ->
+	    [{tableName, odbc_test_lib:unique_table_name()}| Config];
+	_ ->
+	    {skip, "ODBC not startable"}
+    end.
 
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
@@ -117,7 +135,8 @@ end_per_suite(_Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_testcase(_Case, Config) ->
-    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), []),
+    {ok, Ref} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
+    odbc_test_lib:strict(Ref, ?RDBMS),
     Dog = test_server:timetrap(?default_timeout),
     Temp = lists:keydelete(connection_ref, 1, Config),
     NewConfig = lists:keydelete(watchdog, 1, Temp),
@@ -136,7 +155,7 @@ end_per_testcase(_Case, Config) ->
     ok = odbc:disconnect(Ref),
     %% Clean up if needed 
     Table = ?config(tableName, Config),
-    {ok, NewRef} = odbc:connect(?RDBMS:connection_string(), []),
+    {ok, NewRef} = odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()),
     odbc:sql_query(NewRef, "DROP TABLE " ++ Table), 
     odbc:disconnect(NewRef),
     Dog = ?config(watchdog, Config),
@@ -663,9 +682,6 @@ multiple_result_sets_error(Config) when is_list(Config) ->
     end.   
 
 %%-------------------------------------------------------------------------
-
-%%-------------------------------------------------------------------------
-%%-------------------------------------------------------------------------
 param_insert_tiny_int(doc)->
     ["Test insertion of tiny ints by parameterized queries."];
 param_insert_tiny_int(suite) ->
@@ -901,8 +917,6 @@ param_insert_numeric(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-
-%%-------------------------------------------------------------------------
 param_insert_char(doc)->
     ["Test insertion of fixed length string by parameterized queries."];
 param_insert_char(suite) ->
@@ -1325,8 +1339,6 @@ param_select(Config) when is_list(Config) ->
     ok.
 
 %%-------------------------------------------------------------------------
-
-%%-------------------------------------------------------------------------
 describe_integer(doc) ->
     ["Test describe_table/[2,3] for integer columns."];
 describe_integer(suite) ->
@@ -1338,7 +1350,7 @@ describe_integer(Config) when is_list(Config) ->
     {updated, _} = 
 	odbc:sql_query(Ref, 
 		       "CREATE TABLE " ++ Table ++
-		       " (int1 SMALLINT, int2 INT, int3 INTEGER)"),
+		       " (myint1 SMALLINT, myint2 INT, myint3 INTEGER)"),
 
     Decs = ?RDBMS:describe_integer(),
     %% Make sure to test timeout clause
@@ -1399,7 +1411,7 @@ describe_dec_num(Config) when is_list(Config) ->
     {updated, _} = 
 	odbc:sql_query(Ref, 
 		       "CREATE TABLE " ++ Table ++
-		       " (dec DECIMAL(9,3), num NUMERIC(9,2))"),
+		       " (mydec DECIMAL(9,3), mynum NUMERIC(9,2))"),
 
     Decs = ?RDBMS:describe_dec_num(),
 
@@ -1451,3 +1463,7 @@ is_driver_error(Error) ->
 	false ->
 	    test_server:fail(Error)
     end.
+is_supported_multiple_resultsets(sqlserver) ->
+    true;
+is_supported_multiple_resultsets(_) ->
+    false.
diff --git a/lib/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index 65b990133f..440c0ca921 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -125,14 +125,16 @@ start(doc) ->
 start(suite) -> 
     [];
 start(Config) when is_list(Config) -> 
-    {error,odbc_not_started} = odbc:connect(?RDBMS:connection_string(), []),
+    PlatformOptions = odbc_test_lib:platform_options(),
+	{error,odbc_not_started} = odbc:connect(?RDBMS:connection_string(),
+					    PlatformOptions),
     odbc:start(),
-    case odbc:connect(?RDBMS:connection_string(), []) of
+    case odbc:connect(?RDBMS:connection_string(), PlatformOptions) of
 	{ok, Ref0} ->
 	    ok = odbc:disconnect(Ref0),
 	    odbc:stop(),
 	    {error,odbc_not_started} = 
-		odbc:connect(?RDBMS:connection_string(), []),
+		odbc:connect(?RDBMS:connection_string(), PlatformOptions),
 	    start_odbc(transient),
 	    start_odbc(permanent);
 	{error, odbc_not_started} ->
@@ -144,7 +146,7 @@ start(Config) when is_list(Config) ->
     
 start_odbc(Type) ->
     ok = odbc:start(Type),
-    case odbc:connect(?RDBMS:connection_string(), []) of
+    case odbc:connect(?RDBMS:connection_string(), odbc_test_lib:platform_options()) of
 	{ok, Ref} ->
 	    ok = odbc:disconnect(Ref),
 	    odbc:stop();
diff --git a/lib/odbc/test/odbc_test.hrl b/lib/odbc/test/odbc_test.hrl
index 87f50043db..397d04756b 100644
--- a/lib/odbc/test/odbc_test.hrl
+++ b/lib/odbc/test/odbc_test.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -27,7 +27,12 @@
 		   {unix, sunos} ->
 		       postgres;
 		   {unix,linux} ->
-		       postgres;
+		       case erlang:system_info(wordsize) of
+			   4 ->
+			       mysql;
+			   _ ->
+			       postgres
+		       end;
 		   {win32, _} ->
 		       sqlserver
 	       end).
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl
index 012eb96e43..3e78105cf3 100644
--- a/lib/odbc/test/odbc_test_lib.erl
+++ b/lib/odbc/test/odbc_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -38,18 +38,7 @@ match_float(Float, Match, Delta) ->
 odbc_check() ->
     case erlang:system_info(wordsize) of
 	4 ->
-	    case test_server:os_type() of
-		{unix, sunos} ->
-		    ok;
-		{unix, linux} ->
-		    ok;
-		{win32, _} ->
-		    ok;
-		Other ->
-		    lists:flatten(
-		      io_lib:format("Platform not supported: ~w",
-				    [Other]))
-	    end;
+	    ok;
 	Other ->
 	    case os:type() of
 		{unix, linux} ->
@@ -75,3 +64,16 @@ check_row_count(Expected, Count) ->
 
 to_upper(List) ->
     lists:map(fun(Str) -> string:to_upper(Str) end, List).
+
+strict(Ref, mysql) ->
+    odbc:sql_query(Ref, "SET sql_mode='STRICT_ALL_TABLES,STRICT_TRANS_TABLES';");
+strict(_,_) ->
+    ok.
+
+platform_options() ->
+    case os:type() of
+	{unix, sunos} ->
+	    [{scrollable_cursors, off}];
+	_ ->
+	    []
+    end.
diff --git a/lib/odbc/test/oracle.erl b/lib/odbc/test/oracle.erl
index ebf6dbb6bf..786280701d 100644
--- a/lib/odbc/test/oracle.erl
+++ b/lib/odbc/test/oracle.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -231,8 +231,8 @@ param_select() ->
 
 %-------------------------------------------------------------------------
 describe_integer() ->
-    {ok,[{"INT1",{sql_decimal,38,0}},{"INT2",{sql_decimal,38,0}},
-	 {"INT3",{sql_decimal,38,0}}]}.
+    {ok,[{"MYINT1",{sql_decimal,38,0}},{"MYINT2",{sql_decimal,38,0}},
+	 {"MYINT3",{sql_decimal,38,0}}]}.
     
 describe_string() ->
     {ok,[{"STR1",{sql_char,10}},                           
@@ -243,4 +243,4 @@ describe_string() ->
 describe_floating() ->
     {ok,[{"F",sql_double},{"R",sql_double},{"D",sql_double}]}.
 describe_dec_num() ->
-    {ok,[{"DEC",{sql_decimal,9,3}},{"NUM",{sql_decimal,9,2}}]}.
+    {ok,[{"MYDEC",{sql_decimal,9,3}},{"MYNUM",{sql_decimal,9,2}}]}.
diff --git a/lib/odbc/test/postgres.erl b/lib/odbc/test/postgres.erl
index 169ca26e43..9c7eed271f 100644
--- a/lib/odbc/test/postgres.erl
+++ b/lib/odbc/test/postgres.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -275,9 +275,9 @@ param_select() ->
 
 %-------------------------------------------------------------------------
 describe_integer() ->
-    {ok,[{"int1",sql_smallint},
-	 {"int2",sql_integer},
-	 {"int3",sql_integer}]}.
+    {ok,[{"myint1",sql_smallint},
+	 {"myint2",sql_integer},
+	 {"myint3",sql_integer}]}.
 
 describe_string() ->
     {ok,[{"str1",{sql_char,10}},                           
@@ -288,7 +288,7 @@ describe_string() ->
 describe_floating() ->
     {ok,[{"f",sql_real},{"r",sql_real},{"d",{sql_float,15}}]}.
 describe_dec_num() ->
-    {ok,[{"dec",{sql_numeric,9,3}},{"num",{sql_numeric,9,2}}]}.
+    {ok,[{"mydec",{sql_numeric,9,3}},{"mynum",{sql_numeric,9,2}}]}.
 
 describe_timestamp() ->
     {ok, [{"field", sql_timestamp}]}.
diff --git a/lib/odbc/test/sqlserver.erl b/lib/odbc/test/sqlserver.erl
index e3fe30e0bc..13930cd5ae 100644
--- a/lib/odbc/test/sqlserver.erl
+++ b/lib/odbc/test/sqlserver.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -279,8 +279,8 @@ param_select() ->
 %-------------------------------------------------------------------------
 
 describe_integer() ->
-    {ok,[{"int1", sql_smallint},{"int2", sql_integer},
-	 {"int3", sql_integer}]}.
+    {ok,[{"myint1", sql_smallint},{"myint2", sql_integer},
+	 {"myint3", sql_integer}]}.
 
 describe_string() ->
     {ok,[{"str1",{sql_char,10}},                           
@@ -292,7 +292,7 @@ describe_floating() ->
     {ok,[{"f", sql_real},{"r", sql_real}, {"d", {sql_float, 53}}]}.
 
 describe_dec_num() ->
-    {ok,[{"dec",{sql_decimal,9,3}},{"num",{sql_numeric,9,2}}]}.
+    {ok,[{"mydec",{sql_decimal,9,3}},{"mynum",{sql_numeric,9,2}}]}.
 
 describe_timestamp() ->
     {ok, [{"field", sql_timestamp}]}.