into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0

After merge fix.

Issuing error about presence of commit/rollback statements in stored functions and triggers added to SP parsing procedure (BUG#13627)

The crash mentioned in original bug report is already prevented by one
of previous patches (fix for bug #13343 "CREATE|etc TRIGGER|VIEW|USER
don't commit the transaction (inconsistency)"), this patch only improve
error returning.


mysql-test/r/sp-error.result:
  Test that statements which implicitly commit transaction
mysql-test/t/sp-error.test:
  Test that statements which implicitly commit transaction
sql/sp_head.cc:
  We set the new flag about commit/rollback statements presence
sql/sp_head.h:
  The new flag about commit/rollback presence added
  A comment fixed
sql/sql_yacc.yy:
  Removed commit/rollback-statement-present errors spread by this file, only one check left which check flags of a SP

into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/handler.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/mysql_priv.h:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_base.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_handler.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_table.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.

into  mysql.com:/home/mydev/mysql-5.0-5000

mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

Version for 5.0.
It fixes three problems:
1. The cause of the bug was that we did not check the table version for
 the HANDLER ... READ commands. We did not notice when a table was
 replaced by a new one. This can happen during ALTER TABLE, REPAIR
 TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
 for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
 Though the function comment clearly said it must.
 I changed the code so that the locking is done when required. I call
 the fix for this problem "the secondary fix".
3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in
 concur with FLUSH TABLES WITH READ LOCK. I call the fix for this
 problem "the 5.0 addendum fix".


include/my_pthread.h:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Added a new macro for the 5.0 addendum fix.
mysql-test/r/handler.result:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The test result.
mysql-test/t/handler.test:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The test case.
sql/lock.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed a comment which did confuse me and which is not fully
  correct anymore after the 5.0 addendum fix.
  Added an assertion which would fire without the 5.0 addendum fix.
sql/mysql_priv.h:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed a definition for the secondary fix.
sql/sql_base.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed function calls for the secondary fix.
sql/sql_class.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Changed a function call for the secondary fix.
sql/sql_handler.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The first two diffs make the primary bug fix.
  The rest is for the secondary fix.
sql/sql_table.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  The first diff (four changed places) make the 5.0 addendum fix.
  The other three are changed function calls for the secondary fix.

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

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

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


myisam/ft_parser.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged

into  mysql.com:/home/mydev/mysql-4.1-4100


mysql-test/r/handler.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/t/handler.test:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_handler.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.
sql/sql_table.cc:
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Manual merge.

After merge fix.

mysql-test/r/analyze.result:
  Test suite for BUG#13673
mysql-test/t/analyze.test:
  Test suite for BUG#13673

into  mysql.com:/home/mydev/mysql-4.0-4000

into  mysql.com:/home/mydev/mysql-4.1-4100


mysql-test/r/myisam.result:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  Manual merge.
mysql-test/t/myisam.test:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  Manual merge.
sql/sql_select.cc:
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  Manual merge.

into  mysql.com:/usr/home/pem/bug14723/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

test_if_order_by_key() expected only Item_fields to be in order->item, thus
failing to find available index on view's field, which results in reported
error.

Now test_if_order_by_key() calls order->item->real_item() to get field for
choosing index.


sql/sql_select.cc:
  Fix bug #14816 test_if_order_by_key() expected only Item_fields.
  Make test_if_order_by_key() use real_item() to get field.
mysql-test/r/view.result:
  Test case for bug#14816 test_if_order_by_key() expected only Item_fields.
mysql-test/t/view.test:
  Test case for bug#14816 test_if_order_by_key() expected only Item_fields.

Item_ref's null_value wasn't updated in save_org_in_field() causing reported
error.


sql/item.h:
  Fix bug #14850 Item_ref's null_value wasn't updated
  Make save_org_in_field() update Item_ref's null_value.
mysql-test/r/view.result:
  Test case for bug #14850 Item_ref's null_value wasn't updated
mysql-test/t/view.test:
   Test case for bug #14850 Item_ref's null_value wasn't updated

into  selena.:H:/MYSQL/src/#14569-mysql-5.0


sql/sql_parse.cc:
  Auto merged

into  mysql.com:/usr/home/pem/bug14723/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

into  selena.:H:/MYSQL/bkt/mysql-5.0

my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to 
allow deleting opened files. my_sopen() implementation is added to
support this functionality.


include/my_global.h:
  Fixes bug #13377. Added number of constants for share delete file
  open option.
include/my_sys.h:
  Fixes bug #13377. Added my_sopen function.
mysys/my_create.c:
  Fixes bug #13377. my_create() function changed to use my_sopen() and which allows
  to use FILE_SHARE_DELETE flag on win32, which helps in deleting opened files.
mysys/my_open.c:
  Fixes bug #13377. my_open() function changed to use my_sopen() on win32
  which allows to use FILE_SHARE_DELETE flag to allow deleting opened files.
sql/log.cc:
  Fixes bug #13377. Additional patch - remove reference counting for
  opened binlog files, introduced in initial patch of #13377.
sql/sql_class.h:
  Fixes bug #13377. Additional patch - remove reference counting for
  opened binlog files, introduced in initial patch of #13377.
sql/sql_repl.cc:
  Fixes bug #13377. Additional patch - remove reference counting for
  opened binlog files, introduced in initial patch of #13377.

VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  Fixed compiler error for Win32 build. #include "decimal.c" wrere no able to find decimal.c file.
sql/ha_innodb.cc:
  Fixed compiler error for Win32 build.
sql/spatial.cc:
  Fixed compiler error for Win32 build. float8get should be enclosed
  in {} since it is macro on win32 and might cause unmatching blocks.

  Disabled yaSSL support for now


include/config-win.h:
  Disabled yaSSL support for now

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/mysql-test-run.pl:
  Auto merged

  Corrected search for 'mysqlimport' executable


mysql-test/mysql-test-run.pl:
  Corrected search for 'mysqlimport' executable

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

myisam/ft_parser.c:
  word->len calculation correction.
mysql-test/r/fulltext.result:
  Test case for bug#5686.
mysql-test/t/fulltext.test:
  Test case for bug#5686.

support-files/mysql.spec.sh:
  We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
  The fully static RPM build on "build" also does not work with the bundled zlib.
  With this change, we use the bundled zlib for "standard" RPMs (unless fully stytic, "build")
  and the one already installed onm the system for the "max" build which is also labeled "experimental".

we changing current db temporarily and restore it when sp is created. however thd->db
in this case becomes empty string rather than NULL and so all checks of thd->db == NULL 
will be false. So if after this we'll issue create procedure sp2()... without specifying
db it will succeed and create sp with db=NULL, which causes mysqldto crash on 
show procedure status statement.

This patch fixes the problem.


mysql-test/r/sp-error.result:
  Result for bug #14569.
mysql-test/t/sp-error.test:
  Test for bug #14569.
sql/sql_db.cc:
  Fixes bug #14569. When no db is selected as current and we do create procedure db.sp()...
  we changing current db temporarily and restore it when sp is created. however thd->db
  in this case becomes empty string rather than NULL and so all checks of thd->db == NULL 
  will be false. This patch fixes this issue.
sql/sql_parse.cc:
  Fixes bug #14569. Reverted from initial patch to check thd->db for null values only.

into  mysql.com:/usr/home/pem/bug14723/mysql-5.0


sql/sp_head.cc:
  Auto merged

it is added a check of not being empty value. When modifying SP with Admin 
application on win32 it does not pass curent database so sp is stored with
db=null which causes a crash later on show procedure status;

                 in the function body
  Changed the way the end of query was found from the lex state.
  The routine body was not extracted correctly when using the
  /*!version ... */ wrapper (in dump files); for some types of routines
  (e.g. with a label at the first begin), the trailing "*/" was not skipped.


mysql-test/r/sp.result:
  New test case for BUG#14723.
mysql-test/t/sp.test:
  New test case for BUG#14723.
sql/sp_head.cc:
  Changed the way the end of the definition and body is found from the lex state.
  In the case of /*!version */ wrappers we must take the trailing " */" into account.

into  mysql.com:/home/timka/mysql/src/5.0-bug-14662

into  mysql.com:/home/timka/mysql/src/5.0-bug-14662

the same column as an aliased and as a non-aliased column.

The problem was that Item_direct_view_ref::eq() was first comparing view columns
by name, and in this case the name of one of them is different since it is aliased.


mysql-test/r/select.result:
  Added test for BUG#14662.
mysql-test/t/select.test:
  Added test for BUG#14662.
sql/item.cc:
  Changed the way view column refenreces are compared. Two view columns are
  equal if they resolve to the same result field of a view.