where charset_to and charset_from are expressions. For example:

CONVERT('test','latin2','cp1250')


sql/item_strfunc.cc:
  Now this syntax works too:  CONVERT(string,charset_to,charset_from)
sql/item_strfunc.h:
  Now this syntax works too:  CONVERT(string,charset_to,charset_from)
sql/sql_yacc.yy:
  Now this syntax works too:  CONVERT(string,charset_to,charset_from)

some warnings fixes


include/m_ctype.h:
  New charset conversion fields in CHARSET_INFO
mysys/hash.c:
  Fix for "unused argument" warning
strings/ctype-big5.c:
  Fix for "unused argument" warning
strings/ctype-czech.c:
  Fix for "unused argument" warning
strings/ctype-euc_kr.c:
  Fix for "unused argument" warning
strings/ctype-gb2312.c:
  Fix for "unused argument" warning
strings/ctype-gbk.c:
  Fix for "unused argument" warning
strings/ctype-latin1_de.c:
  Fix for "unused argument" warning
strings/ctype-simple.c:
  8bit<->unicode convertion routines
strings/ctype-sjis.c:
  Fix for "unused argument" warning
strings/ctype-tis620.c:
  Fix for "unused argument" warning
strings/ctype-ujis.c:
  Fix for "unused argument" warning
strings/ctype-utf8.c:
  Fix for "unused argument" warning
strings/ctype.c:
  8bit <-> unicode conversion tables

into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1

strings/ctype-big5.c:
  New format for mb char functions
strings/ctype-euc_kr.c:
  New format for mb char functions
strings/ctype-gb2312.c:
  New format for mb char functions
strings/ctype-gbk.c:
  New format for mb char functions
strings/ctype-sjis.c:
  New format for mb char functions
strings/ctype-ujis.c:
  New format for mb char functions

Docs/manual.texi:
  just a test

Docs/manual.texi:
  test.

No commit message

Docs/manual.texi:
  bk commit

Adding entries into the Changelog

mysql-test/r/union.result:
  small bug fixes in unions
BitKeeper/etc/ignore:
  Added Docs/manual.texi.orig Docs/manual.texi.rej to the ignore list
mysql-test/t/union.test:
  test for a bug fix in union's
sql/sql_union.cc:
  bug fix for unions

BUILD/compile-pentium-debug:
  static linking

mysql-test/r/myisam.result:
  prevent determination this index as spatial (due to spatial index determination hack (first dig 'S'))
mysql-test/t/myisam.test:
  prevent determination this index as spatial (due to spatial index determination hack (first dig 'S'))

  Fixed that i mixed Field and Item in some cases


sql/filesort.cc:
  Fixed that i mixed Field and Item in some cases

sql/item_cmpfunc.cc:
  Fix for IN, when String->charset is empty

Fixes in charset related C++ code


configure.in:
  Make things to be easier managable
include/m_ctype.h:
  Hide some functions under conditional compilation
libmysql/Makefile.shared:
  Make things to be easier managable
sql/item_func.cc:
  Fixed that private member is not available in this context
sql/item_strfunc.cc:
  Fixed that private member is not available in this context
strings/Makefile.am:
  Make charset things to be easier managable
  Some fixes in charset C++ code
strings/ctype-big5.c:
  Hide some functions under conditional compilation
strings/ctype-czech.c:
  Hide some functions under conditional compilation
strings/ctype-euc_kr.c:
  Hide some functions under conditional compilation
strings/ctype-gb2312.c:
  Hide some functions under conditional compilation
strings/ctype-gbk.c:
  Hide some functions under conditional compilation
strings/ctype-latin1_de.c:
  Hide some functions under conditional compilation
strings/ctype-mb.c:
  Hide some functions under conditional compilation
strings/ctype-sjis.c:
  Hide some functions under conditional compilation
strings/ctype-tis620.c:
  Hide some functions under conditional compilation
strings/ctype-ujis.c:
  Hide some functions under conditional compilation

Take a look their for details

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1


sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

sql/field.h:
  New function to get charset

client/mysql.cc:
  default_charset_info -> system_charset_info
include/m_ctype.h:
  Remove old ctype
mysys/charset.c:
  Initialize fields after dynamic charset loading
sql/sql_parse.cc:
  default_charset_info -> system_charset_info

client/mysql.cc:
  new ctypes
client/mysqldump.c:
  new ctypes
client/mysqltest.c:
  new ctypes
client/sql_string.cc:
  new ctypes
client/sql_string.h:
  new ctypes
extra/mysql_install.c:
  new ctypes
extra/replace.c:
  new ctypes
extra/resolve_stack_dump.c:
  new ctypes
extra/resolveip.c:
  new ctypes
heap/hp_hash.c:
  new ctypes
include/m_ctype.h:
  new ctypes
include/my_sys.h:
  new ctypes
isam/_key.c:
  new ctypes
isam/_search.c:
  new ctypes
libmysql/Makefile.shared:
  new ctypes
libmysql/libmysql.c:
  new ctypes
myisam/ft_dump.c:
  new ctypes
myisam/ft_parser.c:
  new ctypes
myisam/mi_test1.c:
  new ctypes
