~ubuntu-branches/ubuntu/trusty/mysql-connector-java/trusty

« back to all changes in this revision

Viewing changes to src/com/mysql/jdbc/ConnectionImpl.java

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg
  • Date: 2013-11-06 23:49:02 UTC
  • mfrom: (1.1.10) (3.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20131106234902-fhupetvkmt34mg01
Tags: 5.1.27-1
* New upstream release
* Refreshed the patches
* Updated Standards-Version to 3.9.5 (no changes)
* Use XZ compression for the upstream tarball
* Switch to debhelper level 9

Show diffs side-by-side

added added

removed removed

Lines of Context:
1248
1248
                        if (newPassword == null) {
1249
1249
                                newPassword = "";
1250
1250
                        }
1251
 
        
1252
 
                        this.io.changeUser(userName, newPassword, this.database);
 
1251
 
 
1252
                        try {
 
1253
                                this.io.changeUser(userName, newPassword, this.database);
 
1254
                        } catch(SQLException ex) {
 
1255
                                if (versionMeetsMinimum(5, 6, 13) && "28000".equals(ex.getSQLState())) {
 
1256
                                        cleanup(ex);
 
1257
                                }
 
1258
                                throw ex;
 
1259
                        }
1253
1260
                        this.user = userName;
1254
1261
                        this.password = newPassword;
1255
1262
        
6090
6097
                        executor.execute(new Runnable() {
6091
6098
        
6092
6099
                                public void run() {
6093
 
                                        setSocketTimeout(milliseconds); // for re-connects
6094
6100
                                        try {
 
6101
                                                setSocketTimeout(milliseconds); // for re-connects
6095
6102
                                                mysqlIo.setSocketTimeout(milliseconds);
6096
6103
                                        } catch (SQLException e) {
6097
6104
                                                throw new RuntimeException(e);