1. 20 Jul, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-11954 · fd8952b0
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      fd8952b0
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-5906 · baad44b9
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      sql/field.cc:
        Auto merged
      mysql-test/r/strict.result:
        Resolve conflict
      mysql-test/t/strict.test:
        Resolve conflict
      baad44b9
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-11822 · 8e845dba
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/sql_parse.cc:
        Auto merged
      8e845dba
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 53e59866
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      53e59866
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 038631da
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-11760
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      038631da
    • unknown's avatar
      Fix bug #11760 Typo in Item_func_add_time::print() results in NULLs returned · c816f297
      unknown authored
      by subtime() in view
      
      Item_func_add_time::print() were printing arg[0] instead of arg[1] which
      results in wrongly created view. Functions addtime() and subtime were
      affected by this bug.
      
      
      sql/item_timefunc.cc:
        Fix bug #11760 Typo in Item_func_add_time::print() results in wrongly created view
      mysql-test/t/view.test:
        Test case for bug #11760  Typo in Item_func_add_time::print() results in wrongly created view
      mysql-test/r/view.result:
        Test case for bug #11760  Typo in Item_func_add_time::print() results in wrongly created view
      mysql-test/r/date_formats.result:
        Fixed wrong test result. Affected by bug#11760
      c816f297
  2. 19 Jul, 2005 34 commits
    • unknown's avatar
      Cleanups after merge from 4.1. · ccc3052d
      unknown authored
      
      mysql-test/r/ps_1general.result:
        Update results
      mysql-test/r/ps_2myisam.result:
        Update results
      mysql-test/r/ps_3innodb.result:
        Update results
      mysql-test/r/ps_4heap.result:
        Update results
      mysql-test/r/ps_5merge.result:
        Update results
      mysql-test/r/ps_6bdb.result:
        Update results
      mysql-test/r/ps_7ndb.result:
        Update results
      mysql-test/r/select.result:
        Update results
      mysql-test/t/disabled.def:
        Disable ndb_condition_pushdown test
      mysql-test/t/select.test:
        Fix bad merge
      sql/field_conv.cc:
        Update name of warning message
      sql/mysqld.cc:
        Set proper thd->killed
      tests/mysql_client_test.c:
        Update test cases, change verify_prepared_field() help function
        so it is passed the filename and line from where it is called
        and includes that in the error message.
      ccc3052d
    • unknown's avatar
      Fix a compilation failure. · 9142113c
      unknown authored
      9142113c
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 29654f69
      unknown authored
      into  mysql.com:/data0/emurphy/src/mysql-5.0
      
      
      29654f69
    • unknown's avatar
      ha_ndbcluster.cc: · 217f9fa1
      unknown authored
        BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT
      
      
      sql/ha_ndbcluster.cc:
        BUG#12040 Fixed compile failure by using %p instead of %x to print a pointer in DBUG_PRINT
      217f9fa1
    • unknown's avatar
      Ignore mysql-test/var (I'm pushing it for the second time already :(() · a29f6ca1
      unknown authored
      
      BitKeeper/etc/ignore:
        added mysql-test/var
      a29f6ca1
    • unknown's avatar
      .del-var~62c955ccf2da1a21: · dbec94d1
      unknown authored
        Delete: mysql-test/var
      
      
      BitKeeper/deleted/.del-var~62c955ccf2da1a21:
        Delete: mysql-test/var
      dbec94d1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cd4bce02
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.0-10760-new
      
      
      sql/handler.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      cd4bce02
    • unknown's avatar
      A fix and a test case for Bug#10760 and complementary cleanups. · de6f5ae5
      unknown authored
      The idea of the patch
      is that every cursor gets its own lock id for table level locking.
      Thus cursors are protected from updates performed within the same 
      connection. Additionally a list of transient (must be closed at
      commit) cursors is maintained and all transient cursors are closed
      when necessary. Lastly, this patch adds support for deadlock
      timeouts to TLL locking when using cursors.
      + post-review fixes.
      
      
      include/thr_lock.h:
        - add a notion of lock owner to table level locking. When using
          cursors, lock owner can not be identified by a thread id any more, 
          as we must protect cursors from updates issued within the same 
          connection (thread). So, each cursor has its own lock identifier to 
          use with table level locking.
        - extend return values of thr_lock and thr_multi_lock with
          THR_LOCK_TIMEOUT and THR_LOCK_DEADLOCK, since these conditions
          are now possible (see comments to thr_lock.c)
      mysys/thr_lock.c:
        Better support for cursors:
        - use THR_LOCK_OWNER * as lock identifier, not pthread_t.
        - check and return an error for a trivial deadlock case, when an
          update statement is issued to a table locked by a cursor which has 
          been previously opened in the same connection.
        - add support for locking timeouts: with use of cursors, trivial 
          deadlocks can occur. For now the only remedy is the lock wait timeout,
          which is initialized from a new global variable 'table_lock_wait_timeout'
          Example of a deadlock (assuming the storage engine does not downgrade 
          locks):
          con1: open cursor for select * from t1;
          con2: open cursor for select * from t2;
          con1: update t2 set id=id*2;  -- blocked
          con2: update t1 set id=id*2;  -- deadlock
          Lock timeouts are active only if a connection is using cursors.
        - the check in the wait_for_lock loop has been changed from
          data->cond != cond to data->cond != 0. data->cond is zeroed
          in every place it's changed. 
        - added comments
      sql/examples/ha_archive.cc:
        - extend the handlerton with the info about cursor behaviour at commit.
      sql/examples/ha_archive.h:
        - ctor moved to .cc to make use of archive handlerton
      sql/examples/ha_example.cc:
        - add handlerton instance, init handler::ht with it
      sql/examples/ha_example.h:
        - ctor moved to .cc to make use of ha_example handlerton
      sql/examples/ha_tina.cc:
        - add handlerton instance, init handler::ht with it
      sql/examples/ha_tina.h:
        - ctor moved to .cc to make use of CSV handlerton
      sql/ha_berkeley.cc:
        - init handlerton::flags and handler::ht
      sql/ha_berkeley.h:
        - ctor moved to .cc to make use of BerkeleyDB handlerton
      sql/ha_blackhole.cc:
        - add handlerton instance, init handler::ht with it
      sql/ha_blackhole.h:
        - ctor moved to .cc to make use of blackhole handlerton
      sql/ha_federated.cc:
        - add handlerton instance, init handler::ht with it
      sql/ha_federated.h:
        - ctor moved to .cc to make use of federated handlerton
      sql/ha_heap.cc:
        - add handlerton instance, init handler::ht with it
      sql/ha_heap.h:
        - ctor moved to .cc to make use of ha_heap handlerton
      sql/ha_innodb.cc:
        - init handlerton::flags and handler::ht of innobase storage engine
      sql/ha_innodb.h:
        - ctor moved to .cc to make use of archive handlerton
      sql/ha_myisam.cc:
        - add handlerton instance, init handler::ht with it
      sql/ha_myisam.h:
        - ctor moved to .cc to make use of MyISAM handlerton
      sql/ha_myisammrg.cc:
        - init handler::ht in the ctor
      sql/ha_myisammrg.h:
        - ctor moved to .cc to make use of MyISAM MERGE handlerton
      sql/ha_ndbcluster.cc:
        - init handlerton::flags and handler::ht
      sql/handler.cc:
        - drop support for ISAM storage engine, which was removed from 5.0
        - close all "transient" cursors at COMMIT/ROLLBACK. A "transient"
          SQL level cursor is a cursor that uses tables that have a transaction-
          specific state.
      sql/handler.h:
        - extend struct handlerton with flags, add handlerton *ht to every
          handler instance.
      sql/lock.cc:
        - extend mysql_lock_tables to send error to the client if 
          thr_multi_lock returns a timeout or a deadlock error.
      sql/mysqld.cc:
        - add server option --table_lock_wait_timeout (in seconds)
      sql/set_var.cc:
        - add new global variable 'table_lock_wait_timeout' to specify
        a wait timeout for table-level locks of MySQL (in seconds). The default
        timeout is 50 seconds. The timeout is active only if the connection
        has open cursors.
      sql/sql_class.cc:
        - implement Statement_map::close_transient_cursors
        - safety suggests that we need an assert ensuring 
         llock_info->n_cursors is functioning properly, adjust destruction of
         the Statement_map to allow such assert in THD::~THD
      sql/sql_class.h:
        - add support for Cursors registry to Statement map.
      sql/sql_prepare.cc:
        - maintain a list of cursors that must be closed at commit/rollback.
      sql/sql_select.cc:
        - extend class Cursor to support specific at-COMMIT/ROLLBACK behavior.
        If a cursor uses tables of a storage engine that 
        invalidates all open tables at COMMIT/ROLLBACK, it must be closed
        before COMMIT/ROLLBACK is executed.
      sql/sql_select.h:
        - add an own lock_id and commit/rollback status flag to class Cursor
      tests/mysql_client_test.c:
        A test case for Bug#10760 and complementary issues: test a simple
        deadlock case too.
      mysql-test/var:
        New BitKeeper file ``mysql-test/var''
      de6f5ae5
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · e9c64ae2
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      extra/perror.c:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/src/mgmsrv/main.cpp:
        Auto merged
      sql/des_key_file.cc:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/select.test:
        Resolve conflicts
      scripts/mysqld_safe.sh:
        Resolve conflict
      sql/item.cc:
        Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR
        can be longer in 5.0 than 4.1.
      sql/log_event.cc:
        Resolve conflict
      sql/mysql_priv.h:
        Resolve conflict
      sql/mysqld.cc:
        Remove incorrect fix (merge from 4.1)
      sql/sql_show.cc:
        Resolve conflict
      e9c64ae2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 18552058
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-tn
      
      
      18552058
    • unknown's avatar
      After merge fix. · cbe7fdc9
      unknown authored
      cbe7fdc9
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-7249 · abcd8b03
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      abcd8b03
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a160bc9c
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-tn
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/errmsg.txt:
        Manual merge.
      a160bc9c
    • unknown's avatar
      Fixed some test cases that was not forgotten in a recent patch · 3d5be633
      unknown authored
      
      sql/sql_show.cc:
        Cleanup comment
        Removed extra end space
      3d5be633
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · a4ceba69
      unknown authored
      into  mishka.local:/home/my/mysql-4.1
      
      
      a4ceba69
    • unknown's avatar
      Simple fixes during review of new code · 3a31f7b9
      unknown authored
      
      include/my_global.h:
        Added floatget() to read unaligned flaot
      mysql-test/r/select.result:
        Added test for found_rows()
      mysql-test/t/select.test:
        Added test for found_rows()
      sql/des_key_file.cc:
        Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition
      sql/field_conv.cc:
        Added optimizzed varsion of do_cut_string (for simple character sets)
      sql/item_func.cc:
        Simplify code (and ensure DBUG_ENTER is excuted before main code)
      sql/item_strfunc.cc:
        Safe calculation of max_length
        This was needed as max_length can now be 1<<32-1 (after konstantins recent patch to fix BLOB_LENGTH)
        Remove init_des_key_file() as this is not initialized in mysqld.cc
      sql/item_timefunc.cc:
        Safe calculation of max_length
        This was needed as max_length can now be 1<<32-1 (after konstantins recent patch to fix BLOB_LENGTH)
      sql/log_event.cc:
        Simplify code
      sql/mysql_priv.h:
        Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition
      sql/mysqld.cc:
        Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition
        Revert wrong patch of calling close_connection() in first close_connections() loop. (Bug #7403)
        Instead we now print a warning for closed connections only if mysqld is sarted with --warnings
        Added comments to make the close_connections() logic clearer
      sql/sql_prepare.cc:
        Use floatget() and doubleget() to protect against unaligned data
      sql/sql_select.cc:
        Fixed some cases unlikely cases where found_rows() would return wrong for queries that would return 0 or 1 rows
      3a31f7b9
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-readline · 6ae06030
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      6ae06030
    • unknown's avatar
      Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) · a32bf7fb
      unknown authored
        "Triggers have the wrong namespace"
        "Triggers: duplicate names allowed"
        "Triggers: CREATE TRIGGER does not accept fully qualified names"
        "SHOW TRIGGERS"
      
      
      mysql-test/r/information_schema.result:
        Added tests for new INFORMATION_SCHEMA.TRIGGERS view and SHOW TRIGGERS command.
      mysql-test/r/information_schema_db.result:
        INFORMATION_SCHEMA.TRIGGERS view was added.
      mysql-test/r/rpl_sp.result:
        Now DROP TRIGGER interprets first part of trigger identifier as database
        name and not as table name. Adjusted tests properly.
      mysql-test/r/trigger.result:
        Now DROP TRIGGER interprets first part of trigger identifier as database
        name and not as table name. Adjusted tests properly.
        Added test checking that triggers have database wide namespace.
        Added test for bug #8791 "Triggers: Allowed to create triggers on a subject
        table in a different DB".
      mysql-test/r/view.result:
        Now DROP TRIGGER interprets first part of trigger identifier as database
        name and not as table name. Adjusted tests properly.
      mysql-test/t/information_schema.test:
        Added tests for new INFORMATION_SCHEMA.TRIGGERS view and SHOW TRIGGERS command.
      mysql-test/t/rpl_sp.test:
        Now DROP TRIGGER interprets first part of trigger identifier as database
        name and not as table name. Adjusted tests properly.
      mysql-test/t/trigger.test:
        Now DROP TRIGGER interprets first part of trigger identifier as database
        name and not as table name. Adjusted tests properly.
        Added test checking that triggers have database wide namespace.
        Added test for bug #8791 "Triggers: Allowed to create triggers on a subject
        table in a different DB".
      mysql-test/t/view.test:
        Now DROP TRIGGER interprets first part of trigger identifier as database
        name and not as table name. Adjusted tests properly.
      sql/handler.cc:
        Added .TRN tho the list of known file extensions assoicated with tables.
      sql/item.h:
        trg_action_time_type/trg_event_type enums:
          Added TRG_ACTION_MAX/TRG_EVENT_MAX elements which should be used instead of
          magical values in various loops where we iterate through all types of trigger
          action times or/and trigger event types.
      sql/lex.h:
        Added new symbol "TRIGGERS".
      sql/mysql_priv.h:
        Added declaration of constant holding extension for trigger name (.TRN) files.
      sql/mysqld.cc:
        Added statistical variable for SHOW TRIGGERS command.
      sql/share/errmsg.txt:
        Added error message saying that one attempts to create trigger in wrong schema.
      sql/sp.cc:
        Replaced magical values with TRG_EVENT_MAX/TRG_ACTION_MAX constants.
      sql/sql_base.cc:
        open_unireg_entry():
          Now Table_triggers_list::check_n_load() has one more argument which
          controls whether we should prepare Table_triggers_list with fully functional
          triggers or load only their names.
      sql/sql_lex.h:
        Added element for new SHOW TRIGGERS command to enum_sql_command enum.
      sql/sql_parse.cc:
        prepare_schema_table():
          Added support for SHOW TRIGGERS statement.
      sql/sql_show.cc:
        Added new INFORMATION_SCHEMA.TRIGGERS view and SHOW TRIGGERS command.
      sql/sql_table.cc:
        mysql_rm_table_part2():
          Replaced simple deletion of .TRG file with call to
          Table_triggers_list::drop_all_triggers which will also delete .TRN files
          for all triggers associated with table.
      sql/sql_trigger.cc:
        Now triggers have database wide namespace. To support it we create special .TRN
        file with same name as trigger for each trigger. This file contains name of
        trigger's table so one does not need to specify it explicitly in DROP TRIGGER.
        Moreover DROP TRIGGER treats first part of trigger identifier as database name
        now. Updated mysql_create_or_drop_trigger() routine and
        Table_triggers_list::create_trigger()/drop_trigger()/check_n_load() methods
        accordingly. Added add_table_for_trigger() routine and
        Table_triggers_list::drop_all_triggers() method.
        
        Added Table_triggers_list::get_trigger_info() for obtaining trigger metadata.
      sql/sql_trigger.h:
        Table_triggers_list:
          Use TRG_EVENT_MAX, TRG_ACTION_MAX instead of magic values.
          Added get_trigger_info() method for obtaining trigger's meta-data.
          Added drop_all_triggers() method which drops all triggers for table.
          Added declarations of trg_action_time_type_names/trg_event_type_names
          arrays which hold names of triggers action time types  and event types.
      sql/sql_yacc.yy:
        Changed grammar for CREATE/DROP TRIGGER to support database wide trigger
        namespace. Added new SHOW TRIGGERS statement.
      sql/table.h:
        enum enum_schema_tables:
          Added constant for new INFORMATION_SCHEMA.TRIGGERS view.
      a32bf7fb
    • unknown's avatar
      43a550ae
    • unknown's avatar
      ConfigInfo.cpp: · ac2209a1
      unknown authored
        BUG#12028, cannot use default section for hostname in cluster config
        made clearer error message
      
      
      ndb/src/mgmsrv/ConfigInfo.cpp:
        BUG#12028, cannot use default section for hostname in cluster config
        made clearer error message
      ac2209a1
    • unknown's avatar
      BUG#12028, cannot use default value for HostName in cluster config · 09f19d3b
      unknown authored
      + added switch --print-full-config
      + removed unused REP configuration
      
      
      09f19d3b
    • unknown's avatar
      Bug#10932 - Building server with key limit of 128, makes test cases fail · f1d5c048
      unknown authored
      This patch allows to configure MyISAM for 128 indexes per table.
      The main problem is the key_map, wich is implemented as an ulonglong.
      To get rid of the limit and keep the efficient and flexible
      implementation, the highest bit is now used for all upper keys.
      This means that the lower keys can be disabled and enabled 
      individually as usual and the high keys can only be disabled and
      enabled as a block. That way the existing test suite is still
      applicable, while more keys work, though slightly less efficient.
      To really get more than 64 keys, some defines need to be changed.
      Another patch will address this.
      
      
      include/my_bitmap.h:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Added the declaration for a function that extends the highest bit value
        to all upper bits of a bigger bitmap.
      include/myisam.h:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed MI_MAX_POSSIBLE_KEY to what it was meant for.
        Added a bunch of macros to handle the MyISAM key_map.
      myisam/mi_check.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_create.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_delete.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_extra.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_open.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
        Changed pointer types from signed char* to unsigned char*.
      myisam/mi_preload.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_rsame.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_rsamepos.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_search.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_update.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/mi_write.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/myisamchk.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/myisamdef.h:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed pointer types from signed char* to unsigned char*.
      myisam/myisamlog.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/myisampack.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      myisam/sort.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      mysys/my_bitmap.c:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Added a function that extends the highest bit value
        to all upper bits of a bigger bitmap.
      sql/ha_myisam.cc:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Changed key_map access to use the new macros.
      sql/sql_bitmap.h:
        Bug#10932 - Building server with key limit of 128, makes test cases fail
        Added a method that extends the highest bit value
        to all upper bits of a bigger bitmap.
      f1d5c048
    • unknown's avatar
      perror.c: · a3a9d00b
      unknown authored
        BUG#11999, incorrect --help on perror with ndb
      
      
      extra/perror.c:
        BUG#11999, incorrect --help on perror with ndb
      a3a9d00b
    • unknown's avatar
      Fix for bug#11057 information_schema: columns table has some questionable contents · a2df1eb8
      unknown authored
        fixed BLOB, TEXT(wrong maximum length), BIT and integer types(wrong numeric_precision value)
      
      
      a2df1eb8
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b8497024
      unknown authored
      into mysql.com:/home/gluh/MySQL/Merge/5.0
      
      
      b8497024
    • unknown's avatar
      Bug#11577 'show procedure/function status' doesn't work for user with limited access · 11ff7b16
      unknown authored
         changed 'SHOW PROCEDURE' behavoiur to be like INFORMATION_SCHEMA.routines
      
      
      11ff7b16
    • unknown's avatar
      Remove the ignored files. · 42b35721
      unknown authored
      
      BitKeeper/deleted/.del-mkinstalldirs~6f3fb2535a57b49a:
        Delete: mkinstalldirs
      BitKeeper/deleted/.del-mkinstalldirs~cc63133db18af2f2:
        Delete: innobase/mkinstalldirs
      42b35721
    • unknown's avatar
      Added mkinstalldirs (an auxiliary autotools symlink) to the ignore · ff9be613
      unknown authored
      list.
      
      
      BitKeeper/etc/ignore:
        Added innobase/mkinstalldirs mkinstalldirs to the ignore list
      innobase/mkinstalldirs:
        Ignore
      mkinstalldirs:
        Ignore
      ff9be613
    • unknown's avatar
      Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0 · f97fefa8
      unknown authored
      into  mysql.com:/Users/emurphy/src/work/mysql-5.0-bug11567
      
      
      f97fefa8
    • unknown's avatar
      Fix default for sql_mode so that proc table is actually created · 43ad7dea
      unknown authored
      by mysql-test-run.pl. (Bug #11954)
      
      
      mysql-test/lib/init_db.sql:
        Fix default for sql_mode
      43ad7dea
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · ded99464
      unknown authored
      into  radha.local:/Users/patg/mysql-build/mysql-5.0
      
      
      ded99464
    • unknown's avatar
      Merge mysqldev@production.mysql.com:jimw/mysql-5.0-readline · 1e3be5e9
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-readline
      
      
      1e3be5e9
    • unknown's avatar
      Eric's implentation of OPTIMIZE TABLE and REPAIR TABLE, · f9e4c6e7
      unknown authored
      as well as changes to the test.
      
      
      mysql-test/r/federated.result:
        New test results
      mysql-test/t/federated.test:
        Removed explains per brian's suggestion since on his 64-bit amd, you get 
        different information, something to be ironed out later, as well as it 
        having nothing to do with federated.
      sql/ha_federated.cc:
        - Eric Herman's implementation of repair and optimize!!!
        - Eric's changes to 1EQ0 to FALSE
      sql/ha_federated.h:
        Eric's addition of LEN for each SQL string tokens.
      f9e4c6e7
    • unknown's avatar
      Reimplement use of "config_readline.h" to get readline configuration. · 42d10743
      unknown authored
      
      cmd-line-utils/readline/bind.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/callback.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/compat.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/complete.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/display.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/funmap.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/histexpand.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/histfile.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/history.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/histsearch.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/input.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/isearch.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/keymaps.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/kill.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/macro.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/mbutil.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/misc.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/nls.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/parens.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/readline.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/rltty.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/savestring.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/search.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/shell.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/signals.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/terminal.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/text.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/tilde.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/undo.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/util.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/vi_mode.c:
        Include local config_readline.h instead of config.h
      cmd-line-utils/readline/xmalloc.c:
        Include local config_readline.h instead of config.h
      42d10743