Commit graph

26866 commits

Author SHA1 Message Date
unknown
e42572f5f8 mtr_process.pl:
Append to some of the log files, not overwrite


mysql-test/lib/mtr_process.pl:
  Append to some of the log files, not overwrite
2005-09-28 23:53:31 +02:00
unknown
5e26e3f429 mysql-test-run.pl:
Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.


mysql-test/mysql-test-run.pl:
  Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.
2005-09-28 23:52:10 +02:00
unknown
21f6b1a10c mysql-test-run.pl:
Pass on all --skip-* to mysqld


mysql-test/mysql-test-run.pl:
  Pass on all --skip-* to mysqld
2005-09-28 23:24:44 +02:00
unknown
f75271a53e Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
client/mysqltest.c:
  Auto merged
2005-09-28 23:05:42 +02:00
unknown
51361adaf6 - compile fix: don't use C++ - style comments in .c files! 2005-09-28 23:04:35 +02:00
unknown
44359367f8 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-28 20:09:52 +02:00
unknown
9f9bc8347d Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-09-28 20:09:13 +02:00
unknown
7524b28ca2 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2005-09-28 19:57:08 +02:00
unknown
9de4fa45f9 ndb - printSchemaFile: more checks and options
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  more checks and options
2005-09-28 19:54:55 +02:00
unknown
0fda286a41 select.result, item.cc:
After merge fix for bug#13356


sql/item.cc:
  After merge fix for bug#13356
mysql-test/r/select.result:
  After merge fix for bug#13356
2005-09-28 21:30:10 +04:00
unknown
fd6cc878e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


libmysqld/lib_sql.cc:
  Auto merged
2005-09-28 18:23:23 +02:00
unknown
ea599a0032 BUG #13511 Wrong patch pushed, fixing.
BUILD/SETUP.sh:
  BUG #13511, wrong patch pushed, fixing.
2005-09-28 08:04:08 -07:00
unknown
515610b30d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13546
2005-09-28 18:46:01 +04:00
unknown
e3d7877f4b Fix for bug #13546 "Build errors with --with-embedded-server
--with-embedded-privilege-control options". One more (hopefully last) build
failure which was introduced during work on WL#2787 "Add view definer/owner
to the view definition..."


libmysqld/lib_sql.cc:
  create_embedded_thd()/check_embedded_connection():
    Several security related THD members (user, host, ip, priv_user, ...) have
    moved to the Security_context class. New THD::security_ctx member points to
    active security context.
sql/sql_acl.cc:
  acl_getroot():
    Updated function description to refelect the fact that THD::user/host/ip/...
    members were moved to separate Security_context class.
sql/sql_parse.cc:
  check_user():
    Updated function description to refelect the fact that THD::user/host/ip/...
    members were moved to separate Security_context class.
2005-09-28 18:43:46 +04:00
unknown
95754006eb Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


BitKeeper/deleted/.del-disabled.def:
  Delete: mysql-test/t/disabled.def
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
mysql-test/r/innodb.result:
  Manual merge from 4.1 to 5.0
mysql-test/r/select.result:
  Manual merge from 4.1 to 5.0
mysql-test/t/select.test:
  Manual merge from 4.1 to 5.0
sql/item.cc:
  Manual merge from 4.1 to 5.0
2005-09-28 15:32:05 +02:00
unknown
bb8d3c4e06 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-09-28 23:14:12 +10:00
unknown
c7853e4775 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-28 14:42:01 +02:00
unknown
4ac453e50a Merge mysql.com:/home/mydev/mysql-4.1-4100
into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
2005-09-28 14:10:02 +02:00
unknown
599225749c Merge mysql.com:/home/dlenev/src/mysql-4.1-bg13501
into  mysql.com:/home/dlenev/src/mysql-5.0-merges


libmysqld/lib_sql.cc:
  Auto merged
