mysql-test/r/subselect.result:
  appropriate test result
mysql-test/t/subselect.test:
  test case
sql/item.cc:
  we can get NULL here if the field isn't unique

sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/subselect.result:
  resolving conflicts
mysql-test/t/subselect.test:
  resolving conflicts

Added test case for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
(thankee Monty)


mysql-test/r/order_by.result:
  Added test case for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
mysql-test/t/order_by.test:
  Added test case for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;

- added unsigned_flag= 1; to Item_uint constructors
- removed Item_uint::fix_fields()
- added a comment about fix_fields() call


sql/item.h:
  added unsigned_flag= 1; to Item_uint constructors
  removed Item_uint::fix_fields()
sql/item_func.cc:
  added a comment about fix_fields() call.

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

Fix for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
(test case is too big to be included, take a look at the bug database)

into deer.(none):/home/hf/work/mysql-4.1.233


sql/field.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged

test for IGNORE added


mysql-test/r/gis.result:
  test result for IGNORE added
mysql-test/t/gis.test:
  test for IGNORE added

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

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


sql/log_event.cc:
  Auto merged

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


sql/item_func.cc:
  Auto merged

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

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

  Add ut_strdup
os0file.h, os0file.c:
  Add creation of directories


innobase/os/os0file.c:
  Add creation of directories
innobase/ut/ut0mem.c:
  Add ut_strdup
innobase/include/os0file.h:
  Add creation of directories
innobase/include/ut0mem.h:
  Add ut_strdup

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

#3160 '"mysqladmin password" doesn't work if --skip-grant-tables'
because we can't find out the mysql.user.host properly

now mysqladmin just print an advice error-message in this case


client/mysqladmin.c:
  roll back change for bug 
  #3160 '"mysqladmin password" doesn't work if --skip-grant-tables'
  because we can't find out the mysql.user.host properly
  
  now mysqladmin just print an advice error-message in this case

sql/sql_select.cc:
  Auto merged

mysql-test/r/subselect.result:
  after merge fix
sql/item_func.cc:
  fixed used_tables_cache
sql/item_func.h:
  fixed used_tables_cache
sql/sql_select.cc:
  removed != and !

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


sql/sql_yacc.yy:
  Auto merged

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

sql/sql_yacc.yy:
  Auto merged

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

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

error message corrected


include/my_base.h:
  EOVERFLOW moved to my_base.h - it is used not only in strtod.c
mysql-test/r/variables.result:
  error message corrected
mysql-test/t/variables.test:
  error message corrected
sql/item_func.cc:
  error message corrected
sql/sql_yacc.yy:
  error message corrected
strings/strtod.c:
  EOVERFLOW moved to my_base.h - it is used not only in strtod.c

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

mysql-test/r/subselect.result:
  changes in plans because we do not check nulls where nuul is impossible
  changed warning number

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

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


sql/item_func.cc:
  Auto merged

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

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


client/mysqltest.c:
  Auto merged

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

Q_QUERY_VERTICAL/Q_QYERY_HORIZONTAL in client/mysqltest.c 
(changed switch to ?:)


client/mysqltest.c:
  fixed a lot of warnings in processing of 
  Q_QUERY_VERTICAL/Q_QYERY_HORIZONTAL (changed switch to ?:)

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

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

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