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


mysql-test/r/subselect.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

select sql_calc_found_rows * from table limit 0;
It does ...

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

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

sql/sql_base.cc:
  one more change reverted

sql/sql_class.cc:
  reverting some changes and fixig C style of Sanja ... ;o)

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


sql/sql_select.cc:
  Auto merged

mysql-test/r/subselect.result:
  test of subselect explain
mysql-test/t/subselect.test:
  test of subselect explain

sql/sql_base.cc:
  temporary removal ...

mysql-test/r/create.result:
  A test case for foreign key bug that is resolved
mysql-test/r/select_found.result:
  test case for new select ... limit 0 behaviour
mysql-test/t/create.test:
  test case for foreign key bug that is fixed
mysql-test/t/select_found.test:
  test case for new behaviour of SELECT ... LIMIT 0
sql/sql_select.cc:
  SELECT ... LIMIT 0
sql/sql_union.cc:
  replacing my dirty hack with Sanja's "proper" fix

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_select.cc:
  Auto merged

mysql-test/r/subselect.result:
  test of subselect explain bug
mysql-test/t/subselect.test:
  test of subselect explain bug
sql/sql_select.cc:
  remuved difference between optimization for execution and optimization for description

BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Delete: include/.my_sys.h.swp

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


sql/item_cmpfunc.cc:
  Auto merged

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

mysql-test/r/derived.result:
  A test for derived table which requires creation on temporary MyISAM
  table ...
mysql-test/r/select_found.result:
  A test for LIMIT )
mysql-test/t/derived.test:
  A test for derived table which requires creation on temporary MyISAM
  table ...
mysql-test/t/select_found.test:
  A test for LIMIT 0

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_derived.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged

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

 - fixed switching from heap to MyISAM table
 - fixed error handler


sql/sql_derived.cc:
  A fix for the bug when MyISAM tmp table has to be created in order to resolve derived table.
  fixed error handler
sql/sql_parse.cc:
  fixed error handler
sql/sql_union.cc:
  fixed switching from heap to MyISAM table

include/mysql_com.h:
  basic row Items
include/mysqld_error.h:
  more wide error mening
libmysqld/Makefile.am:
  basic row Items
mysql-test/r/subselect.result:
  more wide error mening
sql/Makefile.am:
  basic row Items
sql/filesort.cc:
  basic row Items
sql/item.cc:
  basic row Items
sql/item.h:
  basic row Items
sql/item_cmpfunc.cc:
  basic row Items
sql/item_cmpfunc.h:
  basic row Items
sql/item_func.cc:
  basic row Items
sql/item_func.h:
  basic row Items
sql/item_strfunc.cc:
  basic row Items
sql/item_strfunc.h:
  basic row Items
sql/item_subselect.cc:
  basic row Items
sql/item_sum.cc:
  basic row Items
sql/share/czech/errmsg.txt:
  more wide error mening
sql/share/danish/errmsg.txt:
  more wide error mening
sql/share/dutch/errmsg.txt:
  more wide error mening
sql/share/english/errmsg.txt:
  more wide error mening
sql/share/estonian/errmsg.txt:
  more wide error mening
sql/share/french/errmsg.txt:
  more wide error mening
sql/share/german/errmsg.txt:
  more wide error mening
sql/share/greek/errmsg.txt:
  more wide error mening
sql/share/hungarian/errmsg.txt:
  more wide error mening
sql/share/italian/errmsg.txt:
  more wide error mening
sql/share/japanese/errmsg.txt:
  more wide error mening
sql/share/korean/errmsg.txt:
  more wide error mening
sql/share/norwegian-ny/errmsg.txt:
  more wide error mening
sql/share/norwegian/errmsg.txt:
  more wide error mening
sql/share/polish/errmsg.txt:
  more wide error mening
sql/share/portuguese/errmsg.txt:
  more wide error mening
sql/share/romanian/errmsg.txt:
  more wide error mening
sql/share/russian/errmsg.txt:
  more wide error mening
sql/share/serbian/errmsg.txt:
  more wide error mening
sql/share/slovak/errmsg.txt:
  more wide error mening
sql/share/spanish/errmsg.txt:
  more wide error mening
sql/share/swedish/errmsg.txt:
  more wide error mening
sql/share/ukrainian/errmsg.txt:
  more wide error mening
sql/sql_base.cc:
  fix_fields error handling
sql/sql_lex.cc:
  basic row Items
sql/sql_select.cc:
  basic row Items
sql/sql_yacc.yy:
  basic row Items

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

to resolve derived table.

Will make a test case for this quite soon.

sql/sql_delete.cc:
  A better fix for safe updates
sql/sql_table.cc:
  A fix for foreign key handling ...

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_select.cc:
  Auto merged

sql/sql_delete.cc:
  fix for safe_updates
  Actually, I do it in order to pull new stuff
sql/sql_select.cc:
  fix for LIMIT 0
  Actually, I do it in order to pull new stuff

client/client_priv.h:
  Add OPT_MYSQL_PROTOCOL and OPT_SHARED_MEMORY_BASE_NAME
include/config-win.h:
  Add shared memory protocol
include/errmsg.h:
  Add error codes of shared memory protocol
include/my_sys.h:
  Delete TYPELIB, moved to typelib.h
include/mysql.h:
  Add shared memory protocol
include/violite.h:
  Add shared memory protocol
libmysql/errmsg.c:
  Add texts of errors of shared memory protocol
sql/mysqld.cc:
  Add shared memory protocol and option --shared-memory, correct option --named-pipe
sql/set_var.cc:
  Add shared memory protocol variables
vio/vio.c:
  Add shared memory protocol
vio/viosocket.c:
  Add shared memory protocol
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted