Commit graph

8761 commits

Author SHA1 Message Date
unknown
1e4b664311 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-19 11:07:57 +02:00
unknown
27ea24b434 Removed idle MY_LEX_SIGNED_NUMBER 2003-08-19 12:49:47 +05:00
unknown
a7c82c5693 Adding Gerogian GEOSTD8 character set 2003-08-18 17:27:09 +05:00
unknown
10ab9f273a Fix strnxfrm_multiplye from 0 to 1 for charsets that do not use strnxfrm 2003-08-18 17:24:50 +05:00
unknown
95728904c9 added compile-pentium-maintainer -
equivalent of compile-pentium-debug but with
--enable-maintainer-mode configure option
Maybe it's worth to merge compile-mentium-debug
and compile-pentium-maintainer to a single script
2003-08-14 13:19:17 +04:00
unknown
a09c75ca89 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-08-12 19:44:13 +02: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
abbcc4ffbb fixed layout 2003-08-12 17:40:11 +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
b94d7ac9d7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-11 18:48:02 +02: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
0033412c32 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/ha_myisam.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-08-09 23:48:57 +02: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
b9aa175cb2 Add --win-dist parameter to Bootstrap, to run make_win_src_distribution
Build-tools/Bootstrap:
  Add --win-dist parameter to run make_win_src_distribution
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-08-07 14:19:42 -04:00
unknown
7c3ae8a8f3 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


client/mysqldump.c:
  Auto merged
2003-08-07 14:19:41 -04:00
unknown
a1630f0e57 fixed bug with missing '\' in string constant in client/mysqldump.cc
client/mysqldump.c:
  fixed bug with missing '\' in string constant
2003-08-07 14:18:43 -04: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
eb5f968c45 table checksum background:
my_checksum() mysys function
   NISAM checksum code moved from mysys to isam/ - it's obsolete
   MyISAM checksum code moved to mysys
   table's checksum accessible from sql layer
   SHOW TABLE STATUS shows checksum (WL#646)
code cleanup


include/my_sys.h:
  table checksum background: my_checksum() mysys function
include/myisam.h:
  table checksum background: my_checksum() mysys function
  MyISAM checksum code moved to mysys
isam/isamchk.c:
  table checksum background:
  NISAM checksum code moved from mysys to isam/ - it's obsolete
isam/isamdef.h:
  table checksum background:
  NISAM checksum code moved from mysys to isam/ - it's obsolete
isam/open.c:
  table checksum background:
  NISAM checksum code moved from mysys to isam/ - it's obsolete
isam/pack_isam.c:
  table checksum background:
  NISAM checksum code moved from mysys to isam/ - it's obsolete
myisam/mi_checksum.c:
  table checksum background: my_checksum() mysys function
  MyISAM checksum code moved to mysys
mysys/checksum.c:
  table checksum background: my_checksum() mysys function
  MyISAM checksum code moved to mysys
sql/ha_myisam.cc:
  table checksum background: table's checksum accessible from sql layer
sql/ha_myisam.h:
  table checksum background: table's checksum accessible from sql layer
sql/handler.h:
  table checksum background: table's checksum accessible from sql layer
  code cleanup
sql/sql_lex.h:
  table checksum background: table's checksum accessible from sql layer
  code cleanup
sql/sql_select.cc:
  warning removed
sql/sql_show.cc:
  SHOW TABLE STATUS shows checksum (WL#646)
sql/sql_yacc.yy:
  cleanup
  (DROP TABLES syntax added as a side effect :))
2003-08-05 21:14:15 +02:00
unknown
e8da290b09 Old style charset() and set_charset() were removed. 2003-08-05 12:52:37 +05: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
d54e55474d Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-08-04 12:43:11 +05:00
unknown
6417c182df Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1


sql/sql_acl.cc:
  Auto merged
2003-08-02 17:24:44 +02:00
unknown
a7eb7a78dd There were two wrong calls to tables_ok() in MySQL 4.0 (BUG#980),
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.
2003-08-02 17:23:39 +02: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
e56fcb4221 merge fix 2003-08-01 19:04:35 +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
cce9e51a70 mysqldump.c:
Use the default character set instead of binary. This is to make "mysqlshow" -> "cat'n'paste database name" -> "mysqldump dbname" circle working.


client/mysqldump.c:
  Use the default character set instead of binary. This is to make "mysqlshow" -> "cat'n'paste database name" -> "mysqldump dbname" circle working.
2003-07-31 09:00:22 +05:00
unknown
79fea68bd7 cp1251.xml:
Upper/lower case translation bug for letter 't' fix.


sql/share/charsets/cp1251.xml:
  Upper/lower case translation bug for letter 't' fix.
2003-07-31 08:33:59 +05:00
unknown
4ee94d21f3 Database name and national characters fixes. 2003-07-30 17:51:42 +05:00
unknown
180b101f56 Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/item.cc:
  Auto merged
2003-07-30 02:15:26 -07: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
0e3524dd88 Fix for timestamp issue (BR #819)
tests/client_test.c:
  Updated test_ts() test (For BR# 819)
2003-07-30 02:01:53 -07:00
unknown
9149ca11e6 README.1st:
Revise 4.1 Windows-install instructions.


Docs/README.1st:
  Revise 4.1 Windows-install instructions.
2003-07-29 12:51:24 -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