Commit graph

18258 commits

Author SHA1 Message Date
unknown
786ba12f31 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-05-07 14:43:03 +01:00
unknown
bb42494438 Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update"
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups.


mysql-test/r/insert_update.result:
  Test for Bug#9725
mysql-test/t/insert_update.test:
  Test for Bug#9725
sql/sql_insert.cc:
  Ignore the failure in update_row when IGNORE is set.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-07 13:31:37 +01:00
unknown
5a50551504 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-05-07 12:19:35 +02:00
unknown
95e6873444 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-05-07 11:18:45 +02:00
unknown
aa0c40a33b ndb - bug#8928
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  same number of lh3distrbits for all frags
2005-05-07 10:56:03 +02:00
unknown
29fcd4b318 Merge mysql.com:/home/jimw/my/mysql-4.1-9186
into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysql.cc:
  Auto merged
2005-05-07 01:05:19 -07:00
unknown
78565b0775 Merge mysql.com:/home/jimw/my/mysql-4.1-8648
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-07 01:04:54 -07:00
unknown
e28ddc8d7b Merge mysql.com:/home/jimw/my/mysql-4.1-8497
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/ha_heap.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-05-07 01:00:24 -07:00
unknown
a3a9677ab2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/ram/work/4.1
2005-05-07 09:06:11 +05:00
unknown
cae0d72898 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


BUILD/compile-dist:
  Auto merged
2005-05-07 01:26:10 +02:00
unknown
8ec23d0efc - typo fix in BUILD/compile-dist
BUILD/compile-dist:
  - typo fix
2005-05-07 01:25:20 +02:00
unknown
03c048b1ea Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


BUILD/compile-dist:
  Auto merged
2005-05-07 01:18:01 +02:00
unknown
bc6457fc36 - added some required CXXFLAGS to BUILD/compile-dist to allow the distribution build to pass without
unresolved symbols


BUILD/compile-dist:
  - added some required CXXFLAGS to allow the distribution build to pass
2005-05-07 00:53:36 +02:00
unknown
d459cb8b5a Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-05-06 17:30:36 +01:00
unknown
b0bc3da102 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_base.cc:
  Auto merged
2005-05-06 16:16:05 +01:00
unknown
a56921bbe0 fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB 2005-05-06 20:11:01 +05:00
unknown
a67043dbd8 Bug#6611: wrong sorting order.
Adding cp1250_croatian_ci collation.
2005-05-06 20:11:00 +05:00
unknown
079910b6f1 Bug#6616
MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
  Infinite loop caused by missing update to thd version.


sql/sql_base.cc:
  Bug#6616
    thd version needs to be updated before reopening tables
    to prevent an infinite loop.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-06 14:42:28 +01:00
unknown
d1b7eda581 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/ram/work/4.1
2005-05-06 18:41:42 +05:00
unknown
cdbf493997 Bug#6505 Wrong sorting order:
latin2_croatian_ci collation was fixed.
2005-05-06 18:41:41 +05:00
unknown
0efb151d46 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/users/rburnett/bug10245


BitKeeper/etc/logging_ok:
  auto-union
2005-05-06 15:24:07 +02:00
unknown
6b819860e5 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/users/rburnett/bug9721


BitKeeper/etc/logging_ok:
  auto-union
2005-05-06 15:10:01 +02:00
unknown
779ac9cf9e Bug #9721 net_write_timeout not used on Windows
viosocket.c:
  Use ?: syntax to simplify code for setting both timeouts


vio/viosocket.c:
  Use ?: syntax to simplify code for setting both timeouts
2005-05-06 15:08:10 +02:00
unknown
f547b03edb A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).
include/my_global.h:
  A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).
  We don't need to manipulate HAVE_ATOMIC_XXX here as we test it in the configure.
2005-05-06 16:12:42 +05:00
unknown
9b2078d5a0 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
2005-05-06 12:31:51 +02:00
unknown
fc80e4c121 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ibmlab.site:/home/my/bk/mysql-4.1
2005-05-06 13:22:56 +03:00
unknown
a0aa453934 bug#6504 Upper/Lower conversion bug:
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
2005-05-06 15:22:55 +05:00
unknown
7249019101 A fix for Bug#8467.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-06 12:18:37 +03:00
unknown
8b49ccace4 Bug#10193
Invalid DataDir in config causes ndbd segfault


ndb/src/kernel/error/ErrorReporter.cpp:
  print error and return error if unable to open the file for error reporting.
2005-05-06 10:43:29 +02:00
unknown
98eb8d7c16 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
2005-05-06 10:15:58 +03:00
unknown
972c1573d1 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-05-06 00:21:20 +02:00
unknown
0bd7e5f97b - fixed typo in variable name that caused compile errors on many platforms (tmp_error -> tmp_errno) 2005-05-06 00:16:33 +02:00
unknown
fa3016a876 Added cp932 character set 2005-05-05 11:37:52 -07:00
unknown
25896a822f Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql


BitKeeper/etc/logging_ok:
  auto-union
