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
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
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
Auto merged
BitKeeper/deleted/.del-MySQLEULA.txt:
Delete: Docs/MySQLEULA.txt
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
Auto merged
Build-tools/mysql-copyright-2:
Auto merged
Build-tools/mysql-copyright:
Auto merged
heap/heapdef.h:
Auto merged
heap/hp_open.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/os/os0thread.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/null_key.test:
Auto merged
mysys/safemalloc.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
tests/grant.res:
Auto merged
Build-tools/Do-compile:
merge
Docs/manual.texi:
merge
configure.in:
merge
mysql-test/r/distinct.result:
merge
mysql-test/r/null_key.result:
merge
sql/ha_innodb.cc:
merge
sql/item.h:
merge
sql/log.cc:
merge
sql/mysqld.cc:
merge
support-files/mysql.spec.sh:
merge
Fixed the remaining join variations, (left, right, natural, etc).
(Previous fix only solved "," and "[cross] join".)
mysql-test/r/select.result:
Added more test case results for more braced join fixes.
mysql-test/t/select.test:
Added more tests for braced join fixes.
sql/sql_yacc.yy:
Changed the remaining join_table_list cases to handle braces.
Also added some precedence declaration to silence shift/reduce conflicts
warnings that turned up after these fixes.
WHERE column_name = key_column_name was calculated as true
for NULL values.
Docs/manual.texi:
Changelog
mysql-test/r/distinct.result:
Updated results caused by bug fix.
mysql-test/r/null_key.result:
New tests
mysql-test/t/null_key.test:
New tests
sql/sql_select.cc:
Additional change for previous changeset for using BLOB in GROUP BY
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
myisam/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysys/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_update.cc:
Auto merged
strings/Makefile.am:
Auto merged
mysql-test/r/subselect.result:
test of cteate temporary field of subselect bug
mysql-test/t/subselect.test:
test of cteate temporary field of subselect bug
Docs/manual.texi:
added text for fixes
mysql-test/r/multi_update.result:
new test case for multi-table deletes
mysql-test/t/multi_update.test:
new test case for multi-table deletes
sql/sql_delete.cc:
fix for multi-table deletes
sql/sql_update.cc:
fix for multi-table updates
This is a simple fix, allowing a join_table_list in the right reduction of a
normal_join sequence, instead of just a join_table. This makes things like
"t1, (t2 left join t3)" work, but it also allows "join" and "cross join" instead
of ",".
This should fix the bug reported as:
Subject: ODBC SQL syntax issue
From: Ivan Vazharov
Date: Mon, 30 Sep 2002 12:02:42 +0200
mysql-test/r/select.result:
Results from new test cases for removing braces in joins.
mysql-test/t/select.test:
New test cases for removing braces in joins.
sql/sql_yacc.yy:
Allow (and remove) braces in all parts of a normal_join list, not just the
first one.
Also added three missing ';'.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
mysql-test/r/select.result:
SELECT ... INTO user_variables
mysql-test/t/select.test:
SELECT ... INTO user_variables
sql/sql_class.cc:
SELECT ... INTO user_variables
sql/sql_class.h:
SELECT ... INTO user_variables
sql/sql_lex.h:
SELECT ... INTO user_variables
sql/sql_parse.cc:
SELECT ... INTO user_variables
sql/sql_yacc.yy:
SELECT ... INTO user_variables
fixed error handling in subselect fix_field
mysql-test/r/subselect.result:
test of name resolution
mysql-test/t/subselect.test:
test of name resolution
sql/item.cc:
fixed couple of bugs in field/reference name resolution.
sql/item_subselect.cc:
fixed error handling
sql/mysql_priv.h:
fixed couple of bugs in field/reference name resolution.
sql/sql_base.cc:
fixed couple of bugs in field/reference name resolution.
sql/sql_select.cc:
new find_item_in_list interface
FN_NO_CASE_SENCE used instead of __WIN__ in table name handling of quary cache
mysql-test/r/query_cache.result:
query cache with system database test
mysql-test/t/query_cache.test:
query cache with system database test
sql/sql_cache.cc:
fixed query cache with system database
FN_NO_CASE_SENCE used instead of __WIN__
test case
heap/hp_create.c:
auto_increment for heap tables
heap/hp_hash.c:
auto_increment for heap tables
heap/hp_info.c:
auto_increment for heap tables
heap/hp_test1.c:
auto_increment for heap tables
heap/hp_test2.c:
auto_increment for heap tables
heap/hp_update.c:
auto_increment for heap tables
heap/hp_write.c:
auto_increment for heap tables
include/heap.h:
auto_increment for heap tables
mysql-test/r/create.result:
auto_increment for heap tables
mysql-test/t/create.test:
auto_increment for heap tables
sql/ha_heap.cc:
auto_increment for heap tables
sql/ha_heap.h:
auto_increment for heap tables
into mysql.com:/home/pz/mysql/mysql-4.1
include/mysql_com.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
client/mysqladmin.c:
Handle new password.c prototypes
include/mysql_com.h:
New prototypes
libmysql/Makefile.shared:
Client need sha1 compiled in now
libmysql/password.c:
Replace copy with symlink
mysql-test/r/func_crypt.result:
Fix test results to handle new password function
mysql-test/t/func_crypt.test:
New tests for new password function
sql/item_create.cc:
add old_password() function
sql/item_create.h:
add old_password() function
sql/item_strfunc.cc:
add old_password() function
changes to new password.c functions prototypes
sql/item_strfunc.h:
add old_password function
handle new prototypes
sql/lex.h:
add OLD_PASSWORD function
sql/password.c:
Continue to work on new password handling
sql/sql_acl.cc:
Handle new passwords
sql/sql_yacc.yy:
Changes for new prototypes
