Skip to content

M
MariaDB
Switch branch/tag
  1. 31 Dec, 2004 8 commits
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 064c2890
      unknown authored 
      into mysql.com:/Users/mikron/mysql-5.0


ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
      064c2890
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · f8034fb9
      unknown authored 
      into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
      f8034fb9
    • unknown's avatar
      merge · d11b52cd
      unknown authored
      d11b52cd
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 01e04e13
      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
      01e04e13
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · c8dc26b4
      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
      c8dc26b4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4fbd6e89
      unknown authored 
      into mysql.com:/home/my/mysql-merge
      4fbd6e89
    • unknown's avatar
      After merge fixes · 58469fb6
      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
      58469fb6
    • unknown's avatar
      Bug #7593 · 3e19b906
      unknown authored 
      Caused a hard limit of 64 unique indexes in cluster
      3e19b906
  3. 30 Dec, 2004 11 commits
    • unknown's avatar
      page0page.c: · 320996cc
      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.
      320996cc
    • unknown's avatar
      Merge with global tree · 5c19723f
      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
      5c19723f
    • unknown's avatar
      row0upd.c: · e3c4c604
      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.
      e3c4c604
    • unknown's avatar
      After merge fixes · 616a56b5
      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
      616a56b5
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 04b48f11
      unknown authored 
      into hundin.mysql.fi:/home/marko/j/mysql-5.0
      04b48f11
    • unknown's avatar
      InnoDB: Remove crash in in-place update from NULL to non-NULL. (Bug #7591) · 435ea232
      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.
      435ea232
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · dc61cadb
      unknown authored 
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      dc61cadb
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9f9d5f5d
      unknown authored 
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      9f9d5f5d
    • unknown's avatar
      Merge from 4.1: fix for bug #7285 (embedded server) · d7f15bdc
      unknown authored 
      
libmysql/libmysql.c:
  Merge from 4.1: fix for bug #7285
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
      d7f15bdc
    • unknown's avatar
      Removed unnecessary chahges from previous commit(see ChangeSet 1.1761 04/12/30) · 09f810c4
      unknown authored
      09f810c4
    • unknown's avatar
      wl#1629 SHOW with WHERE(final part, after review) · a8491ce5
      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)
      a8491ce5
  5. 29 Dec, 2004 3 commits
    • unknown's avatar
      InnoDB: fix bug in insert buffer merge of prefix columns in · 07342bc1
      unknown authored 
      new-style InnoDB tables. (Bug #7578)


innobase/ibuf/ibuf0ibuf.c:
  ibuf_dummy_index_add_col(): Add parameter "len"
      07342bc1
    • unknown's avatar
      InnoDB: Remove dependency on rem0rec.ic from dict0dict.ic (Bug #7464) · a75f125e
      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.
      a75f125e
    • unknown's avatar
      VC++Files/mysqlmanager deleted · 9a547284
      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
      9a547284
  7. 28 Dec, 2004 4 commits
  9. 27 Dec, 2004 7 commits
    • unknown's avatar
      InnoDB: Fix some bugs in the new record format. (Bug #7493) · 8452057e
      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.
      8452057e
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 412b601a
      unknown authored 
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      412b601a
    • unknown's avatar
      Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa · 2ba8305d
      unknown authored 
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      2ba8305d
    • unknown's avatar
      strings/decimal.c · c04caa92
      unknown authored 
          test_d2b2d("123.4", 10, 2, "123.40");


strings/decimal.c:
  test_d2b2d("123.4", 10, 2, "123.40");
      c04caa92
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3905764a
      unknown authored 
      into mysql.com:/M50/mysql-5.0
      3905764a
    • unknown's avatar
      Ensure "bottom-up" order of "inline functions" within 'innobase/include/rem0rec.ic'. · a14f0ef8
      unknown authored 
      This is a partial solution for bug#7464.


innobase/include/rem0rec.ic:
  On several platforms, "inline functions" must be coded before being used, in "bottom-up" order.
  Ensure this for 'rec_get_status' and 'rec_offs_n_fields'.
      a14f0ef8
    • unknown's avatar
      revert "LOCK TABLES ... WHERE ENGINE=INNODB" · 34ff54cf
      unknown authored
      34ff54cf
  11. 24 Dec, 2004 4 commits
    • unknown's avatar
      Many files: · ff755ea2
      unknown authored 
        tabs replaced
ha_innodb.cc:
  Comments removed


innobase/include/que0que.h:
  tabs replaced
innobase/include/sync0rw.h:
  tabs replaced
innobase/include/sync0sync.h:
  tabs replaced
innobase/include/sync0sync.ic:
  tabs replaced
innobase/row/row0sel.c:
  tabs replaced
innobase/srv/srv0srv.c:
  tabs replaced
innobase/sync/sync0rw.c:
  tabs replaced
innobase/sync/sync0sync.c:
  tabs replaced
sql/ha_innodb.cc:
  Comments removed
sql/lex.h:
  tabs replaced
sql/set_var.cc:
  tabs replaced
sql/sql_parse.cc:
  tabs replaced
sql/sql_yacc.yy:
  tabs replaced
      ff755ea2
    • unknown's avatar
      logging_ok: · a91217ce
      unknown authored 
        Logging to logging@openlogging.org accepted
sql_yacc.yy, sql_parse.cc, sql_lex.h, lex.h:
  Implements the SHOW MUTEX STATUS command
set_var.cc, mysqld.cc, mysql_priv.h:
  Added new GLOBAL variable timed_mutexes
ha_innodb.h:
  New function innodb_mutex_show_status
ha_innodb.cc:
  Added new innodb variables in SHOW STATUS
  Implements the SHOW MUTEX STATUS command
innodb.test, innodb.result:
  Added new row_lock_waits status variables tests.
variables.test, variables.result:
  test new variable timed_mutexes
ut0ut.c:
  New function ut_usectime.
sync0sync.c:
  Mutex counting.
sync0rw.c:
  New mutex parameters initialization.
srv0srv.c:
  Counting row lock waits
row0sel.c, row0mysql.c:
  Setting row_lock or table_lock state to thd.
que0que.c:
  Added default no_lock_state to thd.
univ.i:
  Added UNIV_SRV_PRINT_LATCH_WAITS debug define
sync0sync.ic:
  Count mutex using.
sync0sync.h:
  Added new parameters to mutex structure for counting.
sync0rw.h:
  Added new parameters to rw_create_func.
srv0srv.h:
  Added new innodb varuables to SHOW STATUS.
que0que.h:
  Added thread lock states.


innobase/include/que0que.h:
  Added thread lock states.
innobase/include/srv0srv.h:
  Added new innodb varuables to SHOW STATUS.
innobase/include/sync0rw.h:
  Added new parameters to rw_create_func.
innobase/include/sync0sync.h:
  Added new parameters to mutex structure for counting.
innobase/include/sync0sync.ic:
  Count mutex using.
innobase/include/univ.i:
  Added UNIV_SRV_PRINT_LATCH_WAITS debug define
innobase/que/que0que.c:
  Added default no_lock_state to thd.
innobase/row/row0mysql.c:
  Setting row_lock or table_lock state to thd.
innobase/row/row0sel.c:
  Setting row_lock or table_lock state to thd.
innobase/srv/srv0srv.c:
  Counting row lock waits
innobase/sync/sync0rw.c:
  New mutex parameters initialization.
innobase/sync/sync0sync.c:
  Mutex counting.
innobase/ut/ut0ut.c:
  New function ut_usectime.
mysql-test/r/variables.result:
  test new variable timed_mutexes
mysql-test/r/innodb.result:
  Added new row_lock_waits status variables tests.
mysql-test/t/variables.test:
  test new variable timed_mutexes
mysql-test/t/innodb.test:
  Added new row_lock_waits status variables tests.
sql/ha_innodb.cc:
  Added new innodb variables in SHOW STATUS
  Implements the SHOW MUTEX STATUS command
sql/ha_innodb.h:
  New function innodb_mutex_show_status
sql/lex.h:
  Implements the SHOW MUTEX STATUS command
sql/mysql_priv.h:
  Added new GLOBAL variable timed_mutexes
sql/mysqld.cc:
  Added new GLOBAL variable timed_mutexes
sql/set_var.cc:
  Added new GLOBAL variable timed_mutexes
sql/sql_lex.h:
  Implements the SHOW MUTEX STATUS command
sql/sql_parse.cc:
  Implements the SHOW MUTEX STATUS command
sql/sql_yacc.yy:
  Implements the SHOW MUTEX STATUS command
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
      a91217ce
    • unknown's avatar
      Fix for bug #7467: sql_lex.c on HPUX fails to compile · fa01f2c4
      unknown authored
      fa01f2c4
    • unknown's avatar
      Fix for bug: #7218: information_schema: errors in "tables" · fb864271
      unknown authored
      fb864271
  13. 23 Dec, 2004 3 commits
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · eb3964b3
      unknown authored 
      into mysql.com:/home/mydev/mysql-5.0-wl2126


include/my_base.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
      eb3964b3
    • unknown's avatar
      WL#2126 - Multi_read_range. · ece4106a
      unknown authored 
      Added the required structures and functions for
handing over multiple key ranges to the table handler.


include/my_base.h:
  WL#2126 - Multi_read_range.
  Moved key range flags from sql/opt_range.h to here.
  Added the multi-range structure.
sql/handler.cc:
  WL#2126 - Multi_read_range.
  Added the new table handler methods.
sql/handler.h:
  WL#2126 - Multi_read_range.
  Added a new table flag.
  Added a declaration for the handler buffer.
  Added new elements to class handler.
  Added new function declarations.
sql/mysqld.cc:
  WL#2126 - Multi_read_range.
  Added an option to set new system variable 'multi_range_count'.
sql/opt_range.cc:
  WL#2126 - Multi_read_range.
  Added initialization for the new class members.
  Added initialization for the extended get_next().
  Added de-initialization for the allocated buffers.
  Added a buffer allocation method.
  Added an inner loop to collect multiple ranges.
  Adapted range collection loops to the new initialization.
sql/opt_range.h:
  WL#2126 - Multi_read_range.
  Moved key range flags from here to include/my_base.h.
  Added new elements to class QUICK_RANGE_SELECT.
  Added a copy constructor.
sql/records.cc:
  WL#2126 - Multi_read_range.
  Added a call of the allocation method.
sql/set_var.cc:
  WL#2126 - Multi_read_range.
  Added the new system variable 'multi_range_count'.
sql/sql_class.h:
  WL#2126 - Multi_read_range.
  Added the new system variable 'multi_range_count'.
      ece4106a
    • unknown's avatar
      WL#1895 - Print message to error log in case of detected MyISAM corruption · af80e6f3
      unknown authored 
      Changed my_error() to print error messages, which come from
arbitrary registered ranges of error messages. Messages can
be unregistered (and should be at end of the program).
Added registration of handler error messages.
Added a new mi_print_error() macro and a new 
mi_report_error() function, which supply error
messages with a table name.
Added calls to mi_print_error() or mi_report_error()
at all places in MyISAM, where table corruption is detected.


extra/comp_err.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added prints for ER_ERROR_FIRST and ER_ERROR_LAST.
  Removed print for ER_ERROR_MESSAGES.
include/errmsg.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added declaration for a new function.
  Added first and last error number defines.
include/my_base.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added first and last error number defines.
include/my_sys.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Removed obsolete defines.
  Removed a global variable, which held pointers to the error message arrays.
  Added declarations for new functions.
include/mysys_err.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Removed an obsolete define.
  Changed two defines to use the new defines.
  Added first and last error number defines.
libmysql/errmsg.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Replaced global array initialization by proper registration
  and unregistration of client error messages.
libmysql/libmysql.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added a call for unregistration of client error messages.
myisam/mi_delete.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
  Added a debugging call to test undefined error numbers in case a special
  debug string is set.
myisam/mi_extra.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_info.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added the error logging function.
myisam/mi_key.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_keycache.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_locking.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_open.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/mi_page.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_range.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_rkey.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_search.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_update.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/mi_write.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/myisamdef.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added the declaration of the new error logging function
  and a new macro.
mysql-test/r/merge.result:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed test results. These come from the changed error reporting
  in openfrm().
mysql-test/r/repair.result:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed test results. These come from the changed error reporting
  in openfrm().
mysql-test/t/merge.test:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changederror numbers. These come from the changed error reporting
  in openfrm().
mysys/errors.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Dropped the assignment of the global errors to the
  dropped global pointer array.
mysys/my_error.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed my_error() from using a static array of pointers to
  error message arrays to using a linked list of structures
  with pointers to array message arrays.
  Added functions for registering and unregistering error 
  message arrays to the chain.
sql/derror.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed reading of mysqld error messages to using the new
  registering and unregistering functions.
sql/handler.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added initialization and deinitialization of handler error messages.
  Included more handler error messages in the mapping to
  mysqld error messages.
sql/mysqld.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed deinitialization of error messages to proper
  unregistration.
sql/table.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed error reporting in openfrm() so that error messages from
  handler::ha_open() are reported by handler::print_error(). This
  changed messages from "Can't open 't1.MYI' (errno: 130)" to
  "Incorrect file format 't1'" for example.
sql/unireg.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed two defines to use the new defines.
      af80e6f3
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7