Fixed a lot of wrong memory references as reported by valgrind

Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.



BitKeeper/etc/ignore:
  added scripts/fill_help_tables.sql
client/mysql.cc:
  Some fixes when using 'help'
cmd-line-utils/libedit/compat.h:
  Portability fix
cmd-line-utils/libedit/fgetln.c:
  Portability fix
include/mysql.h:
  Added new client function: mysql_get_server_version()
libmysql/libmysql.c:
  Added new client function: mysql_get_server_version()
libmysqld/libmysqld.c:
  Fixed prototype
mysql-test/install_test_db.sh:
  Added creation of help tables
mysql-test/r/connect.result:
  Added help tables
mysql-test/r/myisam.result:
  Test of RTREE index
mysql-test/r/type_ranges.result:
  updated results
mysql-test/t/myisam.test:
  Test of RTREE index
mysql-test/t/type_ranges.test:
  Updated test
mysys/charset.c:
  Indentation change
mysys/my_symlink.c:
  Removed compiler warning
scripts/fill_help_tables.sh:
  Update for new help tables
sql/field.cc:
  Indentation changes
sql/filesort.cc:
  Optimized character set usage
sql/item_cmpfunc.cc:
  Fix wrong usage of binary()
sql/item_cmpfunc.h:
  Fix wrong usage of binary()
sql/item_func.cc:
  Fix wrong usage of binary()
sql/item_func.h:
  Fix wrong usage of binary()
sql/item_strfunc.cc:
  Fix wrong usage of binary()
sql/item_sum.cc:
  Fix wrong usage of binary()
sql/item_sum.h:
  Fix wrong usage of binary()
sql/key.cc:
  Indentation change
sql/lex.h:
  HELP -> HELP_SYM
sql/mysql_priv.h:
  Make get_field() more general
sql/password.c:
  Indentation change + variable initialisation moved
sql/sql_acl.cc:
  Make get_field() more general
sql/sql_base.cc:
  Added comments + assertion for double call to mysql_lock_tables
sql/sql_cache.cc:
  Indentation changes
sql/sql_class.h:
  Added need_strxnfrm to SORT_FIELD to be able to optimise character set handling in filesort
sql/sql_derived.cc:
  Renamed variables
sql/sql_help.cc:
  New help functions (from Victor Vagin)
sql/sql_lex.cc:
  Removed variables that doesn't have to be initialized for each query
sql/sql_lex.h:
  Removed not used variable (olap)
sql/sql_parse.cc:
  Fixed (not fatal) access of unitialized memory
  Indentation / code cleanup
sql/sql_prepare.cc:
  Indentaion cleanup
sql/sql_table.cc:
  Disabled RTREE until 5.0
sql/sql_udf.cc:
  Make get_field() more general
sql/sql_yacc.yy:
  Removed access to uninitialized memory
  Always set offset_limit and select_limit when using LIMIT (removed warnings)
  Allow usage of 'help week'
sql/table.cc:
  Make get_field() more general
  More comments
sql/table.h:
  Fixded type of TABLE_LIST->derived
sql/time.cc:
  Stricter date / datetime handling (to be able to handle timestamps with days and microseconds)
strings/ctype-bin.c:
  Added cha

1 files changed, 30 insertions, 37 deletions

diff --git a/scripts/fill_help_tables.sh b/scripts/fill_help_tables.sh
index f6b16a3b434..da6b8ec80ef 100644
--- a/scripts/fill_help_tables.sh
+++ b/scripts/fill_help_tables.sh
@@ -111,12 +111,12 @@ sub flush_all
   $example= prepare_example($example);
 
   if ($func_name ne "" && $text ne "" && !($func_name =~ /[abcdefghikjlmnopqrstuvwxyz]/)){
-    print "INSERT INTO function (name,description,example) VALUES (";
+    print "INSERT INTO help_topic (name,description,example) VALUES (";
     print "'$func_name',";
     print "'$text',";
     print "'$example'";
     print ");\n";
-    print "INSERT INTO function_category (cat_id,func_id) VALUES (\@cur_category,LAST_INSERT_ID());\n";
+    print "INSERT INTO help_relation (help_category_id,help_topic_id) VALUES (\@cur_category,LAST_INSERT_ID());\n";
   }
 
   $func_name= "";
