summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-08-0722-142/+168
|\ | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1 BitKeeper/etc/logging_ok: auto-union sql/item_func.cc: Auto merged
| * mergeunknown2003-08-066-16/+46
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/innodb.result: Auto merged sql/sql_base.cc: Auto merged sql/sql_derived.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_union.cc: Auto merged
| | * sql_union.cc, sql_select.cc:unknown2003-08-061-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code clean-up sql_union.cc, union.test, union.result: A fix for a bug #978. This enables that NULL's can be entered into UNION's result set, although first SELECT columns are NOT NULL. This is also a start of fixing UNION's properly regarding type acceptance. sql_select.cc: A commit for my second July SPRINT task mysql-test/r/union.result: A fix for a bug #978. This enables that NULL's can be entered into UNION's result set, although first SELECT columns are NOT NULL. This is also a start of fixing UNION's properly regarding type acceptance. mysql-test/t/union.test: A fix for a bug #978. This enables that NULL's can be entered into UNION's result set, although first SELECT columns are NOT NULL. This is also a start of fixing UNION's properly regarding type acceptance. sql/sql_select.cc: Code clean-up sql/sql_union.cc: Code clean-up
| | * Mergeunknown2003-07-196-6/+40
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/innodb.result: Auto merged sql/ha_myisam.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_derived.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_union.cc: Auto merged sql/table.h: Auto merged
| | | * code cleanupunknown2003-06-251-1/+1
| | | |
| | | * Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-1721-320/+482
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| | | * \ Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-125-5/+39
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| | | | * | Derived tables bug fix .......unknown2003-06-125-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_myisam.cc: DISABLE KEYS warnings sql/sql_table.cc: DISABLE KEYS warnings
| | | | * | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-06-101-0/+2
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 mysql-test/r/derived.result: Auto merged
| | | | | * \ Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-05-311-0/+2
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 sql/sql_derived.cc: Auto merged
| | | | | | * | Fix for the optimiser problem caused by the fact that with derivedunknown2003-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tables one (or more tables) is opened / closed twice.
| * | | | | | | Merge oak.local:/home/kostja/mysql/mysql-4.1-rootunknown2003-08-061-1/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into oak.local:/home/kostja/mysql/mysql-4.1-count-distinct
| | * | | | | | | fix for bug #958 and tests for itunknown2003-08-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aligned with Sergey notes. sql/records.cc: fix for bug #958 - big select with count distinct and group by aligned with Sergey notes.
| * | | | | | | | Old style charset() and set_charset() were removed.unknown2003-08-0515-122/+109
| | | | | | | | |
| * | | | | | | | Fix:unknown2003-08-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german2_ci); INSERT INTO t1 VALUES ('Ü'); SELECT FIELD('ue',s1) FROM t1; The above returned 0 in error. Now 1 is returned.
| * | | | | | | | Fix:unknown2003-08-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci); INSERT INTO t1 VALUES ('Ü'); INSERT INTO t1 VALUES ('ue'); SELECT DISTINCT s1 FROM t1; The above returned two rows in error. Now it returns one row, in latin1_german2_ci: Ü == ue
| * | | | | | | | fix_fields recoursion didn't stop when some level's fix_length_and_decunknown2003-08-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | produced an error. This led to server crash in some cases, e.g.: create table t7 (s1 char); select * from t7 where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci) = 'AA';
* | | | | | | | | Fix that -integer works as in 4.0unknown2003-08-071-15/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acinclude.m4: Fix for RedHat9 and openssl sql/item_func.cc: Indentation changes Fix that -integer works as in 4.0
* | | | | | | | | Mergeunknown2003-08-0563-370/+511
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union
| * | | | | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2003-08-021-2/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1 sql/sql_acl.cc: Auto merged
| | * | | | | | | There were two wrong calls to tables_ok() in MySQL 4.0 (BUG#980),unknown2003-08-021-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which are fixed now. In 4.1 there are 3 calls; 2 of them will be fixed when there is a merge; here I fix the 3rd, new one.
| * | | | | | | | mergeunknown2003-08-015-11/+35
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-295-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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-011-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_ci-4.1
| | * | | | | | | | | tabe & query hashes made case insensitive (BUG#933)unknown2003-07-281-2/+2
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-018-13/+22
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-298-13/+22
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-4/+15
| | | | | | | | | |
| * | | | | | | | | Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2003-07-301-0/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into myvenu.com:/home/venu/work/sql/dev-4.1 sql/item.cc: Auto merged
| | * | | | | | | | | Fix for timestamp issue (BR #819)unknown2003-07-301-0/+5
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests/client_test.c: Updated test_ts() test (For BR# 819)
| * | | | | | | | | Derivation attribute was not processed correctlyunknown2003-07-303-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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);
| * | | | | | | | | Fixed that this sequence didn't produce an error as it should have:unknown2003-07-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2928-5/+34
| |/ / / / / / / /
| * | | | | | | | 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)
| * | | | | | | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1unknown2003-07-285-11/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-285-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | |
| * | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1/unknown2003-07-277-21/+20
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-227-21/+20
| | | | | | | | | |
| * | | | | | | | | 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-2423-115/+115
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-4/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-4/+10
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2003-07-232-0/+65
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-232-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-237-3/+19
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-227-3/+19
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-227-3/+19
| | | | | | | | | | |
View Lorry Controller Status