into sinisa.nasamreza.org:/mnt/work/mysql-4.1

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


BUILD/FINISH.sh:
  Auto merged
client/mysqldump.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53:
  Auto merged

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

UNION's bug fixes and code clean-up


mysql-test/r/subselect.result:
  An insignificant consequent of my UNION"s clean-up
sql/sql_derived.cc:
  Fix a bug that our CTO reported
sql/sql_lex.h:
  Fixing some bugs in UNION's with code clean-up
sql/sql_union.cc:
  Fixing some bugs in UNION's with code clean-up
sql/sql_yacc.yy:
  Fixing some bugs in UNION's with code clean-up

client/mysql.cc:
  Auto merged
libmysql/libmysql.c:
  I commited this change 2 weeks ago. 
  I am still waiting for approval to push.
  
  Someone meanwhile pushed different commit, so this merge commit.

  Fix


sql/item_strfunc.cc:
  Fix

  Fix


sql/item_strfunc.cc:
  Fix

  Typo fix
  ,


scripts/fill_help_tables.sh:
  Typo fix
  ,

  Compilation failure fix


sql/sql_yacc.yy:
  Compilation failure fix

libmysql/libmysql.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Fixed a few typos from last patch


configure.in:
  Updated script to handle 1 digit numbers in MySQL version
libmysqld/libmysqld.c:
  Added mysql_get_server_version
sql/sql_parse.cc:
  Fixed typo in last patch
sql/sql_yacc.yy:
  Fixed typo in last patch

Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.



BitKeeper/etc/ignore:
  added scripts/fill_help_tables.sql
client/mysql.cc:
  Some fixes when using 'help'
cmd-line-utils/libedit/compat.h:
  Portability fix
cmd-line-utils/libedit/fgetln.c:
  Portability fix
include/mysql.h:
  Added new client function: mysql_get_server_version()
libmysql/libmysql.c:
  Added new client function: mysql_get_server_version()
libmysqld/libmysqld.c:
  Fixed prototype
mysql-test/install_test_db.sh:
  Added creation of help tables
mysql-test/r/connect.result:
  Added help tables
mysql-test/r/myisam.result:
  Test of RTREE index
mysql-test/r/type_ranges.result:
  updated results
mysql-test/t/myisam.test:
  Test of RTREE index
mysql-test/t/type_ranges.test:
  Updated test
mysys/charset.c:
  Indentation change
mysys/my_symlink.c:
  Removed compiler warning
scripts/fill_help_tables.sh:
  Update for new help tables
sql/field.cc:
  Indentation changes
sql/filesort.cc:
  Optimized character set usage
sql/item_cmpfunc.cc:
  Fix wrong usage of binary()
sql/item_cmpfunc.h:
  Fix wrong usage of binary()
sql/item_func.cc:
  Fix wrong usage of binary()
sql/item_func.h:
  Fix wrong usage of binary()
sql/item_strfunc.cc:
  Fix wrong usage of binary()
sql/item_sum.cc:
  Fix wrong usage of binary()
sql/item_sum.h:
  Fix wrong usage of binary()
sql/key.cc:
  Indentation change
sql/lex.h:
  HELP -> HELP_SYM
sql/mysql_priv.h:
  Make get_field() more general
sql/password.c:
  Indentation change + variable initialisation moved
sql/sql_acl.cc:
  Make get_field() more general
sql/sql_base.cc:
  Added comments + assertion for double call to mysql_lock_tables
sql/sql_cache.cc:
  Indentation changes
sql/sql_class.h:
  Added need_strxnfrm to SORT_FIELD to be able to optimise character set handling in filesort
sql/sql_derived.cc:
  Renamed variables
sql/sql_help.cc:
  New help functions (from Victor Vagin)
sql/sql_lex.cc:
  Removed variables that doesn't have to be initialized for each query
sql/sql_lex.h:
  Removed not used variable (olap)
sql/sql_parse.cc:
  Fixed (not fatal) access of unitialized memory
  Indentation / code cleanup
sql/sql_prepare.cc:
  Indentaion cleanup
sql/sql_table.cc:
  Disabled RTREE until 5.0
sql/sql_udf.cc:
  Make get_field() more general
