into eagle.mysql.r18.ru:/home/vva/work/BUG_3342/mysql-4.1


sql/sql_parse.cc:
  Auto merged

Fixed problems with group_concat() and HAVING
Updated crash-me values


sql-bench/limits/mysql-4.0.cfg:
  Rename: sql-bench/limits/mysql.cfg -> sql-bench/limits/mysql-4.0.cfg
include/my_global.h:
  Safety fix
libmysqld/Makefile.am:
  Portability fix (For AIX 64 bit)
mysql-test/r/func_gconcat.result:
  More tests
mysql-test/t/func_gconcat.test:
  More tests
sql/field.cc:
  Cleanups
sql/init.cc:
  moved thread_stack_min to right place
sql/item_sum.cc:
  Fixed problems with group_concat() and HAVING
  Removed some not needed variables
sql/item_sum.h:
  Fixed problems with group_concat() and HAVING
  Removed some not needed variables
sql/mysqld.cc:
  Moved thread_stack_min to right place to handle case where we didn't get as much stack space as we asked for
sql/sql_parse.cc:
  More debugging
sql/sql_select.cc:
  Cleanup
sql/sql_yacc.yy:
  Fixed handling of Item_group_concat() in having. (Arguments should not be handled as refs)

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

bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
(now it require only SELECT privilege on database)


mysql-test/r/show_check.result:
  added test for 
  bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
mysql-test/t/show_check.test:
  added test for 
  bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"

if doesn't exists or is not writable, then /var/log/mysqld_multi.log, if does not exists
or is not writable, then /tmp/mysqld_multi.log, but only in case the file does not yet
exists in /tmp. Otherwise log will be disabled, unless user explicitely sets it with an
option.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


sql/sql_table.cc:
  Auto merged

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

for Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table


BitKeeper/deleted/.del-synchronization-master.opt~265be23ead00949:
  Delete: mysql-test/t/synchronization-master.opt
BitKeeper/deleted/.del-have_debug.require~d981522532c711b2:
  Delete: mysql-test/r/have_debug.require
BitKeeper/deleted/.del-have_debug.inc~f4dc5160b9912226:
  Delete: mysql-test/include/have_debug.inc
mysql-test/r/synchronization.result:
  fixed the test for 
  Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
mysql-test/t/synchronization.test:
  fixed the test for 
  Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
sql/sql_table.cc:
  deleted test sleep from mysql_create_like_table

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

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


sql/sql_prepare.cc:
  Auto merged

sql/sql_prepare.cc:
  use static variable

Here is 2nd version.
'reduce/reduce conflicts' issue is fixed


sql/sql_yacc.yy:
  'reduce/reduce conflicts' issue is fixed

Don't add -debug to server version if MYSQL_SERVER_PREFIX is used
Indentation cleanups


myisam/mi_write.c:
  Indentation cleanup
mysql-test/r/lowercase_table2.result:
  Fixed test results
sql/filesort.cc:
  Fixed warnings from valgrind (not a bug)
sql/ha_myisam.cc:
  Indentation cleanup
sql/mysqld.cc:
  Don't add -debug to server if MYSQL_SERVER_PREFIX is used
sql/sql_base.cc:
  Indentation cleanup
sql/sql_show.cc:
  Fixed typo in comment
sql/sql_table.cc:
  Indentation cleanup

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.curr


sql/sql_yacc.yy:
  Auto merged

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

the code.

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


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1

mysql-test/r/have_debug.require:
  corrected mistake
mysql-test/t/synchronization.test:
  corrected wrong test

  'SHOW GRANTS' syntax is added 
  'SHOW GRANTS FOR CURRENT_USER' syntax is added
  'SHOW GRANTS FOR CURRENT_USER()' syntax is added
 CURRENT_USER without parens in expressions(SELECT CURRENT_USER;) 


mysql-test/r/grant2.result:
  WL1368: SHOW GRANTS FOR CURRENT USER
mysql-test/r/grant_cache.result:
  WL1368: SHOW GRANTS FOR CURRENT USER
mysql-test/t/grant2.test:
  WL1368: SHOW GRANTS FOR CURRENT USER
mysql-test/t/grant_cache.test:
  WL1368: SHOW GRANTS FOR CURRENT USER
sql/lex.h:
  WL1368: SHOW GRANTS FOR CURRENT USER
