Merge trift2.:/MySQL/M50/mysql-5.0

joerg@trift2. · joerg@trift2. · commit 82767a0a45dd · 2007-10-04T19:24:32.000+02:00
into  trift2.:/MySQL/M50/push-5.0
diff --git a/ndb/test/ndbapi/testScanFilter.cpp b/ndb/test/ndbapi/testScanFilter.cpp
@@ -772,18 +772,20 @@ void ndbapi_tuples(Ndb *ndb, char *str, bool *res)
 * str: a random string of scan opearation and condition
 * return: true stands for ndbapi ok, false stands for ndbapi failed
 */
+template class Vector<bool>;
 bool compare_cal_ndb(char *str, Ndb *ndb)
 {
-  bool res_cal[TUPLE_NUM], res_ndb[TUPLE_NUM];
+  Vector<bool> res_cal;
+  Vector<bool> res_ndb;
 
   for(int i = 0; i < TUPLE_NUM; i++)
   {
-    res_cal[i] = false;
-    res_ndb[i] = false;
+    res_cal.push_back(false);
+    res_ndb.push_back(false);
   }
 
-  check_all_tuples(str, res_cal);
-  ndbapi_tuples(ndb, str, res_ndb);
+  check_all_tuples(str, res_cal.getBase());
+  ndbapi_tuples(ndb, str, res_ndb.getBase());
 
   for(int i = 0; i < TUPLE_NUM; i++)
   {

Original file line number	Diff line number	Diff line change
`@@ -772,18 +772,20 @@ void ndbapi_tuples(Ndb ndb, char str, bool *res)`
`772`	`772`	`* str: a random string of scan opearation and condition`
`773`	`773`	`* return: true stands for ndbapi ok, false stands for ndbapi failed`
`774`	`774`	`*/`
	`775`	`+template class Vector<bool>;`
`775`	`776`	`bool compare_cal_ndb(char str, Ndb ndb)`
`776`	`777`	`{`
`777`		`- bool res_cal[TUPLE_NUM], res_ndb[TUPLE_NUM];`
	`778`	`+ Vector<bool> res_cal;`
	`779`	`+ Vector<bool> res_ndb;`
`778`	`780`
`779`	`781`	`for(int i = 0; i < TUPLE_NUM; i++)`
`780`	`782`	`{`
`781`		`- res_cal[i] = false;`
`782`		`- res_ndb[i] = false;`
	`783`	`+ res_cal.push_back(false);`
	`784`	`+ res_ndb.push_back(false);`
`783`	`785`	`}`
`784`	`786`
`785`		`- check_all_tuples(str, res_cal);`
`786`		`- ndbapi_tuples(ndb, str, res_ndb);`
	`787`	`+ check_all_tuples(str, res_cal.getBase());`
	`788`	`+ ndbapi_tuples(ndb, str, res_ndb.getBase());`
`787`	`789`
`788`	`790`	`for(int i = 0; i < TUPLE_NUM; i++)`
`789`	`791`	`{`