MONDRIAN: This is the first of a series of change lists that merge ne…

…cessary patches from //open/mondrian to //open/mondrian-release/3.0, merging all changes up to change #11047 [git-p4: depot-paths = "//open/mondrian-release/3.0/": change = 11265]
pentaho · Jul 6, 2008 · 691f50f · 691f50f
1 parent 6e398f2
commit 691f50f
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 3,127 deletions.
diff --git a/mondrian.properties b/mondrian.properties
@@ -76,6 +76,14 @@ RoleXX='California manager';
 #mondrian.jdbcDrivers=com.mysql.jdbc.Driver
 #driver.classpath=D:/mysql-connector-3.1.12
 
+mondrian.foodmart.jdbcURL=jdbc:mysql://localhost/foodmart?user=foodmart&password=foodmart
+mondrian.foodmart.jdbcUser=foodmart
+mondrian.foodmart.jdbcPassword=foodmart
+mondrian.jdbcDrivers=com.mysql.jdbc.Driver
+driver.classpath=/opt/mysql-connector-java-5.0.4/mysql-connector-java-5.0.4-bin.jar
+#mondrian.test.connectString=Provider=mondrian;Catalog=file:demo/mondrian-schema.xml
+
+
 # Ingres
 #mondrian.foodmart.jdbcURL=jdbc:ingres://192.168.200.129:II7/MondrianFoodMart;LOOP=on;AUTO=multi;UID=ingres;PWD=sergni
 #mondrian.jdbcDrivers=com.ingres.jdbc.IngresDriver

diff --git a/src/main/mondrian/calc/MemberListCalc.java b/src/main/mondrian/calc/MemberListCalc.java
diff --git a/src/main/mondrian/calc/TupleListCalc.java b/src/main/mondrian/calc/TupleListCalc.java
diff --git a/src/main/mondrian/calc/impl/AbstractMemberListCalc.java b/src/main/mondrian/calc/impl/AbstractMemberListCalc.java
diff --git a/src/main/mondrian/olap/fun/CustomizedFunctionTable.java b/src/main/mondrian/olap/fun/CustomizedFunctionTable.java