Commit graph

21156 commits

Author SHA1 Message Date
unknown
380c64b1fc Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-03-10 15:50:30 +02:00
unknown
5054fdd834 rem0rec.h:
Restore sensible values to REC_OFFS_NORMAL_SIZE and REC_OFFS_SMALL_SIZE.


innobase/include/rem0rec.h:
  Restore sensible values to REC_OFFS_NORMAL_SIZE and REC_OFFS_SMALL_SIZE.
2005-03-10 15:38:09 +02:00
unknown
90eff10bf1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-sp
2005-03-10 16:22:05 +03:00
unknown
066e8900d6 InnoDB: Introduce the symbols REC_OFFS_NORMAL_SIZE and
REC_OFFS_SMALL_SIZE for the initial allocation sizes of
arrays passed to rec_get_offsets().


innobase/btr/btr0btr.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/btr/btr0cur.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/btr/btr0sea.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/include/rem0rec.h:
  Define REC_OFFS_NORMAL_SIZE and REC_OFFS_SMALL_SIZE.
innobase/lock/lock0lock.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/page/page0cur.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/page/page0page.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/rem/rem0rec.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0ins.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0mysql.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0purge.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0row.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0sel.c:
  s/100/REC_OFFS_NORMAL_SIZE/
  s/10/REC_OFFS_SMALL_SIZE/
innobase/row/row0undo.c:
  s/100/REC_OFFS_NORMAL_SIZE/
innobase/row/row0upd.c:
  s/100/REC_OFFS_NORMAL_SIZE/
  s/10/REC_OFFS_SMALL_SIZE/
innobase/trx/trx0rec.c:
  s/100/REC_OFFS_NORMAL_SIZE/
2005-03-10 15:16:16 +02:00
unknown
1690bab938 a fix (bug Traditional: Wrong SQLSTATE returned for string truncation).
sql/field.cc:
  a fix (bug  Traditional: Wrong SQLSTATE returned for string truncation).
  Should issue ER_DATA_TOO_LONG in 'traditional' mode when data truncated.
2005-03-10 17:08:45 +04:00
unknown
8c6a02dff2 Fix for sp.test failure in --ps-protocol mode (2nd attempt).
Now we should call open_and_lock_tables() even if table list is empty -
to cache stored routines used by query and open and lock tables required
for their execution.


sql/sql_insert.cc:
  Now we should call open_and_lock_tables() even if table list is empty -
  to cache stored routines used by query and open and lock tables required
  for their execution.
sql/sql_prepare.cc:
  Now we should call open_and_lock_tables() even if table list is empty -
  to cache stored routines used by query and open and lock tables required
  for their execution. Thus we have to move most of functionality from 
  select_like_statement_test() to separate function to be able to reuse it
  for multi-update processing (for which tables are open and locked in 
  mysql_multi_update_prepare() call).
2005-03-10 16:05:48 +03:00
unknown
db93db85b6 Merge
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  SCCS merged
2005-03-10 13:59:48 +02:00
unknown
cf732466c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-03-10 11:33:36 +01:00
unknown
dd843ee4b5 Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-03-10 11:50:55 +02:00
unknown
87636012c7 Fix uninitialised variable in Dbacc
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Found use of uninitialised variable when increasing m_commit_count.
  Moved initialisation of rootfragrecptr to before increase of m_commit_count, and removed the two initializations further down, since they are now unneccessary.
2005-03-10 10:46:19 +01:00
unknown
8c2067654b Removed unused variable
sql/sql_class.h:
  Removed unused variable temprary_tables_should_be_free
2005-03-10 10:43:11 +01:00
unknown
fb9d4dcafa Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-03-10 09:20:44 +01:00
unknown
6d87bfab7f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-03-10 12:16:30 +04:00
unknown
8a7e82ffa9 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-03-10 08:45:28 +01:00
unknown
2f7e93afab Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0


