summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* mergeunknown2003-08-017-35/+54
|\ | | | | | | | | | | | | | | | | | | | | | | | | sql/item.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
| * prevented finding references in item_list for non-SELECT st_select_lexunknown2003-07-297-12/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fixed BUG#943) mysql-test/r/subselect.result: test for bug 943 mysql-test/t/subselect.test: test for bug 943 sql/item.cc: bool field changed with enum prevented finding references in item_list for non-SELECT st_select_lex sql/sql_lex.cc: bool field changed with enum sql/sql_lex.h: bool field changed with enum sql/sql_parse.cc: all subqueries and UNION parts marked as SELECT sql/sql_yacc.yy: bool field changed with enum PRIMARY SELECT command st_select_lex marked as SELECT
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2003-08-013-16/+36
|\ \ | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_ci-4.1
| * | tabe & query hashes made case insensitive (BUG#933)unknown2003-07-283-16/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/query_cache.result: fixed charecter sets new case sensetive test mysql-test/t/query_cache.test: fixed charecter sets new case sensetive test sql/sql_cache.cc: query & table comparision should be case insensitive
* | | mergeunknown2003-08-0110-13/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item.cc: Auto merged sql/item_subselect.cc: Auto merged sql/sql_lex.cc: Auto merged mysql-test/r/subselect.result: merge fixed test mysql-test/t/subselect.test: merge fixed test
| * | | count HAVING clause elements with select list elements, because agregate ↵unknown2003-07-2910-14/+41
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function can be present in it (BUG#922) removerd unused loop_id mysql-test/r/subselect.result: test of BUG#922 mysql-test/t/subselect.test: test of BUG#922 sql/item.cc: removerd unused loop_id we need count HAVING clause elements, because agregate function can be present in it sql/item.h: removerd unused loop_id sql/item_subselect.cc: new name of field sql/sql_derived.cc: new name of field sql/sql_lex.cc: new name of field sql/sql_lex.h: new name of field sql/sql_select.cc: new name of field sql/sql_union.cc: new name of field
* | | cp1251.xml:unknown2003-07-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Upper/lower case translation bug for letter 't' fix. sql/share/charsets/cp1251.xml: Upper/lower case translation bug for letter 't' fix.
* | | Database name and national characters fixes.unknown2003-07-303-4/+40
| | |
* | | Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-302-24/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1 sql/item.cc: Auto merged
| * | | Fix for timestamp issue (BR #819)unknown2003-07-302-24/+57
| | | | | | | | | | | | | | | | | | | | tests/client_test.c: Updated test_ts() test (For BR# 819)
* | | | Derivation attribute was not processed correctlyunknown2003-07-307-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by MAX/MIN in some cases: SELECT coercibility(max(s1)) from t1; Subselect collation and derivation was not processed correctly: create table a select (select s1 from t1); select * from t1 where s1 = (select s2 from t1);
* | | | README.1st:unknown2003-07-291-24/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise 4.1 Windows-install instructions. Docs/README.1st: Revise 4.1 Windows-install instructions.
* | | | Fixed that this sequence didn't produce an error as it should have:unknown2003-07-293-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci, s2 CHAR(5) COLLATE latin1_swedish_ci); SELECT * FROM t1 WHERE s1 = s2;
* | | | A new separate error message: Unknown collation 'blablabla'unknown2003-07-2933-8/+51
| |_|/ |/| |
* | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-292-0/+63
|\ \ \ | |/ / | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.clean
| * | logging_ok:unknown2003-07-292-0/+63
| |/ | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted README.1st: new file - Readme for Windows distribution BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-281-0/+4
|\ \ | |/ |/| | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.clean
| * Fix for #886unknown2003-07-281-0/+4
| | | | | | | | | | sql-common/client.c: SOCKET_EINTR is handled differently working in replication
* | bugs #701 and #783 - old .frm files were read in incorrectly in 4.1 (each ↵unknown2003-07-282-8/+7
| | | | | | | | field was assigned a charset, BLOBs were converted to TEXT)
* | test results fixedunknown2003-07-282-3/+2
| |
* | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2003-07-287-29/+111
|\ \ | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1 sql/sql_base.cc: Auto merged
| * | changed for AUTO_VALUE_ON_ZEROunknown2003-07-287-29/+111
| | | | | | | | | | | | | | | | | | | | | mysql-test/r/auto_increment.result: added test for AUTO_VALUE_ON_ZERO mysql-test/t/auto_increment.test: added test for AUTO_VALUE_ON_ZERO
* | | 'mysqld --verbose' should not print help screenunknown2003-07-271-1/+1
| | |
* | | ulong is not portableunknown2003-07-271-6/+6
| | |
* | | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-07-2712-45/+121
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged
| * | | now GRANT db.* ... compares patterns correctly to prevent privilege escalationunknown2003-07-2212-70/+85
| | | |
| * | | wild_compare fun: bug in GRANT db_pattern.* ...unknown2003-07-222-0/+61
| | | |
* | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2003-07-261-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1
| * | | My changes to test rpl_insert_id in 4.0 about replication of foreign_key_checksunknown2003-07-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have in fact no effect, because in 4.0 the slave always runs with --skip-innodb. In 4.1, mysqld accepts option --innodb which can override --skip-innodb. So I add this option to the test. When the updated test (using InnoDB tables) from 4.0 will be merged into 4.1, with this good .opt file, we'll have a meaningful test in 4.1. Until then, the test in 4.1 will pass but be useless. And in 4.0, it will stay useless forever. ("it" = the part of the test which tests replication of foreign_key_checks) BitKeeper/deleted/.del-rpl_insert_id-slave.opt~ba10e66ea50b556: Delete: mysql-test/rpl_insert_id-slave.opt
* | | | Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-251-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into teton.kitebird.com:/home/paul/mysql-4.1
| * | | | Bug#909: mysqld --verbose --help != mysqld --help --verboseunknown2003-07-251-9/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Proposed fix for bug#909
* | | | Print accounts in error messages as 'user'@'host' rather than 'user@host'.unknown2003-07-2424-120/+120
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter is misleading because differs from the syntax used for GRANT/REVOKE. Fix up test result affected by error message edits. mysql-test/r/grant_cache.result: Fix up test result to match error message edit. sql/share/czech/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/danish/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/dutch/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/english/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/estonian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/french/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/german/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/greek/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/hungarian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/italian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/japanese/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/korean/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/norwegian-ny/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/norwegian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/polish/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/portuguese/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/romanian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/russian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/serbian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/slovak/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/spanish/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/swedish/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE. sql/share/ukrainian/errmsg.txt: Print user@host in syntax actually used for GRANT/REVOKE.
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-232-4/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-local BitKeeper/etc/logging_ok: auto-union
| * | | Fix security bug. mysqld server without ssl support was completly unknown2003-07-232-4/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | ignorant about ssl_type attribute sql/sql_acl.cc: Now acl_getroot() honors ssl_type attribute even if we compile without openssl BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | temporary modification of rpl_loaddata.test until 4.0 is merged in 4.1.unknown2003-07-232-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid a test failure, which is fixed in 4.0 in ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com by making RESET SLAVE reset the error. mysql-test/r/rpl_loaddata.result: temporary modification until 4.0 is merged in 4.1 mysql-test/t/rpl_loaddata.test: temporary modification until 4.0 is merged in 4.1
* | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2003-07-2311-27/+99
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1
| * | | On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-tableunknown2003-07-2311-27/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and other replicate-*-table options in SHOW SLAVE STATUS. Seems like it had not been done, so I push it now: there's 4 new columns to SHOW SLAVE STATUS. mysql-test/r/rpl000015.result: Result update (more columns) mysql-test/r/rpl_empty_master_crash.result: Result update (more columns) mysql-test/r/rpl_flush_log_loop.result: Result update (more columns) mysql-test/r/rpl_log.result: Result update (more columns) mysql-test/r/rpl_log_pos.result: Result update (more columns) mysql-test/r/rpl_redirect.result: Result update (more columns) mysql-test/r/rpl_replicate_do.result: Result update (more columns) mysql-test/r/rpl_rotate_logs.result: Result update (more columns) mysql-test/t/rpl_replicate_do.test: Result update (more columns) sql/slave.cc: Print replicate_*_table options in SHOW SLAVE STATUS sql/slave.h: two functions to make a string of replicate_*_table lists.
* | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-2310-3/+71
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| * | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2003-07-2210-3/+71
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1 sql/field_conv.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_insert.cc: Auto merged
| | * | fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)unknown2003-07-2210-3/+71
| | | |
* | | | SCRUM - adding client into embedded serverunknown2003-07-237-22/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error handling fixed fetch_lengths made to work differently in embedded and client cases include/mysql.h: removed 'embedded' error containers - they're unnecessary now added declarations for fetch_lengths to be 'virtual' include/sql_common.h: fetch_lengths declaration removed libmysql/libmysql.c: implementations for fetch_lengths to be 'virtual' added libmysqld/lib_sql.cc: error informations now is moved from thd->net to mysql-net libmysqld/libmysqld.c: error data is in mysql->net now sql-common/client.c: we have to return old fetch_lengths implementation for 'client' case sql/protocol.cc: handling of sqlstate for embedded library added
* | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-225-6/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| * | | gen_lex_hash sigsegv fixedunknown2003-07-211-2/+3
| | | |
| * | | INSTALL-WIN-SOURCE:unknown2003-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tweak INSTALL-WIN-SOURCE: tweak
| * | | undo one row warning instead use sql_warnings=1unknown2003-07-213-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: Undo warnings for single row inserts mysql-test/t/warnings.test: undo one row warning instead use sql_warnings=1 mysql-test/r/warnings.result: Fix result file
* | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-2120-1773/+253
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| * | | Another fix for "client code in embedded library"unknown2003-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | include/mysql.h: mysql_close isn't virtual nown
| * | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-1849-381/+518
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
| * | | | SCRUMunknown2003-07-184-24/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including client code into embedded library fixes libmysql/libmysql.c: We should call this way libmysqld/lib_sql.cc: Necessary initializations added libmysqld/libmysqld.c: mysql_close can't be "virtual" mysqltest.c calls mysql_close before mysql_connect sql-common/client.c: We have to redo fetch_lengths to count lengths looking at '\0' in string. It works slower, but is correct for both client and embedded libraries
| * | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-159-129/+36
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.2way
View Lorry Controller Status