@@ -131,50 +131,43 @@ sub new_category
 
   $category= prepare_text($category);
 
-  print "INSERT INTO function_category_name (name) VALUES (\'$category\');\n";
-  print "SELECT \@cur_category:=LAST_INSERT_ID();\n";
+  print "INSERT INTO help_category (name) VALUES (\'$category\');\n";
+  print "SET \@cur_category=LAST_INSERT_ID();\n";
 }
 
-print "INSERT INTO db (Host,DB,User,Select_priv) VALUES ('%','mysql_help','','Y');\n";
-print "CREATE DATABASE mysql_help;\n";
+#print "INSERT INTO db (Host,DB,User,Select_priv) VALUES ('%','mysql_help','','Y');\n";
+#print "CREATE DATABASE mysql_help;\n";
 
-print "USE mysql_help;\n";
+print "USE mysql;\n";
 
-print "DROP TABLE IF EXISTS function;\n";
-print "CREATE TABLE function (";
-print "  func_id       int unsigned not null auto_increment,";
+print "DROP TABLE IF EXISTS help_topic;\n";
+print "CREATE TABLE help_topic (";
+print "  help_topic_id int unsigned not null auto_increment,";
 print "  name          varchar(64) not null,";
-print "  url           varchar(128) not null,";
 print "  description   text not null,";
 print "  example       text not null,";
-print "  min_args      tinyint not null,";
-print "  max_args      tinyint,";
-print "  date_created  datetime not null,";
-print "  last_modified timestamp not null,";
-print "  primary key   (func_id)";
+print "  url           varchar(128) not null,";
+print "  primary key   (help_topic_id),";
+print "  uniuqe index(name)";
 print ") type=myisam;\n\n";
 
-print "DROP TABLE IF EXISTS function_category_name;\n";
-print "CREATE TABLE function_category_name (";
-print "  cat_id        smallint unsigned not null auto_increment,";
-print "  name          varchar(64) not null,";
-print "  url           varchar(128) not null,";
-print "  date_created  datetime not null,";
-print "  last_modified timestamp not null,";
-print "  primary key   (cat_id)";
+print "DROP TABLE IF EXISTS help_category;\n";
+print "CREATE TABLE help_category (";
+print "  help_category_id smallint unsigned not null auto_increment,";
+print "  name             varchar(64) not null,";
+print "  url              varchar(128) not null,";
+print "  primary key      (help_category_id),";
+print "  unique index (name)";    
 print ") type=myisam;\n\n";
 
-print "DROP TABLE IF EXISTS function_category;\n";
-print "CREATE TABLE function_category (";
-print "  cat_id        smallint unsigned not null references function_category_name,";
-print "  func_id       int unsigned not null references function,";
-print "  primary key   (cat_id, func_id)";
+print "DROP TABLE IF EXISTS help_relation;\n";
+print "CREATE TABLE help_relation (";
+print"   help_topic_id    int unsigned not null references help_topic,";
+print"   help_category_id smallint unsigned not null references help_category,";
+print"   primary key      (help_category_id, help_topic_id),";
 print ") type=myisam;\n\n";
 
-print "DELETE FROM function_category_name;\n";
-print "DELETE FROM function_category;\n";
-print "DELETE FROM function;\n";
-print "SELECT \@cur_category:=null;\n\n";
+print "SET \@cur_category=null;\n\n";
 
 my $in_section_6_3= 0;
 
@@ -239,8 +232,8 @@ for(<>)
 }
 
 
-print "DELETE function_category_name ";
-print "FROM function_category_name ";
-print "LEFT JOIN function_category ON function_category.cat_id=function_category_name.cat_id ";
-print "WHERE function_category.cat_id is null;"
+print "DELETE help_category ";
+print "FROM help_category ";
+print "LEFT JOIN help_relation ON help_category.help_category_id=help_relation.help_category_id ";
+print "WHERE help_relation.help_category_id is null;"