1. 27 Nov, 2002 20 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · da8a66aa
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-all_any-4.1
      
      
      da8a66aa
    • unknown's avatar
      typo fixed · a598cff2
      unknown authored
      a598cff2
    • unknown's avatar
      8c603386
    • unknown's avatar
      merging · dbeb6fa2
      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
      dbeb6fa2
    • unknown's avatar
      after review changes in IN/ALL/ANY/SOME (SCRUM) · 94352255
      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
      94352255
    • unknown's avatar
      Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · dd7e533b
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
      
      
      dd7e533b
    • unknown's avatar
      new string-to-number functions · 080b5c60
      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
      080b5c60
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 82c83c4b
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
      
      
      82c83c4b
    • unknown's avatar
      after merging fix · 1ef80674
      unknown authored
      1ef80674
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 2e9eb316
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      2e9eb316
    • unknown's avatar
      Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 · 6217be22
      unknown authored
      into genie.(none):/home/vva/work/new_readline/4.1
      
      
      6217be22
    • unknown's avatar
      correction for compiling under FreeBSD · d3969da2
      unknown authored
      d3969da2
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 3892b734
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-update-4.1
      
      
      3892b734
    • unknown's avatar
      Preparing to use better string-to-number functions to avoid c_ptr() call, · 4b021e6e
      unknown authored
      wich is slower and is not ucs2 compatible
      
      
      4b021e6e
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · 645dec80
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/work-update-4.1
      
      
      sql/sql_parse.cc:
        Auto merged
      645dec80
    • unknown's avatar
      after merging fix · 8ff65ac2
      unknown authored
      8ff65ac2
    • unknown's avatar
      Merge work.mysql.com:/home/bk/mysql-4.1 · d71bdbef
      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
      d71bdbef
    • unknown's avatar
      merging · 9767982a
      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
      9767982a
    • unknown's avatar
      Merge myvenu.com:/home/venu/bk/src-4.1 · e9f96cf9
      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
      e9f96cf9
    • unknown's avatar
      select_test.c, insert_test.c: · 4826ed00
      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
      4826ed00
  2. 26 Nov, 2002 12 commits
  3. 25 Nov, 2002 8 commits
    • unknown's avatar
      subselects in insert/replace (SCRUM) · da538d2b
      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
      da538d2b
    • unknown's avatar
      Merge work:/home/bk/mysql-4.1 · a14db06b
      unknown authored
      into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      
      a14db06b
    • unknown's avatar
      myisammrg::index_next_same · 4ea2f42e
      unknown authored
      
      myisammrg/Makefile.am:
        myrg_rnext_same.c added
      4ea2f42e
    • unknown's avatar
      subselet in delete (SCRUM) · 30d1b143
      unknown authored
      
      mysql-test/r/subselect.result:
        subselects in delete test
      mysql-test/t/subselect.test:
        subselects in delete test
      sql/sql_delete.cc:
        subselet in delete
      30d1b143
    • unknown's avatar
      merging tests · 52f18046
      unknown authored
      
      BitKeeper/deleted/.del-innodb-non-simple.test~380a6ef42b6e15d1:
        Delete: mysql-test/t/innodb-non-simple.test
      BitKeeper/deleted/.del-innodb-non-simple.result~2f77d5b0aaf5aa90:
        Delete: mysql-test/r/innodb-non-simple.result
      52f18046
    • unknown's avatar
      Merge · 4383ef13
      unknown authored
      
      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_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/subselect.result:
        SCCS merged
      mysql-test/t/subselect.test:
        SCCS merged
      4383ef13
    • unknown's avatar
      Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 · cfb331bf
      unknown authored
      
      sql/item.h:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      cfb331bf
    • unknown's avatar
      Fixed CAST( xxx as CHAR) · 1b9becc3
      unknown authored
      
      sql/item.h:
        Made some virtual functions non virtual (as they are not used virtually)
      sql/item_strfunc.cc:
        Optimizations.
      sql/item_strfunc.h:
        Fixed BINARY handling
      sql/sql_string.h:
        Indentation cleanups
      1b9becc3