sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged

correct bug with empty table


sql/item_sum.cc:
  correct bug with empty table

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

BitKeeper/deleted/.del-mini_client.h~be0e3c44e9b0f67d:
  Delete: sql/mini_client.h
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Delete: sql/mini_client.cc
BitKeeper/etc/ignore:
  Added sql/client.c to the ignore list

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


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged

splittiln common client's parts


include/sql_common.h:
  superfluous #ifdef-s removed
libmysql/client_settings.h:
  superfluous #ifdef-s removed
libmysql/libmysql.c:
  some litter removed
libmysqld/lib_sql.cc:
  here we had wrong parameters
mysys/default.c:
  this is not needed anymore - calling code fixed
sql-common/client.c:
  code trimmed and simplified
sql/client_settings.h:
  code trimmed
sql/repl_failsafe.cc:
  option's initialization added
sql/slave.cc:
  option's initialization added

Some default_charset_info were removed

SHOW COLLATION columns have been removed:
  D -> Default
  C -> Compiled
  Y -> Yes

  define ILSEQ for platforms that do not define it themself


strings/ctype-ucs2.c:
  define ILSEQ for platforms that do not define it themself

Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.


Makefile.am:
  symlinking of sql-common/client.c was added
include/mysql.h:
  MYSQL_CLIENT define moved here from libmysql/Makefile
libmysql/Makefile.am:
  ../libmysql/client_settings.h added to the list of necessary h-files
libmysql/Makefile.shared:
  client.lo added to the list of objects
libmysql/libmysql.c:
  a lot of changes about separating code between libmysql.c and client.c
mysys/default.c:
  changed to keep compiler happy
sql-common/client.c:
  a lot of changes about code separating
sql/Makefile.am:
  mini_client.h has to be removed
sql/repl_failsafe.cc:
  mysql_real_connect prototype was unified, so we've got to set connection timeout separately
sql/slave.cc:
  trimming code to the changed function's prototypes
sql/sql_repl.cc:
  mini_client isn't needed anymore

SCRUM
BUG
correct wrong code in group_concat


mysql-test/r/func_gconcat.result:
  add new tests
mysql-test/t/func_gconcat.test:
  add new tests
sql/field.cc:
  add new variable for group_concat
sql/field.h:
  add new variable for group_concat
sql/item_sum.cc:
  correct wrong code
sql/item_sum.h:
  correct wrong code

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

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

character_set_results is now the same with character_set_client by default

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


BitKeeper/etc/ignore:
  auto-union

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

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

into eagle.mysql.r18.ru:/home/vva/work/NEW_HELP/4.1.clear

sql/sql_help.cc:
  fix some warnings

BitKeeper/etc/ignore:
  Added libmysqld/item_geofunc.cc to the ignore list

  mysqldump now produces SET NAMES. It can be disabled by --no-set-names


client/mysqldump.c:
  mysqldump now produces SET NAMES. It can be disabled by --no-set-names

  character_set_connection new variable


sql/set_var.h:
  character_set_connection new variable
sql/set_var.cc:
  character_set_connection new variable

character_set_database was added
Code optimization: reuse more code for all character sets variables


sql/mysqld.cc:
  character_set_server is now updatable
  character_set_database was added
sql/set_var.cc:
  character_set_server is now updatable
  character_set_database was added
sql/set_var.h:
  character_set_server is now updatable
  character_set_database was added
sql/sql_base.cc:
  character_set_server is now updatable
  character_set_database was added
sql/sql_class.cc:
  character_set_server is now updatable
  character_set_database was added
sql/sql_class.h:
  character_set_server is now updatable
  character_set_database was added
sql/sql_db.cc:
  character_set_server is now updatable
  character_set_database was added
sql/sql_load.cc:
  character_set_server is now updatable
  character_set_database was added
sql/sql_table.cc:
  character_set_server is now updatable
  character_set_database was added
sql/sql_yacc.yy:
  character_set_server is now updatable
  character_set_database was added
BitKeeper/etc/ignore:
  Added scripts/mysql_create_system_tables to the ignore list

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

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

(bug #518 fixed)


mysql-test/r/subselect.result:
  test of bug #518
mysql-test/t/subselect.test:
  test of bug #518
sql/item_subselect.cc:
  test and switch mem_root if it is necessary
  exec() - wrapper around engine->exec() to test and switch mem_root if necessary
sql/item_subselect.h:
  added storing THD for mem_root testinmg & switching
  exec() - wrapper around engine->exec() to test and switch mem_root if necessary

SELECT CAST(_latin1'string' AS CHAR CHARACTER SET latin2)

  bug #521 fix: ('3'='4')  was true in cp1250_czech_ci


strings/ctype-win1250ch.c:
  bug #521 fix: ('3'='4')  was true in cp1250_czech_ci

./configure --with-charset=latin1 --with-collation=latin1_danish_ci

  ifdef wrong structure has been fixed


strings/ctype-win1250ch.c:
  ifdef wrong structure has been fixed

libmysql/libmysql.c:
  conflict resolved

libmysqld/Makefile.am:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
libmysql/libmysql.c:
  Resolved conflicts
sql/mini_client.cc:
  resolved conflicts
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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