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

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

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

is specified, the default is SESSION.

Docs/README.1st:
  Change mode to -rw-rw-r--

  Conditional compilation


strings/ctype-uca.c:
  Conditional compilation

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

  Don't dump default implicit weights


strings/uca-dump.c:
  Don't dump default implicit weights

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

dropping of tables added to the testcase


mysql-test/r/subselect.result:
  result fixed
mysql-test/t/subselect.test:
  dropping added

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


sql/item.cc:
  Auto merged

Problem is that Item::save_in_field modifies str_value member
 before it calls val_str but Item_copy_string::val_str just returns
this str_value as the result.
I added local String variable to the Item::save_in_field


mysql-test/r/create.result:
  appropriate test result
mysql-test/t/create.test:
  test case
sql/item.cc:
  local variable added to keep the result

Bug#1428

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


sql/item.cc:
  Auto merged

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

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into greg-laptop.:C:/cygwin/bk/mysql-4.1


sql/item.h:
  Auto merged

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

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

myisam/mi_check.c:
  we only restore key_map if it's required
mysql-test/r/repair_part1.result:
  appropriate test result
mysql-test/t/repair_part1.test:
  test case

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

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


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

some db comparison code cleupup
removed compiler warnings


mysql-test/r/lowercase_table.result:
  test for BUG#3251
mysql-test/t/lowercase_table.test:
  test for BUG#3251
sql/item.cc:
  simple strcmp can be used for db name comparison
sql/set_var.h:
  changed initialisation order to satisfy compiler
sql/sql_cache.cc:
  simple strcmp can be used for db name comparison
sql/sql_db.cc:
  better use special cherset for files
sql/sql_parse.cc:
  simple strcmp can be used for db name comparison
  aliases should be compared with my_strcasecmp
sql/sql_select.cc:
  aliases should be compared with my_strcasecmp

  new file

  Delete: mysys/uca-dump.c


BitKeeper/deleted/.del-uca-dump.c~da786d5a909db27a:
  Delete: mysys/uca-dump.c

VC++Files/mysys/mysys.dsp:
  Add my_gethwaddr, my_getsystime
VC++Files/sql/mysqld.dsp:
  Remove opt_ft.cpp (no longer exists)

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


sql/sql_parse.cc:
  Auto merged

mysql-test/r/variables.result:
  more tests
mysql-test/t/variables.test:
  more tests
sql/set_var.cc:
  don't crash on NULL

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


sql/set_var.cc:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged

mysql-test/r/variables.result:
  new test
mysql-test/t/ctype_utf8.test:
  typos fixed
mysql-test/t/variables.test:
  new test
sql/mysqld.cc:
  sys_str_var->value must be not NULL
sql/set_var.cc:
  initialize sys_str_var->value from a constructor
sql/set_var.h:
  initialize sys_str_var->value from a constructor

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

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


sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

sql/item.cc:
  removed double_fix & already_fixed in Item_field
sql/item.h:
  added quick_fix_field() for cases when we are sure that no need full fix_field processing
  fixed neg() method for numeric constants to have the same logic as constant parser
  Item_null, Item_real, ... are constant which are fixed by creation
sql/item_cmpfunc.h:
  right fix_fields in and_conds call
sql/item_func.cc:
  changed Item_field constructor call
  fix_field emulation call
sql/item_strfunc.cc:
  correct layout
sql/item_subselect.cc:
  correct layout
  changed Item_field constructor call
sql/item_sum.cc:
  changed Item_field constructor call
sql/item_sum.h:
  changed Item_field constructor call
sql/sql_base.cc:
  fixed layout
  right fix_fields calls
sql/sql_help.cc:
  changed Item_field constructor call
sql/sql_load.cc:
  changed Item_field constructor call
sql/sql_parse.cc:
  constant changed
sql/sql_select.cc:
  fixed layout
  fix_field emulation insted of real fix_fields call
sql/sql_show.cc:
  changed Item_field constructor call
sql/sql_union.cc:
  changed Item_field constructor call
  double_fix removed
sql/sql_update.cc:
  renamed variable, fixed layout
sql/sql_yacc.yy:
  typo fixed
  fix_fields emulation calls
  hegation of numbers fixed

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