into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/mysqldump.result:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged

into mysql.com:/home/kostja/mysql/mysql-4.1-root

mysql-test/r/mysqlbinlog.result:
  fixes for mysql tests.
mysql-test/r/mysqldump.result:
  fixes for mysql tests.
mysql-test/r/negation_elimination.result:
  fixes for mysql tests.
mysql-test/t/mysqlbinlog.test:
  fixes for mysql tests.
mysql-test/t/mysqldump.test:
  fixes for mysql tests.

and was removed from THD


sql/sql_class.h:
  old_total_warn_count removed
sql/sql_parse.cc:
  old_total_warn_count removed

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


myisam/mi_check.c:
  Auto merged
myisam/mi_delete.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1056


sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1279

include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
isam/test2.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_test2.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/mysqld.cc:
  SCCS merged
sql/set_var.cc:
  SCCS merged

sql/set_var.cc:
  Auto merged

Bug #1707: mysqldump -X does't quote field and table names
code cleanup

Fixed. Enabled test case in client_test.c.


sql/sql_prepare.cc:
  BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
  Added missing parentheses in IS_PARAM_NULL to get the right bit.
tests/client_test.c:
  BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
  Fixed. Enabled test case.

into mysql.com:/home/pem/work/mysql-4.1

code cleanup


mysql-test/r/subselect.result:
  test for BUG#1668
mysql-test/t/subselect.test:
  test for BUG#1668
sql/item_subselect.cc:
  removed unused class field
  fixed min_max subquery used_tables()/const()
  fixed ALL/ANY optimisation for unions
sql/item_subselect.h:
  removed unused class field
  fixed min_max subquery used_tables()/const()
sql/sql_union.cc:
  fixed result object assignment

into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_warn-4.1

  Fix yet another race condition in sql_parse.cc: thd->user_connect object could get deleted too soon, before the call of check_for_max_user_connections


sql/sql_parse.cc:
  Fix yet another race condition in sql_parse.cc: thd->user_connect object could get deleted too soon, before the call of check_for_max_user_connections

sql/set_var.cc:
  Auto merged

  Add diagnostic printf to chack that number of connections for a user never drops below zero


sql/sql_parse.cc:
  Add diagnostic printf to chack that number of connections for a user never drops below zero

And added new test for BUG#1644. (Disabled for now, not fixed yet.)


tests/client_test.c:
  A few more fixes:
  - Avoid buffer overruns in printf().
  - Corrected index for comment field in show table status output.
  
  And added new test for BUG#1644. (Disabled for now, not fixed yet.)

Note:
- All test results haven't been inspected in detail to see if they are correct.
- Some result set printing seems to have the wrong field width; most notably
  date/time fields and type fields (e.g. "int(4)").
- There are still some valgrind complaints, but they seem to be in assert() or
  in libmysql.


tests/client_test.c:
  A major overhaul to adopt to recent changes:
  
  - SHOW TABLE result has changed (more columns)
  - EXPLAIN result has VAR_STRING types now
  - Added missing mysql_bind_result() calls
  - Adopted to mysql_fetch_column() semantics: Don't use same pointers in MYSQL_BIND
    structs for fetch_column as for binding.
  - Removed a number of duplicated calls to tests
  - Added missing initialization of MYSQL_BIND structs fields (lenght fields),
    to shutup valgrind.

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


sql/sql_parse.cc:
  Auto merged

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


sql/sql_parse.cc:
  Auto merged

  URGENT: MONTY AND SERGEI should check this patch! The patch fixes the memory corruption reported by a user. It happened because the code did not keep correct a count of how many connections a user has, and the user object got freed too soon if the same user had more than 1 connection. Also fix a typo by Sanja: 'and' is not a C operator, I think it should be &&


sql/sql_parse.cc:
  URGENT: MONTY AND SERGEI should check this patch! The patch fixes the memory corruption reported by a user. It happened because the code did not keep correct a count of how many connections a user has, and the user object got freed too soon if the same user had more than 1 connection. Also fix a typo by Sanja: 'and' is not a C operator, I think it should be &&

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug


sql/sql_parse.cc:
  Auto merged

(but broke permission handling for *some* IP's after we started to compare in utf8)
Bug #1636