into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1


mysql-test/r/innodb_cache.result:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged

"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

  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 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

Fixed problem with LIKE and BINARY


BitKeeper/etc/ignore:
  added scripts/fill_help_tables
client/mysqltest.c:
  Better error messages
libmysql/libmysql.c:
  Simple code cleanup
  Simplified connect() and change_user() by using sub function
libmysqld/lib_sql.cc:
  Ensure that new fields in MYSQL_FIELD structure is used
mysql-test/r/rpl_user_variables.result:
  Cleaned up test
mysql-test/r/type_blob.result:
  New test
mysql-test/t/rpl_user_variables.test:
  Cleaned up test
mysql-test/t/type_blob.test:
  New test
sql/item.cc:
  Fixed that Item_ref returns the right character set
sql/item_cmpfunc.cc:
  Fixed problem with LIKE and BINARY
sql/item_func.cc:
  Don't store end ASCII(0) for string user variables
  (Made some other code easier)
sql/log_event.cc:
  Don't store end ASCII(0) for string user variables.
  Fixed comment style
  Some optimizations
sql/log_event.h:
  Optimized type
sql/mini_client.cc:
  Indentation changes
sql/mysql_priv.h:
  Made is_update_query extern
sql/protocol.cc:
  Simple code cleanup
sql/sql_acl.cc:
  Code cleanup
  Fixed problem when connecting to user without a password.
sql/sql_lex.h:
  Fixed problem with uninitialized memory
sql/sql_parse.cc:
  Fixed problem with user without passwords
  Fixed some connect problems.
sql/time.cc:
  removed reference to uninitialized memory

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


BUILD/FINISH.sh:
  Auto merged
client/mysqldump.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53:
  Auto merged

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

  Fix


sql/item_strfunc.cc:
  Fix

  Fix


sql/item_strfunc.cc:
  Fix

  Typo fix
  ,


scripts/fill_help_tables.sh:
  Typo fix
  ,

  Compilation failure fix


sql/sql_yacc.yy:
  Compilation failure fix

libmysql/libmysql.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Fixed a few typos from last patch


configure.in:
  Updated script to handle 1 digit numbers in MySQL version
libmysqld/libmysqld.c:
  Added mysql_get_server_version
sql/sql_parse.cc:
  Fixed typo in last patch
sql/sql_yacc.yy:
  Fixed typo in last patch

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

a socket from another, still living MySQL server.

a socket from another, still living MySQL server.

  Bug fix


myisam/rt_index.c:
  Bug fix

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

 - updated logo to current one


Docs/Images/mysql-logo.gif:
   - updated logo to current one

BitKeeper/deleted/.del-template.texi~e93e39114ba9bcf7:
  Delete: Docs/template.texi