Commit graph

32755 commits

Author SHA1 Message Date
unknown
e22f7abac9 include example storage engines in max build 2006-04-03 11:51:57 -07:00
unknown
e15ff61895 ndb -
fix testprogam if only 1 node group


ndb/test/ndbapi/testNodeRestart.cpp:
  fix testprogam if only 1 node group
2006-04-03 20:43:14 +02:00
unknown
ac308e3ae3 Bug #18596 binlog schema event auto push causes mysqld errors
- move slock bitmask to separate hash list, object living only during query


sql/ha_ndbcluster.h:
  Bug #18596 binlog schema event auto push causes mysqld errors
2006-04-03 19:11:20 +02:00
unknown
57cfa4d17c .libs is no longer used when compiling netware
netware/BUILD/compile-linux-tools:
  .libs/sql is no longer used when compiling netware
2006-04-03 11:54:09 -04:00
unknown
62264b1392 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new
2006-04-03 15:31:12 +02:00
unknown
d6d7213d68 Merge mysql.com:/usr/home/bar/mysql-4.1.12076
into  mysql.com:/usr/home/bar/mysql-5.0


sql/share/charsets/Index.xml:
  Auto merged
strings/ctype-extra.c:
  SCCS merged
2006-04-03 17:24:14 +05:00
unknown
a47bba1f25 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.12076
2006-04-03 17:11:54 +05:00
unknown
4ffa1acc7d ndb -
Fix compile error...when compiling debug


ndb/include/kernel/signaldata/FailRep.hpp:
  Fix compile error...when compiling debug
2006-04-03 13:12:23 +02:00
unknown
063a002705 ndb - bug#18612 - partitioned startup
add testprg for SR case aswell


ndb/test/ndbapi/testNodeRestart.cpp:
  Test also partitioned start during SR
ndb/test/run-test/daily-basic-tests.txt:
  Test also partitioned start during SR
2006-04-03 12:09:50 +02:00
unknown
70f4dbaa6e yassl link problem fixed
config/ac-macros/yassl.m4:
  typo
libmysql/Makefile.am:
  move common code to Makefile.shared
libmysql/Makefile.shared:
  move common code to Makefile.shared
libmysql_r/Makefile.am:
  move common code to Makefile.shared
2006-04-03 12:07:18 +02:00
unknown
3f5bfe4fc0 ndb - bug#18612
post weeked fixes :-)
  change impl. to use READ_NODESREQ to query state of other qmgr(partition)
    this as it has no (current) side effects, so that it's possible only to kill
    starting cluster (if one started and one starting)


ndb/include/kernel/signaldata/FailRep.hpp:
  Add paritioned FAIL_REP
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/test/ndbapi/testNodeRestart.cpp:
  Require that only starting cluster dies
2006-04-03 11:26:29 +02:00
unknown
838c7ddccc Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new
2006-04-03 10:32:19 +02:00
unknown
a5aa1d50b6 Missing file in last commit. 2006-04-03 10:28:53 +02:00
unknown
3f6872df37 Add embedded server build to the CMake build files.
cmakelists.txt:
  Move configure processing to top-level cmakelists.txt so that it can be
  shared by mysqld and libmysqld.
libmysqld/lib_sql.cc:
  Temporary #ifdef to allow building from both bitkeeper sources and windows source package.
libmysqld/libmysqld.def:
  Add export missing for test_libmysqld
sql/cmakelists.txt:
  Move configure processing to top-level cmakelists.txt so that it can be
  shared by mysqld and libmysqld.
sql/mysqld.cc:
  #ifdef out code that is not used, nor compiles, in embedded server.
strings/cmakelists.txt:
  Add some missing sources to fix embedded server build.
2006-04-03 10:25:36 +02:00
unknown
b5ca723613 Merge
scripts/mysql_install_db.sh:
  Auto merged
2006-04-03 03:52:22 +02:00
unknown
2574445ef1 Makefile.am:
Distribute mysql-test-run.pl


mysql-test/Makefile.am:
  Distribute mysql-test-run.pl
2006-04-03 03:47:28 +02:00
unknown
d2744ebcfd Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new


scripts/mysql_install_db.sh:
  Auto merged
2006-04-03 03:40:54 +02:00
unknown
e2b19a59d2 mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c:
Changed web address order.mysql.com to shop.mysql.com


netware/mysql_install_db.c:
  Changed web address order.mysql.com to shop.mysql.com
Docs/MySQLEULA.txt:
  Changed web address order.mysql.com to shop.mysql.com
scripts/mysql_install_db.sh:
  Changed web address order.mysql.com to shop.mysql.com
2006-04-03 03:37:43 +02:00
unknown
6de1d9d378 Makefile.am:
Install Perl mysql-test-run into test directory


mysql-test/Makefile.am:
  Install Perl mysql-test-run into test directory
2006-04-02 02:10:41 +02:00
unknown
4e8577550c Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.1-new
2006-04-01 20:11:22 +03:00
unknown
a11399c920 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug13520
2006-04-01 12:11:21 -05:00
unknown
583ff30bcb Andrei Elkin has arrived.
sql/authors.h:
  One more little helper to the crew.
2006-04-01 14:17:01 +03:00
unknown
a5abc598e5 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-04-01 02:57:56 -08:00
unknown
d5db81aa34 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-04-01 14:57:55 +04:00
unknown
f0bfea2bb0 Added a test case for bug #16504.
Results changed after the bug fix.
2006-03-31 23:12:05 -08:00
unknown
9eccbdaa88 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-520ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug13520


sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged
2006-04-01 00:59:25 -05:00
unknown
5ef6e903a4 Fixed bug #16504.
Multiple equalities were not adjusted after reading constant tables.
It resulted in neglecting good index based methods that could be
used to access of other tables.


mysql-test/r/having.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/r/select.result:
  Added a test case for bug #16504.
mysql-test/r/subselect.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/r/varbinary.result:
  Adjusted a test case results after fix for bug #16504.
mysql-test/t/select.test:
  Added a test case for bug #16504.
sql/item.cc:
  Fixed bug #16504.
  An Item_equal object may contain only a constant member.
  It may happen after reading constant tables.
sql/item_cmpfunc.cc:
  Fixed bug #16504.
  Added method Item_equal::check_const that check appearance of new 
  constant items in a multiple equality.
sql/item_cmpfunc.h:
  Fixed bug #16504.
  Added method Item_equal::check_const that check appearance of new 
  constant items in a multiple equality.
sql/sql_select.cc:
  Fixed bug #16504.
  Adjusted multiple equalities after reading constant tables.
  Fixed a few typo in comments.
2006-03-31 21:26:17 -08:00
unknown
a38750b8b3 use show_table instead of share 2006-03-31 22:03:13 -06:00
unknown
a6871e2713 Merge 2006-04-01 05:53:37 +02:00
unknown
2a4e2e8da2 Makefile.am:
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)


support-files/mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
mysql-test/Makefile.am:
  Let "make install" install mysql-test-run.pl
2006-04-01 05:44:10 +02:00
unknown
3eb7f2a239 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new


README:
  Auto merged
2006-04-01 04:17:30 +02:00
unknown
c19a6fc5c3 README:
Typo (bug#17167)


README:
  Typo (bug#17167)
2006-04-01 04:13:33 +02:00
unknown
3ff1ec0f89 zlib.m4:
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)


config/ac-macros/zlib.m4:
  Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)
2006-04-01 03:49:14 +02:00
unknown
381e1fced6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
2006-04-01 03:37:13 +02:00
unknown
1f762dab21 acinclude.m4:
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)


acinclude.m4:
  Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
  and search the given include directory first (bug#18369)
2006-04-01 03:28:07 +02:00
unknown
217b7eb42b Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-04-01 04:51:54 +04:00
unknown
835d2286f5 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  Auto merged
2006-04-01 02:46:32 +02:00
unknown
ab96fa0728 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-04-01 02:46:31 +02:00
unknown
a432c53f07 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-merged
2006-04-01 04:46:30 +04:00
unknown
69af49fa7a Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss398
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged


sql/ha_innodb.cc:
  Null-merge
storage/innobase/btr/btr0sea.c:
  Null-merge
2006-04-01 04:23:24 +04:00
unknown
0ad405f9d4 vcproj files:
Set MYSQL_SERVER_SUFFIX from build scripts, not hard
  code it into Visual Studio project files, bug#15974


VC++Files/bdb/bdb.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/innobase/innobase.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/libmysqld/libmysqld.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/mysqldemb/mysqldemb.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/mysys/mysys.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/sql/mysqld.vcproj:
  Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
2006-04-01 02:14:54 +02:00
unknown
872d1d71a1 Makefile.am, yassl.m4:
Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273


config/ac-macros/yassl.m4:
  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273
libmysql/Makefile.am:
  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273
libmysql_r/Makefile.am:
  Enable automake to determine dependency on yaSSL, by explicitly
  listing the .la files in Makefile.am, instead of using
  'yassl_libs_with_path', bug#18273
2006-04-01 01:24:28 +02:00
unknown
87c70a599f Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb/mysql-5.0-merged
2006-04-01 03:20:39 +04:00
unknown
f6ffb77cb4 Applied innodb-5.0-ss398 snapshot.
Fixed BUG#15650: DELETE with LEFT JOIN crashes server
 with innodb_locks_unsafe_for_binlog.
 Fixed compilation problem with non-C99 compilers
 in btr0sea.c


innobase/btr/btr0sea.c:
  Applied innodb-5.0-ss398 snapshot.
   Fix compilation problem with non-C99 compilers.
sql/ha_innodb.cc:
  Applied innodb-5.0-ss398 snapshot.
   Remove assertion ut_error which crashes the mysqld
   server if it prints a warning about the adaptive latch.
2006-04-01 01:54:15 +04:00
unknown
1de1269116 Fixed a typo. 2006-03-31 22:54:26 +03:00
unknown
561c21c3f9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18025-r2


sql/sql_partition.cc:
  Auto merged
2006-03-31 22:26:04 +04:00
unknown
c1a3261e60 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug17631


sql/ha_partition.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2006-03-31 11:42:12 -06:00
unknown
04570aa5f4 cleaned up a few method comments
moved several functions from sql_partition to be member functions


sql/partition_info.h:
  move these funcs from sql_partition to this class
sql/sql_partition.cc:
  move these funcs from sql_partition to this class
sql/sql_table.cc:
  calling the member func now instead
2006-03-31 11:39:44 -06:00
unknown
9319c2c777 ndb - autotest
add new testpgrom for bug#18612 to autotest


ndb/test/run-test/daily-basic-tests.txt:
  Add new testprogram to autotest
2006-03-31 18:53:07 +02:00
unknown
b81c6cdd21 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b18436-mysql-5.1-new
2006-03-31 18:27:08 +02:00