into mysql.com:/home/pz/mysql/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
include/mysql_com.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
fixed subselect error handling bug
fixed subselect UNION ALL bug
fixed thd->lex.select restoring
explain UNION subselect bug
mysql-test/r/subselect.result:
test for:
subselect UNION ALL bug
subselect error handling bug
explain UNION subselect bug
mysql-test/t/subselect.test:
test for:
subselect UNION ALL bug
subselect error handling bug
explain UNION subselect bug
sql/sql_lex.cc:
fixed subselect UNION ALL bug
sql/sql_lex.h:
fixed subselect UNION ALL bug
sql/sql_parse.cc:
fixed subselect UNION ALL bug
sql/sql_select.cc:
fixed subselect error handling bug
fixed explain UNION subselect bug
sql/sql_union.cc:
fixed thd->lex.select restoring
code cleanup
fixed subselect error handling bug
fixed subselect UNION ALL bug
sql/sql_yacc.yy:
fixed subselect UNION ALL bug
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~888e38cf95239a33:
'Auto converge rename'
Docs/manual.texi:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/ftdefs.h:
Auto merged
myisam/mi_create.c:
Auto merged
mysys/my_init.c:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
Delete: BitKeeper/etc/skipkeys
BitKeeper/etc/skipkeys:
Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
Build-tools/Do-compile:
Auto merged
Docs/manual.texi:
Auto merged
innobase/pars/lexyy.c:
Auto merged
innobase/pars/pars0grm.c:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/nt_servc.cc:
Auto merged
sql/nt_servc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/bdb-crash.test:
Auto merged
Include univ.i before any system headers to remove a large file compilation failure on AIX
innobase/pars/pars0grm.c:
Include univ.i before any system headers to remove a large file compilation failure on AIX
innobase/pars/lexyy.c:
Include univ.i before any system headers to remove a large file compilation failure on AIX
full support for HA_READ_PREFIX_LAST_OR_PREV in MyISAM
protected by #if NOT_IMPLEMENTED_YET in opt_range.cc as not all table handlers support it
BitKeeper/etc/ignore:
Added configure.lineno innobase/configure.lineno innobase/stamp-h1 myisam/rt_test.MYD myisam/rt_test.MYI stamp-h1 to the ignore list
include/my_base.h:
support for HA_READ_PREFIX_LAST_OR_PREV
myisam/mi_search.c:
full support of HA_READ_PREFIX_LAST_OR_PREV in MyISAM
myisam/mi_static.c:
full support of HA_READ_PREFIX_LAST_OR_PREV in MyISAM
sql/opt_range.cc:
support for HA_READ_PREFIX_LAST_OR_PREV
protected by #if NOT_IMPLEMENTED_YET, not all table handlers support it
sql/sql_handler.cc:
support for HA_READ_PREFIX_LAST_OR_PREV
and CHARSET is now the same with CHARACTER SET:
CREATE DATABASE name
[DEFAULT] {CHAR SET | CHARACTER SET | CHARSET} csname
CREATE TABLE (...) [DEFAULT] {CHARSET | CHARACTER SET | CHAR SET} [=] csname
To Paul and Arjen:
However this should be recommended in db option to conform SQL99:
CREATE DATABASE dbname DEFAULT CHARACTER SET csname
In table option there is no SQL99 recommended syntax as far as
table charset is MySQL extension.
small Item_ref fix
mysql-test/r/subselect.result:
DISTINCT in subselect test
mysql-test/t/subselect.test:
DISTINCT in subselect test
sql/sql_class.cc:
fixed DISTINCT in subselect bug
- fixed essential piece missing from last merge with 3.23 tree
(InnoDB option)
- Added "autoextend" parameter to InnoDB startup options to be able
to pass the full sql-bench run without hitting an "table space full"
error
Build-tools/Do-compile:
- fixed essential piece missing from last merge with 3.23 tree
(InnoDB option)
- Added "autoextend" parameter to InnoDB startup options to be able
to pass the full sql-bench run without hitting an "table space full"
error
necessary (required to actually pass the sql-bench without aborting
with "table space full")
Build-tools/Do-compile:
- Enable InnoDB to autoextend the table space if necessary (required to
actually pass the sql-bench without aborting with "table space full")