2005-09-28 15:59:55 +04:00
unknown
7c8d269be3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-28 13:54:12 +02:00
unknown
68045dfd4b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-28 13:45:42 +02:00
unknown
ada963e012 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 13:45:04 +02:00
unknown
871a1c223d Merge 127.(none):/home/osku/mysql/5.0/clean
into  127.(none):/home/osku/mysql/5.0/13497
2005-09-28 14:40:02 +03:00
unknown
86856939c4 mysql_config.sh:
Added -lz to link using libmysqld


scripts/mysql_config.sh:
  Added -lz to link using libmysqld
2005-09-28 13:39:28 +02:00
unknown
5e81588100 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-09-28 13:37:58 +02:00
unknown
f5f0d7960c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 13:30:33 +02:00
unknown
b4d738e711 Correct merge error, warning ended up after new tests from 4.1
mysql-test/r/cast.result:
  Move the warning to corecct place
2005-09-28 13:29:13 +02:00
unknown
ced7d0efaf Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql/5.0/clean
2005-09-28 14:28:00 +03:00
unknown
a11fc7341c InnoDB: Remove compiler warnings.
innobase/os/os0proc.c:
  Add UT_NOT_USED for parameters in dummy implementations of AWE functions.
sql/ha_innodb.cc:
  Tweak casts to eliminate compiler warnings.
