1. 08 Oct, 2003 6 commits
    • unknown's avatar
      Some simple optimisation · 1db2b4e6
      unknown authored
      = ANY and <> ALL converted to (NOT) IN to get advantage of IN optimisation
      
      
      mysql-test/r/subselect.result:
        test of new optimisation
      mysql-test/t/subselect.test:
        test of new optimisation
      sql/mysql_priv.h:
        new function for subquery creation
      sql/sql_parse.cc:
        layout fix
        new function for subquery creation (convert some ALL/ANY to IN)
      sql/sql_yacc.yy:
        same code blocks replaced with function
      1db2b4e6
    • unknown's avatar
      fixed error handling in SET and DO operators (BUG#1484) · 0f81ecf5
      unknown authored
      
      mysql-test/r/subselect.result:
        test for BUG#1484
      mysql-test/t/subselect.test:
        layout fix
        test for BUG#1484
      sql/set_var.cc:
        value evaluating can fail (because of subqueries for example) => we should check result of operartion and prevent assigning incorrect value
      sql/sql_do.cc:
        DO should ignore all errors
      0f81ecf5
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 21e2957d
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
      
      
      21e2957d
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7de043be
      unknown authored
      into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
      
      
      7de043be
    • unknown's avatar
      query_cache.result, query_cache.test: · f6501fd3
      unknown authored
        Character set variables test
      
      
      mysql-test/t/query_cache.test:
        Character set variables test
      mysql-test/r/query_cache.result:
        Character set variables test
      f6501fd3
    • unknown's avatar
      Fixed test case to work on NetWare. · ddfb716d
      unknown authored
      
      mysql-test/r/func_gconcat.result:
        Removed extraneous CR (0x0D)
      mysql-test/t/func_gconcat.test:
        Removed extraneous CR (0x0D)
      ddfb716d
  2. 07 Oct, 2003 13 commits
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · ac68b4e1
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
      
      
      mysql-test/r/subselect.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      ac68b4e1
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 6577121c
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1
      
      
      6577121c
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 2c951d4c
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1
      
      
      sql/item_subselect.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      2c951d4c
    • unknown's avatar
      after merge fix · 1fded9e1
      unknown authored
      1fded9e1
    • unknown's avatar
      Many files: · d1485aad
      unknown authored
        Multiple tablespaces for InnoDB
      sql_table.cc:
        Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
      sql_update.cc, sql_select.cc, my_base.h:
        More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
      
      
      include/my_base.h:
        More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
      sql/sql_select.cc:
        More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
      sql/sql_update.cc:
        More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
      sql/sql_table.cc:
        Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
      sql/sql_db.cc:
        Multiple tablespaces for InnoDB
      sql/ha_innodb.cc:
        Multiple tablespaces for InnoDB
      sql/mysqld.cc:
        Multiple tablespaces for InnoDB
      sql/set_var.cc:
        Multiple tablespaces for InnoDB
      sql/sql_cache.cc:
        Multiple tablespaces for InnoDB
      sql/ha_innodb.h:
        Multiple tablespaces for InnoDB
      innobase/include/btr0btr.ic:
        Multiple tablespaces for InnoDB
      innobase/include/btr0pcur.ic:
        Multiple tablespaces for InnoDB
      innobase/include/data0type.ic:
        Multiple tablespaces for InnoDB
      innobase/include/dyn0dyn.ic:
        Multiple tablespaces for InnoDB
      innobase/include/fut0lst.ic:
        Multiple tablespaces for InnoDB
      innobase/include/log0log.ic:
        Multiple tablespaces for InnoDB
      innobase/include/mach0data.ic:
        Multiple tablespaces for InnoDB
      innobase/include/mtr0log.ic:
        Multiple tablespaces for InnoDB
      innobase/include/rem0rec.ic:
        Multiple tablespaces for InnoDB
      innobase/include/ut0byte.ic:
        Multiple tablespaces for InnoDB
      innobase/include/ut0ut.ic:
        Multiple tablespaces for InnoDB
      innobase/include/buf0buf.h:
        Multiple tablespaces for InnoDB
      innobase/include/buf0lru.h:
        Multiple tablespaces for InnoDB
      innobase/include/buf0rea.h:
        Multiple tablespaces for InnoDB
      innobase/include/data0type.h:
        Multiple tablespaces for InnoDB
      innobase/include/db0err.h:
        Multiple tablespaces for InnoDB
      innobase/include/dict0boot.h:
        Multiple tablespaces for InnoDB
      innobase/include/dict0dict.h:
        Multiple tablespaces for InnoDB
      innobase/include/dict0load.h:
        Multiple tablespaces for InnoDB
      innobase/include/dict0mem.h:
        Multiple tablespaces for InnoDB
      innobase/include/fil0fil.h:
        Multiple tablespaces for InnoDB
      innobase/include/fsp0fsp.h:
        Multiple tablespaces for InnoDB
      innobase/include/ibuf0ibuf.h:
        Multiple tablespaces for InnoDB
      innobase/include/lock0lock.h:
        Multiple tablespaces for InnoDB
      innobase/include/log0log.h:
        Multiple tablespaces for InnoDB
      innobase/include/log0recv.h:
        Multiple tablespaces for InnoDB
      innobase/include/os0file.h:
        Multiple tablespaces for InnoDB
      innobase/include/page0page.h:
        Multiple tablespaces for InnoDB
      innobase/include/que0types.h:
        Multiple tablespaces for InnoDB
      innobase/include/rem0rec.h:
        Multiple tablespaces for InnoDB
      innobase/include/srv0srv.h:
        Multiple tablespaces for InnoDB
      innobase/include/srv0start.h:
        Multiple tablespaces for InnoDB
      innobase/include/sync0sync.h:
        Multiple tablespaces for InnoDB
      innobase/include/trx0sys.h:
        Multiple tablespaces for InnoDB
      innobase/include/ut0byte.h:
        Multiple tablespaces for InnoDB
      innobase/include/univ.i:
        Multiple tablespaces for InnoDB
      innobase/btr/btr0cur.c:
        Multiple tablespaces for InnoDB
      innobase/btr/btr0sea.c:
        Multiple tablespaces for InnoDB
      innobase/buf/buf0buf.c:
        Multiple tablespaces for InnoDB
      innobase/buf/buf0flu.c:
        Multiple tablespaces for InnoDB
      innobase/buf/buf0lru.c:
        Multiple tablespaces for InnoDB
      innobase/buf/buf0rea.c:
        Multiple tablespaces for InnoDB
      innobase/data/data0type.c:
        Multiple tablespaces for InnoDB
      innobase/dict/dict0boot.c:
        Multiple tablespaces for InnoDB
      innobase/dict/dict0crea.c:
        Multiple tablespaces for InnoDB
      innobase/dict/dict0dict.c:
        Multiple tablespaces for InnoDB
      innobase/dict/dict0load.c:
        Multiple tablespaces for InnoDB
      innobase/dict/dict0mem.c:
        Multiple tablespaces for InnoDB
      innobase/fil/fil0fil.c:
        Multiple tablespaces for InnoDB
      innobase/fsp/fsp0fsp.c:
        Multiple tablespaces for InnoDB
      innobase/ha/ha0ha.c:
        Multiple tablespaces for InnoDB
      innobase/ibuf/ibuf0ibuf.c:
        Multiple tablespaces for InnoDB
      innobase/log/log0log.c:
        Multiple tablespaces for InnoDB
      innobase/log/log0recv.c:
        Multiple tablespaces for InnoDB
      innobase/mach/mach0data.c:
        Multiple tablespaces for InnoDB
      innobase/mem/mem0dbg.c:
        Multiple tablespaces for InnoDB
      innobase/mem/mem0pool.c:
        Multiple tablespaces for InnoDB
      innobase/mtr/mtr0log.c:
        Multiple tablespaces for InnoDB
      innobase/os/os0file.c:
        Multiple tablespaces for InnoDB
      innobase/os/os0proc.c:
        Multiple tablespaces for InnoDB
      innobase/page/page0cur.c:
        Multiple tablespaces for InnoDB
      innobase/que/que0que.c:
        Multiple tablespaces for InnoDB
      innobase/row/row0ins.c:
        Multiple tablespaces for InnoDB
      innobase/row/row0mysql.c:
        Multiple tablespaces for InnoDB
      innobase/row/row0sel.c:
        Multiple tablespaces for InnoDB
      innobase/row/row0upd.c:
        Multiple tablespaces for InnoDB
      innobase/srv/srv0srv.c:
        Multiple tablespaces for InnoDB
      innobase/srv/srv0start.c:
        Multiple tablespaces for InnoDB
      innobase/sync/sync0rw.c:
        Multiple tablespaces for InnoDB
      innobase/sync/sync0sync.c:
        Multiple tablespaces for InnoDB
      innobase/trx/trx0sys.c:
        Multiple tablespaces for InnoDB
      innobase/trx/trx0trx.c:
        Multiple tablespaces for InnoDB
      innobase/trx/trx0undo.c:
        Multiple tablespaces for InnoDB
      innobase/ut/ut0byte.c:
        Multiple tablespaces for InnoDB
      innobase/ut/ut0ut.c:
        Multiple tablespaces for InnoDB
      d1485aad
    • unknown's avatar
      fixed error detection · d1ab51eb
      unknown authored
      d1ab51eb
    • unknown's avatar
      merge · fae46f7c
      unknown authored
      
      sql/item_subselect.h:
        Auto merged
      fae46f7c
    • unknown's avatar
      after merge fix · 4d9cbc26
      unknown authored
      4d9cbc26
    • unknown's avatar
      Simple optimization · bcf562fc
      unknown authored
      bcf562fc
    • unknown's avatar
      merge · 890f427f
      unknown authored
      
      sql/item_subselect.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      890f427f
    • unknown's avatar
      WL #562: Change format of slow log in 4.1 · 118d6df5
      unknown authored
      118d6df5
    • unknown's avatar
      merge · 451cd9e3
      unknown authored
      
      sql/sql_yacc.yy:
        Auto merged
      451cd9e3
    • unknown's avatar
      merge · 1fd6a570
      unknown authored
      1fd6a570
  3. 06 Oct, 2003 19 commits
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 67b5aa64
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
      
      
      sql/mysql_priv.h:
        Auto merged
      67b5aa64
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 18374b97
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      18374b97
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 00594481
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
      
      
      mysql-test/r/subselect.result:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      00594481
    • unknown's avatar
      after merge fix · 7df32ac6
      unknown authored
      7df32ac6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · bae46f12
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      sql/item_subselect.cc:
        Auto merged
      bae46f12
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 978bcb57
      unknown authored
      into mishka.mysql.fi:/home/my/mysql-4.1
      
      
      include/mysql.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      978bcb57
    • unknown's avatar
      Move init_compiled_charsets to own file · 0e93376e
      unknown authored
      Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
      Simple code cleanup
      
      
      client/mysql.cc:
        Fixed indentation
      include/my_sys.h:
        Move init_compiled_charsets to own file
      include/mysql.h:
        Remove compiler warning	
      libmysql/Makefile.shared:
        Move init_compiled_charsets to own file
      mysys/Makefile.am:
        Move init_compiled_charsets to own file
      mysys/charset.c:
        Move init_compiled_charsets to own file
      mysys/my_init.c:
        Remove dependency of charsets
      scripts/mysql_create_system_tables.sh:
        Remove run time warning
      scripts/mysql_fix_privilege_tables.sql:
        Add help tables
      sql/sql_insert.cc:
        Code cleanup
      0e93376e
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 104da10b
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
      
      
      104da10b
    • unknown's avatar
      fixed error names · bd3beb83
      unknown authored
      
      mysql-test/r/row.result:
        fixed error message as it was suggested by Peter Gulutzan
      mysql-test/r/subselect.result:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/czech/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/danish/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/dutch/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/english/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/estonian/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/french/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/german/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/greek/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/hungarian/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/italian/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/japanese/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/korean/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/norwegian-ny/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/norwegian/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/polish/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/portuguese/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/romanian/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/russian/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/serbian/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/slovak/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/spanish/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/swedish/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      sql/share/ukrainian/errmsg.txt:
        fixed error message as it was suggested by Peter Gulutzan
      bd3beb83
    • unknown's avatar
      Merge · ff8c8fa1
      unknown authored
      
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      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/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_derived.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/subselect.result:
        SCCS merged
      mysql-test/t/subselect.test:
        SCCS merged
      ff8c8fa1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3f896fd8
      unknown authored
      into narttu.mysql.fi:/my/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      3f896fd8
    • unknown's avatar
      Fix for #1447 · 6fc8b48c
      unknown authored
      
      libmysqld/lib_sql.cc:
        Check for unfetched rows added
      6fc8b48c
    • unknown's avatar
      Fix for #1488 · c479f5d3
      unknown authored
      
      libmysqld/lib_sql.cc:
        net->sqlstate should be initialized here
      c479f5d3
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 01cb1391
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      
      01cb1391
    • unknown's avatar
      Fix for #1487 · f9ce2f4b
      unknown authored
      
      libmysqld/lib_sql.cc:
        arg_parameters now are stored in these THD members
      sql/sql_class.h:
        members to store query arguments
      sql/sql_prepare.cc:
        query arguments retrieval added for embedded case
        code not necessary in embedded server #ifdefed
      f9ce2f4b
    • unknown's avatar
      fix error messages · 9f7674c8
      unknown authored
      fix derived inside subqueries
      
      
      mysql-test/r/subselect.result:
        error tex changes whi i forgot to commit
      mysql-test/t/derived.test:
        code changing
      sql/sql_yacc.yy:
        allow derived inside subselects
      9f7674c8
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 7a614ffb
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-derived-4.1
      
      
      7a614ffb
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1d5c187e
      unknown authored
      into deer.(none):/home/hf/work/mysql-4.1.stmt
      
      
      1d5c187e
    • unknown's avatar
      Fix for #1470 · 5218a0cd
      unknown authored
      
      libmysqld/lib_sql.cc:
        check for error
      sql/sql_prepare.cc:
        set success mark here
      5218a0cd
  4. 05 Oct, 2003 2 commits
    • unknown's avatar
      Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 9b811484
      unknown authored
      into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
      
      
      sql/share/czech/errmsg.txt:
        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/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/errmsg.txt:
        Auto merged
      sql/share/norwegian-ny/errmsg.txt:
        Auto merged
      sql/share/polish/errmsg.txt:
        Auto merged
      sql/share/romanian/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
      9b811484
    • unknown's avatar
      prohibited using derived tables in UPDATE command (BUG#1477) · ff518b98
      unknown authored
      fixed incorrect table name in test
      
      
      mysql-test/r/derived.result:
        fixed incorrect table name in test
        new test of derived table
      mysql-test/t/derived.test:
        fixed incorrect table name in test
        new test of derived table
      sql/sql_yacc.yy:
        prohibited using derived tables in UPDATE command
      ff518b98