Commit graph

22095 commits

Author SHA1 Message Date
unknown
1b1c2ff62e manual merge
ndb/test/ndbapi/Makefile.am:
  Manual merge
2005-04-20 12:06:11 +02:00
unknown
c276d11b18 After review fix
cmd-line-utils/readline/config_readline.h:
  Fixing code formatting
2005-04-20 12:02:07 +02:00
unknown
56a91d2d90 Merge 2005-04-20 11:59:02 +02:00
unknown
ccd4e77be7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9103
2005-04-20 12:11:06 +04:00
unknown
b529fed683 BUG#9103 merge to 5.0
sql/sql_select.h:
  Auto merged
2005-04-20 12:09:56 +04:00
unknown
58ffacc445 Fixed Bug#8046 --mysqld of mysqld_safe must contain substring "mysqld" 2005-04-20 10:37:03 +03:00
unknown
8b001e2aba Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-04-19 14:06:09 +02:00
unknown
66403f827a Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0 2005-04-19 13:53:34 +02:00
unknown
7b1c02318e BUG#9568 mysql segfaults from CTRL-R
- Segfault because of passing a 64-bit pointer to 32 bit integer.
 - Add new include  config_readline.h which will calculate some new defines 
   based on what is found in config.h
 - This file was originally included in readline 4.3 as config.h.in, only the part that
    makes new defines have been moved to this file. 


cmd-line-utils/readline/bind.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/callback.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/complete.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/display.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/funmap.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/histexpand.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/histfile.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/history.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/histsearch.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/input.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/isearch.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/keymaps.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/kill.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/macro.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/mbutil.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/misc.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/nls.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/parens.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/readline.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/rltty.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/search.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/shell.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/signals.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/terminal.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/text.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/tilde.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/undo.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/util.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/vi_mode.c:
  Include local config_readline.h instead of config.h
cmd-line-utils/readline/xmalloc.c:
  Include local config_readline.h instead of config.h
2005-04-19 13:12:19 +02:00
unknown
696865f844 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/orig/mysql-5.0
2005-04-19 14:01:55 +03:00
unknown
254dfb2be0 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-04-19 13:59:09 +03:00
unknown
f0933e231b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug9496
2005-04-19 10:32:04 +01:00
unknown
92a00143d7 CSC5149 - ndb test programs
Fix src distributions for benchmark prg
2005-04-19 11:17:32 +02:00
unknown
f328e1def9 Merge changes from 4.1.x to 5.0.x. Only a style changes. 2005-04-19 09:38:20 +03:00
unknown
992d230591 Style change. Use 1 and 0 instead of true and false. 2005-04-19 08:23:03 +03:00
unknown
9e7028c8e0 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-04-18 14:49:11 -07:00
unknown
8a0db105b4 view.result:
Correction after fix for bug #9902.


mysql-test/r/view.result:
  Correction after fix for bug #9902.
2005-04-18 14:44:14 -07:00
unknown
e084746626 Fixed Bug#6593, "Inconsistency in handling option prefixes (--skip, --disable, etc.)" 2005-04-19 00:22:57 +03:00
unknown
fb70643001 Update for VARCHAR and remove 4.1-specific actions.
by Philip Antoniades


scripts/mysql_fix_privilege_tables.sql:
  Update for VARCHAR and remove 4.1-specific actions.
    by Philip Antoniades
2005-04-18 22:01:18 +01:00
unknown
d0eecb394d Post merge fix - updated the test results (BUG#9439) 2005-04-18 22:30:22 +04:00
unknown
8e88e012e6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-04-18 17:00:02 +04:00
unknown
ab603af807 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-04-18 16:03:07 +04:00
unknown
b53349040d ha_innodb.cc:
Style fix


sql/ha_innodb.cc:
  Style fix
2005-04-18 14:59:25 +03:00
unknown
cc547dbc7c Fixed test results after merging fix for bug #8068 "TIMEDIFF with first
negative argument gives wrong result" into 5.0 tree.
2005-04-18 15:58:58 +04:00
unknown
24dd3ea806 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
2005-04-18 15:04:50 +04:00
unknown
599fde0c51 Manual merge of patch for bug #8068 "TIMEDIFF with first negative
argument gives wrong result" (and similar bug in ADDTIME/SUBTIME)
into 5.0 tree.


mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/r/func_sapdb.result:
  Manual merge.
sql/item_timefunc.cc:
  Manual merge.
2005-04-18 14:29:31 +04:00
unknown
4594ea1fd1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
2005-04-18 13:54:42 +04:00
unknown
44bab0ead1 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0


sql/sql_yacc.yy:
  Auto merged
2005-04-18 11:27:02 +02:00
unknown
56ea770272 Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).
Backported from 5.0.3.


