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


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug


sql/sql_parse.cc:
  Auto merged

(but broke permission handling for *some* IP's after we started to compare in utf8)
Bug #1636

mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned
(BUG#1484)


mysql-test/r/variables.result:
  test of swaping variables
mysql-test/t/variables.test:
  test of swaping variables
sql/item_func.cc:
  new method of user variables to pre-fetch value
sql/item_func.h:
  new method of user variables to pre-fetch value
sql/set_var.cc:
  check() methods fetch & store value
sql/set_var.h:
  check() methods fetch & store value

myisam/ftbench/Ecompare.pl:
  bug in multi-column comparison fixed
myisam/ftbench/Ereport.pl:
  bug fixed
  report at 0, 0.5, 1
myisam/ftbench/README:
  updated
myisam/ftbench/ft-test-run.sh:
  various fixes

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


sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

(BUG#1638)


mysql-test/r/subselect.result:
  test for BUG#1638
mysql-test/t/subselect.test:
  test for BUG#1638
sql/item_subselect.cc:
  always check cardinality first

mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

sql/item.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

sql/item.cc:
  used variable to avoid using prev_unit->item which should be more clean
sql/item_subselect.cc:
  uncachable tested on fix fields and correct bits set

myisam/ft_boolean_search.c:
  assert.h and queues.h moved to ftdefs.h
myisam/ft_parser.c:
  ft_parse() with alloc
myisam/ft_static.c:
  api changes, ft_max_word_len_for_sort variable removed
myisam/ft_update.c:
  ft_parse() with alloc
myisam/ftdefs.h:
  variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT
  api changes, ft_max_word_len_for_sort variable removed
  ft_parse() with alloc
myisam/mi_check.c:
  variable ft_max_word_len_for_sort -> define FT_MAX_WORD_LEN_FOR_SORT
myisam/myisamchk.c:
  ft_max_word_len_for_sort removed
mysql-test/r/fulltext.result:
  query expansion tests
mysql-test/r/fulltext_var.result:
  ft_max_word_len_for_sort removed
mysql-test/t/fulltext.test:
  query expansion tests
sql/ha_myisam.h:
  ft api changes for query expansion
sql/mysqld.cc:
  ft_max_word_len_for_sort removed
  ft_query_expansion_limit added
sql/set_var.cc:
  ft_max_word_len_for_sort removed
  ft_query_expansion_limit added
sql/sql_yacc.yy:
  EXPANSION added to keyword: rule

myisam/mi_write.c:
  cleanup
mysql-test/t/fulltext.test:
  after merge fix

into deer.(none):/home/hf/work/mysql-4.1.clean


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

libmysqld/lib_sql.cc:
  This code seems to be superfluous
sql/derror.cc:
  in embedded server these functions should return the sign of the error
  instead of halting the program
sql/init.cc:
  my_abort_hook left unchanged
sql/mysql_priv.h:
  declaration of init_errmessage changed
  unireg_abort was replaced with DBUG_RETURN for embedded server
sql/mysqld.cc:
  these functions don't work in embedded server thus #ifdef-ed

BitKeeper/etc/ignore:
  auto-union
include/m_ctype.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
strings/ctype-simple.c:
  Auto merged

myisam/ft_parser.c:
  oops forgot to commit this file :-[]

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


sql/item.cc:
  Auto merged

Description: When a table contains a 'float' field, and one of the functions
MAX, MIN, or AVG is used on that field, the system crashes.

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/item.cc:
  Auto merged

code cleanup


include/m_ctype.h:
  my_mbcharlen_8bit() { return 1 }
mysql-test/r/fulltext.result:
  fulltext on UTF
mysql-test/t/fulltext.test:
  fulltext on UTF
sql/item_cmpfunc.h:
  cleanup
sql/sql_table.cc:
  FULLTEXT: UCS2 is not allowed
sql/sql_yacc.yy:
  FULLTEXT: code cleanup
strings/ctype-bin.c:
  my_mbcharlen_8bit() { return 1 }
strings/ctype-latin1.c:
  my_mbcharlen_8bit() { return 1 }
strings/ctype-simple.c:
  my_mbcharlen_8bit() { return 1 }
strings/ctype-tis620.c:
  my_mbcharlen_8bit() { return 1 }
strings/ctype-utf8.c:
  hack: (to be fixed properly later) all multi-byte sequences are considered isalpha() now

http://bugs.mysql.com/bug.php?id=1022
Description: When a table contains a 'float' field, and one of the functions
MAX, MIN, or AVG is used on that field, the system crashes.

sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

scripts/fill_help_tables.sh:
  made more fine error message

 - correct table name shown in EXPLAIN Iindex reference)
 - pointer on freed memmory (reallocation of table name in reusing table entry) can't be used in EXPLAIN
(BUG#1584)


mysql-test/r/derived.result:
  test moved to derived table tests
  added test of BUG#1584
mysql-test/r/subselect.result:
  test moved to derived table tests
mysql-test/t/derived.test:
  test moved to derived table tests
  added test of BUG#1584
mysql-test/t/subselect.test:
  test moved to derived table tests
sql/item.cc:
  layout fix
sql/sql_select.cc:
  correct table name assigned to temporary table field

  Reduce InnoDB memory allocation if buffer pool < 8 MB


innobase/include/os0thread.h:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/include/srv0srv.h:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/srv/srv0srv.c:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/srv/srv0start.c:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/thr/thr0loc.c:
  Reduce InnoDB memory allocation if buffer pool < 8 MB

mysql-test/r/subselect.result:
  fixed drop table statement
  test for BUG#1536
mysql-test/t/subselect.test:
  fixed drop table statement
  test for BUG#1536
sql/sql_derived.cc:
  all tree of derived table should be deleted
sql/sql_lex.cc:
  delete subtree method
sql/sql_lex.h:
  delete subtree method

(BUG#1444)


mysql-test/r/subselect.result:
  BUG#1444 test
mysql-test/t/subselect.test:
  BUG#1444 test
sql/item.cc:
  storing used tables in Item_subselect
sql/item_subselect.cc:
  fixed support of used_tables() and const_item() in subqueries
sql/item_subselect.h:
  fixed support of used_tables() and const_item() in subqueries