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

  Drop t2 in the beginning.
  ,


mysql-test/r/auto_increment.result:
  Drop t2 in the beginning.
  ,
mysql-test/t/auto_increment.test:
  Drop t2 in the beginning.
  ,

 statement": check that statement is not null when accessing it's name.


tests/client_test.c:
  A test case for bug#4236

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


sql/sql_select.cc:
  Auto merged

into mysql.com:/dbdata/psergey/mysql-4.1-root

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

   requested


Build-tools/Do-compile:
   - explicitely enable libedit, when readline is not requested

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-cleanup

Now we are using time zone abbreviations in debug builds or in utlities only.
Tried to remove warnings generated by compiler by using more proper types for
members of time zone describing structures. Removed unused variables. 
Fixed test_time to be able to build on FreeBSD without much problems.
Portability fix: resolved ambiguity of abs() function.

into mysql.com:/home/mysql_src/mysql-4.1-874

(enum_shutdown_level is going to replace enum killed_state in 5.0).


VC++Files/winmysqladmin/mysql_com.h:
  putting in place the 2 types of KILL of 5.0
include/mysql_com.h:
  putting in place the two types of KILL of 5.0

sql/item_func.cc:
  Unused variable 'thd' removed.
sql/item_subselect.cc:
  Unused variable 'type' removed.
sql/slave.cc:
  Unused variable 'return_val' removed.
sql/sql_derived.cc:
  Unused variable 'is_subsel' removed.
sql/sql_parse.cc:
  Unused variables 'pstr' and 'create_info' removed.
sql/sql_prepare.cc:
  Unused variable 'res' removed.
sql/time.cc:
  Unused variable 'str_begin' removed.

into mysql.com:/home/mysql_src/mysql-4.1-874

"if (thd->killed > thd->killable)", if we simply do
thd->killed= level;

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

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

Updated tests
After merge fix


mysql-test/r/func_time.result:
  Updated tests
sql/field.cc:
  After merge fix
  Removed compiler warning
sql/field.h:
  Field_geom should have same max_length as Field_blob

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
include/my_global.h:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/fil/fil0fil.c:
  merge (Use heikki's code)

Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)


client/mysqltest.c:
  Added MAX_VAR_NAME which was lost in merge
  Added more debugging
  Fixed bug in 'eval'
innobase/data/data0type.c:
  After merge fix
innobase/fil/fil0fil.c:
  After merge fix
innobase/log/log0recv.c:
  After merge fix
myisam/mi_unique.c:
  Better checksum handling
mysql-test/r/func_time.result:
  Return NULL if a time argument is given to date_add()
mysql-test/r/rpl_free_items.result:
  After merge fix
mysql-test/r/rpl_get_lock.result:
  Test was depending on when server was restarted.
mysql-test/r/type_date.result:
  After merge fix
mysql-test/r/type_decimal.result:
  After merge fix
mysql-test/t/func_time.test:
  Removed comment that is not needed anymore
  (After Dimitri's timezone patch is pushed, we should get a warning for the date_add(time...) entry)
mysql-test/t/rpl_get_lock.test:
  Test was depending on when server was restarted.
mysql-test/t/type_date.test:
  Addded missing explanation for bug
netware/mysqld_safe.c:
  Removed end \r
  Run program through indent-ex to get MySQL indentation
sql-common/client.c:
  After merge fix
sql/field.cc:
  Fixed that get_date(time) gives a warning
sql/field.h:
  After merge fix
sql/net_serv.cc:
  More debugging (if DEBUG_DATA_PACKETS is set)
sql/sql_class.cc:
  Removed compiler warning
sql/table.cc:
  Better comment

into mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1-ndb

into mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1

at each 'make' invocation (pushing as two devs tested that the patch is ok).


Makefile.am:
  Fix for bug in build scripts making everything to be reconfigured
  at each 'make' invocation.

libmysql/libmysql.c:
  fix to make autobuild happy.

into mysql.com:/home/mysql_src/mysql-4.1-874


include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysqld >=4.1.3 will however understand shutdown requests sent by clients <4.1.3.
And mysqld <4.1.3 will understand shutdown requests sent by clients >=4.1.3
(it will ignore the level). Those shutdown level are just PLACEHOLDERS now.
So this change is just to make the 4.1 API suitable before it is frozen. Later
we will actually implement the shutdown levels.


VC++Files/winmysqladmin/main.cpp:
  2nd argument to mysql_shutdown()
VC++Files/winmysqladmin/mysql.h:
  2nd argument to mysql_shutdown()
VC++Files/winmysqladmin/mysql_com.h:
  Several types of shutdown now.
include/mysql_com.h:
  SHUTDOWN_DEFAULT is now 0 instead of 255, this saves one test in sql_parse.cc
libmysql/libmysql.c:
  correcting mistake (how come that my tests still all worked with this? - should recheck, for curiosity).
sql/sql_parse.cc:
  with SHUTDOWN_DEFAULT==0, no need for testing packet_length.

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

  MySql -> MySQL (Bug #4182)


extra/perror.c:
  MySql -> MySQL (Bug #4182)

into mysql.com:/home/jonas/src/mysql-4.1-ndb

into mysql.com:/home/jonas/src/mysql-4.1-ndb

No commit message