Modified:
trunk/
trunk/src/com/mysql/jdbc/DatabaseMetaData.java
Log:
Merged revisions 6585-6586,6593-6597,6599-6602,6605,6607-6609,6612,6614-6617,6619-6620,6623-6627,6632,6636-6638,6641,6649,6658-6659,6663,6665-6673,6676,6681-6683 via svnmerge from
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_1
.......
r6683 | mmatthews | 2007-11-18 20:53:16 -0600 (Sun, 18 Nov 2007) | 1 line
Cover JDBC-4.0 case too.
.......
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/branch_5_0:1-6636,6638-6670 /branches/branch_5_1:1-6582,6584-6678,6680-6681
+ /branches/branch_5_0:1-6636,6638-6670 /branches/branch_5_1:1-6582,6584-6678,6680-6683
Modified: trunk/src/com/mysql/jdbc/DatabaseMetaData.java
===================================================================
--- trunk/src/com/mysql/jdbc/DatabaseMetaData.java 2007-11-19 02:53:16 UTC (rev 6683)
+++ trunk/src/com/mysql/jdbc/DatabaseMetaData.java 2007-11-19 02:54:31 UTC (rev 6684)
@@ -633,7 +633,8 @@
return new DatabaseMetaData(connToSet, databaseToSet);
}
- if (connToSet != null && connToSet.getUseInformationSchema()
+ if (checkForInfoSchema && connToSet != null
+ && connToSet.getUseInformationSchema()
&& connToSet.versionMeetsMinimum(5, 0, 7)) {
return (DatabaseMetaData) Util.handleNewInstance(
| Thread |
|---|
| • Connector/J commit: r6684 - in trunk: . src/com/mysql/jdbc | mmatthews | 19 Nov |
