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

  Fix for possible bug when string length is more than 64K


sql/item_strfunc.cc:
  Fix for possible bug when string length is more than 64K

include/m_ctype.h:
  Add conversion routines prototypes
sql/init.cc:
  Fix for small bug

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

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)

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

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:
     .

Docs/manual.texi:
  test .

Docs/manual.texi:
  test

Docs/manual.texi:
  test

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