Commit graph

30283 commits

Author SHA1 Message Date
unknown
59fffa2ef6 Wrapped get/set_ndb_share_state with mutex lock 2006-02-01 10:21:48 +01:00
unknown
55c304a17b bug 16996 ndbd nodes crash at api heartbeat failure if event/replication is used 2006-02-01 10:13:27 +01:00
unknown
8585070fdd adjust test to give predictable output 2006-02-01 10:07:04 +01:00
unknown
b89ce88345 Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
into  mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359


sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_show.cc:
  SCCS merged
2006-02-01 18:23:34 +11:00
unknown
fe98fef92c ensure repeatability of test case 2006-02-01 02:34:02 +01:00
unknown
d2767a25d6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-01 01:15:01 +01:00
unknown
d7d940ee04 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-02-01 01:13:21 +01:00
unknown
0a1351c1f8 wl2325, distribution of schema operations between mysql servers
mysql-test/r/ndb_binlog_ddl_multi.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_ddl_multi.result''
mysql-test/t/ndb_binlog_ddl_multi.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_ddl_multi.test''
2006-02-01 01:12:11 +01:00
unknown
21a946e36d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-fix-assert
2006-02-01 02:20:04 +03:00
unknown
f02d3527a2 Change DBUG_ASSERT(1) to DBUG_ASSERT(0) 2006-02-01 02:19:14 +03:00
unknown
ab9b866257 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Merge
2006-01-31 23:35:23 +01:00
unknown
6387eb20bd Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16407
2006-01-31 23:30:36 +01:00
unknown
1e59303344 sql_mode should be after on_completion and before comment
partial fix for bug #16407
WL#1034 (Internal CRON)


scripts/mysql_fix_privilege_tables.sql:
  sql_mode should be after on_completion and before comment
2006-01-31 23:29:03 +01:00
unknown
667c0e93a4 Propagating DictTabInfo in signal SubTableData for event TE_ALTER 2006-01-31 23:20:48 +01:00
unknown
41f7cb2a0a Added test case for creating index on disk stored table 2006-01-31 20:11:43 +01:00
unknown
6609e38aa5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/marty/MySQL/mysql-5.1-new
2006-01-31 20:11:42 +01:00
unknown
e886b89207 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  big_geek.:C:/Work/mysql/mysql-5.1
2006-01-31 13:11:41 -06:00
unknown
6635bf53a2 a few corrections necessary for the win32 folder rename
win/build-vs71.bat:
  fixed call out to deploy.bat
win/build-vs8.bat:
  fixed call out to deploy.bat
win/cmakefiles/base:
  changed win32 to win
win/cmakefiles/sql:
  use proper win folder for path
win/configure.js:
  this file should be called from the root so we need to use the path
2006-01-31 13:10:05 -06:00
unknown
75322f8dc1 Merge marty@192.168.123.145:MySQL/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892
2006-01-31 18:58:46 +01:00
unknown
f61abdadd5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2006-01-31 18:58:45 +01:00
unknown
78bfdc22c7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-01-31 18:58:44 +01:00
unknown
092f6fff48 Bug #16466 DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK 2006-01-31 18:46:44 +01:00
unknown
36b8f34e6f Updated tests for WL#1892 2006-01-31 18:31:37 +01:00
unknown
821def7f66 add the sql_mode to the enum with the fields
post-push fix for bug#16407 (sql_mode discarded)
WL#1034 (Internal CRON)
2006-01-31 17:22:38 +01:00
unknown
c190522684 Enable WL#1892 for binlog, wrong signature 2006-01-31 17:11:21 +01:00
unknown
866ad215b0 post-push fix
scripts/mysql_fix_privilege_tables.sql:
  fix to be event and ADD
2006-01-31 17:10:44 +01:00
unknown
50029d1c9d Enable WL#1892 for binlog 2006-01-31 17:01:14 +01:00
unknown
d7ef29b3b5 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16407
2006-01-31 16:39:14 +01:00
unknown
1bbd24a6ee Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-31 16:24:25 +01:00
unknown
2c79430086 partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event
WL#1034 (Internal CRON)


mysql-test/lib/init_db.sql:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
mysql-test/r/system_mysql_db.result:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
scripts/mysql_create_system_tables.sh:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
scripts/mysql_fix_privilege_tables.sql:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
2006-01-31 16:01:27 +01:00
unknown
9f68cdd26a Post review fixes 2006-01-31 15:53:35 +01:00
unknown
0923c39042 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
2006-01-31 15:47:00 +01:00
unknown
1940cabd08 change win32 to win 2006-01-31 08:41:39 -06:00
unknown
c062c5704a Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  big_geek.:C:/Work/mysql/mysql-5.1
2006-01-31 08:41:38 -06:00
unknown
d913b14a69 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-01-31 15:41:37 +01:00
unknown
0412006953 Bug #16851 Cluster: Auto Database Push is not working properly 2006-01-31 15:40:26 +01:00
unknown
3fa2273ac1 initial cmake fileset. It is not production ready but stable enough to start working with
win/build-vs71.bat:
  batch file to build project files for Visual Studio 2003