sql/sql_yacc.yy:
  Removed access to uninitialized memory
  Always set offset_limit and select_limit when using LIMIT (removed warnings)
  Allow usage of 'help week'
sql/table.cc:
  Make get_field() more general
  More comments
sql/table.h:
  Fixded type of TABLE_LIST->derived
sql/time.cc:
  Stricter date / datetime handling (to be able to handle timestamps with days and microseconds)
strings/ctype-bin.c:
  Added cha

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

a socket from another, still living MySQL server.

a socket from another, still living MySQL server.

  Bug fix


myisam/rt_index.c:
  Bug fix

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

 - updated logo to current one


Docs/Images/mysql-logo.gif:
   - updated logo to current one

BitKeeper/deleted/.del-template.texi~e93e39114ba9bcf7:
  Delete: Docs/template.texi

Replaced mysql.de.texi in mysql-4.0 tree with dummy placeholder.
Moved world.sql sample database to mysqldoc tree.


BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53:
  Delete: Docs/world.sql
Docs/manual.de.texi:
  Moved mysql.de.texi from mysql-4.0 tree to mysqldoc tree.
  Replaced mysql.de.texi in mysql-4.0 tree with dummy placeholder.

sql/sql_class.cc:
  backporting Peter's fix for better RAND() initialization from 4.0
  to see what it does try
  perl -e 'while($N=shift) { printf "N=%-10d",$N; @b=@c=(); for (1..$N) { @A=split(" ",`mysql -BNe "select rand(), rand(), rand(), rand()"`); for(0..3) { $b[$_]+=$a[$_]; $c[$_]+=$a[$_]*$a[$_]; }} for (0..3) { printf "%15.14f ",($c[$_]-$b[$_]*$b[$_]/$N)/$N } print "\n" }' 10 10 10 100 100 10 100 1000
  before and after the fix

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

  Updates according to last changes


Docs/gis.txt:
  Updates according to last changes

  Typo fix


sql/lex.h:
  Typo fix

  New synonyms for spatial functions for
  compatibility with http://www.opengis.org/testing/sfsql/sqltsch.sql


sql/lex.h:
  New synonyms for spatial functions for
  compatibility with http://www.opengis.org/testing/sfsql/sqltsch.sql

POINT, LINESTRING, POLYGON, MULTIPOINT, MULTIPOLYGON, MULTILINESTRING

- re-added missing pre- and post(un)install scripts to server subpackage
- added config file /etc/my.cnf to the file list (just for completeness)
- make sure to create the datadir with 755 permissions


support-files/mysql.spec.sh:
  - re-added missing pre- and post(un)install scripts to server subpackage
  - added config file /etc/my.cnf to the file list (just for completeness)
  - make sure to create the datadir with 755 permissions

BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/count_distinct.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

Optimize depending sub querys
Remove valgrind warnings


libmysqld/lib_sql.cc:
  Better way to reset errors
mysql-test/mysql-test-run.sh:
  Remove wrong `
mysql-test/r/subselect.result:
  Don't use table t1
mysql-test/t/subselect.test:
  Don't use table t1
sql/item.cc:
  Indentation fix
sql/item.h:
  optimize depending sub querys
sql/item_func.cc:
  Remove warning for uninitalized data
sql/item_row.cc:
  Remove warning
sql/item_strfunc.h:
  Fixed memory overrun
sql/item_subselect.cc:
  Better debugging names
sql/log_event.cc:
  Move tmp_table_used to THD
sql/sql_base.cc:
  Move tmp_table_used to THD
sql/sql_class.cc:
  Move tmp_table_used to THD
sql/sql_class.h:
  Move tmp_table_used to THD
sql/sql_lex.cc:
  Move tmp_table_used to THD
sql/sql_lex.h:
  Move tmp_table_used to THD
sql/sql_parse.cc:
  Move tmp_table_used to THD
sql/sql_select.cc:
  optimize depending sub querys
sql/sql_table.cc:
  Move tmp_table_used to THD

include/my_sys.h:
  Remove compiler warning
mysql-test/mysql-test-run.sh:
  Don't examine log files when you run with --extern

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


Build-tools/Do-compile:
  Auto merged
bdb/dist/configure.in:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

BitKeeper/etc/ignore:
  Added support-files/MacOSX/Description.plist support-files/MacOSX/Info.plist to the ignore list