The problem was that if a prepared statement accessed a view, the
access to the tables listed in the query after that view was done in
the security context of the view.

The bug was in the assigning of the security context to the tables
belonging to a view: we traversed the list of all query tables
instead.  It didn't show up in the normal (non-prepared) statements
because of the different order of the steps of checking privileges
and descending into a view for normal and prepared statements.

The solution is to traverse the list and stop once the last table
belonging to the view was processed.


mysql-test/r/view_grant.result:
  Add result for bug#24404: strange bug with view+permission+prepared
  statement.
mysql-test/t/view_grant.test:
  Add test case for bug#24404: strange bug with view+permission+prepared
  statement.
sql/sql_view.cc:
  Remove dead line.
  When setting security context, we should traverse the list of tables
  belonging to a given view, not all query tables.  We achieve that by
  stopping at the first table past view_tables_tail.

mysql-test/t/sp_stress_case.test:
  Minor cleanup ... the test is now faster, even in debug builds

into  weblab.(none):/home/marcsql/TREE/mysql-5.0-19194


sql/sp_head.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  limitation)
Bug#24854 (Mixing Searched Case with Simple Case inside Stored Procedure
  crashes Mysqld)

Implemented code review (19194) comments


mysql-test/r/sp_stress_case.result:
  Implemented code review comments : use SQL instead of a shell script to
  generate the code
mysql-test/t/sp_stress_case.test:
  Adjusted
sql/sql_yacc.yy:
  Added more explicit comments
BitKeeper/deleted/.del-sp_stress_case.sh:
  Delete: mysql-test/t/sp_stress_case.sh

into  outpost.site:/home/cps/mysql/trees/5.0-runtime-19044

On windows IM aborted on assert once one
stoppped it. The reason is that we didn't
close the sockets on windows and therefore,
the listener thread wasn't able to finish.
This happened because we used close() call
for it. While on windows one should use
closesocket().
On other platfroms we have appropriate defines
for closesocket(), so this is the function which
should be used.


server-tools/instance-manager/listener.cc:
  close -> closesocket

--cursor_protocol": fix a misleading error message in case of
SELECT .. INTO.


sql/sql_class.cc:
  Implement select_result::check_simple_select hierarchy to 
  support correct error messages in case of SELECT .. INTO and C API 
  cursors.
sql/sql_class.h:
  Set the error message inside the function that checks for the error
  condition (simple_select, renamed to check_simple_select).
sql/sql_prepare.cc:
  Use a new method that now sets the error.
tests/mysql_client_test.c:
  Add a test case for Bug#24179 "select b into $var" fails with 
  --cursor_protocol" (check for the right error message and error code).

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-4.1-runtime

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637


sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-5.0-build

Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
inside a stored routine and MySQL is compiled with Query Cache support
(this is not in the manual).

The problem was that the condition test of "we are inside stored routine"
was reversed, thus CONCURRENT _worked only_ from stored routine.  The
solution is to use proper condition test.

No test case is provided because the test case would require a large
amount of input, and it's hard to tell is SELECT is really blocked or
just slow (subject to race).


sql/sql_yacc.yy:
  Fix the condition of TL_WRITE_CONCURRENT_INSERT on LOAD DATA CONCURRENT,
  which was reversed, and return valid value if we are in SP.

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


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

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


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

mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
tests/mysql_client_test.c:
  Manual merge: use local.

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/wait_for_socket.sh:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.

into  bodhi.local:/opt/local/work/mysql-4.1-runtime


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M50/push-5.0

netware/BUILD/nwbootstrap:
  Editing "mwenv" is now obsolete,
  as this file gets its variable settings from the environment already;
  and it is even plain wrong,
  because the assignments to those variables are written in such a way that
  replacing the variables by values (as tried here) yields invalid shell lines.

into  mysql.com:/home/kent/bk/mysql-5.0-build

  Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.


sql/Makefile.am:
  Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.

into  mysql.com:/home/kent/bk/mysql-5.0-build


Docs/Makefile.am:
  Auto merged

  If using \$(srcdir)/mysql.info in action, use same in rule.


Docs/Makefile.am:
  If using \$(srcdir)/mysql.info in action, use same in rule.

into  trift2.:/MySQL/M50/push-5.0


extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-5.0-build

into  mysql.com:/home/kent/bk/mysql-5.0-merge


sql-common/my_time.c:
  Auto merged

into  mysql.com:/home/kent/bk/mysql-4.1-merge

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

  Reenabled build outside source tree


config/ac-macros/ha_berkeley.m4:
  Reenabled build outside source tree
config/ac-macros/ha_innodb.m4:
  Reenabled build outside source tree
config/ac-macros/ha_ndbcluster.m4:
  Reenabled build outside source tree
extra/yassl/src/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/benchmark/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/src/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/test/Makefile.am:
  Reenabled build outside source tree
extra/yassl/testsuite/Makefile.am:
  Reenabled build outside source tree
libmysql/Makefile.shared:
  Reenabled build outside source tree
ndb/src/mgmsrv/Makefile.am:
  Reenabled build outside source tree

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


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

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

  BSD compatibility


Docs/Makefile.am:
  BSD compatibility

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


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
bdb/dist/gen_rec.awk:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
ndb/config/type_ndbapitools.mk.am:
  Auto merged
ndb/src/kernel/Makefile.am:
  Auto merged

  Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree


bdb/dist/gen_rec.awk:
  Fix undefined behaviour.
acinclude.m4:
  Reenabled build outside ource tree
configure.in:
  Reenabled build outside ource tree
libmysql_r/Makefile.am:
  Reenabled build outside ource tree
libmysqld/Makefile.am:
  Reenabled build outside ource tree
ndb/config/common.mk.am:
  Reenabled build outside ource tree
ndb/config/type_kernel.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapi.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitest.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitools.mk.am:
  Reenabled build outside ource tree
ndb/config/type_util.mk.am:
  Reenabled build outside ource tree
ndb/src/kernel/Makefile.am:
  Reenabled build outside ource tree