Commit graph

32588 commits

Author SHA1 Message Date
unknown
12a09a3506 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-28 01:56:24 +02:00
unknown
a242edb454 removed handlerton-win.cc
now using CONFIGURE_FILE and INCLUDE to generate handlerton.cc and to set the definitions based on
the storage engines given on the command line


BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
  Delete: sql/handlerton-win.cc
cmakelists.txt:
  use INCLUDE to read in the cmake file generated as part of configure
  comment out the setting of /wd4996 since we are using the -D flag instead
sql/cmakelists.txt:
  include IF() blocks for every storage engine and set two vars that are used with CONFIGURE_FILE later
  in the script.
  This CONFIGURE_FILE call replaces the need for config-handlerton.js
win/configure.js:
  write out proper cmake code instead of just the values.
2006-03-27 15:19:56 -06:00
unknown
c87b4ee3fd Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-27 23:08:25 +02:00
unknown
7130316d15 mysql_config.sh:
Remove Solaris -xc99=none C option as C++ compiler can't handle it


scripts/mysql_config.sh:
  Remove Solaris -xc99=none C option as C++ compiler can't handle it
2006-03-27 23:04:44 +02:00
unknown
e4e2e5024a Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
in older version.

The problem is that TRN-files created in "old" versions contain
junk in trigger_table field, which is not acceptable in "new" versions.


sql/parse_file.cc:
  1. Made parse_escaped_string() available globally;
  2. Polishing: fixing the comments.
sql/parse_file.h:
  Made parse_escaped_string() available globally.
sql/sql_trigger.cc:
  1. Polishing
  2. Removed declaration of global handle_old_incorrect_sql_modes()
     since it is not used anymore.
  3. Added a hook to support invalid "trigger_table" field in TRN-file
     from old versions.
2006-03-28 01:01:51 +04:00
unknown
2ef9c1c107 Merge mysqldev@win2003-x86:my/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-win-src


mysql-test/mysql-test-run.pl:
  Auto merged
2006-03-27 21:45:48 +02:00
unknown
421ae80b0c mysql_fix_privilege_tables is not available (nor needed) in a Windows CMake
build, so do not require it to be present in mysql-test-run.pl.
2006-03-27 21:44:29 +02:00
unknown
92fb31e3ef removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb
compile error fixes


BitKeeper/deleted/.del-rpl_ndb_sp007.test~72c66392eed0d74:
  Delete: mysql-test/t/rpl_ndb_sp007.test
BitKeeper/deleted/.del-rpl_ndb_sp007.result~b1b713abfd655893:
  Delete: mysql-test/r/rpl_ndb_sp007.result
mysql-test/t/disabled.def:
  removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb
sql/ha_ndbcluster.cc:
  compile error fixes
2006-03-27 19:41:37 +02:00
unknown
ce494285fc Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-03-27 19:37:29 +02:00
unknown
53aadad668 mysql_config.sh:
We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322


scripts/mysql_config.sh:
  We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
2006-03-27 19:25:25 +02:00
unknown
212e79136b netware doesnt use fork 2006-03-27 12:25:01 -05:00
unknown
583d776145 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-27 19:03:22 +02:00
unknown
7412739fb3 Bug #18491 cluster: node restart with pending dropeed events causes failed restart
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Bug #18491 cluster: node restart with pending dropeed events causes failed restart
  - recreate subscriptions in correct state (dropped if dropped...)
  - handle recreated subscribers with drooped table (tab_inforef)
2006-03-27 18:53:23 +02:00
unknown
bccd6a0293 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/skozlov/mysql-5.1-new
2006-03-27 18:03:30 +04:00
unknown
f4337c8b62 Bug#18436 (RBR: Replication to partition engine triggers assertion on slave):
Switching to using index_read() instead of index_read_idx() since a
range of rows need to be retrieved.


mysql-test/r/rpl_row_basic_8partition.result:
  Result change
mysql-test/t/rpl_row_basic_8partition.test:
  Enabling section for testing PARTITION BY KEY().
sql/log_event.cc:
  Using index_read() instead of index_read_idx() since a range of records
  are read using index_next().
mysql-test/extra/rpl_tests/rpl_partition.test:
  New BitKeeper file ``mysql-test/extra/rpl_tests/rpl_partition.test''
2006-03-27 14:58:37 +02:00
unknown
ab123657b2 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-03-27 15:23:16 +03:00
unknown
880b72d020 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2006-03-27 13:31:33 +02:00
unknown
1ef3430ef3 Merge mysql.com:/space/pekka/ndb/version/my50
into  mysql.com:/space/pekka/ndb/version/my51


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  already fixed in 5.1
2006-03-27 13:24:50 +02:00
unknown
65cb0b51b8 ndb - bug#17380: Missing charset causes NDB Client to crash
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  check parseTableInfo return value to avoid coredump
  seen on solaris when charsets missing on client host
2006-03-27 13:16:53 +02:00
unknown
4ad1c2290c ATRT documentation
storage/ndb/test/run-test/ATRT_SETUP_README.txt:
  ATRT Setup documentation
