into mysql.com:/space/my/mysql-4.1

 - removed obsolete compile options from compile-pentium-debug-openssl


BUILD/compile-pentium-debug-openssl:
   - removed "--without-innodb" (InnoDB is on by default) and "--with-vio"
     (--with-openssl implies --with-vio)
libmysqld/lib_vio.c:
   - removed duplicate my_sys.h inclusion

libmysqld/libmysqld.c:
  Another missed fix for Embedded Library

libmysqld/libmysqld.c:
  Minor tweak to fix the Netware portability to libmysqld

VC++Files/client/mysqlclient.dsp:
  .
VC++Files/libmysql/libmysql.dsp:
  .
VC++Files/libmysqld/libmysqld.dsp:
  .
VC++Files/myisammrg/myisammrg.dsp:
  .
VC++Files/mysqlmanager/MySqlManager.dsp:
  .
VC++Files/mysys/mysys.dsp:
  .
VC++Files/strings/strings.dsp:
  .

strings/strto.c:
  Windows won't compile for a wrong argument passing, expects a charset pointer
sql/filesort.cc:
  Remove unused variable
sql/lex.h:
  Change POINT->POINT_SYM due to redefination error from windef.h
sql/mysqld.cc:
  Fix Embedded Server related code
sql/protocol.cc:
  Remove unused variables from Embedded Server
sql/sql_class.h:
  Remove silly usage
sql/sql_derived.cc:
  Windows won't let you compile for this kind of assignments
sql/sql_help.cc:
  Need a cast to make it compile
sql/sql_parse.cc:
  Remove unused variables from Embedded server
sql/sql_yacc.yy:
  Change POINT->POINT_SYM due to redefination error from windef.h
mysys/mf_keycache.c:
  Add a correct cast and remove the unused variables
libmysqld/lib_sql.cc:
  Remove unused variable
libmysqld/libmysqld.c:
  Port the netware change to remove mysql_once_init to libmysqld

  SHOW CHARACTER SET now displays "1" in mb_maxlen even if a charset is not loaded yet


mysys/charset.c:
  SHOW CHARACTER SET now displays "1" in mb_maxlen even if a charset is not loaded yet

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1

Code cleanup.


myisam/mi_open.c:
  Bug fix: we should set have_rtree value in case of table reopen.
myisam/myisamdef.h:
  code cleanup
myisam/rt_index.c:
  code cleanup

client/mysqltest.c:
  Fixed typo in command name.

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.uvar

into hundin.mysql.fi:/home/heikki/mysql-4.1

  InnoDB maps HA_READ_PREFIX_LAST_OR_PREV to PAGE_CUR_LE, but note that only complete-field prefixes of the kay value can be used as the search key


sql/ha_innodb.cc:
  InnoDB maps HA_READ_PREFIX_LAST_OR_PREV to PAGE_CUR_LE, but note that only complete-field prefixes of the kay value can be used as the search key

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

myisam/ft_dump.c:
  style fix
myisam/sort.c:
  typo fixed

"syntax error".


sql/mysqld.cc:
  Test for "syntax error" in yyerror() as well.
  They've changed the "parse error" string into "syntax error" in bison 1.875.

myisam/rt_index.c:
  bug fix
myisam/rt_key.c:
  bug fix
myisam/rt_test.c:
  bug fix

myisam/rt_key.c:
  bug fix
myisam/rt_split.c:
  bug fix

Added ROW_RESULT to switchs(for documentation purposes)


sql/filesort.cc:
  For documentation purposes
sql/item_cmpfunc.cc:
  For documentation purposes
sql/item_func.cc:
  For documentation purposes
sql/item_sum.cc:
  For documentation purposes
sql/log_event.cc:
  For documentation purposes
sql/sql_lex.cc:
  For documentation purposes
sql/sql_select.cc:
  For documentation purposes
sql/sql_show.cc:
  Bug fix: for SHOW STATUS (when ssl is used)

  Bug fix
opt_range.cc:
  Buf fix


sql/field.cc:
  Bug fix
sql/opt_range.cc:
  Buf fix
sql/sql_table.cc:
  Bug fix

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.uvar


sql/filesort.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb

client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/rpl000001.result:
  Auto merged
mysql-test/r/rpl000004.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
Makefile.am:
  Merge with 4.0.11
mysql-test/mysql-test-run.sh:
  Merge with 4.0.11
