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

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

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

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/jimw/my/mysql-5.0-clean


scripts/mysqld_safe.sh:
  Auto merged

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

Item_func_group_concat::print() wasn't printing sort order thus creating wrong
view. This results in reported error.


sql/item_sum.cc:
  Fix bug #14466 lost sort order in GROUP_CONCAT() in a view
  Now Item_func_group_concat::print() prints sort order.
mysql-test/r/view.result:
  Test case for bug #14466 lost sort order in GROUP_CONCAT() in a view
mysql-test/t/view.test:
  Test case for bug #14466 lost sort order in GROUP_CONCAT() in a view

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

Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values


myisam/mi_check.c:
  keyoffset is not a position (no %lx here)
mysql-test/r/func_sapdb.result:
  Fixed test after marking that timediff() can return NULL
sql/item_func.cc:
  Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
sql/item_timefunc.cc:
  Mark that add_time and str_to_date() can return null values
sql/item_timefunc.h:
  Mark that time_diff can return 0
sql/spatial.cc:
  Simple cleanups during review of new code

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

mysql-test/r/analyse.result:
  test result fixed
sql/sql_analyse.cc:
  missing sqrt(std_sqr) added

mysql-test/r/gis.result:
  test result fixed

into  mysql.com:/usr/home/ram/work/mysql-4.1

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

Post-review fixes


mysql-test/r/federated.result:
  BUG# 14532
  
  Regenerated test results
mysql-test/t/federated.test:
  BUG# 14532 
  
  Added comments to test

  Make IM ports change with MTR_BUILD_THREAD


mysql-test/mysql-test-run.pl:
  Make IM ports change with MTR_BUILD_THREAD

Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns
work.


mysql-test/r/federated.result:
  BUG# 14532
  
  Test fix by creating table with bit column and inserting,selecting
mysql-test/t/federated.test:
  BUG# 14532
  
  Test fix by creating table with bit column and inserting,selecting
sql/field.cc:
  BUG #14532
  
  Just needed to quote/escape bit field, add FIELD_TYPE_BIT to switch

sql/item_func.cc:
  some optimisation
sql/sql_acl.cc:
  some optimisation
sql/sql_base.cc:
  some optimisation
sql/sql_parse.cc:
  some optimisation
sql/table.cc:
  some optimisation

even when --ledir option is specified. (Bug #13774)


scripts/mysqld_safe.sh:
  Figure out whether to use mysqld or mysqld-max after we have handled
  the command-line options and .cnf files.

1. Made sure that base64 string is terminated with NUL.
2. Made calculation of needed size for base64 string exact.
Added checks in test for the above two fixes.


mysys/base64.c:
  Made sure that base64 string is terminated with NUL.
  Made calculation of needed size for base64 string exact.
  Added checks in test for the above two fixes.

client/mysqltest.c:
  Fixed crash bug in debug mode and make sure q->last_argument is set right
  so that check_eol_junk() will work again.

client/mysqltest.c:
  Removed C++-isms from C file.

sql/ha_berkeley.h:
  BDB supports keylength of maximal 2^32 - use the maximum allowed by mysqld.
  (http://www.sleepycat.com/docs/ref/am_misc/dbsizes.html)

get real results after all checks.
(see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).


client/mysqltest.c:
  Check for NULLs only if we don't replace column results,
  get real results after all checks.