2005-05-05 10:46:14 -07:00
unknown
b1d7d8211b Added cp932 character set
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-05 10:36:17 -07:00
unknown
09ca059e4a Bug #10245 VC++ compiler error with mysql.cc
Only print the read line version if we are on a platform that supports readline

mysql.cc:
  Add #ifdef to only print readline version if we are on a platform that supports readline


client/mysql.cc:
  Add #ifdef to only print readline version if we are on a platform that supports readline
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-05 17:48:50 +02:00
unknown
af5596b32e Bug #9721 net_write_timeout not used on Windows
Added an extra parameter to all calls to timeout().  
1 means we want to set the write timeout
0 means we wnat to set the read timeout

viossl.c:
  Add which parameter to ssl timeout routine
vio_priv.h:
  Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
  Add which parameter to vio_timeout sigs
net_serv.cc:
  Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
  Set the appropriate timeout in vio_timeout


vio/viosocket.c:
  Set the appropriate timeout in vio_timeout
sql/net_serv.cc:
  Use proper which code in call to vio_timeout to set the proper timeout
include/violite.h:
  Add which parameter to vio_timeout sigs
vio/vio_priv.h:
  Added which parameter to vio_ignore_timeout and vio_ssl_timeout
vio/viossl.c:
  Add which parameter to ssl timeout routine
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-05 17:17:57 +02:00
unknown
a48bccf44e Fix option handling of ./BUILD/compile-* to not try and pass options to
configure. It was already changed not to support additional options, but now
it was trying to pass all of the options to ./configure. (Bug #8648)


BUILD/FINISH.sh:
  Remove obsolete code that took arguments to the build scripts and passed
  them to configure -- now the only options supported are those handled within
  BUILD/SETUP.sh.
2005-05-05 04:56:30 -07:00
unknown
d4b3d364ed Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Devel/mysql-4.1
2005-05-05 16:23:39 +05:00
unknown
c758512a91 A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it
should return a non empty one"
(see comments for the changed files for details).


mysql-test/r/ps.result:
  A test case for Bug#9777: tests results fixed.
mysql-test/t/ps.test:
  A test case for Bug#9777
sql/item.cc:
  A fix for Bug#9777: when creating a constant item from within 
  Item_int_with_ref::new_item, create the item by value, not by name.
  This should work with prepared statements placeholders.
  Item_int_with_ref is a special optimization case used
   when we compare datetime constants with datetime value.
  Converting the item to integer early is OK as it is in line
  with the purpose of Item_int_with_ref - to speed up comparison by 
  using integers.
  Minor cleanups.
sql/item.h:
  Declaration for Item_int_with_ref::new_item
2005-05-05 12:55:09 +04:00
unknown
f3883ad0fa Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-05 09:36:19 +02:00
unknown
203543d1e7 mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper:
Initial Metrowerks CodeWarrior compiler support
  new file


support-files/MacOSX/mwar-wrapper:
  Initial Metrowerks CodeWarrior compiler support
BUILD/compile-darwin-mwcc:
  Initial Metrowerks CodeWarrior compiler support
support-files/MacOSX/mwcc-wrapper:
  Initial Metrowerks CodeWarrior compiler support
2005-05-05 09:34:15 +02:00
unknown
8b5b75ec11 Bug #5843: Server code does not check whether PID file was successfully written 2005-05-05 12:24:10 +05:00
unknown
a4053ca3e2 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-05 10:15:15 +03:00
unknown
f59fef3f97 terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:
Initial Metrowerks CodeWarrior compiler support


cmd-line-utils/libedit/config.h:
  Initial Metrowerks CodeWarrior compiler support
configure.in:
  Initial Metrowerks CodeWarrior compiler support
include/my_sys.h:
  Initial Metrowerks CodeWarrior compiler support
sql/sql_bitmap.h:
  Initial Metrowerks CodeWarrior compiler support
cmd-line-utils/readline/terminal.c:
  Initial Metrowerks CodeWarrior compiler support
2005-05-05 09:15:14 +02:00
unknown
709c4ad120 Fig compiler error. 2005-05-05 08:08:39 +03:00
unknown
021171697f Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-bug9444
2005-05-04 15:07:29 +02:00
unknown
40042ccc6b - adjusted the start and stop priority level in the mysql.server init script for chkconfig on
Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux
  (e.g. RHEL3/RHEL4)


support-files/mysql.server.sh:
  - adjusted the start and stop priority level for chkconfig on Red Hat Linux (BUG#9444) - we now match
    the levels used by the MySQL as shipped with Red Hat Linux (RHEL3/RHEL4)
2005-05-04 14:58:43 +02:00
unknown
7a8357e8e0 Initial value for a auto_increment can now be set using ALTER TABLE
AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
change is backported from 5.0 (Bug #7061).


sql/ha_innodb.cc:
  Initial value for a auto_increment can now be set using ALTER TABLE
  AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
  change is backported from 5.0.
2005-05-04 12:24:56 +03:00
unknown
1a8d41a557 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-05-04 12:24:55 +03:00