win/build-vs8.bat:
  batch file to build project files for Visual Studio 2005
win/cmakefiles/base:
  cmakefile that will later be moved into the target directory
win/cmakefiles/bdb:
  cmakefile that will later be moved into the target directory
win/cmakefiles/client:
  cmakefile that will later be moved into the target directory
win/cmakefiles/dbug:
  cmakefile that will later be moved into the target directory
win/cmakefiles/deploy.bat:
  cmakefile that will later be moved into the target directory
win/cmakefiles/extra:
  cmakefile that will later be moved into the target directory
win/cmakefiles/heap:
  cmakefile that will later be moved into the target directory
win/cmakefiles/innobase:
  cmakefile that will later be moved into the target directory
win/cmakefiles/myisam:
  cmakefile that will later be moved into the target directory
win/cmakefiles/myisammrg:
  cmakefile that will later be moved into the target directory
win/cmakefiles/mysys:
  cmakefile that will later be moved into the target directory
win/cmakefiles/regex:
  cmakefile that will later be moved into the target directory
win/cmakefiles/sql:
  cmakefile that will later be moved into the target directory
win/cmakefiles/strings:
  cmakefile that will later be moved into the target directory
win/cmakefiles/taocrypt:
  cmakefile that will later be moved into the target directory
win/cmakefiles/vio:
  cmakefile that will later be moved into the target directory
win/cmakefiles/yassl:
  cmakefile that will later be moved into the target directory
win/cmakefiles/zlib:
  cmakefile that will later be moved into the target directory
win/config-handlerton.js:
  javascript file for updating handlerton.cc based on configure options
win/config-version.js:
  javascript file for updating mysql_version.h based on configure.in data
win/configure.js:
  basic configure javascript
2006-01-31 07:52:16 -06:00
unknown
852a5405e6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829


sql/sql_yacc.yy:
  Auto merged
2006-01-31 15:51:55 +03:00
unknown
07104f36f0 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new
2006-01-31 05:08:43 -07:00
unknown
36732399c5 post-merge fix 2006-01-31 05:07:48 -07:00
unknown
2a65a55dc9 Merge neptunus.(none):/home/msvensson/mysql/bug15302/my50-bug15302
into  neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302


client/mysqltest.c:
  Auto merged
sql/sql_db.cc:
  Auto merged
2006-01-31 12:53:40 +01:00
unknown
b498114fba Merge neptunus.(none):/home/msvensson/mysql/bug15302/my41-bug15302
into  neptunus.(none):/home/msvensson/mysql/bug15302/my50-bug15302


client/mysqltest.c:
  Already in 5.0
sql/sql_db.cc:
  "mysql_create_db" is already silent in 5.0
2006-01-31 12:52:25 +01:00
unknown
5dda41a717 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
2006-01-31 12:47:36 +01:00
unknown
c35be28149 Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)
- Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
 - Change mysqltest to detect when there aren't as many warnings available as was reported.


client/mysqltest.c:
  Call "die" if warnings were reported but there weren't any warnings to retrieve
sql/sql_db.cc:
  Don't call "send_ok" if in silent mode.
2006-01-31 12:47:22 +01:00
unknown
4675b563e2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
2006-01-31 14:43:41 +03:00
unknown
80c60741c0 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-01-31 11:43:11 +01:00
unknown
394dd23495 bug#10987 - rpl_ndb_bank
last bug fix revealed another bug.
  fix buffer management when parsing table descriptor


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  remove pages on backup record, use buffer in file record instead
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  remove useless pages on backup record
    file buffer is good enough
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove useless pages on backup record
    file buffer is good enough
2006-01-31 11:42:36 +01:00
unknown
107ad3a03e Check std_data_ln already created
Add / to std_data in ln command


mysql-test/mysql-test-run.sh:
  Check if std_data_ln is already created
  Add / to std_data to create a symlink to a dir an not a file.
2006-01-31 10:48:40 +01:00
unknown
26cc7364a5 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/x/mysql-5.1-new
2006-01-31 10:48:40 +01:00
unknown
b5e313f364 Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
2006-01-31 09:49:54 +01:00