innobase/log/log0recv.c:
  Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2005-03-10 09:07:42 +02:00
unknown
16103a014f Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-03-10 09:01:02 +02:00
unknown
d357dba8cf Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/trix/Trix.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2005-03-10 07:48:44 +01:00
unknown
6217486774 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-10 07:47:27 +01:00
unknown
4b5c3e6e42 bug#9089
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/mgmsrv/ConfigInfo.cpp:
  Reenable MAX_OPEN_FILES to enable LCP in some situations
2005-03-10 07:45:17 +01:00
unknown
be0f640d26 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-03-10 10:22:35 +04:00
unknown
83fa3560bc Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2005-03-09 16:53:20 -08:00
unknown
ef46ec4197 sql/ha_ndbcluster.cc
after merge fix
sql/sql_parse.cc
    correct max_connections condition


sql/ha_ndbcluster.cc:
  after merge fix
sql/sql_parse.cc:
  correct max_connections condition
2005-03-10 00:10:10 +01:00
unknown
ab32d7b000 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-09 14:44:58 -08:00
unknown
7a842c63ca Fixed broken 4.1->5.0 merge 2005-03-09 23:38:11 +01:00
unknown
eb0168d766 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
2005-03-09 22:10:38 +00:00
unknown
0f888b1bf0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
2005-03-09 21:59:29 +00:00
unknown
5b26228c3d Cleanup for VC++
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Cleanup
2005-03-09 21:53:04 +00:00
unknown
fad705db81 Portability fix.
sql/sql_lex.h:
  LEX::requires_prelocking():
    Portability fix. Seems that VC++ does not understand implicit pointer
    to bool conversion.
2005-03-10 00:52:47 +03:00
unknown
3d4971c4a7 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
2005-03-09 13:26:11 -08:00
unknown
e1d3524d81 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-03-09 13:24:05 -08:00
unknown
4c53613580 func_str.result:
Correction after manual merge.


mysql-test/r/func_str.result:
  Correction after manual merge.
2005-03-09 13:20:52 -08:00
unknown
c9f3e0f40c Merge 2005-03-09 21:41:09 +01:00
unknown
07df51aa75 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-03-09 21:19:57 +01:00
unknown
db32810d02 InnoDB: Improve performance by about 10% by removing implicit
memcpy() calls, by not initializing the offsets_[] arrays.
InnoDB: Remove a Microsoft compiler warning in page0page.c.


innobase/btr/btr0btr.c:
  Only initialize the first element of offsets_[]
innobase/btr/btr0cur.c:
  Only initialize the first element of offsets_[]
innobase/btr/btr0sea.c:
  Only initialize the first element of offsets_[]
innobase/lock/lock0lock.c:
  Only initialize the first element of offsets_[]
innobase/page/page0cur.c:
  Only initialize the first element of offsets_[]
innobase/page/page0page.c:
  page_validate(): Silence a warning about unsigned/signed comparison.
  Other places: Only initialize the first element of offsets_[].
innobase/rem/rem0rec.c:
  Only initialize the first element of offsets_[]
innobase/row/row0ins.c:
  Only initialize the first element of offsets_[]
innobase/row/row0mysql.c:
  Only initialize the first element of offsets_[]
innobase/row/row0purge.c:
  Only initialize the first element of offsets_[]
innobase/row/row0row.c:
  Only initialize the first element of offsets_[]
innobase/row/row0sel.c:
  Only initialize the first element of offsets_[]
innobase/row/row0undo.c:
  Only initialize the first element of offsets_[]
innobase/row/row0upd.c:
  Only initialize the first element of offsets_[]
innobase/trx/trx0rec.c:
  Only initialize the first element of offsets_[]
2005-03-09 22:04:55 +02:00
unknown
1f22956271 Fix complilation failure 2005-03-09 20:49:44 +01:00
unknown
85be2e57ab Manual merge
sql/item_strfunc.cc:
  Auto merged
