Repository: trafodion Updated Branches: refs/heads/master 6a9e57dae -> 071a5db97
[TRAFODION-3149] Delete duplicated property names in T4Messages.properties Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/379b3b3b Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/379b3b3b Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/379b3b3b Branch: refs/heads/master Commit: 379b3b3ba04ff4cda9b7af3a18dec2ac8326bca4 Parents: f8c90f3 Author: Haolin.song <[email protected]> Authored: Tue Jul 17 15:25:10 2018 +0000 Committer: Haolin.song <[email protected]> Committed: Tue Jul 17 15:25:10 2018 +0000 ---------------------------------------------------------------------- core/conn/jdbcT4/src/main/java/T4Messages.properties | 14 +++----------- core/conn/jdbcT4/src/main/samples/t4jdbc.properties | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/379b3b3b/core/conn/jdbcT4/src/main/java/T4Messages.properties ---------------------------------------------------------------------- diff --git a/core/conn/jdbcT4/src/main/java/T4Messages.properties b/core/conn/jdbcT4/src/main/java/T4Messages.properties index 3b2e661..a6e68e9 100644 --- a/core/conn/jdbcT4/src/main/java/T4Messages.properties +++ b/core/conn/jdbcT4/src/main/java/T4Messages.properties @@ -172,18 +172,10 @@ unsupported_encoding_msg=Unsupported encoding {0} unsupported_encoding_sqlstate=HY000 unsupported_encoding_sqlcode=29036 -forward_only_cursor_msg=The Result Set Type is TYPE_FORWARD_ONLY -forward_only_cursor_sqlstate=HY106 -forward_only_cursor_sqlcode=29037 - invalid_row_number_msg=The row number is not valid invalid_row_number_sqlstate=HY107 invalid_row_number_sqlcode=29038 -read_only_concur_msg=The concurrency mode of the result set is CONCUR_READ_ONLY -read_only_concur_sqlstate=HY092 -read_only_concur_sqlcode=29039 - invalid_operation_msg=Operation invalid, since the current row is insert row invalid_operation_sqlstate=HY000 invalid_operation_sqlcode=29040 @@ -304,9 +296,9 @@ address_format_2_error_msg=//<{IP Address|Machine Name}[:port]>/<database name> address_format_2_error_sqlstate=HY000 address_format_2_error_sqlcode=29109 -missing ip_or_name_error_msg=Address is missing an IP address or machine name -missing ip_or_name_error_sqlstate=HY000 -missing ip_or_name_error_sqlcode=29110 +missing_ip_or_name_error_msg=Address is missing an IP address or machine name +missing_ip_or_name_error_sqlstate=HY000 +missing_ip_or_name_error_sqlcode=29110 address_lookup_error_msg=Unable to evaluate address {0} Cause: {1} address_lookup_error_sqlstate=HY000 http://git-wip-us.apache.org/repos/asf/trafodion/blob/379b3b3b/core/conn/jdbcT4/src/main/samples/t4jdbc.properties ---------------------------------------------------------------------- diff --git a/core/conn/jdbcT4/src/main/samples/t4jdbc.properties b/core/conn/jdbcT4/src/main/samples/t4jdbc.properties index d8ae73e..e0e5f47 100755 --- a/core/conn/jdbcT4/src/main/samples/t4jdbc.properties +++ b/core/conn/jdbcT4/src/main/samples/t4jdbc.properties @@ -23,4 +23,4 @@ catalog = TRAFODION schema = SEABASE url = jdbc:t4jdbc://server:port/: user = usr -password = pwd +password = password
