1. 11 Aug, 2003 1 commit
    • unknown's avatar
      merge · e6476990
      unknown authored
      
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_sum.cc:
        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/table.h:
        Auto merged
      e6476990
  2. 07 Aug, 2003 3 commits
  3. 06 Aug, 2003 4 commits
    • unknown's avatar
      merge · 6496a0dd
      unknown authored
      
      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
      6496a0dd
    • unknown's avatar
      sql_union.cc, sql_select.cc: · b5e85696
      unknown authored
        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
      b5e85696
    • unknown's avatar
      Merge oak.local:/home/kostja/mysql/mysql-4.1-root · e4477bca
      unknown authored
      into oak.local:/home/kostja/mysql/mysql-4.1-count-distinct
      
      
      e4477bca
    • unknown's avatar
      fix for bug #958 and tests for it · a8cb3628
      unknown authored
      aligned with Sergey notes.
      
      
      sql/records.cc:
        fix for bug #958 - big select with 
        count distinct and group by
        aligned with Sergey notes.
      a8cb3628
  4. 05 Aug, 2003 5 commits
    • unknown's avatar
      e8da290b
    • unknown's avatar
      merge · 6181294d
      unknown authored
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_derived.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      6181294d
    • unknown's avatar
      Fix: · 970f910d
      unknown authored
      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.
      
      
      970f910d
    • unknown's avatar
      Fix: · fc8b1385
      unknown authored
      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
      
      
      fc8b1385
    • unknown's avatar
      fix_fields recoursion didn't stop when some level's fix_length_and_dec · 691b7584
      unknown authored
      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';
      
      
      691b7584
  5. 04 Aug, 2003 1 commit
  6. 02 Aug, 2003 2 commits
  7. 01 Aug, 2003 7 commits
  8. 31 Jul, 2003 2 commits
    • unknown's avatar
      mysqldump.c: · cce9e51a
      unknown authored
        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.
      cce9e51a
    • unknown's avatar
      cp1251.xml: · 79fea68b
      unknown authored
        Upper/lower case translation bug for letter 't' fix.
      
      
      sql/share/charsets/cp1251.xml:
        Upper/lower case translation bug for letter 't' fix.
      79fea68b
  9. 30 Jul, 2003 4 commits
  10. 29 Jul, 2003 7 commits
    • unknown's avatar
      README.1st: · 9149ca11
      unknown authored
        Revise 4.1 Windows-install instructions.
      
      
      Docs/README.1st:
        Revise 4.1 Windows-install instructions.
      9149ca11
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 29b23035
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      29b23035
    • unknown's avatar
      prevented finding references in item_list for non-SELECT st_select_lex · 668cd972
      unknown authored
      (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
      668cd972
    • unknown's avatar
      Fixed that this sequence didn't produce an error as it should have: · ec1a433f
      unknown authored
      CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
                       s2 CHAR(5) COLLATE latin1_swedish_ci);
      SELECT * FROM t1 WHERE s1 = s2;
      
      
      
      ec1a433f
    • unknown's avatar
      8d7b54b7
    • unknown's avatar
      count HAVING clause elements with select list elements, because agregate... · 0792c1c8
      unknown authored
      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
      0792c1c8
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8713e979
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.clean
      
      
      8713e979
  11. 28 Jul, 2003 4 commits
    • unknown's avatar
      logging_ok: · 0db8648a
      unknown authored
        Logging to logging@openlogging.org accepted
      README.1st:
        new file - Readme for Windows distribution
      
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      0db8648a
    • unknown's avatar
      tabe & query hashes made case insensitive (BUG#933) · 37ddceba
      unknown authored
      
      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
      37ddceba
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2ee5454d
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.clean
      
      
      2ee5454d
    • unknown's avatar
      Fix for #886 · 4ef2a430
      unknown authored
      
      sql-common/client.c:
        SOCKET_EINTR is handled differently working in replication
      4ef2a430