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

after merge.

Concurrent read and update of privilege structures (like simultaneous
run of SHOW GRANTS and ADD USER) could result in server crash.

Ensure that proper locking of ACL structures is done.

No test case is provided because this bug can't be reproduced
deterministically.


sql/sql_acl.cc:
  Ensure that access to ACL data is protected by acl_cache->lock mutex.
  Use system_charset_info for host names consistently.
  Remove check_acl_user().  Use find_acl_user() instead.
sql/sql_acl.h:
  Remove check_acl_user() declaration.
sql/sql_parse.cc:
  Use is_acl_user() instead of check_acl_user().

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge


mysql-test/r/func_misc.result:
  Manual merge of the fix for bug#16501.
mysql-test/t/func_misc.test:
  Manual merge of the fix for bug#16501.
sql/item_func.cc:
  Manual merge of the fix for bug#16501.
sql/sql_acl.cc:
  For the fix of bug#16372, use local version, since the fix for 5.0 is
  different, and will go in separate ChangeSet.

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-real

into  hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1_2nd

into  hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1_2nd

into  mysql.com:/space/pekka/ndb/version/my50-work

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501

mysql-test/r/ndb_condition_pushdown.result:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
mysql-test/t/ndb_condition_pushdown.test:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/include/ndbapi/NdbOperation.hpp:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/include/util/NdbSqlUtil.hpp:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/src/common/util/NdbSqlUtil.cpp:
  bug#17421, changes NDB API pushdown LIKE arg to plain char

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Merged from 4.1

  Delete: Docs/changelog-5.0.xml


BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Delete: Docs/changelog-5.0.xml

into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

  Delete: Docs/changelog-4.1.xml


BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Delete: Docs/changelog-4.1.xml

into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

  Delete: Docs/changelog-4.0.xml


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Delete: Docs/changelog-4.0.xml

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

mysql-test-run now fails in case of warnings


mysql-test/lib/mtr_report.pl:
  Fail if find warnings
mysql-test/mysql-test-run.sh:
  Fail if find warnings
sql/sql_lex.cc:
  Initalize st_lex properly
sql/sql_view.cc:
  Fixed problem with unaligned memory (wrong free)

into  hundin.mysql.fi:/home/jani/mysql-5.0merge_4_1

TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column


mysql-test/r/date_formats.result:
  Added test case for Bug#11324,
  "TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column"
mysql-test/t/date_formats.test:
  Added test case for Bug#11324,
  "TIME_FORMAT using "%l:%i" returns 36:00 with 24:00:00 in TIME column"

mysql-test/r/date_formats.result:
  Added test cases for Bug#11326
mysql-test/t/date_formats.test:
  Added test cases for Bug#11326

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/ansi.result:
  Merged from 4.1
mysql-test/r/auto_increment.result:
  Merged from 4.1
mysql-test/r/mysqldump.result:
  Merged from 4.1
mysql-test/r/symlink.result:
  Merged from 4.1
mysql-test/t/auto_increment.test:
  Merged from 4.1
mysql-test/t/mysqldump.test:
  Merged from 4.1
sql/set_var.cc:
  Merged from 4.1
sql/sql_show.cc:
  Merged from 4.1

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501

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

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

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

is only to make sure that this will not be fixed, as it is
intended behaviour. Documentation will be improved accordingly.

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16372

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

This caused sp-vars.test to fail


sql/item_func.h:
  Removed compiler warning
sql/sp.cc:
  Fixed memory leak in sql_parse.cc
sql/sp_head.cc:
  Fixed memory leak in sql_parse.cc
sql/sp_head.h:
  Fixed memory leak in sql_parse.cc