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


sql/set_var.cc:
  Auto merged

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

into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1

into client/mysqltest.c


client/mysqltest.c:
  corrected spelling error horisontal->horizontal

into eagle.mysql.r18.ru:/home/vva/work/BUG_2593/mysql-4.1


mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged

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

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

into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1


sql/field.cc:
  Auto merged

- get my_strtod to return inf
- get Field_float::store(double) and Field_double::store(float) to set null for 
nan value 
(as extra serg's recomendations to fix for patch on 
 Bug #2082 'mysqldump converts "inf" to null')


client/mysqltest.c:
  added commands --query_vertical and --query_horisontal
mysql-test/r/insert.result:
  converted testcase so as my_strtod can return inf now
mysql-test/r/mysqldump.result:
  converted testcase so as my_strtod can return inf now
mysql-test/t/insert.test:
  corrected tests to using --query_vertical instead of 
  pair (vertical_results,horisontal_results)
sql/field.cc:
  corrected Field_float::store(double) and Field_double::store(double)
  to set null for nan value
strings/strtod.c:
  get my_strtod to return inf

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

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

mysql-test/r/show_check.result:
  Updated results
mysql-test/t/show_check.test:
  Portability fix (for 64 bit platforms)
mysys/hash.c:
  Portablity fix
sql/gen_lex_hash.cc:
  Don't include mysql_priv.h;  Causes build errors on a lot of platforms
sql/lex_symbol.h:
  Moved symbols here from mysql_priv.h to avoid including mysql_priv.h in gen_lex_hash.cc
sql/mysql_priv.h:
  Move symbols and struct to lex_symbol.h
sql/sql_db.cc:
  Don't use sql_alloc/sql_free methods in sql_string.h
sql/sql_help.cc:
  Don't use sql_alloc/sql_free methods in sql_string.h
sql/sql_string.h:
  Don't use sql_alloc/sql_free methods in sql_string.h
  This makes the code faster and more portable
sql/sql_yacc.yy:
  Don't use sql_alloc/sql_free methods in sql_string.h

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

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

to avoid troubles with OS which don't support these symbols in file name
used create table 'a/b' as hook for WL#1324 which should fix this problem


mysql-test/r/show_check.result:
  commented testcases with quotation marks in table name
  to avoid troubles with OS which don't support these symbols in file name
  used create table 'a/b' as hook for WL#1324 which should fix this problem
mysql-test/t/show_check.test:
  commented testcases with quotation marks in table name
  to avoid troubles with OS which don't support these symbols in file name
  used create table 'a/b' as hook for WL#1324 which should fix this problem

into mysql.com:/home/kostja/mysql/mysql-4.1-rename

Renames:
mysql_bind_param      -> mysql_stmt_bind_param
mysql_bind_result     -> mysql_stmt_bind_result
mysql_execute         -> mysql_stmt_execute
mysql_fetch           -> mysql_stmt_fetch
mysql_fetch_column    -> mysql_stmt_fetch_column
mysql_get_metadata    -> mysql_stmt_result_metadata
mysql_param_count     -> mysql_stmt_param_count
mysql_param_result    -> mysql_stmt_param_metadata
mysql_prepare         -> mysql_stmt_prepare
mysql_send_long_data  -> mysql_stmt_send_long_data

client_test.c cleaned up from memory leaks


include/mysql.h:
  New call mysql_stmt_init() introduced.
  Renames:
  mysql_bind_param      -> mysql_stmt_bind_param
  mysql_bind_result     -> mysql_stmt_bind_result
  mysql_execute         -> mysql_stmt_execute
  mysql_fetch           -> mysql_stmt_fetch
  mysql_fetch_column    -> mysql_stmt_fetch_column
  mysql_get_metadata    -> mysql_stmt_result_metadata
  mysql_param_count     -> mysql_stmt_param_count
  mysql_param_result    -> mysql_stmt_param_metadata
  mysql_prepare         -> mysql_stmt_prepare
  mysql_send_long_data  -> mysql_stmt_send_long_data
  Renames are done according to the rule 'Everything call operating with
  'MYSQL_STMT' structure has 'mysql_stmt_' prefix.
  Additionally mysql_param_result was renamed to mysql_stmt_param_metadata
  and mysql_get_metadata to mysql_stmt_result_metadata.
  All renames are done in hope that new names are easier to remember and 
  understand.
libmysql/client_settings.h:
  skip_list is not needed any more
libmysql/libmysql.c:
  New call mysql_stmt_init() introduced.
  Renames:
  mysql_bind_param      -> mysql_stmt_bind_param
  mysql_bind_result     -> mysql_stmt_bind_result
  mysql_execute         -> mysql_stmt_execute
  mysql_fetch           -> mysql_stmt_fetch
  mysql_fetch_column    -> mysql_stmt_fetch_column
  mysql_get_metadata    -> mysql_stmt_result_metadata
  mysql_param_count     -> mysql_stmt_param_count
  mysql_param_result    -> mysql_stmt_param_metadata
  mysql_prepare         -> mysql_stmt_prepare
  mysql_send_long_data  -> mysql_stmt_send_long_data
sql-common/client.c:
  no skip_list argument any more
tests/client_test.c:
  - many memory leaks and valgrind errors cleaned up.

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


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

mysys/my_getsystime.c:
  Add NetWare high-resolution time call.

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


sql/item_create.cc:
  Auto merged

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

into eagle.mysql.r18.ru:/home/vva/work/BUG_1661/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_1661/mysql-4.1

added commands vertical_results and horisontal_results to client/mysqltest.c


client/mysqltest.c:
  added commands vertical_results and horisontal_results
mysql-test/r/insert.result:
  added test for bug #2082 'mysqldump converts "inf" to NULL'
mysql-test/t/insert.test:
  Fixed bug #2082 'mysqldump converts "inf" to NULL'
sql/field.cc:
  added test for Fixed bug #2082 'mysqldump converts "inf" to NULL'

sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
mysql-test/r/subselect.result:
  merging
mysql-test/t/subselect.test:
  merging

into mashka.mysql.fi:/home/my/mysql-4.1


sql/item_create.cc:
  Auto merged

heap/hp_delete.c:
  Added comments
mysql-test/r/gis.result:
  Updated results after name changes (all results line are unchanged)
mysql-test/r/show_check.result:
  Update test results after fix in hp_delete.cc
mysql-test/t/gis.test:
  Changed table names to longer, hopefully non conflicting ones.
  Added missing drop table
mysys/hash.c:
  Inendation cleanup
mysys/tree.c:
  Updated comments
  Decrease tree->allocated on delete (for status)
sql/field.cc:
  Added safety checking for GIS objects
sql/gstream.cc:
  Added copyright message
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/gstream.h:
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/item_create.cc:
  Indentation fixup
sql/item_geofunc.cc:
  Use new gis interface functions and new gis class names.
  Simple optimizations
  Indentation fixups
  Fixed a lot of unlikely but possible errors.
sql/item_geofunc.h:
  Moved SRID_SIZE to spatial.h
sql/spatial.cc:
  Added copyright message
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/spatial.h:
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
  Indentation fixes
  Use bool instead of int as result type for functions that only return 0 or 1
sql/sql_string.cc:
  Simple optimizations
sql/sql_string.h:
  Simple cleanups
sql/structs.h:
  Added LEX_STRING_WITH_INIT (needed by spatial.cc)

Two things changed:
1. Repeated queries are only stored once in the history.
2. Multiline queries are stored in a concated format in the history, 
   in addition to pieces. 
(Push approved by serg)


client/mysql.cc:
  Fix up history in readline implementation.
  1. Repeated queries are only stored once in the history.
  2. Multiline queries are stored in a concated format in the history.
  (Push approved by serg)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

SHOW SLAVE STATUS.

BUG#2826 "Seconds behind master weirdness"
(sometimes this column of SHOW SLAVE STATUS shows a very big value,
in fact a small negative number casted to ulonglong).
This problem was reported by only one user, but which uses
synchronized time between his servers.
As suggested by the user, to hide this I display max(0, the value)
so that it will be less confusing. For a user, seeing 0 is probably
better than seeing -1 (both tell you that the slave is very close
to the master).


sql/slave.cc:
  Don't display a negative Seconds_Behind_Master in SHOW SLAVE STATUS.