2005-09-28 14:26:33 +03:00
unknown
fe591c50bd Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-09-28 13:23:57 +02:00
unknown
2de206b4ee Fixed a bug checksum table locks the InnoDB table and does not use a
consistent read (Bug #12669).


mysql-test/r/innodb.result:
  Added test results for a checksum test.
mysql-test/t/innodb.test:
  Added test case for a checksum bug #12669.
sql/ha_innodb.cc:
  Use consistent read for checksum table and convert MySQL lock type
  to the TL_READ because at the moment MySQL uses TL_READ_NO_INSERT.
2005-09-28 14:14:49 +03:00
unknown
e57abdc754 Added a cast. Fix for Metrowerks compiler. 2005-09-28 14:12:44 +03:00
unknown
d33ce6f5f4 ndb - bug#13512
core dump on no free node id


ndb/tools/restore/consumer_restore.cpp:
  return correct value
2005-09-28 11:58:34 +02:00
unknown
69bfcd9c40 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/sql_update.cc:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/r/cast.result:
  Manual merge
mysql-test/t/cast.test:
  Manual merge
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Manual merge
sql/ha_ndbcluster.cc:
  Manual merge
sql/item.h:
  Manual merge
sql/opt_sum.cc:
  Manual merge
sql/sql_delete.cc:
  Manual merge
sql/sql_lex.cc:
  Manual merge
sql/sql_load.cc:
  Manual merge
sql/sql_prepare.cc:
  Manual merge
2005-09-28 11:34:53 +02:00
unknown
59041a2b35 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 10:29:04 +02:00
unknown
1a49a7a1d0 InnoDB: Print better error message when log files are missing/corrupt
(bug #13497).


innobase/buf/buf0buf.c:
  Print better error message when log files are missing/corrupt.
2005-09-28 11:14:25 +03:00
unknown
91cb248a7d Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-28 09:24:04 +02:00
unknown
f07bec6569 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-09-28 13:19:59 +10:00
unknown
a5dd3d5d8f Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-5.0
2005-09-27 15:04:26 -07:00
unknown
0559f1e012 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13356-bug-4.1-mysql
2005-09-28 01:06:16 +04:00
unknown
a17b3dcbe3 Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
resolve_const_item() assumed to be not called for Item_row items. For
ensuring that DBUG_ASSERT(0) was set there.

This patch adds section for Item_row items. If it can it recursively calls
resolve_const_item() for each item the Item_row contains. If any of the
contained items is null then whole Item_row substitued by Item_null. Otherwise
it just returns.


sql/item.cc:
  Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
  
  Added section to resolve_const_item() for Item_row items. If it can it
  recursively calls resolve_const_item() for each item the Item_row contains. If
  any of the contained items is null then Item_row is substituted by Item_null.
  Otherwise it just returns.
  Comment moved closer to function it belongs to.
mysql-test/t/select.test:
  Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.
mysql-test/r/select.result:
  Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.
2005-09-28 00:58:12 +04:00
unknown
06313b18f2 Fix for bug #13501 "build problem: too many arguments to function my_bool
acl_init".

Updated calls to acl_init()/grant_init() in init_embedded_server() - their
signatures were changed recently, now they don't need argument for passing
pointer to THD object (this code was only compiled if one built embedded
server library with --with-embedded-privilege-control switch).


libmysqld/lib_sql.cc:
  acl_init/grant_init() are now used only at server start up so they always
  allocate temporary THD object and don't need argument for passing pointer
  to it.
2005-09-27 23:36:02 +04:00
unknown
68985389a2 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.0
2005-09-27 21:19:50 +02:00
unknown
94496220cd CHECKSUM TABLE now allows concurrent inserts
myisam/mi_check.c:
  info->s->state.checksum moved to info->state->checksum
myisam/mi_delete.c:
  info->s->state.checksum moved to info->state->checksum
myisam/mi_delete_all.c:
  info->s->state.checksum moved to info->state->checksum
myisam/mi_open.c:
  info->s->state.checksum moved to info->state->checksum
myisam/mi_update.c:
  info->s->state.checksum moved to info->state->checksum
myisam/mi_write.c:
  info->s->state.checksum moved to info->state->checksum
myisam/myisamchk.c:
  info->s->state.checksum moved to info->state->checksum
myisam/myisamdef.h:
  info->s->state.checksum moved to info->state->checksum
myisam/myisampack.c:
  info->s->state.checksum moved to info->state->checksum
mysql-test/r/system_mysql_db.result:
  result fixed
sql/ha_myisam.cc:
  info->s->state.checksum moved to info->state->checksum
2005-09-27 20:11:09 +02:00
unknown
ab00d873c5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-5.0
2005-09-27 09:42:27 -07:00
unknown
13651fa55b BUG #7815 - Post-review fixes required for push.
client/mysqldump.c:
  BUG #7815
  
  Pre-push fixes requested per Sergei's review.
2005-09-27 09:40:51 -07:00
unknown
651134cf60 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-27 17:54:46 +02:00
unknown
3eef1c161e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-27 17:42:26 +02:00
unknown
6c2dad0dbe Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2005-09-27 08:24:19 -07:00
unknown
06eabeeea8 Fixed BUG#12589: Assert when creating temp. table from decimal stored
procedure variable
  Second version, after review.
  Keep the unsigned_flag in Item_decimal updated. Note that this also changed
  the result of several old test results - creating tables from decimal
  templates now gives unsigned columns and different sizes. (Several tests
  had Length > Max_length before.)


mysql-test/r/case.result:
  Updated result (after fixing BUG#12589).
mysql-test/r/metadata.result:
  Updated result (after fixing BUG#12589).
mysql-test/r/ps_2myisam.result:
  Updated result (after fixing BUG#12589).
mysql-test/r/ps_3innodb.result:
  Updated result (after fixing BUG#12589).
mysql-test/r/ps_4heap.result:
  Updated result (after fixing BUG#12589).
mysql-test/r/ps_5merge.result:
  Updated result (after fixing BUG#12589).
mysql-test/r/ps_6bdb.result:
  Updated result (after fixing BUG#12589).
mysql-test/r/ps_7ndb.result:
  Updated result (after fixing BUG#12589).
mysql-test/r/sp.result:
  New test case for BUG#12589.
mysql-test/r/type_newdecimal.result:
  Updated result (after fixing BUG#12589).
mysql-test/t/sp.test:
  New test case for BUG#12589.
sql/item.cc:
  Keep the unsigned_flag updated in Item_splocal and Item_decimal.
2005-09-27 17:07:28 +02:00