1. 28 Nov, 2002 1 commit
  2. 27 Nov, 2002 25 commits
    • unknown's avatar
      changed compare engine in basic row items (SCRUM) · c53dd15d
      unknown authored
      fixed layout
      
      
      sql/item_cmpfunc.cc:
        changed compare engine in basic row items
      BitKeeper/etc/ignore:
        Added libmysqld/item_row.cc to the ignore list
      sql/item_cmpfunc.h:
        changed compare engine in basic row items
      sql/item_func.h:
        changed compare engine in basic row items
        fixed layout
      sql/sql_select.cc:
        changed compare engine in basic row items
      c53dd15d
    • unknown's avatar
      after-merge fix · ca2a6854
      unknown authored
      ca2a6854
    • unknown's avatar
      merging · 50c277e4
      unknown authored
      
      include/mysql_com.h:
        Auto merged
      include/mysqld_error.h:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/danish/errmsg.txt:
        Auto merged
      sql/share/dutch/errmsg.txt:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/estonian/errmsg.txt:
        Auto merged
      sql/share/french/errmsg.txt:
        Auto merged
      sql/share/german/errmsg.txt:
        Auto merged
      sql/share/greek/errmsg.txt:
        Auto merged
      sql/share/hungarian/errmsg.txt:
        Auto merged
      sql/share/italian/errmsg.txt:
        Auto merged
      sql/share/japanese/errmsg.txt:
        Auto merged
      sql/share/korean/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/norwegian/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/portuguese/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/serbian/errmsg.txt:
        Auto merged
      sql/share/slovak/errmsg.txt:
        Auto merged
      sql/share/spanish/errmsg.txt:
        Auto merged
      50c277e4
    • unknown's avatar
      layout fix · 17dbd8e4
      unknown authored
      17dbd8e4
    • unknown's avatar
      fixed current_thread · cb0f9b31
      unknown authored
      cb0f9b31
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · f412ac39
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-all_any-4.1
      
      f412ac39
    • unknown's avatar
      typo fixed · 4121d279
      unknown authored
      4121d279
    • unknown's avatar
      338df2ae
    • unknown's avatar
      merging · 66cd5e82
      unknown authored
      
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      66cd5e82
    • unknown's avatar
      after review changes in IN/ALL/ANY/SOME (SCRUM) · a87495fd
      unknown authored
      
      sql/item.cc:
        after review changes
      sql/item.h:
        after review changes
      sql/item_subselect.cc:
        after review changes
      sql/mysql_priv.h:
        after review changes
      sql/sql_base.cc:
        after review changes
      a87495fd
    • unknown's avatar
      Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · d45fb2c5
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
      
      d45fb2c5
    • unknown's avatar
      new string-to-number functions · 68e63a36
      unknown authored
      
      include/m_ctype.h:
        Typo fix
      sql/field.cc:
        Use new string-to-number functions
      strings/ctype-bin.c:
        Use new string-to-number functions
      strings/ctype-simple.c:
        Use new string-to-number functions
      strings/ctype-utf8.c:
        Use new string-to-number functions
      68e63a36
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 24ef0b4a
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
      
      24ef0b4a
    • unknown's avatar
      after merging fix · b17c887c
      unknown authored
      b17c887c
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · bff492c5
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      bff492c5
    • unknown's avatar
      Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 · 6e2c3b3b
      unknown authored
      into genie.(none):/home/vva/work/new_readline/4.1
      
      6e2c3b3b
    • unknown's avatar
      correction for compiling under FreeBSD · 6be0ecb6
      unknown authored
      6be0ecb6
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · c1bede83
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-update-4.1
      
      c1bede83
    • unknown's avatar
      Preparing to use better string-to-number functions to avoid c_ptr() call, · b94f9320
      unknown authored
      wich is slower and is not ucs2 compatible
      
      b94f9320
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 280ff91a
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-update-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      280ff91a
    • unknown's avatar
      after merging fix · c173fa38
      unknown authored
      c173fa38
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql-4.1 · 9f43b994
      unknown authored
      into mysql.com:/home/pem/work/mysql-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      9f43b994
    • unknown's avatar
      merging · 1de4a76b
      unknown authored
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      1de4a76b
    • unknown's avatar
      Merge myvenu.com:/home/venu/bk/src-4.1 · 4548da4c
      unknown authored
      into myvenu.com:/home/venu/work/sql/dev-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      4548da4c
    • unknown's avatar
      select_test.c, insert_test.c: · 60dd9029
      unknown authored
        Added my_global.h to compile after my_list.h is added to mysql.h
      sql_prepare.cc:
        Handle close stmt from client
        Minor fixups to make SET variable=? to work
      sql_parse.cc:
        Added missed COM_CLOSE_STMT
      mysql_priv.h:
        Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
      libmysql.c:
        Clean all open stmts during mysql_close() implicitly
      
      
      libmysql/libmysql.c:
        Clean all open stmts during mysql_close() implicitly
      sql/mysql_priv.h:
        Handle close_stmt from client
        Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
      sql/sql_parse.cc:
        Added missed COM_CLOSE_STMT
      sql/sql_prepare.cc:
        Handle close stmt from client
        Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
        Minor fixups to make SET variable=? to work
      client/insert_test.c:
        Added my_global.h to compile after my_list.h is added to mysql.h
      client/select_test.c:
        Added my_global.h to compile after my_list.h is added to mysql.h
      60dd9029
  3. 26 Nov, 2002 12 commits
  4. 25 Nov, 2002 2 commits
    • unknown's avatar
      subselects in insert/replace (SCRUM) · f16beb6c
      unknown authored
      
      mysql-test/r/subselect.result:
        test of insert/replace with subselects
      mysql-test/t/subselect.test:
        test of insert/replace with subselects
      sql/sql_insert.cc:
        subselects in insert/replace
      sql/sql_yacc.yy:
        subselects in insert/replace
      f16beb6c
    • unknown's avatar
      Merge work:/home/bk/mysql-4.1 · 81f8ca96
      unknown authored
      into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      81f8ca96