diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-08-23 11:55:41 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-23 11:55:41 +0200 |
| commit | 529a67b809726c105d9ff8a37089f15594203d06 (patch) | |
| tree | 505651584fae5ca542ad5e31adbf0c5ed0276660 /lib | |
| parent | ce6ec3ffd49023bdd36d5546c86e57424bbcc847 (diff) | |
| parent | db5288a7ee4a60aff143f65b90a2bebcbe1bf15d (diff) | |
| download | otp-529a67b809726c105d9ff8a37089f15594203d06.tar.gz otp-529a67b809726c105d9ff8a37089f15594203d06.tar.bz2 otp-529a67b809726c105d9ff8a37089f15594203d06.zip | |
Merge branch 'maint'
* maint:
Fix assembler comments for hipe on ppc
odbc: remove "-" in hostname from generated unique table name
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/odbc/test/odbc_test_lib.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl index a8439d5fb6..e814cd2aca 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-2011. All Rights Reserved. +%% Copyright Ericsson AB 2002-2012. 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 @@ -29,6 +29,7 @@ unique_table_name() -> lists:reverse(lists:foldl(fun($@, Acc) -> [$t, $A |Acc] ; + ($-,Acc) -> Acc; (X, Acc) -> [X |Acc] end, [], atom_to_list(node()))). |