1. 12 Feb, 2005 1 commit
  2. 10 Feb, 2005 4 commits
    • unknown's avatar
      Things missing in last changset · 4adab48b
      unknown authored
      After merge fixes
      Don't give duplicate warnings for some ::store() functions
      
      
      mysql-test/mysql-test-run.sh:
        Added back missing line
      mysql-test/r/ps_2myisam.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_3innodb.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_4heap.result:
        Update results after removing duplicate warnings from ::store()
      mysql-test/r/ps_5merge.result:
        Update results after removing duplicate warnings from ::store()
      sql/field.cc:
        Don't give duplicate warnings for some ::store() functions
        Before we could get different number of warnings in the test suite for different platforms
      sql/field.h:
        Update results after removing duplicate warnings from ::store()
      sql/sql_class.h:
        Update results after removing duplicate warnings from ::store()
      sql/sql_error.cc:
        Update results after removing duplicate warnings from ::store()
      sql/sql_list.h:
        After merge fix
      4adab48b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2d435c8a
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      2d435c8a
    • unknown's avatar
      Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc. · 7684e100
      unknown authored
      
      sql/sql_parse.cc:
        Added missing #ifdef HAVE_INNOBASE_DB:s.
      7684e100
    • unknown's avatar
      Merge with 4.1 · 9f04f9d0
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      client/mysqltest.c:
        Auto merged
      extra/my_print_defaults.c:
        Auto merged
      extra/perror.c:
        Auto merged
      extra/resolve_stack_dump.c:
        Auto merged
      include/help_end.h:
        Auto merged
      include/help_start.h:
        Auto merged
      myisam/myisamlog.c:
        Auto merged
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/heap_hash.result:
        Auto merged
      BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      ndb/src/kernel/vm/FastScheduler.cpp:
        Auto merged
      netware/mysql_test_run.c:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      netware/BUILD/nwbootstrap:
        merge: keep local
      scripts/make_binary_distribution.sh:
        merge: keep local
      sql/ha_heap.cc:
        Trivial merge
      sql/ha_innodb.cc:
        Auto merge (Code already existed in 5.0)
      sql/item_cmpfunc.cc:
        Simple merge
      sql/item_func.cc:
        Simple merge
      sql/item_row.cc:
        Simple merge
      sql/item_strfunc.cc:
        Simple merge
      sql/item_subselect.cc:
        Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed
      9f04f9d0
  3. 09 Feb, 2005 29 commits
  4. 08 Feb, 2005 6 commits
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · f4eef98e
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.clean
      
      
      mysql-test/r/view.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      f4eef98e
    • unknown's avatar
      Precision Math implementation · 91db48e3
      unknown authored
      
      BitKeeper/etc/ignore:
        Added client/decimal.c client/my_decimal.cc client/my_decimal.h to the ignore list
      91db48e3
    • unknown's avatar
      Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table · 37e2873f
      unknown authored
      
      mysql-test/r/heap_hash.result:
        Testcase for BUG#8371: wrong rec_per_key value for hash index on temporary table
      mysql-test/t/heap_hash.test:
        Testcase for BUG#8371: wrong rec_per_key value for hash index on temporary table
      sql/ha_heap.cc:
        Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table:
        Don't assume that table->rec_per_key==NULL if table->tmp_table != NO_TMP_TABLE, 
        this is not true for tables created with "CREATE TEMPORARY TABLE" (while it holds
        for temporary tables created during query execution)
      sql/sql_select.cc:
        Initialize rec_per_key for all keys in temporary table.
      37e2873f
    • unknown's avatar
      WL#2130: Table locking for stored FUNCTIONs · 3f249321
      unknown authored
      Collect all tables and SPs refered by a statement, and open all tables
      with an implicit LOCK TABLES. Do find things refered by triggers and views,
      we open them first (and then repeat this until nothing new is found), before
      doing the actual lock tables.
      
      
      mysql-test/r/information_schema.result:
        Updated result for WL#2130.
      mysql-test/r/lock.result:
        Updated result for WL#2130.
      mysql-test/r/sp-error.result:
        Updated result for WL#2130.
      mysql-test/r/sp.result:
        Updated result for WL#2130.
      mysql-test/r/view.result:
        Updated result for WL#2130.
      mysql-test/t/information_schema.test:
        Disabled one test case due to a bug involving LOCK TABLES,
        which shows up with WL#2130.
      mysql-test/t/lock.test:
        New error message with WL#2130. This change is under debate and might change
        in the future, but will do for now.
      mysql-test/t/sp-error.test:
        Updated for WL#2130. Some tests are voided when table access does work from
        functions.
      mysql-test/t/sp.test:
        Updated for WL#2130.
      mysql-test/t/view.test:
        Updated for WL#2130.
      sql/item_func.cc:
        We now have to set net.no_send_ok for functions too, with WL#2130.
      sql/share/errmsg.txt:
        Reused an error code since the old use was voided by WL#2130, but a new
        one was needed instead (similar, but more specific restriction).
      sql/sp.cc:
        Fixed error handling and collection of used tables for WL#2130.
      sql/sp.h:
        Fixed error handling and collection of used tables for WL#2130.
      sql/sp_head.cc:
        Added support functions for collecting and merging hash tables and lists
        of used tables from SPs and substatements, for WL#2130.
      sql/sp_head.h:
        Added support functions for collecting and merging hash tables and lists
        of used tables from SPs and substatements, for WL#2130.
      sql/sql_base.cc:
        Changed the way table->query_id is tested and set during with locked tables
        in effect. This makes some SP test cases work with WL#2130, but has a side
        effect on some error cases with explicit LOCK TABLES. It's still debated if
        this is the correct way, so it might change.
      sql/sql_class.h:
        Added flags for circumventing some interference between WL#2130 and mysql_make_view().
      sql/sql_derived.cc:
        Added some missing initializations. (Potential bugs.)
      sql/sql_lex.cc:
        Clear the new hash tables for WL#2130.
      sql/sql_lex.h:
        Added hash tables for procedures and tables too (as for functions), for WL#2130.
      sql/sql_parse.cc:
        WL#2130: Make table accesses from stored functions work by adding an implicit
        LOCK TABLES around (most) executed statements. To do this, we have to go through
        a loop where we collect all SPs and tables in mysql_execute_statement.
      sql/sql_prepare.cc:
        Cache both functions and procedures for WL#2130.
      sql/sql_show.cc:
        Added some missing initializations. (Potential bugs.)
      sql/sql_view.cc:
        Shortcut mysql_make_view() if thd->shortcut_make_view is true during
        the pre-open phase for collecting tables in WL#2130. Otherwise, the
        similar mechanism here causes interference.
      sql/sql_yacc.yy:
        For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
      3f249321
    • unknown's avatar
      Applied a patch for Netware. · ffe417fd
      unknown authored
      ffe417fd
    • unknown's avatar
      Merge mysql.com:/home/wax/mysql/mysql-4.1 · 30e89d0a
      unknown authored
      into mysql.com:/home/wax/mysql/mysql-4.1test2
      
      
      30e89d0a