into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

Added check which throws ER_WRONG_OBJECT error in case the .frm
doesn't contain a valid table type (e.g. view or trigger)


mysql-test/r/create.result:
  Added test case for bug #6859
mysql-test/t/create.test:
  Add testcase for bug #6850

mysql-test/r/information_schema.result:
  Update test results

into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysqltest.c:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  Resolve conflict

into  mysql.com:/home/jimw/my/mysql-5.0-clean

mysql-test/t/information_schema.test:
  Stub out column in results that we don't care about, and may vary
mysql-test/r/information_schema.result:
  Update results

into  mysql.com:/home/jimw/my/mysql-5.0-clean


VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
sql/mysqld.cc:
  Auto merged
strings/Makefile.am:
  Auto merged

into rurik.mysql.com:/home/igor/mysql-5.0

into  fedora.(none):/home/reggie/bk/mysql-5.0

Visual Studio 2003.  I have not yet changed the windows build scripts
to use these.


VC++Files/bdb/bdb.vcproj:
  New BitKeeper file ``VC++Files/bdb/bdb.vcproj''
VC++Files/client/mysql.vcproj:
  New BitKeeper file ``VC++Files/client/mysql.vcproj''
VC++Files/client/mysqladmin.vcproj:
  New BitKeeper file ``VC++Files/client/mysqladmin.vcproj''
VC++Files/client/mysqlclient.vcproj:
  New BitKeeper file ``VC++Files/client/mysqlclient.vcproj''
VC++Files/client/mysqldump.vcproj:
  New BitKeeper file ``VC++Files/client/mysqldump.vcproj''
VC++Files/client/mysqlimport.vcproj:
  New BitKeeper file ``VC++Files/client/mysqlimport.vcproj''
VC++Files/client/mysqlshow.vcproj:
  New BitKeeper file ``VC++Files/client/mysqlshow.vcproj''
VC++Files/client/mysqltest.vcproj:
  New BitKeeper file ``VC++Files/client/mysqltest.vcproj''
VC++Files/comp_err/comp_err.vcproj:
  New BitKeeper file ``VC++Files/comp_err/comp_err.vcproj''
VC++Files/dbug/dbug.vcproj:
  New BitKeeper file ``VC++Files/dbug/dbug.vcproj''
VC++Files/heap/heap.vcproj:
  New BitKeeper file ``VC++Files/heap/heap.vcproj''
VC++Files/innobase/innobase.vcproj:
  New BitKeeper file ``VC++Files/innobase/innobase.vcproj''
VC++Files/libmysql/libmysql.vcproj:
  New BitKeeper file ``VC++Files/libmysql/libmysql.vcproj''
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
  New BitKeeper file ``VC++Files/libmysqld/examples/test_libmysqld.vcproj''
VC++Files/libmysqld/libmysqld.vcproj:
  New BitKeeper file ``VC++Files/libmysqld/libmysqld.vcproj''
VC++Files/libmysqltest/myTest.vcproj:
  New BitKeeper file ``VC++Files/libmysqltest/myTest.vcproj''
VC++Files/my_print_defaults/my_print_defaults.vcproj:
  New BitKeeper file ``VC++Files/my_print_defaults/my_print_defaults.vcproj''
VC++Files/myisam/myisam.vcproj:
  New BitKeeper file ``VC++Files/myisam/myisam.vcproj''
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
  New BitKeeper file ``VC++Files/myisam_ftdump/myisam_ftdump.vcproj''
VC++Files/myisamchk/myisamchk.vcproj:
  New BitKeeper file ``VC++Files/myisamchk/myisamchk.vcproj''
VC++Files/myisamlog/myisamlog.vcproj:
  New BitKeeper file ``VC++Files/myisamlog/myisamlog.vcproj''
VC++Files/myisammrg/myisammrg.vcproj:
  New BitKeeper file ``VC++Files/myisammrg/myisammrg.vcproj''
VC++Files/myisampack/myisampack.vcproj:
  New BitKeeper file ``VC++Files/myisampack/myisampack.vcproj''
VC++Files/mysql-test/mysql_test_run_new.vcproj:
  New BitKeeper file ``VC++Files/mysql-test/mysql_test_run_new.vcproj''
VC++Files/mysql.sln:
  New BitKeeper file ``VC++Files/mysql.sln''
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  New BitKeeper file ``VC++Files/mysqlbinlog/mysqlbinlog.vcproj''
VC++Files/mysqlcheck/mysqlcheck.vcproj:
  New BitKeeper file ``VC++Files/mysqlcheck/mysqlcheck.vcproj''