storage/ndb/test/run-test/ATRT_USAGE_README.txt:
  ATRT Usage documentation
2006-03-27 14:59:19 +04:00
unknown
dc9441e3cf Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-03-27 13:47:13 +03:00
unknown
5e59971773 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-27 11:52:54 +02:00
unknown
7c641b686a Merge mysql.com:/home/kgeorge/mysql/5.0/B15102
into  mysql.com:/home/kgeorge/mysql/5.1/B15102


netware/BUILD/compile-netware-START:
  Auto merged
2006-03-27 12:35:16 +03:00
unknown
3b69e5ec42 Merge mysqldev@win2003-x86:my/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-win-src
2006-03-27 11:23:51 +02:00
unknown
084fd460c5 Add missing files for CMake build. 2006-03-27 11:23:50 +02:00
unknown
b3230cc265 Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
Reproduced in 5.0.16-nt. Tested to work in 5.0.20
  


mysql-test/r/group_min_max.result:
  Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
    Reproduced in 5.0.16-nt. Tested to be fixed in 5.0.20
mysql-test/t/group_min_max.test:
  Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
    Reproduced in 5.0.16-nt. Tested to be fixed in 5.0.20
2006-03-27 12:20:25 +03:00
unknown
8b1a1c6ccb Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-03-27 12:07:59 +03:00
unknown
783780f1c9 Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"
This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library


include/mysql.h:
  Safer fix for Bug #18435
sql-common/client.c:
  Safer fix for Bug #18435
2006-03-27 12:02:23 +03:00
unknown
d5ea29f42e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-27 10:43:37 +02:00
unknown
da1a6f58a6 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-03-27 10:34:21 +02:00
unknown
de8997d6c8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-03-27 10:31:25 +02:00
unknown
3cbae11cfd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-03-27 10:29:36 +02:00
unknown
b4af134a52 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  merge
2006-03-27 10:26:37 +02:00
unknown
f97e32b0b2 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
ndb/test/src/NdbRestarts.cpp:
  Auto merged
2006-03-27 10:21:52 +02:00
unknown
2a00c51673 ndb - autotest
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/ndbapi/testNodeRestart.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbBackup.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbRestarts.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
2006-03-27 10:18:48 +02:00
unknown
c04cf13756 added option for netware build
netware/BUILD/compile-netware-START:
  added option for netware builds
2006-03-26 21:23:15 -05:00
unknown
273aa4899a added option for netware build
netware/BUILD/compile-netware-START:
  added option for netware builds
2006-03-26 21:19:43 -05:00
unknown
67448e021b Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-03-26 01:35:45 -08:00
unknown
56e8814b77 Fix to remove engine dependency from handler.cc file, the last one for functions.
sql/ha_innodb.cc:
  Added new function to handlerton.
sql/handler.cc:
  Removed Innodb dependency (last remaining function call).
sql/handler.h:
  Added additional function for engines who need to know about client communication.
2006-03-26 01:32:52 -08:00
unknown
919d0d85ac Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/dlenev/mysql-5.1-merges


configure.in:
  Auto merged
2006-03-25 19:03:09 +03:00
unknown
157a6470e2 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/dlenev/mysql-5.1-merges
2006-03-25 18:55:02 +03:00
unknown
b16ef80fec configure.in:
AC_ARG_WITH inside "if" sometimes gives unexpected result,
  --with-fast-mutexes was not ignored when --with-debug given


configure.in:
  AC_ARG_WITH inside "if" sometimes gives unexpected result,
  --with-fast-mutexes was not ignored when --with-debug given
2006-03-25 13:38:37 +01:00
unknown
b98431a0ab update
BitKeeper/etc/ignore:
  Added mysql-test/r/backup.log mysql-test/r/events.log mysql-test/r/events_bugs.log mysql-test/r/events_logs_tests.log mysql-test/r/mysqltest.log mysql-test/r/symlink.log mysql-test/r/system_mysql_db.log to the ignore list
2006-03-25 13:14:52 +01:00
unknown
8e77d37f6e Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16415
2006-03-25 13:05:34 +01:00
unknown
2a60a43201 Updated test case. SHOW CREATE TABLE uses uppercase DEFAULT clause in 5.1. 2006-03-25 12:07:45 +03:00
unknown
9f9832e62d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16415
2006-03-25 01:12:06 +01:00
unknown
89822edbd5 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-24 15:24:06 -08:00
unknown
b16e72977d Merge mysql.com:/home/dlenev/mysql-5.0-bg18153
into  mysql.com:/home/dlenev/mysql-5.1-merges


sql/sql_table.cc:
  Manual merge.
2006-03-25 02:24:05 +03:00
unknown
b95fb17332 manual merge
mysql-test/r/events.result:
  Auto merged
mysql-test/t/events_bugs.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
2006-03-25 00:24:04 +01:00
unknown
8cf221f4bb changed version number 2006-03-24 18:24:04 -05:00