BitKeeper/etc/ignore:
  Added ndb/tools/ndb_restore to the ignore list
sql/item.cc:
  Fixed VC 6.0 warning:
  mysql-5.0.2-alpha\sql\item.cpp(1729) : warning C4715: 'resolve_ref_in_select_and_group' : not all control paths return a value
sql/opt_range.cc:
  Fixed VC 6.0 errors:
  ERROR # 4: mysql-5.0.2-alpha\sql\opt_range.cpp(8070) : error C2664: 'key_cmp' : cannot convert parameter 2 from 'char *' to 'const unsigned char *'
          Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast
  
  ERROR # 5: mysql-5.0.2-alpha\sql\opt_range.cpp(8196) : error C2664: 'key_cmp' : cannot convert parameter 2 from 'char *' to 'const unsigned char *'
          Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast

into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/wl638.3

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

  Rework parser expression rules
  Rework handling for "||" concat/or
  Eliminate some shift/reduce conflicts
  Add support for "xxx IS [ NOT ] truth_value"


mysql-test/r/ansi.result:
  Fix test for new BROKEN_NOT mode bit
mysql-test/r/bool.result:
  WL#638
    New test for BROKEN_NOT mode
    New test for "expr IS [NOT] truth_value" syntax
mysql-test/r/sql_mode.result:
  Fix test for new BROKEN_NOT mode bit
mysql-test/t/bool.test:
  WL#638
    New test for BROKEN_NOT mode
    New test for "expr IS [NOT] truth_value" syntax
sql/lex.h:
  WL#638
    "&&" and "AND" return different tokens,
    NOT token changed to NOT_SYM
    OR_OR_CONCAT token changed to OR_OR_SYM
    New token "UNKNOWN"
sql/mysql_priv.h:
  WL#638
    New mode: BROKEN_NOT
sql/mysqld.cc:
  WL#638
    New mode: BROKEN_NOT
sql/set_var.cc:
  WL#638
    New mode: BROKEN_NOT
    BROKEN_NOT is set in MYSQL323 and MYSQL40 modes
sql/sql_lex.cc:
  Bug#638
    Alter tokens returned by lexer depending upon sql_mode:
    Return NOT2_SYM token instead of NOT_SYM when in BROKEN_NOT mode
    Return OR2_SYM token instead of OR_OR_SYM when not in PIPES_AS_CONCAT mode
sql/sql_yacc.yy:
  WL#638
    Change grammar to respect proper SQL syntax for NOT
    Clean up grammar, eliminate >100 shift/reduce conflicts
    New support for "expr IS [NOT] truth_value" SQL syntax
    Remove or_or_concat() support func. New support func is_truth_value()

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.1

code cleanup


mysql-test/r/information_schema.result:
  Fix for Auto_increment filed value in 'show table status'
mysql-test/t/information_schema.test:
  Fix for Auto_increment filed value in 'show table status'

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

AC_FUNC_MMAP changes to AC_CHECK_FUNCS(mmap)


configure.in:
  don't use AC_FUNC_MMAP - it checks for "private fixed mapping of
  already-mapped memory" - and we don't care about it.
  use regular AC_CHECK_FUNCS(mmap) instead
  (blame autoconf for misleading macro name - should've been
  AC_MMAP_CAN_DO_PRIVATE_FIXING_MAPPING_OF_ALREADY_MAPPED_MEMORY :)
include/my_pthread.h:
  not all cpp's understand #warning :-[]

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


sql/item_func.cc:
  Auto merged
sql/table.h:
  Auto merged

sql/item_func.cc:
  fixed type
sql/sql_base.cc:
  keep kompiller happy about unused lable in libmysqld
sql/sql_view.cc:
  keep kompiller happy about unused variable in libmysqld
sql/table.h:
  correct type casting

sql/field.cc:
  Fix warning.
sql/item_func.cc:
  Fix Windows compilation failure.
sql/opt_range.cc:
  Fix warnings and errors (Windows)
sql/sp_pcontext.h:
  Fix warning (Windows).
sql/table.h:
  Fix warning (Windows).

server-tools/instance-manager/mysqlmanager.cc:
  removed non-portable sys_siglist

into sinisa.nasamreza.org:/mnt/work/petica

BitKeeper/etc/ignore:
  added ac_available_languages_fragment

into sinisa.nasamreza.org:/mnt/work/petica

unresolved symbols.

sql/sql_parse.cc:
  bad fix of the bad cleanup corrected

mysql-test/r/rpl_rewrite_db.result:
  in 5.0 we return 'out of range' instead of 'data truncated'.

into mysql.com:/home/mysql_src/mysql-5.0-clean


client/mysqldump.c:
  Auto merged

client/mysqldump.c:
  row[i] is char* so some compilers don't want to put it into a unsigned char*. A C++ comment.

Makefile.am:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_parse.cc:
  SCCS merged

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

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin

into sinisa.nasamreza.org:/mnt/work/petica

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

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


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/my_dbug.h:
  Auto merged
include/my_sys.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_isam.cc:
  Auto merged
sql/ha_isammrg.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

The bug was that the function allocates 'a', then changes the value
of 'a' with the operator ++, and then tries to free 'a'!

sql/sql_acl.cc:
  Fix for bug 'If user has column privilege with grant option is_grantable is 'NO' in 
  INFORMATION_SCHEMA.COLUMN_PRIVILEGES'
sql/sql_show.cc:
  removed sprinf
  Fix for 'sp with select from information_schema table crashes server'
  typo fixes

Replication using replicate-rewrite-db did not work for LOAD DATA INFILE.
Now is does.  There was one place in the code that used current database 
instead of the rewrite database.


mysql-test/r/rpl_rewrite_db.result:
  New tests
mysql-test/t/rpl_rewrite_db-slave.opt:
  New tests
mysql-test/t/rpl_rewrite_db.test:
  New tests
sql/log_event.cc:
  Added db to set_fields function so that current db is used.
sql/log_event.h:
  Added db to set_fields function so that current db is used.

    added libs variable for ndbmgmclient used by mysqladmin
    add linkage with @ndb_mgmclient_libs@
    additional options for ndbcluster
    added support for managing the cluster to mysqladmin
    added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
    use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs


Makefile.am:
  changed compile order, mysqladming with ndbcluster extensions needs ndb to be compiled first
acinclude.m4:
  added libs variable for ndbmgmclient used by mysqladmin
client/Makefile.am:
  add linkage with @ndb_mgmclient_libs@
client/client_priv.h:
  additional options for ndbcluster
client/mysqladmin.c:
  added support for managing the cluster to mysqladmin
configure.in:
  added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
include/my_global.h:
  use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs

    print some info event on api connects with wrong versions


BitKeeper/deleted/.del-Makefile.am~91c159ff4011609:
  Delete: ndb/tools/restore/Makefile.am
ndb/src/common/transporter/TransporterRegistry.cpp:
  let traffic through to api cluster manager as well
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  print some info event on api connects with wrong versions

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

Try to lower the probability of a stall of mysqldump AND most client connections, when mysqldump does a FLUSH TABLES WITH READ LOCK
(doing FLUSH TABLES first).


client/mysqldump.c:
  try to lower the probability of a stall of mysqldump AND most client connections, when mysqldump does a FLUSH TABLES WITH READ LOCK
  (doing FLUSH TABLES first).