Commit graph

30998 commits

Author SHA1 Message Date
unknown
3554d87f84 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 19:23:37 +01:00
unknown
7a7c1f7983 Merge
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged
2006-02-16 21:11:38 +03:00
unknown
adb30dd537 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-16 10:27:48 -06:00
unknown
ed8b745909 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-16 17:27:47 +01:00
unknown
22b4ced45e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-16 17:27:46 +01:00
unknown
931f4d74bb Bug #17459 Cluster row based replication not setup if backup is ongoing
- also accept setting up binlog for tables in stateBackup
2006-02-16 17:25:28 +01:00
unknown
0deff29c05 Bug #17169: Partitions: out of memory if add partition and unique.
When creating a new partition, a bogus memory allocation problem was
reported.


mysql-test/r/partition.result:
  Add new results
mysql-test/t/partition.test:
  Add new regression test
sql/sql_table.cc:
  Fix inverted tests that caused mysql_copy_key_list() to not work at all,
  remove a forward declaration for a function that does not exist, and fix
  a debug message.
2006-02-16 08:15:36 -08:00
unknown
55383493e0 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-16 10:01:16 -06:00
unknown
74f6299efd mysqlcheck.c:
Fix out of order options.


client/mysqlcheck.c:
  Fix out of order options.
2006-02-16 10:00:14 -06:00
unknown
14a4824194 Test updates
mysql-test/t/ndb_dd_backuprestore.test:
  Updated with suggestions from Jonas
mysql-test/include/ndb_restore_master.inc:
  corrected issues with using cygwin to create
mysql-test/include/ndb_backup.inc:
  corrected issues with using cygwin to create
2006-02-16 16:33:46 +01:00
unknown
f39aca3f86 fix for bug#17543 Creating Event crash the server
this problem affects only debug builds


mysql-test/r/events.result:
  update results
mysql-test/t/events.test:
  tests for bug#17543 Creating Event crash the server
sql/event_timed.cc:
  the delimiter between DO and the body could be not only a space
  but any other recognized white space, so use proper macro.
2006-02-16 16:11:02 +01:00
unknown
e0cbeea11f ndb - wl#3023 : pass tables per GCI to injector at epoch start
sql/ha_ndbcluster_binlog.cc:
  use_table at beginning of epoch
storage/ndb/include/ndbapi/Ndb.hpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/Ndb.cpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  getGCIEventOperations: return distinct event ops at epoch start
2006-02-16 14:54:30 +01:00
unknown
5cdf49f0ce Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 14:53:38 +01:00
unknown
b5e971dd1f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-16 14:53:37 +01:00
unknown
5e98e21a6e Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 14:53:37 +01:00
unknown
b0232826ae 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-02-16 14:53:36 +01:00
unknown
e0ffcea886 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1


client/mysqldump.c:
  Auto merged
2006-02-16 14:53:36 +01:00
unknown
b1249dd8d7 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406


sql/sql_show.cc:
  Auto merged
2006-02-16 14:53:36 +01:00
unknown
79e26c1fb3 Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/ndb_msg-5.1 2006-02-16 14:53:35 +01:00
unknown
42f8c2d2ea Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
2006-02-16 16:53:34 +03:00
unknown
99ea15c93f The patch adds PROCESSLIST information schema
mysql-test/r/information_schema.result:
  Fixing results after PROCESSLIST information schema is added.
mysql-test/r/information_schema_db.result:
  Fixing results after PROCESSLIST information schema is added.
mysql-test/t/information_schema.test:
  Test case to check PROCESSLIST information schema.
    (Note that selecting other fields from PROCESSLIST
    can make the test unstable).
sql/sql_show.cc:
  Code for PROCESSLIST information schema
sql/table.h:
  Added for PROCESSLIST informarion schema
2006-02-16 16:45:05 +03:00
unknown
b4e7b365b5 Updates from review
mysql-test/include/ndb_backup.inc:
  We are writting test cases that use the ndb backup. This new include contains all the code needed to start the backup and grab the backup ID for the test. By moving the code here it will be easy to reuse
mysql-test/include/ndb_restore_master.inc:
  We are writting test cases that use the ndb backup and restore. This new include contains all the code needed to restore a master cluster from the backup done with ndb_backup.inc. By moving the code here it will be easy to reuse
mysql-test/t/ndb_dd_backuprestore.test:
  Updated with suggestions from Jonas
