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

  new file
sql_table.cc, handler.h:
  Fixed bug #14540.
  Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
  to report that an operation cannot be applied for views.
view.test, view.result:
  Added a test case for bug #14540.
errmsg.txt:
  Fixed bug #14540.
  Added error ER_CHECK_NOT_BASE_TABLE.


mysql-test/r/view.result:
  Added a test case for bug #14540.
mysql-test/t/view.test:
  Added a test case for bug #14540.
sql/handler.h:
  Fixed bug #14540.
  Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
  to report that an operation cannot be applied for views.
sql/share/errmsg.txt:
  Added error ER_CHECK_NOT_BASE_TABLE.
sql/sql_table.cc:
  Fixed bug #14540.
  Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
  to report that an operation cannot be applied for views.

into  mysql.com:/my/mysql-5.0

into  mysql.com:/my/mysql-5.0


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

(Fixed failure in rpl0000008.test)

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


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

into  mysql.com:/my/mysql-5.0


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

into  mysql.com:/my/mysql-5.0

(BDB test failed in Intel64)


mysql-test/r/bdb.result:
  Portability fix
mysql-test/t/bdb.test:
  Portability fix

into  mysql.com:/my/mysql-5.0

BUILD/SETUP.sh:
  Use --with-openssl instead of --with-yassl for now
  (We need to fix that libmysqlclient_r links with a -PIC compiled yassl library before enabling yassl)

sql/sql_parse.cc:
  allow query_tables_own_last work correctly
sql/table.cc:
  fixed returning value for libmysqld

into  mysql.com:/my/mysql-5.0

BUILD/SETUP.sh:
  Build with --yassl instead of openssl

into  mysql.com:/my/mysql-5.0

Optimize new pushed code


sql/item_func.cc:
  Fixed wrong merge
sql/sql_update.cc:
  Optimize new pushed code
  (There is no reason to add extra test for not common error case if code can handle it anyway)

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

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


sql/item_func.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  merge

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2

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

into  mysql.com:/my/mysql-5.0

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


scripts/mysqld_safe.sh:
  Auto merged

Compile max with --yassl instead of --with-openssl


sql/table.cc:
  Add missing return
BUILD/SETUP.sh:
  Compile max with --yassl instead of --with-openssl

into moonbone.local:/work/14186-bug-5.0-mysql

into lmy004.:/work/mysql-5.0-bug14381

(BDB keylength limitted to 255)


mysql-test/r/bdb.result:
  fix bdb test after fixing the maximal length of BDB keys to 2^32-1
sql/ha_berkeley.h:
  use the maximal possible length of 2^32 - 1

  After merge fix


sql/sql_update.cc:
  After merge fix

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

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2

into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64

client/mysqltest.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged

into mysql.com:/data0/mysqldev/lenz/mysql-4.1

into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64

into mysql.com:/data0/mysqldev/lenz/mysql-5.0


configure.in:
  Auto merged

into moonbone.local:/work/14186-bug-4.1-mysql


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

Fix for bug #14536: SELECT @A,@A:=... fails with prepared statements


mysql-test/r/func_sapdb.result:
  Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
mysql-test/r/type_newdecimal.result:
  Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
mysql-test/r/user_var.result:
  More test with SELECT @A:=
mysql-test/t/disabled.def:
  Enable user_var.test for
mysql-test/t/user_var.test:
  More test with SELECT @A:=
sql/item.cc:
  Simple optimization during review of new code
sql/item_func.cc:
  Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
sql/item_timefunc.h:
  timediff() can return NULL for not NULL arguments
sql/sql_base.cc:
  Remove usage of current_thd() in mysql_make_view()
sql/sql_lex.h:
  Remove usage of current_thd() in mysql_make_view()
sql/sql_select.cc:
  Fix for bug #14536: SELECT @A,@A:=... fails with prepared statements
sql/sql_view.cc:
  Remove usage of current_thd() in mysql_make_view()
  Simple optimization of new code
sql/sql_view.h:
  Remove usage of current_thd() in mysql_make_view()
sql/table.cc:
  Simple optimization of new code

mysql-test/r/analyse.result:
  test result fixed
mysql-test/t/disabled.def:
  user_var disabled
sql/sql_analyse.cc:
  rounding added