mysql-test/r/rpl_log.result:
  Use local version (needs to be updated)
mysql-test/t/type_blob.test:
  Merge with 4.0.11
sql/mysqld.cc:
  Merge with 4.0.11
sql/protocol.cc:
  Use local version

Novell patches


Makefile.am:
  Novell patch
client/mysql.cc:
  Novell patch
configure.in:
  Novell patch
extra/mysql_waitpid.c:
  Novell patch
include/my_pthread.h:
  Novell patch
include/mysql.h:
  Novell patch
libmysql/libmysql.c:
  Novell patch
libmysqld/libmysqld.c:
  Novell patch
mysql-test/mysql-test-run.sh:
  Don't use running server with --valgrind
mysql-test/r/innodb.result:
  Updated results
mysql-test/r/rpl000001.result:
  Updated results
mysql-test/r/rpl000004.result:
  Updated results
mysql-test/r/rpl_log.result:
  Updated results
mysql-test/r/type_blob.result:
  Updated results
mysql-test/std_data/words.dat:
  Added more words to make type_blob test relevant
mysql-test/t/innodb.test:
  test of multi-table-delete
mysql-test/t/rpl000001.test:
  Update for new word file
mysql-test/t/type_blob.test:
  Test if BLOB IS NULL on NOT NULL column
mysys/my_init.c:
  Novell patch
mysys/my_netware.c:
  Novell patch
netware/Makefile.am:
  Novell patch
netware/init_db.sql:
  Novell patch
netware/isamchk.def:
  Novell patch
netware/isamlog.def:
  Novell patch
netware/libmysql.def:
  Novell patch
netware/my_print_defaults.def:
  Novell patch
netware/myisamchk.def:
  Novell patch
netware/myisamlog.def:
  Novell patch
netware/myisampack.def:
  Novell patch
netware/mysql.def:
  Novell patch
netware/mysql_install_db.c:
  Novell patch
netware/mysql_install_db.def:
  Novell patch
netware/mysql_test_run.def:
  Novell patch
netware/mysqladmin.def:
  Novell patch
netware/mysqlbinlog.def:
  Novell patch
netware/mysqlcheck.def:
  Novell patch
netware/mysqld_safe.c:
  Novell patch
netware/mysqldump.def:
  Novell patch
netware/mysqlimport.def:
  Novell patch
netware/mysqlshow.def:
  Novell patch
netware/mysqltest.def:
  Novell patch
netware/pack_isam.def:
  Novell patch
netware/perror.def:
  Novell patch
netware/replace.def:
  Novell patch
netware/resolveip.def:
  Novell patch
netware/test_db.sql:
  Novell patch
scripts/make_binary_distribution.sh:
  Novell patch
sql/item_cmpfunc.h:
  Optimization of 'IS NULL'
sql/mysql_priv.h:
  Code cleanup
sql/mysqld.cc:
  Novell patch
sql/net_pkg.cc:
  Code cleanup
sql/records.cc:
  Fixed multi-table-delete for InnoDB tables
sql/sql_delete.cc:
  Fixed multi-table-delete for InnoDB tables
sql/sql_handler.cc:
  Code cleanup
sql/sql_table.cc:
  Code cleanup
sql/structs.h:
  Fixed multi-table-delete for InnoDB tables

into mashka.mysql.fi:/home/my/mysql-4.0


sql/item_cmpfunc.h:
  Auto merged

Reverted wrong patch for mysqld_safe.sh


client/mysqldump.c:
  Patch for novell.
scripts/mysqld_safe.sh:
  Reverted wrong patch.
  (We must delete the files first as otherwise we will get a problem if the files has the wrong permissions or if the machine went down without removing the socket file)

fixed destroing not well constructed analize object
fixed wrong detection of unions in derived tables


sql/sql_analyse.h:
  fixed destroing not well constructed analize object
sql/sql_derived.cc:
  fixed wrong detection of unions in derived tables
sql/sql_lex.cc:
  fixed excluding st_select_lex from global select list

libmysql/libmysql.c:
  Fix to read the correct 'default value'

tests/client_test.c:
  Another misc variable test which is of bool type returning a longlong

tests/client_test.c:
  Updated tests for MYSQL_FIELD members for misc cases
libmysql/libmysql.c:
  Remove the assignment from stmt->fields to stmt->mysql->fields

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb