Commit graph

1589 commits

Author SHA1 Message Date
unknown
651ead1a9f A fix for a bug with long definition of SET or ENUM.
Barkov approved it already
2003-08-19 16:35:17 +03:00
unknown
dc271c8fc3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-having_resolve-4.1
2003-08-12 18:44:48 +03:00
unknown
45b145a96e fixed problem with reference on derived table fields (BUG#1031)
mysql-test/r/derived.result:
  test of BUG#1031
mysql-test/t/derived.test:
  test of BUG#1031
sql/item_sum.cc:
  'alias' parameter added to create_tmp_table
sql/sql_derived.cc:
  Derived table should be named (to pass it name to Field and then to Item_field)
sql/sql_select.cc:
  'alias' parameter added to create_tmp_table
sql/sql_select.h:
  'alias' parameter added to create_tmp_table
sql/sql_union.cc:
  'alias' parameter added to create_tmp_table
sql/sql_update.cc:
  'alias' parameter added to create_tmp_table
2003-08-12 15:04:49 +03:00
unknown
2338e2eaf9 LIKE didn't work with non-default charset 2003-08-12 16:42:52 +05:00
unknown
253b2a9654 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-345
2003-08-11 23:43:54 +04:00
unknown
2ad06dc68e Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345)
configure.in:
  ./configure now tests if gmtime_r is present
include/config-os2.h:
  Supposing that OS/2 have gmtime_r
include/my_pthread.h:
  Use our imeplementation of gmtime_r if system lacks one
mysql-test/r/func_time.result:
  Added UTC_* functions to test
mysql-test/t/func_time.test:
  Added UTC_* functions to test
mysys/my_pthread.c:
  Our implementation of gmtime_r
mysys/my_thr_init.c:
  Now we also need LOCK_locktime_r if gmtime_r is absent
sql/item_timefunc.cc:
  Generalized classes for CURDATE, CURTIME and NOW, abstracted them from
  timezone. Added new children classes for implementing these and UTC_*
  functions.
sql/item_timefunc.h:
  Generalized classes for CURDATE, CURTIME and NOW, abstracted them from
  timezone. Added new children classes for implementing these and UTC_*
  functions.
sql/lex.h:
  Added tokens for UTC_TIME, UTC_DATE and UTC_TIMESTAMP
sql/sql_yacc.yy:
  Added UTC_* functions to grammar. Current functions are using 
  classes now.
2003-08-11 23:43:01 +04:00
unknown
0960c3eb26 Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
The above query created a field of koi8r charset, not cp1251

Change:
CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
Length now means character length, not byte length.
The above creates a field that guarantees can store a multibyte value
1 character long. For utf8 the above creates a field that can store
3 bytes.
2003-08-11 18:18:34 +05:00
unknown
f3f6e5e9b2 test for BUG#969 2003-08-09 17:10:58 +03:00
unknown
7b44d753d0 merge
sql/sql_union.cc:
  Auto merged
2003-08-09 16:53:23 +03:00
unknown
9b16dd8962 fixed union unlocking problem (BUG#906)
mysql-test/r/subselect.result:
  test of union unlocking problem
mysql-test/t/subselect.test:
  test of union unlocking problem
sql/sql_union.cc:
  prohibit unlocking all tables by fake select execution
2003-08-09 14:39:54 +03:00
unknown
6496a0dd14 merge
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
2003-08-06 18:59:26 +03:00
unknown
b5e8569674 sql_union.cc, sql_select.cc:
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
2003-08-06 18:48:34 +03:00
unknown
e4477bcacf Merge oak.local:/home/kostja/mysql/mysql-4.1-root
into oak.local:/home/kostja/mysql/mysql-4.1-count-distinct
2003-08-06 17:25:01 +04:00
unknown
a8cb3628b7 fix for bug #958 and tests for it
aligned with Sergey notes.


sql/records.cc:
  fix for bug #958 - big select with 
  count distinct and group by
  aligned with Sergey notes.
2003-08-06 16:58:03 +04:00
unknown
970f910d75 Fix:
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.
2003-08-05 11:26:31 +05:00
unknown
fc8b138544 Fix:
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
2003-08-05 11:03:05 +05:00
unknown
691b7584fb fix_fields recoursion didn't stop when some level's fix_length_and_dec
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';
2003-08-05 10:08:16 +05:00
unknown
b97d0ea2c3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-unknown_table-4.1
2003-08-01 19:06:03 +03:00
unknown
a98105c5a6 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-08-01 19:44:27 +04:00
unknown
875a26d50a merge
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
2003-08-01 18:24:27 +03:00
unknown
7fc417047d added disable_query_log to fulltext2.test
mysql-test/r/fulltext2.result:
  result updated
mysql-test/t/fulltext2.test:
  test is now more silent
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-08-01 18:49:30 +04:00
unknown
c44af18bd5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_ci-4.1
2003-08-01 17:32:05 +03:00
unknown
a3e261437a merge
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
2003-08-01 16:51:54 +03:00
unknown
4ee94d21f3 Database name and national characters fixes. 2003-07-30 17:51:42 +05:00
unknown
53e4153de1 Derivation attribute was not processed correctly
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);
2003-07-30 14:15:25 +05:00
unknown
668cd9729f prevented finding references in item_list for non-SELECT st_select_lex
(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
2003-07-29 16:59:46 +03:00
unknown
ec1a433f08 Fixed that this sequence didn't produce an error as it should have:
CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
                 s2 CHAR(5) COLLATE latin1_swedish_ci);
SELECT * FROM t1 WHERE s1 = s2;
2003-07-29 17:39:39 +05:00
unknown
8d7b54b7c2 A new separate error message: Unknown collation 'blablabla' 2003-07-29 17:12:14 +05:00
unknown
0792c1c824 count HAVING clause elements with select list elements, because agregate 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
2003-07-29 13:00:32 +03:00
unknown
37ddcebad2 tabe & query hashes made case insensitive (BUG#933)
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
2003-07-28 18:28:44 +03:00
unknown
683e3ef018 test results fixed 2003-07-28 16:58:51 +02:00
unknown
dfc8a17724 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1


sql/sql_base.cc:
  Auto merged
2003-07-28 10:58:50 -04:00
unknown
a56959a5b6 changed for AUTO_VALUE_ON_ZERO
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
2003-07-28 10:57:46 -04:00
unknown
ab0641ccfe Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
2003-07-27 09:59:24 +02:00
unknown
3a8d1c3cd0 Print accounts in error messages as 'user'@'host' rather than 'user@host'.
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.
2003-07-24 12:43:57 -05:00
unknown
3be8c60c25 temporary modification of rpl_loaddata.test until 4.0 is merged in 4.1.
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
2003-07-23 16:48:45 +02:00
unknown
bacddcc5f5 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-07-23 15:48:52 +02:00
unknown
dae34fb60f On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table
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.
2003-07-23 15:46:46 +02:00
unknown
9b675b8be0 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
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
2003-07-22 19:02:36 -04:00
unknown
38aa6d1c15 fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump) 2003-07-22 18:58:30 -04:00
unknown
1cf4eea19d now GRANT db.* ... compares patterns correctly to prevent privilege escalation 2003-07-22 22:21:23 +02:00
unknown
b413e5c420 wild_compare fun: bug in GRANT db_pattern.* ... 2003-07-22 22:00:51 +02:00
unknown
d1db620853 undo one row warning instead use sql_warnings=1
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
2003-07-21 19:37:18 +03:00
unknown
f22517e4ec Enable warnings by default for single value list inserts also when the client protocol is >= 4.1
tests/client_test.c:
  test for timestamp bug (BR #819)
sql/sql_insert.cc:
  Enable warnings by default for single value list
  protocol
mysql-test/t/warnings.test:
  Updated test for single value list insert warning
mysql-test/r/warnings.result:
  Updated warnings results
2003-07-21 00:13:22 -07:00
unknown
012910656f Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/r/innodb.result:
  Auto merged
2003-07-21 00:33:13 +02:00
unknown
a4dbcfd681 absurd (and syntaxically incorrect) column definition corrected 2003-07-21 00:32:35 +02:00
unknown
bc14ad82df Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2003-07-20 07:01:18 -05:00
unknown
de13ae26e1 Fix test results affected by error message edit.
mysql-test/r/bdb.result:
  Fix test result affected by error message edit.
mysql-test/r/innodb.result:
  Fix test result affected by error message edit.
mysql-test/r/isam.result:
  Fix test result affected by error message edit.
mysql-test/r/repair_part1.result:
  Fix test result affected by error message edit.
2003-07-20 07:00:00 -05:00
unknown
c1ed639cb6 bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error
mysql-test/r/bigint.result:
  test results updated
mysql-test/r/type_decimal.result:
  test results updated
mysql-test/t/bigint.test:
  new tests added
mysql-test/t/type_decimal.test:
  error numbers updated
sql/item.h:
  round(9999999999999999999) fixed
sql/sql_yacc.yy:
  bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0'   => syntax error
  unary '+' added
2003-07-20 12:26:18 +02:00
unknown
5dadac8701 Merge
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
2003-07-19 18:49:04 +03:00