mysys/charset.c:
  new ctypes
mysys/default.c:
  new ctypes
mysys/getvar.c:
  new ctypes
mysys/hash.c:
  new ctypes
mysys/mf_casecnv.c:
  new ctypes
mysys/mf_dirname.c:
  new ctypes
mysys/mf_format.c:
  new ctypes
mysys/mf_iocache2.c:
  new ctypes
mysys/mf_soundex.c:
  new ctypes
mysys/mf_wfile.c:
  new ctypes
mysys/my_error.c:
  new ctypes
mysys/my_getwd.c:
  new ctypes
mysys/my_init.c:
  new ctypes
mysys/my_vsnprintf.c:
  new ctypes
mysys/typelib.c:
  new ctypes
sql/convert.cc:
  new ctypes
sql/des_key_file.cc:
  new ctypes
sql/field.cc:
  new ctypes
sql/field.h:
  new ctypes
sql/field_conv.cc:
  new ctypes
sql/filesort.cc:
  new ctypes
sql/ha_innodb.cc:
  new ctypes
sql/hostname.cc:
  new ctypes
sql/init.cc:
  new ctypes
sql/item.cc:
  new ctypes
sql/item_func.cc:
  new ctypes
sql/item_strfunc.cc:
  new ctypes
sql/item_sum.cc:
  new ctypes
sql/item_timefunc.cc:
  new ctypes
sql/key.cc:
  new ctypes
sql/log.cc:
  new ctypes
sql/mysql_priv.h:
  new ctypes
sql/mysqld.cc:
  new ctypes
sql/opt_range.cc:
  new ctypes
sql/procedure.cc:
  new ctypes
sql/slave.cc:
  new ctypes
sql/sql_acl.cc:
  new ctypes
sql/sql_analyse.cc:
  new ctypes
sql/sql_base.cc:
  new ctypes
sql/sql_cache.cc:
  new ctypes
sql/sql_db.cc:
  new ctypes
sql/sql_handler.cc:
  new ctypes
sql/sql_lex.cc:
  new ctypes
sql/sql_parse.cc:
  new ctypes
sql/sql_show.cc:
  new ctypes
sql/sql_string.cc:
  new ctypes
sql/sql_string.h:
  new ctypes
sql/sql_table.cc:
  new ctypes
sql/sql_yacc.yy:
  new ctypes
sql/table.cc:
  new ctypes
sql/time.cc:
  new ctypes
strings/Makefile.am:
  new ctypes
strings/ctype-big5.c:
  new ctypes
strings/ctype-czech.c:
  new ctypes
strings/ctype-gbk.c:
  new ctypes
strings/ctype-latin1_de.c:
  new ctypes
strings/ctype-sjis.c:
  new ctypes
strings/ctype-tis620.c:
  new ctypes
strings/ctype.c:
  new ctypes
strings/str2int.c:
  new ctypes
strings/strto.c:
  new ctypes
tools/mysqlmanager.c:
  new ctypes

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1

into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1

include/m_ctype.h:
  Adding new functions into CHARSET_INFO structure
strings/ctype.c:
  Temporary fill these new fields with NULL

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1

to allow usage of many character sets at a time.


include/m_ctype.h:
  Added condition to simplify migrating from old ctype
  Added new style toupper, tolower which accepts charset in first argument
regex/debug.c:
  Added charset argument
regex/debug.ih:
  added charset argument
regex/engine.c:
  added charset argument
regex/engine.ih:
  added charset arguent
regex/main.c:
  added charset argument
regex/regcomp.c:
  added CHARSET_INFO field
regex/regcomp.ih:
  Added charset argument
regex/regex.h:
  Added #include <m_ctype.h> for CHARSET_INFO
  Added charset argument for regcomp()
regex/regex2.h:
  New charset argument for ISWORD()
regex/regexec.c:
  New charset argument
regex/reginit.c:
  Move to new style ctype. 
  However still needs fixes:
    instead of single static cclass variable,
    each charset must have it's own variable.
sql/item_cmpfunc.cc:
  Pass charset field into regcomp()
  This will be fixed tommorow to use String->charset
    instead of default_charset_info

into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1

This is to simplify maintaining charsets, especially changing
CHARSET_INFO structure.


acconfig.h:
  New defines for charsets
configure.in:
  New way to build charsets
include/m_ctype.h:
  Prototypes, moved from ctype_autoconf.c
libmysql/Makefile.shared:
  Removed ctype_autoconf.c and ctype_extra_sources.c from target dependancies
strings/Makefile.am:
  The same with above
strings/conf_to_src.c:
  Remove unnecessary comment
strings/ctype-czech.c:
   Fix for possible bugs that prototypes was not included
strings/ctype-euc_kr.c:
   Fix for possible bugs that prototypes was not included
strings/ctype-gb2312.c:
   Fix for possible bugs that prototypes was not included
strings/ctype-ujis.c:
   Fix for possible bugs that prototypes was not included
strings/ctype.c:
  Move tables from ctype_extra_sources.c and hide them under #ifdefs

in 4.0.

configure.in:
  Added armscii8
sql/share/charsets/Index:
  A