VC++Files/mysqldemb/mysqldemb.vcproj:
  New BitKeeper file ``VC++Files/mysqldemb/mysqldemb.vcproj''
VC++Files/mysqlserver/mysqlserver.vcproj:
  New BitKeeper file ``VC++Files/mysqlserver/mysqlserver.vcproj''
VC++Files/mysys/mysys.vcproj:
  New BitKeeper file ``VC++Files/mysys/mysys.vcproj''
VC++Files/perror/perror.vcproj:
  New BitKeeper file ``VC++Files/perror/perror.vcproj''
VC++Files/regex/regex.vcproj:
  New BitKeeper file ``VC++Files/regex/regex.vcproj''
VC++Files/replace/replace.vcproj:
  New BitKeeper file ``VC++Files/replace/replace.vcproj''
VC++Files/sql/mysqld.vcproj:
  New BitKeeper file ``VC++Files/sql/mysqld.vcproj''
VC++Files/strings/strings.vcproj:
  New BitKeeper file ``VC++Files/strings/strings.vcproj''
VC++Files/test1/test1.vcproj:
  New BitKeeper file ``VC++Files/test1/test1.vcproj''
VC++Files/tests/mysql_client_test.vcproj:
  New BitKeeper file ``VC++Files/tests/mysql_client_test.vcproj''
VC++Files/thr_test/thr_test.vcproj:
  New BitKeeper file ``VC++Files/thr_test/thr_test.vcproj''
VC++Files/vio/vio.vcproj:
  New BitKeeper file ``VC++Files/vio/vio.vcproj''
VC++Files/zlib/zlib.vcproj:
  New BitKeeper file ``VC++Files/zlib/zlib.vcproj''
extra/yassl/taocrypt/taocrypt.vcproj:
  New BitKeeper file ``extra/yassl/taocrypt/taocrypt.vcproj''
extra/yassl/yassl.vcproj:
  New BitKeeper file ``extra/yassl/yassl.vcproj''

mysql-test/t/lowercase_table3.test:
  Move requirements into include files

  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.
  Added my comment.


sql/item_sum.cc:
  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.
  Added my comment.

myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged

  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.


sql/sql_class.h:
  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.
sql/sql_select.cc:
  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.

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

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


support-files/mysql.spec.sh:
  Auto merged

  required commands/packages so the installation succeeds. Removed the superflouus
  Requires field from the source RPM.

into  mysql.com:/home/svoj/devel/mysql/BUG12075/mysql-4.1

FULLTEXT non-functional for big5 strings


mysql-test/r/ctype_big5.result:
  Test case for BUG#12075.
mysql-test/t/ctype_big5.test:
  Test case for BUG#12075.
strings/ctype-big5.c:
  hack: (to be fixed properly later) all multi-byte sequences are considered isalpha() now

into  mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1


myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Manual merge.
mysql-test/t/fulltext.test:
  Manual merge.

Repair crashes mysql when table has fulltext index.


myisam/sort.c:
  Use static ft_buf instead of dynamic mergebuf. Latter could be NULL if record has long words.
mysql-test/r/fulltext.result:
  Test case for BUG#11684 - repair crashes mysql when table has fulltext index.
mysql-test/t/fulltext.test:
  Test case for BUG#11684 - repair crashes mysql when table has fulltext index.

mysql-test/r/func_math.result:
  Fix incorrect merge of test results
mysql-test/r/user_var.result:
  Fix incorrect merge

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/r/func_math.result:
  Resolve conflicts
mysql-test/r/user_var.result:
  Resolve conflicts
mysql-test/t/func_math.test:
  Resolve conflicts
mysql-test/t/user_var.test:
  Resolve conflicts
sql/item_func.cc:
  Resolve conflicts
sql/sql_parse.cc:
  Resolve conflicts

into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_parse.cc:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item_func.cc:
  Auto merged
mysql-test/t/func_math.test:
  Resolve conflict

into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/user_var.test:
  Resolve conflict

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged

conflict in a unique key. (Bug #12226)


mysql-test/r/delayed.result:
  Add results
mysql-test/t/delayed.test:
  Add new regression test
sql/sql_insert.cc:
  Fix crash in error handling of 'INSERT DELAYED' statement

cleanup.


sql/sp_head.cc:
  Remove unused variable and always add sql_mode to fields in
  sp_head::show_create_function().

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0


sql/sql_select.cc:
  Auto merged

Review of new pushed code


client/mysqlbinlog.cc:
  After merge fixes
sql/set_var.cc:
  After merge fixes
sql/sql_select.cc:
  Removed not needed test (field->maybe_null() also tests field->table->maybe_null)