Fix of bug in stores(Lower|Mixed)Case(Quoted)Identifiers methods. they were plain wrong.

lawrin · lawrin · commit e7b8f43adfca · 2012-01-28T00:32:44.000+02:00
diff --git a/driver/mysql_metadata.cpp b/driver/mysql_metadata.cpp
@@ -4197,7 +4197,7 @@ bool
 MySQL_ConnectionMetaData::storesLowerCaseIdentifiers()
 {
 	CPP_ENTER("MySQL_ConnectionMetaData::storesLowerCaseIdentifiers");
-	return ((lower_case_table_names.compare("1") || lower_case_table_names.compare("2")));
+	return (lower_case_table_names.compare("1")==0 || lower_case_table_names.compare("2")==0);
 }
 /* }}} */
 
@@ -4207,7 +4207,7 @@ bool
 MySQL_ConnectionMetaData::storesLowerCaseQuotedIdentifiers()
 {
 	CPP_ENTER("MySQL_ConnectionMetaData::storesLowerCaseQuotedIdentifiers");
-	return ((lower_case_table_names.compare("1") || lower_case_table_names.compare("2")));
+	return (lower_case_table_names.compare("1")==0 || lower_case_table_names.compare("2")==0);
 }
 /* }}} */
 
@@ -4217,7 +4217,7 @@ bool
 MySQL_ConnectionMetaData::storesMixedCaseIdentifiers()
 {
 	CPP_ENTER("MySQL_ConnectionMetaData::storesMixedCaseIdentifiers");
-	return !((lower_case_table_names.compare("1") || lower_case_table_names.compare("2")));
+	return !(lower_case_table_names.compare("1")==0 || lower_case_table_names.compare("2")==0);
 }
 /* }}} */
 
@@ -4227,7 +4227,7 @@ bool
 MySQL_ConnectionMetaData::storesMixedCaseQuotedIdentifiers()
 {
 	CPP_ENTER("MySQL_ConnectionMetaData::storesMixedCaseQuotedIdentifiers");
-	return !((lower_case_table_names.compare("1") || lower_case_table_names.compare("2")));
+	return !(lower_case_table_names.compare("1")==0 || lower_case_table_names.compare("2")==0);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -4197,7 +4197,7 @@ bool`
`4197`	`4197`	`MySQL_ConnectionMetaData::storesLowerCaseIdentifiers()`
`4198`	`4198`	`{`
`4199`	`4199`	`CPP_ENTER("MySQL_ConnectionMetaData::storesLowerCaseIdentifiers");`
`4200`		`- return ((lower_case_table_names.compare("1") \|\| lower_case_table_names.compare("2")));`
	`4200`	`+ return (lower_case_table_names.compare("1")==0 \|\| lower_case_table_names.compare("2")==0);`
`4201`	`4201`	`}`
`4202`	`4202`	`/* }}} */`
`4203`	`4203`
`@@ -4207,7 +4207,7 @@ bool`
`4207`	`4207`	`MySQL_ConnectionMetaData::storesLowerCaseQuotedIdentifiers()`
`4208`	`4208`	`{`
`4209`	`4209`	`CPP_ENTER("MySQL_ConnectionMetaData::storesLowerCaseQuotedIdentifiers");`
`4210`		`- return ((lower_case_table_names.compare("1") \|\| lower_case_table_names.compare("2")));`
	`4210`	`+ return (lower_case_table_names.compare("1")==0 \|\| lower_case_table_names.compare("2")==0);`
`4211`	`4211`	`}`
`4212`	`4212`	`/* }}} */`
`4213`	`4213`
`@@ -4217,7 +4217,7 @@ bool`
`4217`	`4217`	`MySQL_ConnectionMetaData::storesMixedCaseIdentifiers()`
`4218`	`4218`	`{`
`4219`	`4219`	`CPP_ENTER("MySQL_ConnectionMetaData::storesMixedCaseIdentifiers");`
`4220`		`- return !((lower_case_table_names.compare("1") \|\| lower_case_table_names.compare("2")));`
	`4220`	`+ return !(lower_case_table_names.compare("1")==0 \|\| lower_case_table_names.compare("2")==0);`
`4221`	`4221`	`}`
`4222`	`4222`	`/* }}} */`
`4223`	`4223`
`@@ -4227,7 +4227,7 @@ bool`
`4227`	`4227`	`MySQL_ConnectionMetaData::storesMixedCaseQuotedIdentifiers()`
`4228`	`4228`	`{`
`4229`	`4229`	`CPP_ENTER("MySQL_ConnectionMetaData::storesMixedCaseQuotedIdentifiers");`
`4230`		`- return !((lower_case_table_names.compare("1") \|\| lower_case_table_names.compare("2")));`
	`4230`	`+ return !(lower_case_table_names.compare("1")==0 \|\| lower_case_table_names.compare("2")==0);`
`4231`	`4231`	`}`
`4232`	`4232`	`/* }}} */`
`4233`	`4233`