2006-02-16 14:24:47 +01:00
unknown
9b0dcd4104 Fix for solaris compiler 2006-02-16 13:12:25 +01:00
unknown
c80a0d7171 fix bug in show events which shows
| INTERVAL_VALUE | INTERVAL_FIELD |
| 20             | 20 MINUTE      |
the second one should be without the value


mysql-test/r/events.result:
  update test result to be as they should be
sql/event_timed.cc:
  manually append the name of the interval because it's no more appended
  by reconstruct_value
2006-02-16 13:11:16 +01:00
unknown
8916aa35bc missing DBUG_RETURN 2006-02-16 12:31:33 +01:00
unknown
ec2485c302 Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/ndb_msg-5.1 2006-02-16 12:14:03 +01:00
unknown
57aeec9a5c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-clean
2006-02-16 10:41:07 +01:00
unknown
920b9275bb Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 10:31:32 +01:00
unknown
3eacd48420 Merge msvensson@devsrv-b:/space/magnus/my51-bug17386
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
2006-02-16 10:24:50 +01:00
unknown
23b5e83ca4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:23:33 +01:00
unknown
9f6be31796 Merge neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:22:04 +01:00
unknown
f42c2c533a Merge neptunus.(none):/home/msvensson/mysql/bug16333/my50-bug16333
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-16 10:20:42 +01:00
unknown
99c6db8177 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  Merge
2006-02-16 10:18:12 +01:00
unknown
bf9e29d174 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 10:17:30 +01:00
unknown
c7fced7f0b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-02-16 10:09:53 +01:00
unknown
77fe1eba22 Merge neptunus.(none):/home/msvensson/mysql/bug16333/my50-bug16333
into  neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333


mysys/thr_mutex.c:
  Auto merged
2006-02-16 10:08:02 +01:00
unknown
4283d9f092 ndb_load disabled
mysql-test/t/disabled.def:
  Disable ndb_load again...
2006-02-16 10:03:13 +01:00
unknown
ba02b2e485 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-16 09:12:45 +01:00
unknown
0a7677b9dd Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-16 09:07:17 +01:00
unknown
802afca744 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-16 09:05:58 +01:00
unknown
4ecc62881f Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug8841


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
2006-02-16 08:59:55 +01:00
unknown
b67174961c Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-16 07:01:15 +01:00
unknown
13adc06f53 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new


storage/ndb/include/util/File.hpp:
  Auto merged
storage/ndb/src/common/portlib/NdbConfig.c:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
2006-02-16 15:51:37 +11:00
unknown
82f645531c Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname
2006-02-16 15:47:48 +11:00
unknown
7141bfd049 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 05:23:04 +01:00
unknown
89f598eea9 small post-merge fixes for bug#16406
(pre-push)


mysql-test/r/events.result:
  update result
mysql-test/t/events.test:
  few more tests
sql/event.cc:
  fix compilation failure after big merge
sql/event.h:
  initialize s_ctx to be the context to be used.
  don't use sphead->m_security_ctx but we will copy 
  the initted ctx to there
sql/event_timed.cc:
  -initialize s_ctx to be the context to be used.
  don't use sphead->m_security_ctx but we will copy 
  the initted ctx to there
  
  - first init the context
  - then compile the event
  - and then copy the context
  - don't use mysql_change_db() for now change_security_context() gets the
    right context info
2006-02-16 05:21:02 +01:00
unknown
be4a1c2e94 Test case updates and new test cases added to CRBR
BitKeeper/deleted/.del-rpl_row_multi_update3.test~fcf9a2234bd0f1b:
  Delete: mysql-test/t/rpl_row_multi_update3.test
BitKeeper/deleted/.del-rpl_row_multi_update3.test~b366698f8379f38f:
  Delete: mysql-test/extra/rpl_tests/rpl_row_multi_update3.test
BitKeeper/deleted/.del-rpl_row_multi_update3.result~1a3a8438eaaf11f2:
  Delete: mysql-test/r/rpl_row_multi_update3.result
mysql-test/t/rpl_ndb_commit_afterflush.test:
  added comments
mysql-test/r/rpl_ndb_commit_afterflush.result:
  New results file
mysql-test/t/rpl_ddl.test:
  Added to skip default ndb engine
mysql-test/t/rpl_ndb_ddl.test:
  new wrapper for ndb
mysql-test/r/rpl_ndb_ddl.result:
  new wrapper for ndb
mysql-test/t/rpl_insert_ignore.test:
  Added to skip ndb if default engine
mysql-test/t/rpl_ndb_insert_ignore.test:
  New wrapper for ndb
mysql-test/r/rpl_ndb_insert_ignore.result:
  New Results file
