1. 22 Jul, 2003 3 commits
    • unknown's avatar
      fix olap test filing · d35bf560
      unknown authored
      d35bf560
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1 · 54396ee8
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
      
      
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/sql_select.h:
        Auto merged
      54396ee8
    • unknown's avatar
      merge · ca6c74b7
      unknown authored
      
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      ca6c74b7
  2. 21 Jul, 2003 4 commits
  3. 20 Jul, 2003 6 commits
  4. 18 Jul, 2003 8 commits
  5. 17 Jul, 2003 10 commits
  6. 16 Jul, 2003 6 commits
    • unknown's avatar
      Error message consistency edits + updates to affected test results. · 7770c167
      unknown authored
      
      mysql-test/r/innodb.result:
        Fix test result to correspond to error message edits.
      mysql-test/r/repair_part2.result:
        Fix test result to correspond to error message edits.
      mysql-test/r/type_blob.result:
        Fix test result to correspond to error message edits.
      sql/share/czech/errmsg.txt:
        Error message consistency edits.
      sql/share/dutch/errmsg.txt:
        Error message consistency edits.
      sql/share/estonian/errmsg.txt:
        Error message consistency edits.
      sql/share/french/errmsg.txt:
        Error message consistency edits.
      sql/share/german/errmsg.txt:
        Error message consistency edits.
      sql/share/greek/errmsg.txt:
        Error message consistency edits.
      sql/share/hungarian/errmsg.txt:
        Error message consistency edits.
      sql/share/italian/errmsg.txt:
        Error message consistency edits.
      sql/share/norwegian-ny/errmsg.txt:
        Error message consistency edits.
      sql/share/norwegian/errmsg.txt:
        Error message consistency edits.
      sql/share/danish/errmsg.txt:
        Error message consistency edits.
      sql/share/polish/errmsg.txt:
        Error message consistency edits.
      sql/share/portuguese/errmsg.txt:
        Error message consistency edits.
      sql/share/romanian/errmsg.txt:
        Error message consistency edits.
      sql/share/serbian/errmsg.txt:
        Error message consistency edits.
      sql/share/slovak/errmsg.txt:
        Error message consistency edits.
      sql/share/spanish/errmsg.txt:
        Error message consistency edits.
      sql/share/swedish/errmsg.txt:
        Error message consistency edits.
      sql/share/ukrainian/errmsg.txt:
        Error message consistency edits.
      sql/share/english/errmsg.txt:
        Error message consistency edits.
      7770c167
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 69764747
      unknown authored
      into ice.snake.net:/Users/paul/mysql-4.1
      
      
      69764747
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1 · 04c6e88c
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
      
      
      04c6e88c
    • unknown's avatar
      fixed memory leak · c55142d9
      unknown authored
      
      sql/item_sum.h:
        fixed initialization
      c55142d9
    • unknown's avatar
      merge · eba0a3aa
      unknown authored
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      eba0a3aa
    • unknown's avatar
      Item_func_null doesn't have a separate Item for the first argument anymore. · a41a43f9
      unknown authored
      args[0] is used instead. This allowed to resuse a lot of code.
      
      
      a41a43f9
  7. 15 Jul, 2003 3 commits
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · d9145e39
      unknown authored
      into ice.snake.net:/Users/paul/mysql-4.1
      
      
      d9145e39
    • unknown's avatar
      Update openssl_1 test. · 6b52f582
      unknown authored
      6b52f582
    • unknown's avatar
      Modifications to error messages, and affected test results. · 2caf4612
      unknown authored
      
      mysql-test/r/merge.result:
        Sync to modified error message.
      sql/share/danish/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/dutch/errmsg.txt:
        Remove extraneous periods.
      sql/share/english/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/estonian/errmsg.txt:
        Remove extraneous periods.
      sql/share/french/errmsg.txt:
        Remove extraneous periods.
      sql/share/german/errmsg.txt:
        Remove extraneous periods.
      sql/share/greek/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/hungarian/errmsg.txt:
        Remove extraneous periods.
      sql/share/italian/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/japanese/errmsg.txt:
        Remove extraneous periods.
      sql/share/korean/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/norwegian-ny/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/norwegian/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/polish/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/romanian/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/russian/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/serbian/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/slovak/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/spanish/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      sql/share/swedish/errmsg.txt:
        Ellipses are three dots, not four or five.
        Remove other extraneous periods.
      2caf4612