Commit graph

22732 commits

Author SHA1 Message Date
unknown
1f75afedeb ndb - autotest
fixes


ndb/test/run-test/conf-daily-basic-dl145a.txt:
  dl145 uses /home for running
ndb/test/run-test/make-config.sh:
  output d.txt aswell
ndb/test/run-test/ndb-autotest.sh:
  more scripts updates
2005-05-07 13:23:38 +02:00
unknown
ce41e0de81 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-05-07 12:24:02 +02: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
1b001d8c52 merge 2005-05-07 11:56:10 +02:00
unknown
27139d3ae1 ndb - autotest
upgrades to shell script


ndb/test/run-test/Makefile.am:
  add config files
ndb/test/run-test/ndb-autotest.sh:
  bump version
  use rsync to sync participating hosts
2005-05-07 11:53:06 +02:00
unknown
4c91091dd1 Test case added for bug #9527 (negative zero is a nonsence)
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
2005-05-07 14:52:03 +05:00
unknown
77cb61d2cf Fix for bug #9527 (negative zero is a nonsence)
strings/decimal.c:
  added the check to make sure we don't ge -0.00
2005-05-07 14:41:00 +05:00
unknown
1570873c6b [backport of 4.1, because 4.0 autobuild now hits the same problem;
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.


configure.in:
  Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
  because config.status may later need this file (if it does not find it
  it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )
sql/share/Makefile.am:
  using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
  all-local is the standard way to :
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-07 11:35:14 +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
902aa10d23 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_base.cc:
  Auto merged
2005-05-07 08:46:42 +01:00
unknown
0228f89725 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.clean
2005-05-07 12:13:12 +05:00
unknown
52db68ca48 Small fix for the test
mysql-test/t/type_newdecimal.test:
  these lines work differently in ps-protocol mode so should always work in
  normal here
2005-05-07 12:11:05 +05:00
unknown
f291fb7285 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/test1-mysql-5.0
2005-05-07 12:08:14 +05:00
unknown
12380536bd Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/test1-mysql-5.0
2005-05-07 12:05:56 +05:00
unknown
a1494918f3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
2005-05-07 10:00:34 +03:00
unknown
c574528807 typo fixed 2005-05-07 08:59:12 +02: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
f5e0fd663d Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-05-07 01:28:46 +02: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
af6ba3866d Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.0.10004
2005-05-07 02:26:45 +05:00
unknown
1c3529013a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0


sql/sql_show.cc:
  Auto merged
2005-05-07 00:26:45 +03:00
unknown
930a245913 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/mysql-5.0
2005-05-07 02:26:44 +05:00
unknown
6397471f88 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.8998
2005-05-06 21:26:43 +00:00
unknown
fb760acf62 Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
DEFAULT_COLLTION_NAME field is added to SCHEMATA table


mysql-test/r/information_schema.result:
  Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
sql/sql_show.cc:
  Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
2005-05-06 20:14:22 +00:00
unknown
bf049c3167 Fix for bug #10018:use INFORMATION_SCHEMA works, but show tables in it returns error 2005-05-06 19:06:10 +00:00
unknown
f8aca31803 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 19:22:02 +02:00
unknown
57ec978bad ndb - autotest
fix count of nodes needed in test


ndb/test/run-test/conf-daily-basic-dl145a.txt:
  Fix typo
ndb/test/run-test/conf-daily-basic-ndbmaster.txt:
  Fix typo
ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  Fix typo
ndb/test/run-test/conf-daily-sql-ndbmaster.txt:
  Fix typo
ndb/test/run-test/ndb-autotest.sh:
  Fix count of needed computers for test
2005-05-06 19:20:32 +02:00
unknown
447b519072 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 18:59:37 +02:00
unknown
a2fe4d1bb2 ndb - autotest
fix to ndb-autotest.sh


ndb/test/run-test/ndb-autotest.sh:
  Add bin/ to get access to ndb_cpcc
2005-05-06 18:58:46 +02:00
unknown
6f83de163b Dmitri please review. Fix for BUG#10417 "CREATE TRIGGER not written to binlog":
writing DROP and CREATE TRIGGER to binlog, disabling binlogging
of substatements, testing.


mysql-test/r/rpl_sp.result:
  result update
mysql-test/t/rpl_sp.test:
  removing useless lines, plus testing replication of triggers
sql/sql_trigger.cc:
  trigger can be used to destroy slave, so only SUPER can create it by default.
  If create|drop goes ok, binlog CREATE TRIGGER and DROP TRIGGER.
sql/sql_trigger.h:
  disable binlogging of substatements of triggers (even if now triggers
  can't do updates)
2005-05-06 18:52:19 +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
c90926e055 Fix FC3 yaSSL compilation problem.
This fix is about WL#2286 - Compile MySQL w/YASSL support


extra/yassl/include/yassl_int.hpp:
  Use instance as static class member to fix FC compilation problem.
extra/yassl/src/yassl_int.cpp:
  Remove local static variable, use static class member instead.
extra/yassl/taocrypt/include/integer.hpp:
  Use instance as static class member to fix FC compilation problem.
extra/yassl/taocrypt/src/integer.cpp:
  Remove local static variable, use static class member instead.
2005-05-06 20:54:38 +05:00
unknown
843b47b16b merging
strings/decimal.c:
  Auto merged
2005-05-06 20:31:50 +05:00
unknown
793ab2b759 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 17:27:15 +02:00
unknown
e9df53909e ndb - autotest
Add shutdown options (so far only SIGKILL), so that there won't be any strace mysqld threads


ndb/src/cw/cpcd/APIService.cpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/src/cw/cpcd/CPCD.hpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/src/cw/cpcd/Process.cpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/test/include/CpcClient.hpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/test/run-test/main.cpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/test/src/CpcClient.cpp:
  Add shutdown options
   (so far only SIGKILL)
2005-05-06 17:26:22 +02: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
38d43503e5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/mysql-5.0
2005-05-06 20:11:02 +05: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
9c3a41f388 Merge mysql.com:/home/ram/work/mysql-4.1
into mysql.com:/home/ram/work/mysql-5.0


include/my_global.h:
  Auto merged
BitKeeper/etc/logging_ok:
  auto-union
sql/share/charsets/Index.xml:
  Auto merged
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
f98913819b Fix for bug #10004 (Decimal operation crashes server)
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
strings/decimal.c:
  old code didn't work when both decimals had zero before the decimal point
2005-05-06 20:06:25 +05:00
unknown
9207ef4b39 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
2005-05-06 17:55:30 +03:00
unknown
aa9391a0a9 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 16:42:49 +02:00