1. 04 Dec, 2003 1 commit
    • unknown's avatar
      Fixed BUG#336: Subselects with tables does not work as values for local SP variables · 3aaa8ab9
      unknown authored
       and BUG#1654: Stored Procedure Crash if contains subquery and set function
      
      Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
      The latter should work, but turned out to be difficult to fix, so we just
      disallow it for the time being.
      
      
      include/mysqld_error.h:
        New error message for unsupported subselect as SP set values (for the time being).
      include/sql_state.h:
        New error message for unsupported subselect as SP set values (for the time being).
      mysql-test/r/sp-error.result:
        Test cases for BUG#336 and BUG#1654. (Unsupported use of subselect)
      mysql-test/t/sp-error.test:
        Test cases for BUG#336 and BUG#1654. (Unsupported use of subselect)
      sql/item.cc:
        Made Item_splocal::type() work at compile time, for error checking.
      sql/item.h:
        Made Item_splocal::type() work at compile time, for error checking.
      sql/share/czech/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/danish/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/dutch/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/english/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/estonian/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/french/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/german/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/greek/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/hungarian/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/italian/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/japanese/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/korean/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/norwegian-ny/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/norwegian/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/polish/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/portuguese/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/romanian/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/russian/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/serbian/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/slovak/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/spanish/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/swedish/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/share/ukrainian/errmsg.txt:
        New error message for unsupported subselect as SP set values (for the time being).
      sql/sp_head.cc:
        Fixed (bogus) compile error on HP-UX alpha.
      sql/sql_yacc.yy:
        Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
        The latter should work, but turned out to be difficult to fix, so we just
        disallow it for the time being.
      3aaa8ab9
  2. 02 Dec, 2003 9 commits
    • unknown's avatar
      Merge mysql.com:/home/pem/work/mysql-4.1 · a17de3dd
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      
      mysql-test/r/join_outer.result:
        Auto merged
      mysql-test/r/null.result:
        Auto merged
      mysql-test/t/null.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      a17de3dd
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0e286c90
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      
      0e286c90
    • unknown's avatar
      Fix for #1189 (Mess with names about CONSTRAINT) · 6990f6cf
      unknown authored
      Second edition: error message was deleted as Segey suggested
      Now name of the constraint will be used as the name of the key
      if the last not specified
      
      
      mysql-test/r/constraints.result:
        appropriate test result
      mysql-test/t/constraints.test:
        test case for 1189
      sql/sql_yacc.yy:
        language definitions changed so that we can obtaint constraint's name
        and send it as the name of the key if it's not specified
      6990f6cf
    • unknown's avatar
      Item_param::save_in_field(): · 5ea174a9
      unknown authored
      thd->command can be anything except COM_EXECUTE in no cases
      except programming error.
      
      
      5ea174a9
    • unknown's avatar
      Ensure that innodb is created for the first replication test as the... · 40d2de8e
      unknown authored
      Ensure that innodb is created for the first replication test as the slave-timeout is lower for future tests and this failed on some slower machines
      
      
      
      40d2de8e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 7bdb1b1e
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      
      7bdb1b1e
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 7daa6cdc
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-1
      
      
      sql/item_cmpfunc.h:
        Auto merged
      7daa6cdc
    • unknown's avatar
      index_merge.result: · 49278596
      unknown authored
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      
      
      mysql-test/r/index_merge.result:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      49278596
    • unknown's avatar
      join_outer.result, null.result, null.test: · a65c6989
      unknown authored
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      item_cmpfunc.h:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      
      
      sql/item_cmpfunc.h:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (big #1990).
      mysql-test/t/null.test:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      mysql-test/r/null.result:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      mysql-test/r/join_outer.result:
        Fixed inconsistency of values of used_tables_cache
        and const_item_cache for Item_func_isnull objects (bug #1990).
      a65c6989
  3. 01 Dec, 2003 7 commits
    • unknown's avatar
      join_outer.result, null.result, null.test, item_cmpfunc.h: · 17119e6d
      unknown authored
        Fixed inconsistency of values of used_tables_cache and
        const_item_cache for Item_func_isnull objects (bug #1990).
      
      
      sql/item_cmpfunc.h:
        Fixed inconsistency of values of used_tables_cache and
        const_item_cache for Item_func_isnull objects (bug #1990).
      mysql-test/t/null.test:
        Fixed inconsistency of values of used_tables_cache and
        const_item_cache for Item_func_isnull objects (bug #1990).
      mysql-test/r/null.result:
        Fixed inconsistency of values of used_tables_cache and
        const_item_cache for Item_func_isnull objects (bug #1990).
      mysql-test/r/join_outer.result:
        Fixed inconsistency of values of used_tables_cache and
        const_item_cache for Item_func_isnull objects (bug #1990).
      17119e6d
    • unknown's avatar
      cleanup: unused variable removed · 524ab904
      unknown authored
      followup of Bordeaux Optimizer session
      
      
      524ab904
    • unknown's avatar
      Post-merge fixes. · da7ca9ba
      unknown authored
      da7ca9ba
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 49a8ca4d
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      
      49a8ca4d
    • unknown's avatar
      Merge 4.1 to 5.0 · 38f853d2
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      include/my_global.h:
        Auto merged
      include/my_pthread.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/install_test_db.sh:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/protocol.h:
        Auto merged
      sql/protocol_cursor.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_derived.cc:
        Auto merged
      sql/sql_error.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_test.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      38f853d2
    • unknown's avatar
      don't delete select_lex->having and select_lex->where as we delete · 6736de28
      unknown authored
      all items in free_prep_stmt(free_items);
      
      indentation fix
      
      
      6736de28
    • unknown's avatar
      Portability fixes (for binary build) · 91de6fdb
      unknown authored
      Added --protocol to mysqlbinlog
      
      
      client/mysql.cc:
        Indentation cleanup
      client/mysqlbinlog.cc:
        Added protocol option
      mysql-test/r/rpl_until.result:
        Update results
      mysql-test/t/rpl_until.test:
        If --sleep option was given then the salve could do many retries, which affected the size of the binary log. This is fixed by not comparing the binary log size/position
      sql/mysqld.cc:
        More debugging with set_maximum_open_files()
      vio/viosocket.c:
        Portability fix.
      91de6fdb
  4. 28 Nov, 2003 23 commits
    • unknown's avatar
      Mark position as # to make test portable · 046b80bb
      unknown authored
      046b80bb
    • unknown's avatar
      Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1 · fd3847ce
      unknown authored
      
      libmysql/libmysql.c:
        Auto merged
      fd3847ce
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c61299dc
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      c61299dc
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · 90fc2b97
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      90fc2b97
    • unknown's avatar
      "optimization cleanup" reverted - problems on rpl_redirect test. · 88d274c6
      unknown authored
      It happens that mysql->client_next->client_next=mysql
      and mysql_close() goes into infinite loop.
      Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
      :)
      
      
      88d274c6
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 57eda305
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1
      
      
      57eda305
    • unknown's avatar
      In the slave I/O thread (in master.info), it seems less worse to flush · 7ec796f3
      unknown authored
      the relay log before flushing master.info.
      Doing 'before' leads to duplicate event, doing after leads to missing event.
      Both can be as destructive, but 'duplicate' enables us to later add detection
      code to catch it. Whereas 'missing' can't be caught (it can't, because
      the I/O thread can produce legal position jumps, for example if it has
      ignored an event coming from this slave (rememember that starting from 4.1.1,
      the I/O thread filters the server id). 
      
      
      7ec796f3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a55db621
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      
      sql-common/client.c:
        Auto merged
      a55db621
    • unknown's avatar
      cleanup: comment moved to proper place · 3cbc822d
      unknown authored
      3cbc822d
    • unknown's avatar
      merge with 4.0 to get fix for range bug · 6cb23b94
      unknown authored
      
      libmysql/libmysql.c:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      6cb23b94
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 15763ed5
      unknown authored
      into mysql.com:/my/mysql-4.0
      
      
      15763ed5
    • unknown's avatar
      Fixed range optimzier bug (Bug #1828) · e5cc604e
      unknown authored
      
      mysql-test/r/range.result:
        test for range optimzier bug
      mysql-test/t/range.test:
        test for range optimzier bug
      e5cc604e
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · aa780843
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      aa780843
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · f531c801
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      sql-common/client.c:
        Auto merged
      f531c801
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · 7c8f81f3
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      7c8f81f3
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · 56b45eea
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      56b45eea
    • unknown's avatar
      merged · c19f18ec
      unknown authored
      c19f18ec
    • unknown's avatar
    • unknown's avatar
      Merge · ef432201
      unknown authored
      
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_derived.cc:
        keep local copy
      sql/sql_union.cc:
        keep local copy
      ef432201
    • unknown's avatar
      Fix wrong last edit for last commit · 183b02a8
      unknown authored
      183b02a8
    • unknown's avatar
      Added missing SSL library (Should be in source distribution) · 76bf7d22
      unknown authored
      Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
      Added a lot of 'version_xxx' strings to 'show variables'
      Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
      Fixed problem with printing sub selects to debug log
      
      
      Docs/mysqld_error.txt:
        Updated error messages
      Makefile.am:
        Added missing SSL library (Should be in source distribution)
      configure.in:
        Added missing SSL library
      include/sql_common.h:
        Move duplicated prototypes
      innobase/os/os0file.c:
        Added comment for line that could be removed
      innobase/srv/srv0srv.c:
        Added comment for line that could be removed
      innobase/srv/srv0start.c:
        Added comment for line that could be removed
      innobase/trx/trx0sys.c:
        Added cast to remove compiler warning
      isam/isamchk.c:
        Fixed compiler warning
      libmysql/conf_to_src.c:
        Include files in proper order
      myisam/mi_check.c:
        Removed else part that caused compiler warning
      myisam/mi_delete.c:
        Added cast
      myisam/mi_page.c:
        Added cast
      myisam/mi_preload.c:
        Added cast
      myisam/mi_write.c:
        Added cast
      myisam/myisampack.c:
        changed 'byte' to 'current_byte' to avoid compiler warnings
      mysql-test/mysql-test-run.sh:
        Removed start-from as test '<' is not portable and this can easily be done from command line
      mysys/hash.c:
        Added cast
      mysys/mf_wcomp.c:
        Removed not reached line
      mysys/my_append.c:
        Fixed include file order to get this more portable
      mysys/my_copy.c:
        Fixed include file order to get this more portable
      mysys/my_redel.c:
        Fixed include file order to get this more portable
      sql-common/client.c:
        More DBUG_PRINT
      sql-common/pack.c:
        Added casts becasue Fortre compiler apparently compares (ulonglong) < (longlong) as signed
      sql/ha_heap.cc:
        Changed variable names to not cause hidden variables
      sql/ha_innodb.cc:
        Changed variable names to not cause hidden variables
      sql/item.cc:
        Changed variable names to not cause hidden variables
      sql/item.h:
        Changed variable names to not cause hidden variables
      sql/item_cmpfunc.h:
        Changed variable names to not cause hidden variables
      sql/item_func.cc:
        Changed variable names to not cause hidden variables
      sql/item_subselect.cc:
        Changed variable names to not cause hidden variables
      sql/item_subselect.h:
        Changed variable names to not cause hidden variables
      sql/item_sum.cc:
        Changed variable names to not cause hidden variables
      sql/item_timefunc.cc:
        Changed variable names to not cause hidden variables
      sql/log.cc:
        Changed variable names to not cause hidden variables
      sql/protocol.cc:
        Changed variable names to not cause hidden variables
      sql/protocol.h:
        Changed variable names to not cause hidden variables
        Remove function not declared in protocol.cc
      sql/protocol_cursor.cc:
        Changed variable names to not cause hidden variables
      sql/set_var.cc:
        Added a lot of 'version_xxx' strings
        Changed 'bdb_version' to 'version_bdb'
      sql/sql_class.cc:
        Changed variable names to not cause hidden variables
        Add TMP_TABLE_PARAM::init() to allow one to initialize structure several times
      sql/sql_class.h:
        Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
      sql/sql_derived.cc:
        Avoid copying TMP_TABLE_PARAM (Use class version instead)
      sql/sql_error.cc:
        More DBUG
      sql/sql_help.cc:
        Fixed compiler warning
      sql/sql_lex.cc:
        Changed variable names to not cause hidden variables
      sql/sql_list.h:
        Changed variable names to not cause hidden variables
      sql/sql_parse.cc:
        Changed variable names to not cause hidden variables
      sql/sql_select.cc:
        Changed variable names to not cause hidden variables
        Ensure that you don't send NULL to printf() for %s
        Fixed problem with printing sub selects to debug log
      sql/sql_select.h:
        Changed variable names to not cause hidden variables
      sql/sql_union.cc:
        Changed variable names to not cause hidden variables
        Don't use local copy of TMP_TABLE_PARAM (Caused core dump on Solaris)
      sql/sql_update.cc:
        Indentation cleanup
      sql/sql_yacc.yy:
        Remove warning
      strings/conf_to_src.c:
        Fixed include file order
      76bf7d22
    • unknown's avatar
      BK automerge tends to eat break; statements · a723514b
      unknown authored
      a723514b