.gitignore

@@ -8,3 +8,5 @@
 *.lock
 *.swp
 *.DS_Store
+*.diff
+*.sh

.project

@@ -23,8 +23,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.team.cvs.core.cvsnature</nature>
-		<nature>com.telesynthesis.tools.eclipse.checkstyle.CheckStyleNature</nature>
 	</natures>
 	<filteredResources>
 		<filter>

.settings/org.eclipse.jdt.core.prefs

@@ -122,8 +122,11 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
+org.eclipse.jdt.core.formatter.align_with_spaces=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -133,7 +136,8 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_e
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
@@ -176,6 +180,8 @@ org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
 org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
@@ -199,7 +205,7 @@ org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
@@ -239,7 +245,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
@@ -397,10 +403,24 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_decla
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_lines_in_comments=false
 org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_empty
+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
 org.eclipse.jdt.core.formatter.lineSplit=160
 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

.settings/org.eclipse.jdt.ui.prefs

@@ -60,7 +60,7 @@ cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_ConnectorJ Team
-formatter_settings_version=13
+formatter_settings_version=15
 internal.default.compliance=default
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;testsuite;

CHANGES

@@ -1,6 +1,51 @@
 # Changelog
 # https://dev.mysql.com/doc/relnotes/connector-j/5.1/en/
 
+Version 5.1.48
+
+  - Fix for Bug#30035246, COMMUNITY README AND README.TXT FILES HAS THE WRONG YEAR (2018).
+
+  - Fix for Bug#29998730, REGRESSION UNIT TESTS FAILS WHEN THE 8.0 SERVER'S CHARSET IS SET TO DEFAULT UTF8MB4.
+
+  - WL#12942, Update README.md and add new CONTRIBUTING.md.
+
+  - Fix for Bug#91435 (28268619), Improve DatabaseMetaData.getSQLKeywords() to include new reserved words.
+
+  - Fix for Bug#95796 (29907618), Parameter metadata inferred incorrectly when procedure or function doesn't exist.
+
+  - Fix for Bug#73774 (19531305), Can't execute a stored procedure if exists function with same name.
+
+  - Fix for Bug#20913289, PSTMT.EXECUTEUPDATE() FAILS WHEN SQL MODE IS NO_BACKSLASH_ESCAPES.
+
+  - Fix for Bug#80441 (22850444), SYNTAX ERROR ON RESULTSET.UPDATEROW() WITH SQL_MODE NO_BACKSLASH_ESCAPES.
+
+  - Fix for Bug#92089 (28529781), PREPAREDSTATEMENT.SETTIMESTAMP NULLPOINTEREXCEPTION.
+
+  - WL#13124, Support new utf8mb4 bin collation.
+
+  - Fix for Bug#94585 (29452669), GETTABLENAME() RETURNS NULL FOR A QUERY HAVING COUNT(*) WITH JDBC DRIVER V8.0.12.
+
+  - Fix for Bug#94101 (29277648), SETTING LOGSLOWQUERIES SHOULD NOT AUTOMATICALLY ENABLE PROFILESQL FOR QUERIES.
+    Thanks to Florian Agsteiner for the contribution.
+
+  - Fix for Bug#74690 (20010454), PROFILEREVENT HOSTNAME HAS NO GETTER().
+
+  - Fix for Bug#70677 (17640628), CONNECTOR J WITH PROFILESQL - LOG CONTAINS LOTS OF STACKTRACE DATA.
+
+  - Fix for Bug#41172 (11750577), PROFILEREVENT.PACK() THROWS ARRAYINDEXOUTOFBOUNDSEXCEPTION.
+
+  - Fix for Bug#27453692, CHARACTERS GET GARBLED IN CONCAT() IN PS WHEN USECURSORFETCH=TRUE.
+
+  - Fix for Bug#93590 (29054329), javax.net.ssl.SSLException: closing inbound before receiving peer's close_notify.
+
+  - Fix for Bug#29329326, PLEASE AVOID SHOW PROCESSLIST IF POSSIBLE.
+
+  - Fix for Bug#91317 (28207422), Wrong defaults on collation mappings.
+
+  - Fix for Bug#29244101, ADD MAPPING FOR UTF8MB4_ZH_0900_AS_CS COLLATION.
+
+  - Fix for Bug#92508 (28747636), mysql-connector in bootclasspath causing memory leak.
+
 Version 5.1.47
 
   - Fix for Bug#28449601, MASTER : UNITTEST FOR BUG#22305979 (TESTBUG22305979) STILL FAILS ON QA SETUP.

CONTRIBUTING.md

