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

   if a variable is not defined (empty).

   (crc32.c is included by mysys/my_crc32.c)

into mysql.com:/home/mysql_src/mysql-4.1

Don't free the client's selected db (thd->db) when it has been DROPped,
if this is a slave thread; the x_free() was causing a lot
of various bugs in rpl_loaddata_rule_m (garbage characters, segfault, hangs in
other threads).
A small post-merge fix (rli->inside_transaction exists in 4.0 only).


sql/log_event.cc:
  Post-merge fix (rli->inside_transaction existed in 4.0 only)
sql/sql_db.cc:
  Don't free the client's selected db (thd->db) when it has been DROPped,
  if this is a slave thread; the x_free() was causing a lot
  of various bugs in rpl_loaddata_rule_m which does a DROP DATABASE 
  (garbage characters, segfault, hangs in other threads).

into mysql.com:/home/dlenev/src/mysql-4.1-rplunt

mysql-test/r/rpl_until.result:
  Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.
mysql-test/t/rpl_until.test:
  Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.

- offset of substr begining
- offset of substr end
- number of characters (MB compatible)

null_string wasn't known in libmysqld/lib_sql.cc, that caused compiler's error
i put the declaration of the null_string in mysql_priv.h and renamed it
to my_null_string to reduce the probability of name's intersections


libmysqld/lib_sql.cc:
  null_string -> my_null_string
sql/mysql_priv.h:
  my_null_string was made known
sql/sql_prepare.cc:
  null_string -> my_null_string

into mishka.mysql.fi:/home/my/mysql-4.1

Now it can work with any character set.

sql/item_strfunc.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
sql/net_serv.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into narttu.mysql.fi:/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged

   .c files (the IBM Visual Age C compiler aborts with a syntax error
   on these)


libmysql/dll.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
libmysql/libmysql.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
mysys/my_getopt.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
sql/net_serv.cc:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
strings/ctype-bin.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)
tests/client_test.c:
   - replaced C++-style comment with the proper syntax for .c files
     (the IBM Visual Age C compiler aborts with a syntax error on these)

   (instead of libedit, which is the default for 4.1)
 - brushed up the usage help text a bit

into mysql.com:/home/dlenev/src/mysql-4.1-868

  Typo fix: redundant "in"


sql/derror.cc:
  Typo fix: redundant "in"

into mysql.com:/home/dlenev/src/mysql-4.1-868

  comp_err failed to compile error message file when a
  character set was not incompiled.


mysys/charset.c:
  comp_err failed to compile error message file when a
  character set was not incompiled.

  Better English message


sql/derror.cc:
  Better English message

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

   cmd-line-utils/readline from the commercial distribution
 - fixed some copyright headers so mysql-copyright can process them


Build-tools/mysql-copyright:
   - remove the cmd-line-utils/readline directory from the commercial
     distribution
   - make use of more builtin Perl functions instead of forking 
     subprocesses
include/my_pthread.h:
   - fixed copyright header
sql/filesort.cc:
   - fixed copyright header
sql/gen_lex_hash.cc:
   - fixed copyright header
sql/item.h:
   - fixed copyright header
sql/item_cmpfunc.cc:
   - fixed copyright header
sql/records.cc:
   - fixed copyright header

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

into mysql.com:/home/dlenev/src/mysql-4.1-868

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


sql/item_strfunc.cc:
  Auto merged

  Bug fix


strings/xml.c:
  Bug fix

into mysql.com:/home/dlenev/src/mysql-4.1-868

  There are some problems compiling with pure "configure"
  I need to fix it first.


extra/comp_err.c:
  There are some problems compiling with pure "configure"
  I need to fix it first.

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


sql/item_func.cc:
  Auto merged

sequence boundaries in functions LIKE and LOCATE in
the case of "binary" collation. Comparison was done
like if the strings were just a binary strings without
character set assumption.

embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?


client/mysqltest.c:
  hash_insert ->my_hash_insert
include/hash.h:
  hash_insert ->my_hash_insert
mysys/hash.c:
  hash_insert ->my_hash_insert
mysys/testhash.c:
  hash_insert ->my_hash_insert
sql/ha_berkeley.cc:
  hash_insert ->my_hash_insert
sql/ha_innodb.cc:
  hash_insert ->my_hash_insert
sql/hash_filo.h:
  hash_insert ->my_hash_insert
sql/item_func.cc:
  hash_insert ->my_hash_insert
sql/lock.cc:
  hash_insert ->my_hash_insert
sql/repl_failsafe.cc:
  hash_insert ->my_hash_insert
sql/set_var.cc:
  hash_insert ->my_hash_insert
sql/slave.cc:
  hash_insert ->my_hash_insert
sql/sql_acl.cc:
  hash_insert ->my_hash_insert
sql/sql_base.cc:
  hash_insert ->my_hash_insert
sql/sql_cache.cc:
  hash_insert ->my_hash_insert
sql/sql_parse.cc:
  hash_insert ->my_hash_insert
sql/sql_select.cc:
  hash_insert ->my_hash_insert
sql/sql_udf.cc:
  hash_insert ->my_hash_insert
sql/table.cc:
  hash_insert ->my_hash_insert
tools/mysqlmanager.c:
  hash_insert ->my_hash_insert

embedded library
missed memory freeing added


libmysqld/embedded_priv.h:
  declaration added
libmysqld/lib_sql.cc:
  implementation added
libmysqld/libmysqld.c:
  mysql->thd releasing

prepared statements in embedded library.
some fixes after testing


include/mysql.h:
  virtual method added
libmysql/client_settings.h:
  declaration added
libmysql/libmysql.c:
  implementation added
  mysql_fetch changed to work in both libraries
libmysqld/lib_sql.cc:
  implementation added
sql-common/client.c:
  added items in methods table
sql/client_settings.h:
  decided to remove such defines - i placed single #ifdef in client.c