2005-03-09 10:58:52 -08:00
unknown
f8b66f7656 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
2005-03-09 10:40:27 -08:00
unknown
368731548e log0recv.c:
Better ibbackup message
  Add a message explaining why we do a 'crash recovery' after an ibbackup restore; suggested by Tim Smith


innobase/log/log0recv.c:
  Better ibbackup message
2005-03-09 20:32:01 +02:00
unknown
076f5164e4 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1 2005-03-09 19:32:00 +01:00
unknown
d1b3c64b23 after merge fixes
mysql-test/r/fulltext.result:
  after merge - test results updated
sql/sql_class.cc:
  protection
2005-03-09 19:22:30 +01:00
unknown
9d839a140f Fix to make mysql-test-run.pl work with new system tables definitions
mysql-test/lib/init_db.sql:
  Fixed mysql-test-run.pl's system tables to correspond to the real ones.
2005-03-09 19:21:57 +01:00
unknown
80588dcf54 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysqld.cc:
  Auto merged
2005-03-09 09:39:05 -08:00
unknown
cd4961830e .del-ndb_multi.test~651e6ccb21dab6d9:
Delete: mysql-test/t/ndb_multi.test
.del-ndb_multi.result~4baa26e7403188ae:
  Delete: mysql-test/r/ndb_multi.result
.del-have_multi_ndb.inc~ef8da69d972ee707:
  Delete: mysql-test/include/have_multi_ndb.inc


BitKeeper/deleted/.del-have_multi_ndb.inc~ef8da69d972ee707:
  Delete: mysql-test/include/have_multi_ndb.inc
BitKeeper/deleted/.del-ndb_multi.result~4baa26e7403188ae:
  Delete: mysql-test/r/ndb_multi.result
BitKeeper/deleted/.del-ndb_multi.test~651e6ccb21dab6d9:
  Delete: mysql-test/t/ndb_multi.test
2005-03-09 18:30:29 +01:00
unknown
bfbc7595dc Fix change made to ER_READY by creating a new message, instead.
sql/mysqld.cc:
  Use new message for startup
sql/share/errmsg.txt:
  Revert change to ER_READY, add new ER_STARTUP to use instead
2005-03-09 08:56:50 -08:00
unknown
5dca460b00 corrected typo: deafault -> default 2005-03-09 16:39:23 +01:00
unknown
146df30f79 Fix for BUG#7425.
The reported problems were due to two completely unrelated omissions.
1) The file sort procedure didn't correctly create the sort key in
   make_sortkey when the sortkey was an unsigned integer.
2) The name resolution procedure for column references inside a HAVING
   clause did not propagate the unsigned_flag of the resolved references.
This patch corrects both problems.


mysql-test/r/select.result:
  Added test result for BUG#7425.
mysql-test/t/select.test:
  Added test for BUG#7425.
sql/filesort.cc:
  Take into account whether 'item' represents a signed or an unsigned integer.
sql/item.cc:
  Once an Item_ref is resolved, propagate the unsigned_flag to the resolved item.
2005-03-09 16:51:03 +02:00
unknown
76835818f1 a fix (bug : "archive" test fails on UnixWare when using prepared statements)
sql/handler.cc:
  s/MY_WME/0/ - don't issue an error when a file does not exists on
  deletion, a table does not need to have all bas_ext[] files;
  two-line function removed and expanded inline.
2005-03-09 18:33:01 +04:00
unknown
914afabd39 mysqldumpslow.sh:
bug#4914 added --help and usage information


scripts/mysqldumpslow.sh:
  bug#4914 added --help and usage information
2005-03-09 15:00:40 +01:00
unknown
380b5819a2 Fix for Bug Test ndb_autodiscover: Spurious warning in --ps-protocol on NDB 2005-03-09 14:29:22 +01:00
unknown
48577bb59f merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/page0page.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-03-09 14:09:06 +01:00