mysql-test/r/create.result:
  added test for bug #856 'Naming a key "Primary" causes trouble'
mysql-test/t/create.test:
  added test for bug #856 'Naming a key "Primary" causes trouble'

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

   MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special
   AR flag)


innobase/configure.in:
   - added AC_PROG_LIBTOOL to be able to compile MySQL with InnoDB on IBM
     AIX 5.2 in 64bit mode (which requires a special AR flag)

set_mysql_error is deployed


libmysql/client_settings.h:
  declaration for set_mysql_error
libmysql/libmysql.c:
  - set_mysql_error moved to client.c
  - st_stmt_errmsg -> set_stmt_error
sql-common/client.c:
  deployment of set_mysql_error

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

Now we use virtual calls instead and redirect VMT pointer of the
geometry object with 'new' operation


sql/field.cc:
  Usage of the Geometry class changed
sql/item_geofunc.cc:
  Usage of the Geometry class changed
sql/spatial.cc:
  Now we rewrite the real VMT of the object with new operation
sql/spatial.h:
  No need for the VMT-like structure and pointers to it
sql/sql_yacc.yy:
  enum items was renamed accordingly to coding standards

mysql-test/r/mysqldump.result:
  merge correction

mysql-test/r/mysqldump.result:
  e
mysql-test/t/mysqldump.test:
  SCCS merged

mysql-test/r/mysqldump.result:
  added test for bug #2591 "mysqldump quotas names inconsistently"
mysql-test/t/mysqldump.test:
  added test for bug #2591 "mysqldump quotas names inconsistently"

read_statistic -> read_statistics
(statistic is adjective)


include/mysql.h:
  read_statistic -> read_statistics
libmysql/client_settings.h:
  read_statistic -> read_statistics
libmysql/libmysql.c:
  read_statistic -> read_statistics
libmysqld/lib_sql.cc:
  read_statistic -> read_statistics
sql-common/client.c:
  read_statistic -> read_statistics

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

into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.1

is false.


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

   (it got lost during a recent BK merge) 

sql/set_var.cc:
  SCCS merged

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

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


sql/set_var.cc:
  Auto merged

Note: the patch removes an extra declaration of
the read_only variable. It also assumes that '_'
sorts before [a-z].


mysql-test/r/fulltext_var.result:
  Fix test result to account for SHOW VARIABLES
  output reordering.
sql/set_var.cc:
  Make SHOW VARIABLES output really alphabetic.

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