sql/sql_yacc.yy:
  WL1368: SHOW GRANTS FOR CURRENT USER

Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319)
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly


include/mysql_com.h:
  Fixed compiler warning
libmysqld/emb_qcache.cc:
  Removed not used variable
libmysqld/lib_sql.cc:
  Removed not used variable
myisam/mi_locking.c:
  Added comment
myisam/mi_rnext.c:
  Fixed bug in concurrent insert
myisam/mi_rprev.c:
  Simple optimization
mysql-test/r/func_gconcat.result:
  New tests
mysql-test/t/func_gconcat.test:
  New tests
mysql-test/t/func_group.test:
  Cleanup
sql-common/client.c:
  Removed compiler warning
sql/derror.cc:
  Better comments
sql/field.cc:
  Removed not used function/variable
sql/field.h:
  Removed not needed variable
sql/ha_innodb.cc:
  Removed not used function
sql/item.cc:
  Fixed compiler warning
sql/item_cmpfunc.cc:
  Fixed compiler warning
sql/item_func.cc:
  Fixed compiler warning
sql/item_geofunc.cc:
  Fixed compiler warning
sql/item_sum.cc:
  Fixed bugs in group_concat and added more comments
  (Bugs #2695, #3381 and #3319)
  - field->abs_offset was not needed
  - Wrong assumption of field order in temporary table
  - Some not used variables removed
  - Added ORDER BY fields after argument fields so that code in sql_select.cc can move all fields to point to temporary tables, if needed.
  - Optimized loops
sql/item_sum.h:
  Bug fixing and cleanup of group_concat()
sql/log.cc:
  Removed wrong comment
sql/log_event.cc:
  Removed compiler warning
sql/mysqld.cc:
  Set locked_in_memory properly
sql/protocol.cc:
  Removed compiler warning
sql/set_var.cc:
  Code cleanup
sql/slave.cc:
  Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
sql/sql_cache.cc:
  Removed compiler warnings
sql/sql_derived.cc:
  Removed not used variable
sql/sql_insert.cc:
  Removed compiler warnings
sql/sql_lex.cc:
  Removed not used lable
sql/sql_lex.h:
  Removed compiler warnings
sql/sql_parse.cc:
  Removed compiler warnings
sql/sql_prepare.cc:
  Removed compiler warnings
sql/sql_select.cc:
  Removed not used variables
  Added function comments
sql/sql_show.cc:
  Removed compiler warnings
sql/sql_yacc.yy:
  Fix for ORDER BY handling in GROUP_CONCAT()

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

sql/share/portuguese/errmsg.txt:
  Translation from English
sql/share/spanish/errmsg.txt:
  Translation from English

I can't see group_concat_max_len in a list of variables


sql/set_var.cc:
  add sys_group_concat_max_len.name

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


sql/ha_myisam.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/table.h:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

Bug #2385 "CREATE TABLE LIKE lacks locking on source and destination table" 
(in sql_table.cc and mysql-test/t/synchronization.test)


mysql-test/t/synchronization.test:
  added sleep to more reliable work
sql/sql_table.cc:
  made some optimization of last patch for 
  Bug #2385 "CREATE TABLE LIKE lacks locking on source and destination table" 
  in mysql_create_like_table

into eagle.mysql.r18.ru:/home/vva/work/BUG_2397/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_system_db_test/mysql-4.1

BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41:
  Delete: Docs/manual_toc.html
BitKeeper/deleted/.del-manual.ja.texi~bdf63728a7b03acf:
  Delete: Docs/manual.ja.texi
BitKeeper/deleted/.del-section.Infolinks.texi~c237f2f9:
  Delete: Docs/section.Infolinks.texi
BitKeeper/deleted/.del-section.Testimonials.texi~418f3f63:
  Delete: Docs/section.Testimonials.texi
BitKeeper/deleted/.del-section.Users.texi~41da5f4c:
  Delete: Docs/section.Users.texi

for working on aix and so on..


mysql-test/t/system_mysql_db_fix-master.opt:
  added newline for working aix and so on..

into hegel.local:/home/miguel/bk/mysql-4.1


sql/mysqld.cc:
  Auto merged

sql/share/swedish/errmsg.txt:
  Added missing error message swedish/errmsg.txt and corrected another one.