bk commit into 5.2 tree (eherman:1.2525)

[eherman]

Below is the list of changes that have just been committed into a local
5.2 repository of eric. When eric does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-21 21:34:01+02:00, eherman@stripped +2 -0
  Hard coded some JVM initialization info.
  Yeah, yeah - it's hard coded to my home directory, I know. This will change.

  plugin/java_udf/java_udf.cc@stripped, 2007-09-21 21:33:58+02:00, eherman@stripped +6 -1
    added JVM hard coded initialization concept. 

  plugin/java_udf/jvm_options.cnf@stripped, 2007-09-21 21:33:58+02:00, eherman@stripped +1 -1
    added hard coded classpath to the jvm_options.cnf file.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	eherman
# Host:	halle.local
# Root:	/Users/eric/src/mysql-5.2-eric+antony

--- 1.3/plugin/java_udf/java_udf.cc	2007-09-21 21:15:20 +02:00
+++ 1.4/plugin/java_udf/java_udf.cc	2007-09-21 21:33:58 +02:00
@@ -66,7 +66,12 @@ struct st_mysql_psmroutine /* each funct
 
 static int java_udf_plugin_init(void *arg __attribute__((unused)))
 {
-  Jvm *jvm = Jvm_singleton::get();
+  Jvm *jvm = Jvm_singleton::check();
+  if(!jvm)
+  {
+    Jvm_singleton::set_default_jvm_options("/home/eric/src/mysql-5.2-eric+antony/plugin/java_udf/jvm_options.cnf");
+    jvm = Jvm_singleton::get();
+  }
   if (!jvm)
     return 1;
   Java_context *java_context = jvm->attach();

--- 1.1/plugin/java_udf/jvm_options.cnf	2007-06-04 21:41:15 +02:00
+++ 1.2/plugin/java_udf/jvm_options.cnf	2007-09-21 21:33:58 +02:00
@@ -1,2 +1,2 @@
--Djava.class.path=.
 -Djava.awt.headless=true
+-Djava.class.path=.:/home/eric/src/mysql-5.2-eric+antony/plugin/java_udf