innobase/row/row0ins.c:
  If the SQL-query will update or replace duplicate records we take X-lock
  for duplicate records.
sql/ha_innodb.cc:
  INSERT ON DUPLICATE KEY UPDATE will also update duplicate records and we should
  take X-lock in this case for duplicate records.
2005-04-18 12:17:32 +03:00
unknown
ede0adac42 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-04-18 10:19:49 +02:00
unknown
e371d05b63 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/clone-5.0.4-build
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
2005-04-18 10:07:51 +02:00
unknown
955ec71f78 Fix for BUG#9103:
Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables.


mysql-test/r/update.result:
  Testcase for BUG#9103
mysql-test/t/update.test:
  Testcase for BUG#9103
sql/opt_range.cc:
  cp_buffer_from_ref now has THD* parameter
sql/sql_select.h:
  cp_buffer_from_ref now has THD* parameter
2005-04-18 05:21:44 +04:00
unknown
fab23b39de Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-look-range
2005-04-17 21:00:44 +04:00
unknown
b51f70b81e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9439
2005-04-17 20:56:36 +04:00
unknown
982a12eea0 Merge fix for BUG#9439 from 4.1
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
2005-04-17 20:54:31 +04:00
unknown
4c66b82868 Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-04-17 13:04:29 +02:00
unknown
1780ad4940 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


support-files/MacOSX/Makefile.am:
  Auto merged
2005-04-17 12:48:33 +02:00
unknown
ff3d799a05 - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.am
already (and that's the Makefile that acutally creates it)
2005-04-17 12:44:59 +02:00
unknown
be9b52bd69 Post-merge fixes
sql/opt_range.cc:
  Auto merged
2005-04-17 02:10:43 +04:00
unknown
3c112262b5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-look-range
2005-04-17 02:06:17 +04:00
unknown
6b00231421 Fix for BUG#9348: when computing union of two intervals set lower bound to
minimum of lower bounds of two joined intervals.


mysql-test/r/range.result:
  Testcase for BUG#9348
mysql-test/t/range.test:
  Testcase for BUG#9348
2005-04-17 02:05:09 +04:00
unknown
b8f4f27e00 mysql.server script fixed to use mysqld_safe by default + lots of minor additions
scripts/make_binary_distribution.sh:
  add libexec expansion handling to make_binary_distribution
support-files/mysql.server.sh:
  mysql.server init.d script fixed back to use mysqld_safe by default, as mysqlmanager does not handle all
  installation scenarious yet. + libexecdir template was added for mysqlmanager to deal nicely  with the
  source distribution
2005-04-16 23:57:15 +04:00
unknown
9e5325ab5c Fix for BUG#9439:
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)


mysql-test/r/show_check.result:
  Testcase for BUG#9439
mysql-test/t/show_check.test:
  Testcase for BUG#9439
sql/sql_show.cc:
  Fix for BUG#9439:
  Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
2005-04-16 23:35:39 +04:00
unknown
1eb8066155 Merge mysql.com:/home/mydev/mysql-4.1-bug9188
into mysql.com:/home/mydev/mysql-5.0-bug9188


myisam/myisampack.c:
  Auto merged
2005-04-16 21:01:46 +02:00
unknown
ec280d6ffb Merge mysql.com:/home/mydev/mysql-4.1-bug9487
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-16 20:56:21 +02:00
unknown
f3feba87a2 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug9487
2005-04-16 18:56:46 +02:00
unknown
cef7e66e98 Merge
myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged
2005-04-16 17:58:11 +02:00
unknown
dacff5a908 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-16 17:44:04 +02:00
unknown
550fff6b72 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
2005-04-16 11:43:03 +03:00
unknown
ca66271141 Set bindir, datadir & others if --basedir is given. This ensures that one only has to set basedir in [mysqld] group when moving a binary installation to a not default polace
Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf)
Search first for defaults files in basedir and then in datadir (like mysqld_safe)


support-files/mysql.server.sh:
  Set bindir, datadir & others if --basedir is given. This ensures that one only has to set basedir in [mysqld] group when moving a binary installation to a not default polace
  Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf)
  Search first for defaults files in basedir and then in datadir (like mysqld_safe)
  I removed the test for localstatedir as default.c doesn't anymore read defaults files from localstatedir
2005-04-16 11:40:41 +03:00