Add a missing space to the output format of SHOW INNODB STATUS; reported by Jocelyn Fournier


innobase/srv/srv0srv.c:
  Add a missing space to the output format of SHOW INNODB STATUS; reported by Jocelyn Fournier

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

test results updated


myisam/ft_boolean_search.c:
  cleanup
myisam/ft_parser.c:
  cleanup
  bug#2708
mysql-test/r/derived.result:
  error messages updated
mysql-test/r/fulltext.result:
  bug#2708
mysql-test/r/warnings.result:
  error messages updated
mysql-test/t/fulltext.test:
  bug#2708

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

--disable-warning in union.test


mysql-test/t/union.test:
  cleanup
sql/share/czech/errmsg.txt:
  no dots in the error messages!
sql/share/danish/errmsg.txt:
  no dots in the error messages!
sql/share/dutch/errmsg.txt:
  no dots in the error messages!
sql/share/english/errmsg.txt:
  no dots in the error messages!
sql/share/estonian/errmsg.txt:
  no dots in the error messages!
sql/share/french/errmsg.txt:
  no dots in the error messages!
sql/share/german/errmsg.txt:
  no dots in the error messages!
sql/share/greek/errmsg.txt:
  no dots in the error messages!
sql/share/hungarian/errmsg.txt:
  no dots in the error messages!
sql/share/italian/errmsg.txt:
  no dots in the error messages!
sql/share/japanese/errmsg.txt:
  no dots in the error messages!
sql/share/korean/errmsg.txt:
  no dots in the error messages!
sql/share/norwegian-ny/errmsg.txt:
  no dots in the error messages!
sql/share/norwegian/errmsg.txt:
  no dots in the error messages!
sql/share/polish/errmsg.txt:
  no dots in the error messages!
sql/share/portuguese/errmsg.txt:
  no dots in the error messages!
sql/share/romanian/errmsg.txt:
  no dots in the error messages!
sql/share/russian/errmsg.txt:
  no dots in the error messages!
sql/share/serbian/errmsg.txt:
  no dots in the error messages!
sql/share/slovak/errmsg.txt:
  no dots in the error messages!
sql/share/spanish/errmsg.txt:
  no dots in the error messages!
sql/share/swedish/errmsg.txt:
  no dots in the error messages!
sql/share/ukrainian/errmsg.txt:
  no dots in the error messages!

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

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


sql/sql_yacc.yy:
  Auto merged

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


mysql-test/r/mysqldump.result:
  Auto merged

is changed to a more consistent
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_list.
Bug #2642

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


mysql-test/t/union.test:
  Auto merged

mysql-test/t/union.test:
  error code changed

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

now it's working


include/mysql.h:
  read_change_user_result 'virtual' method added
libmysql/client_settings.h:
  cli_read_change_user_result interface
libmysql/libmysql.c:
  cli_read_change_user_result implementation
libmysqld/lib_sql.cc:
  emb_read_change_user_result implementation
sql-common/client.c:
  cli_read_change_user_result added to the method's table
sql/sql_parse.cc:
  fixes to make mysql_change_user working in embedded library

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

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


mysql-test/r/union.result:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

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


sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

(case MY_LEX_USER_VARIABLE_DELIMITER for multichar strings)
and my_mbcharlen


include/m_ctype.h:
  a trivial optimization of my_mbcharlen (case !USE_MB)
sql/sql_lex.cc:
  a little optimization in yylex 
  (case MY_LEX_USER_VARIABLE_DELIMITER for multichar strings)

client/mysqldump.c:
  fixed bug #2705 "mysqldump --tab extra output"
  and splited setting of sql_mode to separate line to merge with 4.0

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


configure.in:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged

strtod from mit-threads is restored and cleaned up


BitKeeper/deleted/.del-atof.c~d3edf47a9884080:
  Delete: strings/atof.c
configure.in:
  atod() is no longer used in MySQL
  isinf() now is
include/m_string.h:
  my_strtod, my_atof
include/my_global.h:
  my_atof is deleted
  define isinf()
libmysql/Makefile.shared:
  use internal strtod
sql/gstream.cc:
  use internal strtod
sql/init.cc:
  my_atof is deleted
sql/item.h:
  use internal strtod
sql/item_func.cc:
  use internal strtod
sql/item_sum.h:
  use internal strtod
sql/sql_analyse.cc:
  use internal strtod
strings/Makefile.am:
  use internal strtod
strings/ctype-simple.c:
  use internal strtod
strings/ctype-ucs2.c:
  use internal strtod
strings/strtod.c:
  cleanup
  stricter input checks (e.g. ".E10" is no longer a number)
  don't return an "inf"

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

sql-common/client.c:
  'virtual' method initialization

libmysqld/lib_sql.cc:
  not the right variable was used

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

previous one had error


libmysqld/lib_sql.cc:
  memdup_mysql deleted
sql/sql_class.h:
  String instead of char*
sql/sql_parse.cc:
  storing of the rest of the query

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

include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
tests/client_test.c:
  manual merge

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

mysql-test/r/mysqldump.result:
  fixed mistake after merge

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


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_lex.cc:
  Auto merged

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


sql/sql_lex.cc:
  Auto merged

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


sql/mysql_priv.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

sql/sql_show.cc:
  some optimization in append_identifier

make all "artificial" syntax errors to report a place where they take place ("...syntax error ... near ...")