1. 12 Aug, 2003 4 commits
  2. 11 Aug, 2003 6 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 253b2a96
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-345
      
      
      253b2a96
    • unknown's avatar
      Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345) · 2ad06dc6
      unknown authored
      
      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.
      2ad06dc6
    • unknown's avatar
      Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a · 0960c3eb
      unknown authored
      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.
      
      
      0960c3eb
    • unknown's avatar
      after merge fix · 27c52212
      unknown authored
      27c52212
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1 · 986be1aa
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      986be1aa
    • 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
  3. 09 Aug, 2003 3 commits
    • unknown's avatar
      test for BUG#969 · f3f6e5e9
      unknown authored
      f3f6e5e9
    • unknown's avatar
      merge · 7b44d753
      unknown authored
      
      sql/sql_union.cc:
        Auto merged
      7b44d753
    • unknown's avatar
      fixed union unlocking problem (BUG#906) · 9b16dd89
      unknown authored
      
      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
      9b16dd89
  4. 07 Aug, 2003 4 commits
  5. 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
  6. 05 Aug, 2003 6 commits
    • unknown's avatar
      e8da290b
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1 · 4a8ab8ac
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
      
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      4a8ab8ac
    • 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
  7. 04 Aug, 2003 1 commit
  8. 02 Aug, 2003 2 commits
  9. 01 Aug, 2003 7 commits
  10. 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
  11. 30 Jul, 2003 1 commit