1. 31 Dec, 2004 14 commits
    • unknown's avatar
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ead0873
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-1339
      
      
      4ead0873
    • unknown's avatar
      Merge mysql.com:/dbdata/psergey/mysql-5.0-bug7264 · 21189edb
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
      
      
      21189edb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7979cbd3
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      7979cbd3
    • unknown's avatar
      Fix max_key_length and max_unique_length to take into account varchar and null extra lengths · 7ea744f7
      unknown authored
      This fixes a bug found by bdb.test
      Fixes a portability issue with bdb tables
      
      
      mysql-test/include/varchar.inc:
        Fix test to be reproducable
        (Either key v or v_2 could be used here)
      mysql-test/r/bdb.result:
        Fix test to be reproducable
        (Either key v or v_2 could be used here)
      mysql-test/r/myisam.result:
        Fix test to be reproducable
        (Either key v or v_2 could be used here)
      sql/table.cc:
        Fix max_key_length and max_unique_length to take into account varchar and null extra lengths
        This fixes a bug found by bdb.test
      7ea744f7
    • unknown's avatar
      Manual merge. · efe5d60e
      unknown authored
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      efe5d60e
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 15f84399
      unknown authored
      into mysql.com:/Users/mikron/mysql-5.0
      
      
      ndb/src/kernel/blocks/suma/Suma.cpp:
        Auto merged
      15f84399
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · f43d5367
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      f43d5367
    • unknown's avatar
      merge · d8526230
      unknown authored
      d8526230
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · c4c2c7bc
      unknown authored
      into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      innobase/srv/srv0srv.c:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      c4c2c7bc
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5df5f5c1
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      ndb/src/common/util/Makefile.am:
        Auto merged
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      ndb/src/kernel/blocks/backup/Backup.hpp:
        Auto merged
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      ndb/src/ndbapi/NdbDictionary.cpp:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      ndb/src/ndbapi/TransporterFacade.cpp:
        Auto merged
      ndb/src/ndbapi/TransporterFacade.hpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      ndb/test/ndbapi/Makefile.am:
        Auto merged
      ndb/test/tools/Makefile.am:
        Auto merged
      ndb/tools/restore/restore_main.cpp:
        Auto merged
      5df5f5c1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ee4c9104
      unknown authored
      into mysql.com:/home/my/mysql-merge
      
      
      ee4c9104
    • unknown's avatar
      After merge fixes · 45199f54
      unknown authored
      Cleanup of mi_print_error() handling
      Deleted 'merge' directory
      
      
      BitKeeper/deleted/.del-mrg_close.c~1fa9230422daa62a:
        Delete: merge/mrg_close.c
      BitKeeper/deleted/.del-mrg_create.c~b747c8ec2b801f6:
        Delete: merge/mrg_create.c
      BitKeeper/deleted/.del-mrg_delete.c~38b4156885bb4537:
        Delete: merge/mrg_delete.c
      BitKeeper/deleted/.del-mrg_extra.c~7eb6181e1761907e:
        Delete: merge/mrg_extra.c
      BitKeeper/deleted/.del-mrg_info.c~37728e7238cc5a11:
        Delete: merge/mrg_info.c
      BitKeeper/deleted/.del-mrg_locking.c~112756a2d581e1d0:
        Delete: merge/mrg_locking.c
      BitKeeper/deleted/.del-mrg_open.c~6e1d5c8bfa62a519:
        Delete: merge/mrg_open.c
      BitKeeper/deleted/.del-mrg_panic.c~e204e43cd6d55406:
        Delete: merge/mrg_panic.c
      BitKeeper/deleted/.del-mrg_rrnd.c~6087c3dd7ecb77:
        Delete: merge/mrg_rrnd.c
      BitKeeper/deleted/.del-mrg_rsame.c~3e8ed4be2a0952b1:
        Delete: merge/mrg_rsame.c
      BitKeeper/deleted/.del-mrg_static.c~75a4b78a165dbd0:
        Delete: merge/mrg_static.c
      BitKeeper/deleted/.del-mrg_update.c~4110a4f1fbf1ab45:
        Delete: merge/mrg_update.c
      BitKeeper/deleted/.del-Makefile.am~41238af048e60515:
        Delete: merge/Makefile.am
      BitKeeper/deleted/.del-make-ccc~4f1acbfc127e25d5:
        Delete: merge/make-ccc
      BitKeeper/deleted/.del-mrg_def.h~a10557d12a87ef1c:
        Delete: merge/mrg_def.h
      BitKeeper/deleted/.del-.cvsignore~2f287ba794db3da7:
        Delete: merge/.cvsignore
      include/myisam.h:
        Added 'share' to st_mi_keydef' to not have to pass 'st_myisam_info' to functions
      myisam/ft_static.c:
        Removed compiler warning
      myisam/mi_delete.c:
        Cleanup of mi_print_error() handling
        Break if get_key() return 0
        Don't test for HA_ERR_CRASHED; Print errors when my_errno is set
      myisam/mi_extra.c:
        Cleanup of mi_print_error() handling
      myisam/mi_key.c:
        Cleanup of mi_print_error() handling
      myisam/mi_keycache.c:
        Cleanup of mi_print_error() handling
      myisam/mi_locking.c:
        Cleanup of mi_print_error() handling
      myisam/mi_open.c:
        Added 'my_isam_share' to MI_KEYDEF
      myisam/mi_page.c:
        Cleanup of mi_print_error() handling
      myisam/mi_range.c:
        get_key() calls mi_print_error() if needed
      myisam/mi_rkey.c:
        Cleanup of mi_print_error() handling
      myisam/mi_search.c:
        Cleanup of mi_print_error() handling
        Break if get_key() return 0
        Don't test for HA_ERR_CRASHED; Print errors when my_errno is set
      myisam/mi_update.c:
        Cleanup of mi_print_error() handling
      myisam/mi_write.c:
        Cleanup of mi_print_error() handling
        Break if get_key() return 0
        Don't test for HA_ERR_CRASHED; Print errors when my_errno is set
      myisam/myisamdef.h:
        Cleanup of mi_print_error() handling
      mysql-test/r/grant.result:
        Update results after merge
      mysql-test/r/timezone2.result:
        Update results after merge
      mysql-test/t/grant.test:
        New error numbers
      mysql-test/t/timezone2.test:
        New error numbers
      sql/item_func.cc:
        Remove duplicate include file
      sql/sql_acl.cc:
        Remove warnings from valgrind
      sql/tztime.cc:
        Print wrong timezone names to log
      45199f54
    • unknown's avatar
      Bug #7593 · 11b1f49f
      unknown authored
      Caused a hard limit of 64 unique indexes in cluster
      
      
      11b1f49f
  2. 30 Dec, 2004 12 commits
    • unknown's avatar
      page0page.c: · 8736181d
      unknown authored
        page_dir_find_owner_slot(): Fix bug in corruption diagnostics.
      
      
      innobase/page/page0page.c:
        page_dir_find_owner_slot(): Fix bug in corruption diagnostics.
      8736181d
    • unknown's avatar
      Merge with global tree · 12a215b0
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysqltest.c:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/include/dict0dict.h:
        Auto merged
      libmysql/errmsg.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      myisam/mi_write.c:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/t/derived.test:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      mysql-test/t/system_mysql_db_fix.test:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      sql/tztime.h:
        Auto merged
      12a215b0
    • unknown's avatar
      row0upd.c: · 9e8f628d
      unknown authored
        row_upd_clust_rec(): Call btr_cur_get_rec() after
        btr_pcur_restore_position(), not before.  (Bug #7598)
      
      
      innobase/row/row0upd.c:
        row_upd_clust_rec(): Call btr_cur_get_rec() after
        btr_pcur_restore_position(), not before.
      9e8f628d
    • unknown's avatar
      After merge fixes · 2e8d13c7
      unknown authored
      
      config/ac-macros/character_sets.m4:
        Added latin1_spanish_ci
      dbug/dbug_analyze.c:
        Remove compiler warnings
      include/my_handler.h:
        Reorder structure arguments to be more optimal
      innobase/dict/dict0load.c:
        Fixed wrong define tag (for MySQL 5.0)
      innobase/fil/fil0fil.c:
        Fixed compiler warning
      innobase/os/os0file.c:
        Fixed compiler warning
      myisam/ft_boolean_search.c:
        Fixed compiler warning
      myisam/ft_static.c:
        Update to use new HA_KEYSEG structure
      myisam/mi_open.c:
        Simple optimization
      myisammrg/myrg_static.c:
        Removed compiler warning
      mysql-test/r/grant.result:
        Update results after merge
      mysql-test/r/index_merge.result:
        Update results after merge
      mysql-test/r/information_schema_inno.result:
        Add missing drop table
      mysql-test/r/lowercase_table.result:
        safety fix
      mysql-test/r/multi_update.result:
        safety fix
      mysql-test/r/ps_1general.result:
        safety fix
      mysql-test/r/ps_2myisam.result:
        Update results after merge
        (set is not anymore of binary type)
      mysql-test/r/ps_3innodb.result:
        Update results after merge
      mysql-test/r/ps_4heap.result:
        Update results after merge
      mysql-test/r/ps_5merge.result:
        Update results after merge
      mysql-test/r/ps_6bdb.result:
        Update results after merge
      mysql-test/r/show_check.result:
        Update results after merge
      mysql-test/r/subselect.result:
        Update results after merge
        (added missing quotes)
      mysql-test/r/timezone2.result:
        Update results after merge
      mysql-test/r/view.result:
        Update results after merge
        (note that INSERT IGNORE will work again after next merge from 4.1)
      mysql-test/t/derived.test:
        Removed empty line
      mysql-test/t/grant.test:
        Update results after merge
      mysql-test/t/information_schema_inno.test:
        added missing drop table
      mysql-test/t/lowercase_table.test:
        safety fix
      mysql-test/t/multi_update.test:
        safety fix
      mysql-test/t/ps_1general.test:
        safety fix
      mysql-test/t/view.test:
        update error codes after merge
      ndb/src/mgmsrv/main.cpp:
        after merge fix
      ndb/tools/ndb_test_platform.cpp:
        removed compiler warnings
      regex/main.c:
        remove compiler warnings
      sql/field.cc:
        Remove compiler warning
      sql/gen_lex_hash.cc:
        Added DBUG support
      sql/ha_myisam.cc:
        Removed warning from valgrind
      sql/ha_ndbcluster.cc:
        Remove compiler warning
      sql/item_cmpfunc.cc:
        Better to use val_int() instead of val_real() as we don't want Item_func_nop_all to return different value than the original ref element
      sql/mysqld.cc:
        Remove compiler warning
      sql/sql_acl.cc:
        More debugging
      sql/sql_lex.cc:
        Remove unnecessary 'else'
      sql/sql_parse.cc:
        After merge fixes
        Simplify reset of thd->server_status for SQLCOM_CALL
      sql/sql_prepare.cc:
        After merge fixes
        Removed possible core dump in mysql_stmt_fetch()
      sql/sql_update.cc:
        After merge fixes (together with Sanja)
      strings/ctype-czech.c:
        Remove compiler warning
      strings/ctype-ucs2.c:
        Remove compiler warning
      strings/ctype-win1250ch.c:
        Remove compiler warning
      strings/xml.c:
        Remove compiler warning
      tests/client_test.c:
        Fix test to work with 5.0
      vio/test-sslserver.c:
        Portability fix
      2e8d13c7
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · cdf70f2e
      unknown authored
      into hundin.mysql.fi:/home/marko/j/mysql-5.0
      
      
      cdf70f2e
    • unknown's avatar
      InnoDB: Remove crash in in-place update from NULL to non-NULL. (Bug #7591) · c6d329b4
      unknown authored
      rem0rec.c:
        rec_init_offsets(): Make the function comment more accurate.
      rem0rec.ic:
        rec_get_nth_field(): Return pointer to the field, even to NULL fields.
        rec_set_nth_field(): Make more accurate debug assertions.
      
      
      innobase/include/rem0rec.ic:
        rec_get_nth_field(): Return pointer to the field, even to NULL fields.
        rec_set_nth_field(): Make more accurate debug assertions.
      innobase/rem/rem0rec.c:
        rec_init_offsets(): Make the function comment more accurate.
      c6d329b4
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0c0d8cfd
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      0c0d8cfd
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c1b5d272
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      c1b5d272
    • unknown's avatar
      Merge from 4.1: fix for bug #7285 (embedded server) · fe5e1699
      unknown authored
      
      libmysql/libmysql.c:
        Merge from 4.1: fix for bug #7285
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      fe5e1699
    • unknown's avatar
    • unknown's avatar
      wl#1629 SHOW with WHERE(final part, after review) · 525242d3
      unknown authored
        added syntax:
        'show variables where', 'show status where', 'show open tables where'
      
      
      mysql-test/r/grant_cache.result:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/r/information_schema.result:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/r/query_cache.result:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/r/temp_table.result:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/r/union.result:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/t/information_schema.test:
        wl#1629 SHOW with WHERE(final part,after review)
      mysql-test/t/query_cache.test:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/item.cc:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/mysql_priv.h:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/sql_parse.cc:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/sql_select.cc:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/sql_show.cc:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/sql_yacc.yy:
        wl#1629 SHOW with WHERE(final part,after review)
      sql/table.h:
        wl#1629 SHOW with WHERE(final part,after review)
      525242d3
    • unknown's avatar
      Fix for BUG#7264: Change the test so optimizer doesn't have to make choice... · 61797567
      unknown authored
      Fix for BUG#7264: Change the test so optimizer doesn't have to make choice between two with [nearly] identical
      costs.
      
      
      
      61797567
  3. 29 Dec, 2004 6 commits
    • unknown's avatar
      InnoDB: fix bug in insert buffer merge of prefix columns in · 499deb9c
      unknown authored
      new-style InnoDB tables. (Bug #7578)
      
      
      innobase/ibuf/ibuf0ibuf.c:
        ibuf_dummy_index_add_col(): Add parameter "len"
      499deb9c
    • unknown's avatar
      WL#1339. More post-merge fixes. · 23517e16
      unknown authored
      Updated test results after adding max_user_connections column
      to mysql.user table.
      
      
      mysql-test/r/grant.result:
        Updated test results after adding max_user_connections column
        to mysql.user table.
      mysql-test/r/information_schema.result:
        Updated test results after adding max_user_connections column
        to mysql.user table.
      23517e16
    • unknown's avatar
      Manual merge of patch implementing WL#1339 with main tree. · f174d5a2
      unknown authored
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/system_mysql_db.result:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/structs.h:
        Auto merged
      mysql-test/r/grant.result:
        Manual merge
      scripts/mysql_create_system_tables.sh:
        Manual merge
      scripts/mysql_fix_privilege_tables.sql:
        Manual merge
      sql/mysql_priv.h:
        Manual merge
      sql/mysqld.cc:
        Manual merge
      sql/sql_parse.cc:
        Manual merge
      f174d5a2
    • unknown's avatar
      WL#1339 "Add per account max_user_connections limit (maximum number · 05b709fc
      unknown authored
      of concurrent connections for the same account)"
      
      Added support of account specific max_user_connections limit. Made all
      user limits to be counted per account instead of the old behavior,
      which was per user/host accounting. Added option which enables the old
      behavior. Added testing of these to the test suite.
      
      (After review version).
      
      
      client/mysqltest.c:
        Extended mysqltest to be able to handle connect() statements for which
        error is expected.
        
        - Added replace_dynstr_append() utility function.
        - added connect_n_handle_errors() function which connects with server
          without retries and handles errors as if "connect" was usual
          statement.
        - do_connect(): added ability to handle connects which are expected
          to return an error.
        - run_query_normal(): Moved all expected-error-handling code to separate
          normal_handle_error()/normal_handle_no_error() functions to be able
          to reuse them in connect_n_handle_errors().
      mysql-test/r/grant.result:
        Fixed test results since one more column to mysql.user was added.
      mysql-test/r/system_mysql_db.result:
        Fixed test results since one more column to mysql.user was added.
      scripts/mysql_create_system_tables.sh:
        Added max_user_connections column to mysql.user table for storing
        new maximal concurrent connections per account limit.
      scripts/mysql_fix_privilege_tables.sql:
        Added max_user_connections column to mysql.user table for storing
        new maximal concurrent connections per account limit.
      sql/lex.h:
        Added MAX_USER_CONNECTIONS symbol used for specifying
        maximum number of concurrent connections per account.
      sql/mysql_priv.h:
        Added declaration of opt_old_style_user_limits variable which is defined
        in sql/mysqld.cc used in sql/sql_parse.cc.
      sql/mysqld.cc:
        Added "old-style-user-limits" option which forces user limits to behave
        in old way i.e. to be counted per user/host pair instead of per account.
        Added comment describing mqh_used variable.
      sql/set_var.cc:
        Added sys_var_max_user_conn class which implements support for the new 
        behavior of max_user_connections variable. Now the global instance of
        this variable holds default maximum number of concurrent connections per
        account (as it was before) and the session instance gives read-only
        access to account-specific version of this limit.
      sql/set_var.h:
        Added sys_var_max_user_conn class which implements support for the new 
        behavior of max_user_connections variable. Now the global instance of
        this variable holds default maximum number of concurrent connections per
        account (as it was before) and the session instance gives read-only
        access to account-specific version of this limit.
      sql/sql_acl.cc:
        Added support for account-specific MAX_USER_CONNECTIONS limit.
        Tweaked USER_RESOURCES and their handling for better clarity.
      sql/sql_parse.cc:
        Added support for account-specific MAX_USER_CONNECTIONS (maximum number
        of concurrent connections per account) limit. Changed default behavior
        of all user limits to be per account instead of per user+host.
        '--old-style-user-limits' option was added to enable the old behavior.
        Made maximum number of connections per hour to be independant on the
        value of global max_user_connections variable.
      sql/sql_yacc.yy:
        Added support of new MAX_USER_CONNECTIONS limit to grammar.
        Renamed USER_RESOURCES::connections member to conn_per_hour and bits
        member to specified_limits. Also enum is used instead of naked numbers
        when we are working with specified_limits.
      sql/structs.h:
        USER_RESOURCES struct:
         - Added user_conn member to store the maximum number of concurrent 
           connections for an account. Renamed connections member to 
           conn_per_hour for less ambiguity.
         - Renamed member 'bits' to 'specified_limits' for the sake of clarity.
           The member was used as a flag indicating which limits were mentioned
           in GRANT clause.
         - Added comments.
        USER_CONN struct:
         - Removed unused user_len member.
         - Added comments.
      05b709fc
    • unknown's avatar
      InnoDB: Remove dependency on rem0rec.ic from dict0dict.ic (Bug #7464) · 44728324
      unknown authored
      
      innobase/dict/dict0dict.c:
        Make dict_is_mixed_table_rec() a non-inlined function.
      innobase/include/dict0dict.h:
        Make dict_is_mixed_table_rec() a non-inlined function.
        Remove dict_index_rec_get_sys_col().
      innobase/include/dict0dict.ic:
        Make dict_is_mixed_table_rec() a non-inlined function.
        Remove dict_index_rec_get_sys_col().
      innobase/trx/trx0rec.c:
        Replace the two calls to the removed
        function dict_index_rec_get_sys_col() with equivalent code.
      44728324
    • unknown's avatar
      VC++Files/mysqlmanager deleted · 4b24ddeb
      unknown authored
      
      BitKeeper/deleted/.del-bitmap1.bmp~54ea131b7c29df5f:
        Delete: VC++Files/mysqlmanager/RES/bitmap1.bmp
      BitKeeper/deleted/.del-bitmap3.bmp~6faf6bc91b463d2d:
        Delete: VC++Files/mysqlmanager/RES/bitmap3.bmp
      BitKeeper/deleted/.del-bmp00001.bmp~ed2353e7a58f63d8:
        Delete: VC++Files/mysqlmanager/RES/bmp00001.bmp
      BitKeeper/deleted/.del-bmp00002.bmp~ba8f5b6fd1066053:
        Delete: VC++Files/mysqlmanager/RES/bmp00002.bmp
      BitKeeper/deleted/.del-database.bmp~d1a1f6159bfd71e:
        Delete: VC++Files/mysqlmanager/RES/database.bmp
      BitKeeper/deleted/.del-fontd.bmp~bd3e1b7461b00016:
        Delete: VC++Files/mysqlmanager/RES/fontd.bmp
      BitKeeper/deleted/.del-fontu.bmp~6e22e2ed7ae639:
        Delete: VC++Files/mysqlmanager/RES/fontu.bmp
      BitKeeper/deleted/.del-mysqlmanager.ico~94a243787d626945:
        Delete: VC++Files/mysqlmanager/RES/mysqlmanager.ico
      BitKeeper/deleted/.del-mysqlmanager.rc2~fbc8719f8b13efcd:
        Delete: VC++Files/mysqlmanager/RES/mysqlmanager.rc2
      BitKeeper/deleted/.del-mysqlmanagerdoc.ico~29c87653289ac9cf:
        Delete: VC++Files/mysqlmanager/RES/mysqlmanagerdoc.ico
      BitKeeper/deleted/.del-query_ex.bmp~ab2603bf4bd91317:
        Delete: VC++Files/mysqlmanager/RES/query_ex.bmp
      BitKeeper/deleted/.del-toolbar.bmp~168741ee79064a8e:
        Delete: VC++Files/mysqlmanager/RES/toolbar.bmp
      BitKeeper/deleted/.del-README.TXT~8ff556bf1b02820a:
        Delete: VC++Files/mysqlmanager/README.TXT
      BitKeeper/deleted/.del-childfrm.cpp~3417c093c7cdeb2a:
        Delete: VC++Files/mysqlmanager/childfrm.cpp
      BitKeeper/deleted/.del-childfrm.h~9ef4b6fd2c2f9fc1:
        Delete: VC++Files/mysqlmanager/childfrm.h
      BitKeeper/deleted/.del-cresource.h~fae297f06d54bb1c:
        Delete: VC++Files/mysqlmanager/cresource.h
      BitKeeper/deleted/.del-mainfrm.cpp~d244cbb63582bd80:
        Delete: VC++Files/mysqlmanager/mainfrm.cpp
      BitKeeper/deleted/.del-mainfrm.h~b76be2ff891c1071:
        Delete: VC++Files/mysqlmanager/mainfrm.h
      BitKeeper/deleted/.del-mysqlmanager.cpp~39ea688f3e047a32:
        Delete: VC++Files/mysqlmanager/mysqlmanager.cpp
      BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
        Delete: VC++Files/mysqlmanager/mysqlmanager.dsp
      BitKeeper/deleted/.del-mysqlmanager.dsw~2b8409b0200abf7e:
        Delete: VC++Files/mysqlmanager/mysqlmanager.dsw
      BitKeeper/deleted/.del-mysqlmanager.h~1b072d70b3a7182d:
        Delete: VC++Files/mysqlmanager/mysqlmanager.h
      BitKeeper/deleted/.del-mysqlmanager.mak~182f734c438d1b3b:
        Delete: VC++Files/mysqlmanager/mysqlmanager.mak
      BitKeeper/deleted/.del-mysqlmanager.rc~6464a02e5cd36fcf:
        Delete: VC++Files/mysqlmanager/mysqlmanager.rc
      BitKeeper/deleted/.del-mysqlmanagerdoc.cpp~9ff2c50e7fcff890:
        Delete: VC++Files/mysqlmanager/mysqlmanagerdoc.cpp
      BitKeeper/deleted/.del-mysqlmanagerdoc.h~7945547b7791a7ce:
        Delete: VC++Files/mysqlmanager/mysqlmanagerdoc.h
      BitKeeper/deleted/.del-mysqlmanagerview.cpp~cdd54f8f4624d17:
        Delete: VC++Files/mysqlmanager/mysqlmanagerview.cpp
      BitKeeper/deleted/.del-mysqlmanagerview.h~a6bc8b1e58b54505:
        Delete: VC++Files/mysqlmanager/mysqlmanagerview.h
      BitKeeper/deleted/.del-registerserver.cpp~b191b37e5d69b483:
        Delete: VC++Files/mysqlmanager/registerserver.cpp
      BitKeeper/deleted/.del-registerserver.h~ab70de17932db93a:
        Delete: VC++Files/mysqlmanager/registerserver.h
      BitKeeper/deleted/.del-resource.h~26da5f7e53499741:
        Delete: VC++Files/mysqlmanager/resource.h
      BitKeeper/deleted/.del-stdafx.cpp~c4ad855530f5cc0f:
        Delete: VC++Files/mysqlmanager/stdafx.cpp
      BitKeeper/deleted/.del-stdafx.h~ec4c4d8fb3597657:
        Delete: VC++Files/mysqlmanager/stdafx.h
      BitKeeper/deleted/.del-toolsql.cpp~27601d31f5c5c1a6:
        Delete: VC++Files/mysqlmanager/toolsql.cpp
      BitKeeper/deleted/.del-toolsql.h~966f9761b84e9df0:
        Delete: VC++Files/mysqlmanager/toolsql.h
      BitKeeper/deleted/.del-toolsqlquery.cpp~c0d895cf5657eb97:
        Delete: VC++Files/mysqlmanager/toolsqlquery.cpp
      BitKeeper/deleted/.del-toolsqlquery.h~a05f34095fc943eb:
        Delete: VC++Files/mysqlmanager/toolsqlquery.h
      BitKeeper/deleted/.del-toolsqlresults.cpp~c263d8e2ba797dc4:
        Delete: VC++Files/mysqlmanager/toolsqlresults.cpp
      BitKeeper/deleted/.del-toolsqlresults.h~bd0a93e948792b71:
        Delete: VC++Files/mysqlmanager/toolsqlresults.h
      BitKeeper/deleted/.del-toolsqlstatus.cpp~ff5562b787f794ef:
        Delete: VC++Files/mysqlmanager/toolsqlstatus.cpp
      BitKeeper/deleted/.del-toolsqlstatus.h~6dad0c576d9c67f4:
        Delete: VC++Files/mysqlmanager/toolsqlstatus.h
      4b24ddeb
  4. 28 Dec, 2004 4 commits
  5. 27 Dec, 2004 4 commits
    • unknown's avatar
      InnoDB: Fix some bugs in the new record format. (Bug #7493) · 7ce58bef
      unknown authored
      
      innobase/btr/btr0btr.c:
        Remove parameter n_fields from cmp_rec_rec()
      innobase/btr/btr0cur.c:
        Remove parameter n_fields from cmp_rec_rec_with_match()
      innobase/btr/btr0pcur.c:
        Remove parameter n_fields from cmp_rec_rec()
      innobase/include/rem0cmp.h:
        Remove parameter n from cmp_rec_rec_with_match() and cmp_rec_rec()
      innobase/include/rem0cmp.ic:
        Remove parameter n from cmp_rec_rec()
      innobase/include/rem0rec.ic:
        Correct the implementation of rec_offs_nth_size() (Bug #7493)
      innobase/page/page0page.c:
        Remove parameter n_fields from cmp_rec_rec()
      innobase/rem/rem0cmp.c:
        Remove parameter n from cmp_rec_rec_with_match()
      innobase/rem/rem0rec.c:
        rec_get_offsets(): Pass the number of allocated elements to
        rec_offs_set_n_alloc() instead of the number of allocated bytes,
        so that debugging assertions are more likely to detect
        out-of-bounds errors.
      7ce58bef
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · e3c76974
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      e3c76974
    • unknown's avatar
      Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa · 1fb2c0bc
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      1fb2c0bc
    • unknown's avatar
      strings/decimal.c · 83e58bc0
      unknown authored
          test_d2b2d("123.4", 10, 2, "123.40");
      
      
      strings/decimal.c:
        test_d2b2d("123.4", 10, 2, "123.40");
      83e58bc0