mysql-test/t/rpl_multi_update2.test:
  Updated to skip ndb default engine + added comments
mysql-test/t/rpl_ndb_multi_update2.test:
  New ndb wrapper for test case
mysql-test/t/rpl_ndb_multi_update2-slave.opt:
  New slave option file to go with new NDB test wrapper
mysql-test/r/rpl_ndb_multi_update2.result:
  New results file
mysql-test/t/rpl_multi_update3.test:
  Updated to skip ndb default engine + added comments
mysql-test/t/rpl_ndb_multi_update3.test:
  New ndb wrapper for test case
mysql-test/r/rpl_ndb_multi_update3.result:
  New results file
mysql-test/t/rpl_relayrotate.test:
  added comments and ability to sjip when ndb is default engine
mysql-test/t/rpl_ndb_relayrotate.test:
  New wrapper for ndb
mysql-test/t/rpl_ndb_relayrotate-slave.opt:
  New option file for ndb slave
mysql-test/r/rpl_ndb_relayrotate.result:
  New results file
mysql-test/t/rpl_loaddata.test:
  Updated
mysql-test/t/rpl_multi_update.test:
  Updated
mysql-test/t/rpl_relay_space_myisam.test:
  Updated
mysql-test/t/rpl_row_001.test:
  Updated
mysql-test/t/rpl_row_blob_myisam.test:
  Updated
mysql-test/t/rpl_row_charset.test:
  Updated
mysql-test/t/rpl_row_delayed_ins.test:
  Updated
mysql-test/t/rpl_row_log.test:
  Updated
mysql-test/t/rpl_row_UUID.test:
  Updated
mysql-test/t/rpl_auto_increment.test:
  Updated
mysql-test/t/rpl_commit_after_flush.test:
  Updated
mysql-test/t/rpl_deadlock_innodb.test:
  Updated
mysql-test/t/rpl_failed_optimize.test:
  Updated
mysql-test/t/rpl_foreign_key_innodb.test:
  Updated
mysql-test/t/rpl_insert_id_pk.test:
  Updated
mysql-test/t/rpl_insert_id.test:
  Updated
mysql-test/t/rpl_relay_space_innodb.test:
  Updated
mysql-test/t/rpl_row_blob_innodb.test:
  Updated
mysql-test/t/rpl_row_func003.test:
  Updated
mysql-test/t/rpl_row_log_innodb.test:
  Updated
mysql-test/t/rpl_row_sp002_innodb.test:
  Updated
mysql-test/t/rpl_row_sp003.test:
  Updated
mysql-test/t/rpl_row_sp006_InnoDB.test:
  Updated
mysql-test/t/rpl_row_sp007_innodb.test:
  Updated
mysql-test/t/rpl_ndb_row_001.test:
  New wrapper for ndb
mysql-test/r/rpl_ndb_row_001.result:
  New results file
mysql-test/t/rpl_ndb_UUID.test:
  New wrapper for ndb
mysql-test/r/rpl_ndb_UUID.result:
  New results file
mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
  Updated with order by
mysql-test/r/rpl_row_delayed_ins.result:
  Updated results file
mysql-test/t/rpl_ndb_charset.test:
  New wrapper for ndb
mysql-test/r/rpl_ndb_charset.result:
  New results file
mysql-test/t/rpl_row_until.test:
  Updated to skip when ndb is default. ndb bin logs are different size, so test would need to be rewitten for ndb
mysql-test/t/rpl_row_max_relay_size.test:
  Updated
mysql-test/t/rpl_row_sp008.test:
  Removed show binlog as it is not needed for test
mysql-test/r/rpl_row_sp008.result:
  Updated results
mysql-test/t/rpl_row_basic_11bugs.test:
  Removed show binlog as it is not needed for test
mysql-test/r/rpl_row_basic_11bugs.result:
  Updated results
BitKeeper/deleted/.del-rpl_ndb_max_relay_size.test~afa6834a51627676:
  Delete: mysql-test/t/rpl_ndb_max_relay_size.test
BitKeeper/deleted/.del-rpl_ndb_max_relay_size.result~1e944e2782e270d8:
  Delete: mysql-test/r/rpl_ndb_max_relay_size.result
mysql-test/t/disabled.def:
  Updated
2006-02-16 04:42:16 +01:00
unknown
bd24b49eff Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
2006-02-16 03:24:55 +01:00
unknown
6c2b561309 Bug #17415 special character tables are not handled correctly in ndb binlog/schema dist 2006-02-16 03:23:43 +01:00
unknown
51e1a5f810 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 02:13:37 +01:00