into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/set_var.cc:
  Auto merged

into  mysql.com:/home/gluh/MySQL/Merge/5.0-kt

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


client/mysqldump.c:
  manula merge

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660


client/mysqldump.c:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my50-bug19356


BitKeeper/etc/collapsed:
  auto-union

The executing code had a safety assertion so that it refused to free Items
that it didn't create.  However, there is a case, undefined user variables,
which would put Items into the list to be freed.

Instead, do something that is more risky in expectation that the code will 
be refactored soon, as Kostja wants to do:  Remove the assertions from 
prepare() and execute().  Put one assertion at a higher level, before 
stmt->set_params_from_vars(), which may then create new to-be-freed Items .


mysql-test/r/ps_11bugs.result:
  Create tests to prove that undefined variables work, as keys and not, and 
  that variables explicitly assigned to Null work.
mysql-test/t/ps_11bugs.test:
  Create tests to prove that undefined variables work, as keys and not, and 
  that variables explicitly assigned to Null work.
sql/sql_prepare.cc:
  Move a safety assertion up one level and higher, because there is 
  legitimately a case where thd->free_list is not NULL going into 
  Prepared_statement::{prepare,execute} methods.
  
  Kostja plans to refactor this code so that it is both safe and works.  
  (Now it works, but isn't very safe.)

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


sql/set_var.cc:
  Auto merged

  
The server variable warning_count should include the number of warnings, errors and notes according to the manual


mysql-test/r/user_var.result:
  Added warning_count results.
mysql-test/t/user_var.test:
  Added test case for warning_count.
sql/set_var.cc:
  Added number errors to warning_count.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

client/mysqldump.c:
  Bug#19660 mysqldump --single-transaction should be with CONSISTENT SNAPSHOT
  
  - Remove old BEGIN syntax and replace with START TRANSATION. Add CONSISTENT SNAPSHOT option for servers that support it.

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix


sql/sql_select.cc:
  Auto merged

into  booka.:/home/alik/MySQL/devel/5.0-rt

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix


sql/sql_select.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/collapsed:
  auto-union
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

wrong results in order by in some rare cases.

invocations of LAST_INSERT_ID.

Reding of LAST_INSERT_ID inside stored function wasn't noted by caller,
and no LAST_INSERT_ID_EVENT was issued for binary log.

The solution is to add THD::last_insert_id_used_bin_log, which is much
like THD::last_insert_id_used, but is reset only for upper-level
statements.  This new variable is used to issue LAST_INSERT_ID_EVENT.


mysql-test/r/rpl_insert_id.result:
  For bug#21726, add result for statement-based replication of function
  calls.
mysql-test/t/rpl_insert_id.test:
  For bug#21726, add test case for statement-based replication of function
  calls.
sql/item_func.cc:
  Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.
sql/log.cc:
  Issue LAST_INSERT_ID_EVENT if THD::last_insert_id_used_bin_log is set.
sql/set_var.cc:
  Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.
sql/sql_class.cc:
  Initialize THD::last_insert_id_used_bin_log.
  Fix typo, add whitespace.
sql/sql_class.h:
  Add THD::last_insert_id_used_bin_log.
sql/sql_parse.cc:
  Reset THD::last_insert_id_used_bin_log for upper-level statements.
sql/sql_select.cc:
  Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.

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

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


scripts/mysqlhotcopy.sh:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-5.0-rpl


mysql-test/r/cast.result:
  null merge for bug#8663
  It will beed another fix for 5.0
  - changes in new DECIMAL instead of FLOAT
mysql-test/r/ps.result:
  null merge
mysql-test/t/cast.test:
  null merge
mysql-test/t/count_distinct3.test:
  null merge
sql/item_func.cc:
  null merge

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

into  mysql.com:/usr/home/bar/mysql-4.1-rpl


mysql-test/r/cast.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
sql/item_func.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug22271/my50-bug22271


sql/field.cc:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


include/m_ctype.h:
  Auto merged
include/my_global.h:
  Manual merge

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
sql/item_func.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.0

into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

This was available from gcc 3.1, so diable it before that
Update m_ctype.h to use the new macro


include/m_ctype.h:
  Use macro ATTRIBUTE_FORMAT_FPTR on function pointer
include/my_global.h:
  Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers
  This was available from gcc 3.1, so diable it before that

into  siva.hindu.god:/usr/home/tim/m/bk/41


scripts/mysqlhotcopy.sh:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/41

into  siva.hindu.god:/usr/home/tim/m/bk/40

into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/50

into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Manual merge
sql/mysqld.cc:
  Manual merge

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

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


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

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged