added install


BitKeeper/etc/ignore:
  added install

Corrected minor problems of the preceding changeset 1.1705.


sql/sql_table.cc:
  Worklog#1563 - Support of on-line CREATE/DROP INDEX.
  Replaced all tabs by a proper number of spaces. In the diff list this looks unaligned sometimes.
  Changed all sprintf to snprintf and checked the return value.
  Fixed key_count<= 0. key_count is unsigned.
  Removed an obsolete comment.

This is to enable table handlers to implement online create/drop index.
It consists of some parts:
- New default handler methods in handler.h
- Split of mysql_alter_table. It decides if only one kind of
  alteration is to be done (e.g. only create indexes or only drop
  indexes etc.) It then calls the specialized new handler method if
  the handler implements it. Otherwise it calls real_alter_table.
- The parser sets flags for each alter operation detected in a
  command. These are used by mysql_alter_table for the decision.
- mysql_prepare_table is pulled out of mysql_create_table. This is
  also used by mysql_create_index to prepare the key structure array
  for the handler. It is also used by mysql_create_index and
  mysql_drop_index to prepare a call to mysql_create_frm.
- mysql_create_frm is pulled out of rea_create_table for use by
  mysql_create_index and mysql_drop_index after the index is
  created/dropped.
Thanks to Antony who supplied most of the changes.


sql/handler.h:
  Worklog#1563 - Support of on-line CREATE/DROP INDEX.
  New virtual handler methods with default implementation and return flags.
sql/mysql_priv.h:
  Worklog#1563 - Support of on-line CREATE/DROP INDEX.
  New function prototypes. mysql_prepare_table is pulled out of
  mysql_create_table. It prepares a table structure, which is used by 
  mysql_create_table, mysql_create_index and mysql_drop_index.
  real_alter_table is pulled out of mysql_alter_table. The latter only
  looks if the requested operation can be done by specialized functions
  or else calls real_alter_table, which does the real thing.
  mysql_add_column and mysql_drop_colunm are for future use. They simply
  call real_alter_table. mysql_create_frm is pulled out of
  rea_create_table. It is called also from mysql_create_index and
  mysql_drop_index after successful create/drop index.
  mysql_alter_table prototype is extended by the new alter_flags argument.
sql/sql_base.cc:
  Worklog#1563 - Support of on-line CREATE/DROP INDEX.
  mysql_create_index and mysql_drop_index moved to sql_table.cc.
sql/sql_lex.h:
  Worklog#1563 - Support of on-line CREATE/DROP INDEX.
  Definitions for the new alter_flags.
sql/sql_parse.cc:
  Worklog#1563 - Support of on-line CREATE/DROP INDEX.
  Extend the calls to mysql_alter_table by the new alter_flags argument.
sql/sql_table.cc:
  Worklog#1563 - Support of on-line CREATE/DROP INDEX.
  mysql_prepare_table is pulled out of mysql_create_table.
  mysql_create_index and mysql_drop_index are changed so that they use
  the new handler functions if the handler implements them.
  mysql_add_column and mysql_drop_column are for future use. They simply
  call real_alter_table. mysql_alter_table only decides which function
  to use for the requested operation. real_alter_table implements most
  of what mysql_alter_table did before.
sql/sql_yacc.yy:
  Worklog#1563 - Support of on-line CREATE/DROP INDEX.
  Set the alter_flags where appropriate.
sql/unireg.cc:
  Worklog#1563 - Support of on-line CREATE/DROP INDEX.
  mysql_create_frm is pulled out of rea_create_table.

into mysql.com:/home/mydev/mysql-4.1-wl1648

  new file

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

UCS2 now has its own my_like_range function.

into mysql.com:/space/my/mysql-4.1-build

   not work as expected) - need to investigate (after 4.1.2 is released)

I am fixing it here in 4.1, not in 4.0, as it goes with another change
which I did in 4.1 (fix for BUG#3204
""mysqlbinlog --read-from-remote-server this_binlog.001" prints all binlogs").


client/mysqlbinlog.cc:
  correcting code to compute the position right when we are reading
  a remote binlog.

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


client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged

we now detect that the server is sending us a log which we did not request
by testing the info in the fake Rotate event.
I also changed code to not print the fake Rotate which describes the
log we asked for (it's always the first received event but old masters
may not send it).


client/mysqlbinlog.cc:
  Detect when the master is sending us a binlog which we have not requested,
  then stop.
  Skip the fake Rotate event if there is one (there may be none if
  the server to which we connect is < 4.0.14).
mysql-test/r/mysqlbinlog.result:
  result update: master-bin.000002 is not printed anymore (as mysqlbinlog
  stops at the end of the requested log, master-bin.000001).
mysql-test/t/mysqlbinlog.test:
  comment is wrong now

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

  Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work


innobase/trx/trx0trx.c:
  Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work
innobase/trx/trx0undo.c:
  Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work
innobase/include/trx0undo.h:
  Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work

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

Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X


include/m_ctype.h:
  Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
include/mysql.h:
  Removed compiler warning
libmysqld/lib_sql.cc:
  Removed compiler warning
mysys/charset2html.c:
  Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
regex/regcomp.c:
  Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
sql-common/client.c:
  Indentation fix

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

   instead of calling them directly (WL#1521) - this also fixed a compile
   error with libtool-1.5.2 on FreeBSD (error: tag name "CXX" already 
   exists)

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

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


sql/sql_db.cc:
  Auto merged

  Remove includes of sys/types.h and sys/stat.h because these are already included through univ.i


innobase/os/os0file.c:
  Remove includes of sys/types.h and sys/stat.h because these are already included through univ.i

Portability fixes


client/mysqltest.c:
  Fixed output of 'affected rows'
innobase/os/os0file.c:
  Portability fix (for AIX)
mysql-test/r/rpl_trunc_binlog.result:
  Update results after merge
sql/mysqld.cc:
  Don't change server suffix if given to configure

client/mysqladmin.c:
  Auto merged
client/mysqltest.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

include/my_tree.h:
  After merge fixes
mysql-test/r/create.result:
  After merge fixes
mysql-test/r/insert.result:
  After merge fixes
mysql-test/r/multi_update.result:
  After merge fixes
mysql-test/r/query_cache.result:
  After merge fixes
mysql-test/r/rpl_error_ignored_table.result:
  After merge fixes
mysql-test/r/rpl_optimize.result:
  After merge fixes
mysql-test/r/show_check.result:
  After merge fixes
mysql-test/t/insert.test:
  After merge fixes (Remove columns with space last)
mysql-test/t/multi_update.test:
  After merge fixes
mysql-test/t/show_check.test:
  After merge fixes
sql/field.cc:
  Remove compiler warnings
sql/sql_base.cc:
  Fix bug when table was refreshed

  Add a comment that InnoDB always retrieves the row id, if the clustered index was internally generated by InnoDB. Then we know the 'ref' to the row.


sql/ha_innodb.cc:
  Add a comment that InnoDB always retrieves the row id, if the clustered index was internally generated by InnoDB. Then we know the 'ref' to the row.

into teton.kitebird.com:/home/paul/mysql-4.1

  Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY


innobase/dict/dict0dict.c:
  Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY
innobase/include/dict0dict.h:
  Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY
innobase/include/row0mysql.h:
  Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY
sql/ha_innodb.cc:
  Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY
sql/sql_select.cc:
  Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY
include/my_base.h:
  Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY

into teton.kitebird.com:/home/paul/mysql-4.1

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

into teton.kitebird.com:/home/paul/mysql-4.1

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