@@ -0,0 +1,49 @@
+# Contributing Guidelines
+
+We love getting feedback from our users. Bugs and code contributions are great forms of feedback and we thank you for any bugs you report or code you contribute.
+
+## Reporting Issues
+
+Before reporting a new bug, please [check first](https://bugs.mysql.com/search.php) to see if a similar bug already exists.
+
+Bug reports should be as complete as possible. Please try and include the following:
+
+* Complete steps to reproduce the issue.
+* Any information about platform and environment that could be specific to the bug.
+* Specific version of the product you are using.
+* Specific version of the server being used.
+* Sample code to help reproduce the issue, if possible.
+
+## Contributing Code
+
+Contributing to MySQL projects is easy. You just need to follow these steps.
+
+* Make sure you have a user account at [bugs.mysql.com](https://bugs.mysql.com). You will need to reference this user account when you submit your Oracle Contributor Agreement (OCA).
+* Sign the Oracle Contributor Agreement. You can find instructions for doing that at the [OCA Page](https://www.oracle.com/technetwork/community/oca-486395.html).
+* Develop your pull request. Make sure you are aware of the requirements for the project (e.g. do not require Java 7 if we are supporting Java 8 and higher).
+* Validate your pull request by including tests that sufficiently cover the functionality you are adding.
+* Verify that the entire test suite passes with your code applied.
+* Submit your pull request. While you can submit the pull request via [GitHub](https://github.com/mysql/mysql-connector-j/pulls), you can also submit it directly via [bugs.mysql.com](https://bugs.mysql.com).
+
+Thanks again for your wish to contribute to MySQL. We truly believe in the principles of open source development and appreciate any contributions to our projects.
+
+## Setting Up a Development Environment
+
+You can use your preferred Java IDE to view, edit, and compile the MySQL Connector/J source code. The configuration setup can be adapted from [Installing from Source](https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-installing-source.html) with little effort.
+
+Running the entire test suite or your own test case is also possible by setting a few Ant properties in your IDE preferences setup. Refer to [Testing Connector/J](https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-testing.html) for additional details.
+
+## Getting Help
+
+If you need help or just want to get in touch with us, please use the following resources:
+
+* [MySQL Connector/J, JDBC and Java forum](https://forums.mysql.com/list.php?39).
+* [`#connectors` channel in MySQL Community Slack](https://mysqlcommunity.slack.com/messages/connectors). ([Sign-up](https://lefred.be/mysql-community-on-slack/) required if you do not have an Oracle account.)
+* [@MySQL on Twitter](https://twitter.com/MySQL).
+* [MySQL and Java Mailing Lists](https://lists.mysql.com/java).
+* [InsideMySQL.com Connectors Blog](https://insidemysql.com/category/mysql-development/connectors/).
+* [MySQL Bugs database](https://bugs.mysql.com/).
+
+We hope to hear from you soon. Enjoy your coding!
+
+[![Twitter Follow](https://img.shields.io/twitter/follow/MySQL.svg?label=Follow%20%40MySQL&style=social)](https://twitter.com/intent/follow?screen_name=MySQL)

README

@@ -6,7 +6,7 @@ doubt, this particular copy of the software is released
 under the version 2 of the GNU General Public License.
 MySQL Connector/J is brought to you by Oracle.
 
-Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the COPYING file.
 

README.md

@@ -1,35 +1,61 @@
 # MySQL Connector/J
 
-MySQL provides connectivity for client applications developed in the Java programming language with MySQL Connector/J, a driver that implements the [Java Database Connectivity (JDBC) API](http://www.oracle.com/technetwork/java/javase/jdbc/).
+[![GitHub top language](https://img.shields.io/github/languages/top/mysql/mysql-connector-j.svg?color=5382a1)](https://github.com/mysql/mysql-connector-j/tree/release/5.1/src) [![License: GPLv2 with FOSS exception](https://img.shields.io/badge/license-GPLv2_with_FOSS_exception-c30014.svg)](COPYING) [![Maven Central](https://img.shields.io/maven-central/v/mysql/mysql-connector-java/5.svg)](https://search.maven.org/artifact/mysql/mysql-connector-java/5.1.48/jar)
 
-MySQL Connector/J 5.1 is a JDBC Type 4 driver that is compatible with the [JDBC 3.0](http://docs.oracle.com/javase/1.5.0/docs/guide/jdbc/), [JDBC 4.0](http://docs.oracle.com/javase/6/docs/technotes/guides/jdbc/), [JDBC 4.1](http://docs.oracle.com/javase/7/docs/technotes/guides/jdbc/) and [JDBC 4.2](http://docs.oracle.com/javase/8/docs/technotes/guides/jdbc/) specifications. The Type 4 designation means that the driver is a pure Java implementation of the MySQL protocol and does not rely on the MySQL client libraries.
+MySQL provides connectivity for client applications developed in the Java programming language with MySQL Connector/J, a driver that implements the [Java Database Connectivity (JDBC) API](https://www.oracle.com/technetwork/java/javase/jdbc/).
 
-For detailed information please visit the official [MySQL Connector/J documentation](http://dev.mysql.com/doc/connector-j/en/).
+MySQL Connector/J 5.1 is a JDBC Type 4 driver that is compatible with the [JDBC 4.2](https://docs.oracle.com/javase/8/docs/technotes/guides/jdbc/) specification. The Type 4 designation means that the driver is a pure Java implementation of the MySQL protocol and does not rely on the MySQL client libraries.
+
+> **MySQL Connector/J 5.1 is a Maintenance Release.  For latest version with support for the [MySQL X DevAPI](https://dev.mysql.com/doc/x-devapi-userguide/en/) please refer to [Connector/J 8.0](tree/release/8.0).**
+
+For detailed information, please visit the official [MySQL Connector/J documentation](https://dev.mysql.com/doc/connector-j/5.1/en/).
 
 ## Licensing
 
-Please refer to files README and COPYING, available in this repository, and [Legal Notices in documentation](http://dev.mysql.com/doc/connector-j/en/preface.html) for further details. 
+Please refer to the [README](README) and [COPYING](COPYING) files, available in this repository, and the [Legal Notices in the Connector/J documentation](https://dev.mysql.com/doc/connector-j/5.1/en/preface.html) for further details.
+
+## Getting the Latest Release
+
+MySQL Connector/J is free for usage under the terms of the specified licensing and it runs on any Operating System that is able to run a Java Virtual Machine.
+
+### Download and Install
 
-## Download & Install
+MySQL Connector/J can be installed from pre-compiled packages that can be downloaded from the [Connector/J download page](https://dev.mysql.com/downloads/connector/j/). Installing Connector/J only requires obtaining the corresponding Jar file from the downloaded bundle or installer and including it in the application's CLASSPATH.
 
-MySQL Connector/J can be installed from pre-compiled packages that can be downloaded from the [MySQL downloads page](http://dev.mysql.com/downloads/connector/j/). Installing Connector/J only requires extracting the corresponding Jar file from the downloaded bundle and place it somewhere in the application's CLASSPATH.
+### As a Maven Dependency
 
-Alternatively you can setup [Maven's dependency management](http://search.maven.org/#search|ga|1|g%3A%22mysql%22%20AND%20a%3A%22mysql-connector-java%22) directly in your project and let it download it for you.
+Alternatively, Connector/J can be obtained automatically via [Maven's dependency management](https://search.maven.org/search?q=g:mysql%20AND%20a:mysql-connector-java%20AND%20v:5.1.*) by adding the following configuration in the application's Project Object Model (POM) file:
 
-### Building from sources
+```xml
+<dependency>
+  <groupId>mysql</groupId>
+  <artifactId>mysql-connector-java</artifactId>
+  <version>5.1.48</version>
+</dependency>
+```
 
-This driver can also be complied and installed from the sources available in this repository. Please refer to the documentation for [detailed instructions](http://dev.mysql.com/doc/connector-j/en/connector-j-installing-source.html) on how to do it.
+### Build From Sources
+
+This driver can also be complied and installed from the sources available in this repository. Please refer to the Connector/J documentation for [detailed instructions](https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-installing-source.html) on how to do it.
 
 ### GitHub Repository
 
-This repository contains the MySQL Connector/J source code as per latest released version. You should expect to see the same contents here and within the latest released Connector/J package, except for the pre-compiled Jar.
+This repository contains the MySQL Connector/J source code as per the latest release. No changes are made in this repository between releases.
+
+## Contributing
+
+There are a few ways to contribute to the Connector/J code. Please refer to the [contributing guidelines](CONTRIBUTING.md) for additional information.
+
+## Additional Resources
 
-## Additional resources
+* [MySQL Connector/J Developer Guide](https://dev.mysql.com/doc/connector-j/5.1/en/).
+* [MySQL Connector/J, JDBC and Java forum](https://forums.mysql.com/list.php?39).
+* [`#connectors` channel in MySQL Community Slack](https://mysqlcommunity.slack.com/messages/connectors). ([Sign-up](https://lefred.be/mysql-community-on-slack/) required if you do not have an Oracle account.)
+* [@MySQL on Twitter](https://twitter.com/MySQL).
+* [MySQL and Java Mailing Lists](https://lists.mysql.com/java).
+* [InsideMySQL.com Connectors Blog](https://insidemysql.com/category/mysql-development/connectors/).
+* [MySQL Bugs Database](https://bugs.mysql.com/).
 
-- [MySQL Connector/JDBC and Java forum](http://forums.mysql.com/list.php?39)
-- [MySQL and Java Mailing Lists](http://lists.mysql.com/java)
-- [InsideMySQL Connectors Blog](http://insidemysql.com/category/mysql-development/connectors/)
-- [MySQL Connectors Java Blog](https://blogs.oracle.com/mysqlconnectors-java)
-- [MySQL Bugs database](http://bugs.mysql.com/)
-- For more information about this and other MySQL products, please visit [MySQL Contact & Questions](http://www.mysql.com/about/contact/).
+For more information about this and other MySQL products, please visit [MySQL Contact & Questions](https://www.mysql.com/about/contact/).
 
+[![Twitter Follow](https://img.shields.io/twitter/follow/MySQL.svg?label=Follow%20%40MySQL&style=social)](https://twitter.com/intent/follow?screen_name=MySQL)

build.xml

@@ -158,7 +158,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=yes
 
     <property name="major_version" value="5" />
     <property name="minor_version" value="1" />
-    <property name="subminor_version" value="47" />
+    <property name="subminor_version" value="48" />
     <property name="version_status" value="" />
 
     <property name="version" value="${major_version}.${minor_version}.${subminor_version}${version_status}" />