1. 04 Nov, 2004 9 commits
  2. 03 Nov, 2004 13 commits
    • unknown's avatar
      take into accound end \0 in decimal_string_size · e981c836
      unknown authored
      e981c836
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · dccbc690
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
      
      
      mysql-test/r/ndb_blob.result:
        Auto merged
      dccbc690
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0/ · 9aa4871c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      9aa4871c
    • unknown's avatar
      After merge fixes · 3693aa47
      unknown authored
      
      libmysqld/lib_sql.cc:
        After merge fix
      sql/handler.cc:
        Cleanup
      3693aa47
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0/ · e50a3099
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      e50a3099
    • unknown's avatar
      error codes chaged to bitmap (for easier testing with masks) · c41f992d
      unknown authored
      two more round() modes - CEILING and FLOOR
      
      
      c41f992d
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4fb5d78d
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_yacc.yy:
        Auto merged
      4fb5d78d
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2c856fa5
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
      
      
      2c856fa5
    • unknown's avatar
      Various syntax fixes in sql/sql_yacc.yy for stored procedures: · ebbe5e39
      unknown authored
        - No RESTICT|CASCADE in DROP SP (since it's not implemented)
        - Added optional "noise" to FETCH: [[NEXT] FROM]
        - At least one statement required in all block constructs except BEGIN-END
          (where zero is allowed)
      
      
      mysql-test/r/sp.result:
        Modified test cases for optional [[NEXT] FROM] in FETCH.
      mysql-test/t/sp.test:
        Modified test cases for optional [[NEXT] FROM] in FETCH.
      sql/sql_yacc.yy:
        Various syntax fixes for stored procedures:
          - No RESTICT|CASCADE in DROP SP (since it's not implemented)
          - Added optional "noise" to FETCH: [[NEXT] FROM]
          - At least one statement required in all block constructs except BEGIN-END
            (where zero is allowed)
      ebbe5e39
    • unknown's avatar
      Merge on pull · 614cda69
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/grant2.result:
        Auto merged
      mysql-test/r/sql_mode.result:
        Auto merged
      mysql-test/t/grant2.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      614cda69
    • unknown's avatar
      Fixes after merge with 4.1 · f5a47f15
      unknown authored
      FOUND is not a reserved keyword anymore
      Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
      Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
      Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
      
      
      BUILD/SETUP.sh:
        Portability fix
      client/mysqltest.c:
        Portability fix
      mysql-test/r/drop.result:
        updated results
      mysql-test/r/func_str.result:
        New warnings (after merge)
      mysql-test/r/insert.result:
        Updated tests
      mysql-test/r/join_nested.result:
        Updated results (because of new column types in 5.0)
      mysql-test/r/lock_multi.result:
        Temporarly wrong results until Sanja fixes multi-update-lock in 5.0
      mysql-test/r/multi_update.result:
        Temporary fix until Sanja fixes multi-update locking
      mysql-test/r/ps_1general.result:
        Update of results after merge
      mysql-test/r/ps_2myisam.result:
        Update of results after merge
      mysql-test/r/ps_3innodb.result:
        Update of results after merge
      mysql-test/r/ps_4heap.result:
        Update of results after merge
      mysql-test/r/ps_5merge.result:
        Update of results after merge
      mysql-test/r/ps_6bdb.result:
        Update of results after merge
      mysql-test/r/query_cache.result:
        Update of results after merge
      mysql-test/r/range.result:
        New results for new tests
      mysql-test/r/rpl_auto_increment.result:
        Update with new 4.0 information
      mysql-test/r/rpl_charset.result:
        After merge fixes
      mysql-test/r/subselect.result:
        After merge fixes
      mysql-test/r/view.result:
        Temporary fix until multi-update-locking is fixed
      mysql-test/t/drop.test:
        Safety fix
      mysql-test/t/multi_update.test:
        Temporary fix until multi-update-locking is fixed
      mysql-test/t/rpl_charset.test:
        More comments
      mysql-test/t/sp-error.test:
        Updated comments
      mysql-test/t/view.test:
        Temporary fix until multi-update-locking is fixed
      scripts/mysql_fix_privilege_tables.sh:
        Better error message
      sql-common/client.c:
        More debugging
      sql/ha_ndbcluster.cc:
        After merge fixes
      sql/handler.cc:
        After merge fixes
      sql/item.cc:
        Simple optimization of creating item
        After merge fixed
        Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
        The problem is that if you compare a string field to a binary string, you can't replace the field with a string constant as the binary comparison may then fail (The original field value may be in a different case)
      sql/item.h:
        Added Item::set_no_const_sub() to be able to mark fields that can't be substituted
      sql/item_cmpfunc.cc:
        Mark fields compared as binary to not be substituted.
      sql/item_func.cc:
        After merge fix
      sql/log_event.cc:
        After merge fix
      sql/mysql_priv.h:
        After merge fix
      sql/opt_range.cc:
        After merge fix
      sql/protocol.cc:
        Made flags uint instead of int (as it's used as a bit mask)
      sql/protocol.h:
        Made flags uint instead of int (as it's used as a bit mask)
      sql/protocol_cursor.cc:
        Made flags uint instead of int (as it's used as a bit mask)
        Indentation cleanups
      sql/sp.cc:
        After merge fixes
        Removed compiler warnings
      sql/sp_head.cc:
        After merge fixes
      sql/sql_base.cc:
        After merge fixes
        Removed 'send_error' from 'insert_fields()' as the error is sent higher up
      sql/sql_class.cc:
        Give assert if set_n_backup_item_arena is used twice
      sql/sql_class.h:
        Give assert if set_n_backup_item_arena is used twice
        After merge fixes
        Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
      sql/sql_handler.cc:
        After merge fixes
      sql/sql_parse.cc:
        After merge fixes
      sql/sql_prepare.cc:
        After merge fixes
      sql/sql_select.cc:
        After merge fixes
        Moved 'build_equal_items' to optimize_cond() (logical place)
      sql/sql_table.cc:
        After merge fixes
      sql/sql_trigger.cc:
        After merge fixes
      sql/sql_update.cc:
        After merge fixes
        (This should be fixed by Sanja to have lower granuality locking of tables in multi-update)
      sql/sql_view.cc:
        After merge fixes
      sql/sql_yacc.yy:
        After merge fixes
        Don't have FOUND as a reserved keyword
      f5a47f15
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · fbb2b237
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
      
      
      fbb2b237
    • unknown's avatar
      Merge bk://mysql.bkbits.net/mysql-5.0 · 2bc842a4
      unknown authored
      into avenger.(none):/export/brian/mysql/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      configure.in:
        Auto merged
      2bc842a4
  3. 02 Nov, 2004 8 commits
  4. 01 Nov, 2004 7 commits
  5. 31 Oct, 2004 3 commits