summaryrefslogtreecommitdiff
path: root/mysql-test/suite
Commit message (Collapse)AuthorAgeFilesLines
* Many files:unknown2007-10-283-38/+38
| | | | | | | | | | | | Error message numbers. mysql-test/suite/rpl/r/rpl_extraCol_innodb.result: Error message numbers. mysql-test/suite/rpl/r/rpl_extraCol_myisam.result: Error message numbers. mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Error message numbers.
* rpl_row_tabledefs_2myisam.result, sp.result, rpl_row_colSize.result:unknown2007-10-282-32/+32
| | | | | | | | | | | | Error message numbers. mysql-test/suite/rpl/r/rpl_row_colSize.result: Error message numbers. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Error message numbers. mysql-test/r/sp.result: Error message numbers.
* Many files:unknown2007-10-279-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error message numbers. mysql-test/r/binlog_unsafe.result: Error message numbers. mysql-test/r/events_bugs.result: Error message numbers. mysql-test/r/events_trans.result: Error message numbers. mysql-test/r/sp_gis.result: Error message numbers. mysql-test/r/xml.result: Error message numbers. mysql-test/suite/rpl/r/rpl_incident.result: Error message numbers. mysql-test/suite/rpl/r/rpl_loaddata_fatal.result: Error message numbers. mysql-test/suite/rpl/r/rpl_udf.result: Error message numbers. mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result: Error message numbers. mysql-test/suite/ndb/r/ndb_dd_basic.result: Error message numbers. mysql-test/suite/ndb/r/ndb_dd_ddl.result: Error message numbers. mysql-test/suite/ndb/r/ndb_gis.result: Error message numbers. mysql-test/suite/ndb/r/ndb_row_format.result: Error message numbers. mysql-test/suite/ndb/r/ndb_single_user.result: Error message numbers.
* Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-optunknown2007-10-181-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/work/B31221-5.1-opt mysql-test/r/derived.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/type_date.test: Auto merged BitKeeper/deleted/.del-ps_6bdb.result: Auto merged mysql-test/suite/ndb/r/ps_7ndb.result: Auto merged sql/field.cc: Auto merged sql/item_timefunc.cc: Auto merged mysql-test/r/type_date.result: merge 5.0-opt -> 5.1-opt
| * Bug#31568 Some "information_schema" entries suddenly report a NULL defaultunknown2007-10-173-129/+117
| | | | | | | | | | | | | | | | | | | | | | | | updated result files mysql-test/suite/funcs_1/r/innodb__datadict.result: updated result file mysql-test/suite/funcs_1/r/memory__datadict.result: updated result file mysql-test/suite/funcs_1/r/myisam__datadict.result: updated result file
* | Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-10-102-6/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.1-opt libmysql/libmysql.c: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/r/innodb_mysql.result: Auto merged sql/field.cc: Auto merged sql/ha_partition.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_select.cc: Auto merged
| * \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optunknown2007-10-102-6/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.1-opt sql/item_timefunc.h: Auto merged mysql-test/suite/rpl/r/rpl_flushlog_loop.result: Auto merged sql/set_var.cc: manual merge. mysql-test/r/view.result: manual merge mysql-test/suite/rpl/t/rpl_flushlog_loop.test: manual merge mysql-test/t/view.test: manual merge
* | | | Fix bug#31150 "Test case does not cleanup":unknown2007-10-012-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the cleanup by dropping the database 'track' in test "rpl_bug31076". mysql-test/suite/rpl/r/rpl_bug31076.result: Fix bug#31150 "Test case does not cleanup": Drop the database 'track' which was newly created for this test. mysql-test/suite/rpl/t/rpl_bug31076.test: Fix bug#31150 "Test case does not cleanup": Drop the database 'track' which was newly created for this test.
* | | | Merge trift2.:/MySQL/M51/clone-5.1unknown2007-09-282-0/+176
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 This is mysql-5.1.22-rc. mysql-test/r/innodb_mysql.result: Auto merged scripts/mysqld_safe.sh: Auto merged sql/log_event.cc: Auto merged sql/sql_select.cc: Manual merge - the 31001 bug is already fixed. mysql-test/include/mix1.inc: Manual merge - should not have conflicted at all.
| * \ \ \ Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-releaseunknown2007-09-202-0/+176
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-release
| | * | | | BUG#31076 (Server crashes when start slave is issued):unknown2007-09-202-0/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22 due to an uninitialized variable. sql/log_event.cc: Initializing m_null_bits to null so that it can be detected that it was not initialized later. mysql-test/suite/rpl/r/rpl_bug31076.result: New BitKeeper file ``mysql-test/suite/rpl/r/rpl_bug31076.result'' mysql-test/suite/rpl/t/rpl_bug31076.test: New BitKeeper file ``mysql-test/suite/rpl/t/rpl_bug31076.test''
* | | | | | Merge trift-lap.fambruehe:/MySQL/M51/push-5.1unknown2007-09-2724-380/+2697
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M51/antony-5.1 Makefile.am: Auto merged configure.in: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged mysql-test/suite/funcs_1/r/innodb__datadict.result: Use most current version of test results. mysql-test/suite/funcs_1/r/memory__datadict.result: Use most current version of test results. mysql-test/suite/funcs_1/r/myisam__datadict.result: Use most current version of test results. mysql-test/suite/funcs_1/r/ndb__datadict.result: Use most current version of test results.
| * \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22unknown2007-09-2424-644/+2323
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M51/antony-5.1 mysql-test/suite/funcs_1/include/ndb_tb2.inc: Auto merged mysql-test/suite/funcs_1/r/innodb_views.result: Auto merged mysql-test/suite/funcs_1/r/memory_views.result: Auto merged mysql-test/suite/funcs_1/r/myisam_views.result: Auto merged mysql-test/suite/funcs_1/r/ndb_cursors.result: Auto merged mysql-test/suite/funcs_1/r/ndb_func_view.result: Auto merged mysql-test/suite/funcs_1/r/ndb_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/ndb_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/ndb_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/ndb_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/ndb_trig_03e.result: Auto merged mysql-test/suite/funcs_1/r/ndb_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/ndb_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/ndb_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/ndb_views.result: Auto merged mysql-test/suite/funcs_1/views/views_master.inc: Auto merged sql/ha_partition.h: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged configure.in: Version is updated already. sql/ha_partition.cc: Manual merge of 5.1.22 changes into main.
| | * | | | | | fix intermittant timing-related test failureunknown2007-09-132-2/+2
| | | | | | | |
| | * | | | | | Changes for pushbuild test runs and VSC compile warningsunknown2007-09-123-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: Fix test results for pushbuild mysql-test/suite/rpl/t/rpl_innodb_bug28430.test: Fix test results for pushbuild mysql-test/suite/rpl/t/rpl_innodb_bug30888.test: Fix test results for pushbuild storage/innobase/handler/ha_innodb.cc: resolve a VSC++ typecast compile warning.
| | * | | | | | undo unneccessary change to ha_innodb.ccunknown2007-09-126-26/+10
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove 'drop database' from new tests. mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: remove "DROP DATABASE test" mysql-test/suite/rpl/r/rpl_innodb_bug30888.result: remove "DROP DATABASE test" mysql-test/suite/rpl/r/rpl_innodb_bug30919.result: remove "DROP DATABASE test" mysql-test/suite/rpl/t/rpl_innodb_bug28430.test: remove "DROP DATABASE test" mysql-test/suite/rpl/t/rpl_innodb_bug30888.test: remove "DROP DATABASE test" mysql-test/suite/rpl/t/rpl_innodb_bug30919.test: remove "DROP DATABASE test" storage/innobase/handler/ha_innodb.cc: undo unneccessary edits.
| | * | | | | Bug#30919unknown2007-09-084-8/+1123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Rows not deleted from innodb partitioned tables if --innodb_autoinc_lock_mode=0" Due to a previous bugfix which initializes a previously uninitialized variable, ha_partition::get_auto_increment() may fail to operate correctly when the storage engine reports that it is only reserving one value and one or more partitions have a different 'next-value'. Currently, only affects Innodb's new-style auto-increment code which reserves larger blocks of values and has less inter-thread contention. mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: Fix results - previous results shows symptoms of Bug30919 sql/ha_partition.cc: Bug30919 ha_partition::write_row() Do not insert a row if a failure occurred while generating auto-increment value. ha_partition::get_auto_increment() If there is an empty 'intersection' of auto-increment values, perform a second pass before failing because partitions may have different auto-increment 'next-value' attributes. storage/innobase/handler/ha_innodb.cc: Bug30919 Only set *first_value if it is less than autoinc value. This allows a higher value to be hinted when operating as a partitioned table. mysql-test/suite/rpl/r/rpl_innodb_bug30919.result: New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug30919.result'' mysql-test/suite/rpl/t/rpl_innodb_bug30919-master.opt: New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30919-master.opt'' mysql-test/suite/rpl/t/rpl_innodb_bug30919.test: New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30919.test''
| | * | | | | perform explicit cleanupunknown2007-09-085-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add missing opt file mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: explicit post-test cleanup mysql-test/suite/rpl/r/rpl_innodb_bug30888.result: explicit post-test cleanup mysql-test/suite/rpl/t/rpl_innodb_bug28430.test: explicit post-test cleanup mysql-test/suite/rpl/t/rpl_innodb_bug30888.test: explicit post-test cleanup mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt: New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt''
| | * | | | | Bug#30907unknown2007-09-086-0/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases" Bug#28430 "Failure in replication of innodb partitioned tables on row/mixed format" Bug#30888 "Innodb table + stored procedure + row deletion = server crash" Apply Oracle patch from Sunny Include tests cases by Omer Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0 No need for "if" guard around row_unlock_table_autoinc_for_mysql() because it already performs same check. Make autoinc_lock_mode variable read-only for duration of running mysqld process. storage/innobase/handler/ha_innodb.cc: Bug30907/28430 "Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases" "Failure in replication of innodb partitioned tables on row/mixed format" Apply Oracle patch from Sunny Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0 No need for "if" guard around row_unlock_table_autoinc_for_mysql() because it already performs same check. Make autoinc_lock_mode variable read-only for duration of running mysqld process. storage/innobase/row/row0sel.c: Bug30888 "Innodb table + stored procedure + row deletion = server crash" Remove endian-specific code. Fix function row_search_autoinc_read_column() to handle any integer size up to 8 bytes. mysql-test/suite/rpl/r/rpl_innodb_bug28430.result: New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug28430.result'' mysql-test/suite/rpl/r/rpl_innodb_bug30888.result: New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug30888.result'' mysql-test/suite/rpl/t/rpl_innodb-master.opt: New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb-master.opt'' mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt: New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt'' mysql-test/suite/rpl/t/rpl_innodb_bug28430.test: New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430.test'' mysql-test/suite/rpl/t/rpl_innodb_bug30888.test: New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30888.test''
| | * | | | | Modifications to funcs_1 files for 5.1.22rc release including:unknown2007-09-0631-2583/+2694
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated row help count information - Added missing 'order by' clauses (altrady fixed in build tree) - Fixed isses with ndb_storeproc06/10 tests (added use database) - Corrected use of wrong engine in ndb tests (already fixed in build tree) - Update to ndb__datadict to replect additional fields in I_S (already corrected in build tree) mysql-test/suite/funcs_1/include/ndb_tb2.inc: Correction of wrong engine used for ndb test mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated result file mysql-test/suite/funcs_1/r/innodb_storedproc_06.result: Updated result file mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Updated result file mysql-test/suite/funcs_1/r/innodb_views.result: Updated result file mysql-test/suite/funcs_1/r/memory__datadict.result: Updated result file mysql-test/suite/funcs_1/r/memory_storedproc_06.result: Updated result file mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Updated result file mysql-test/suite/funcs_1/r/memory_views.result: Updated result file mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated result file mysql-test/suite/funcs_1/r/myisam_storedproc_06.result: Updated result file mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Updated result file mysql-test/suite/funcs_1/r/myisam_views.result: Updated result file mysql-test/suite/funcs_1/r/ndb__datadict.result: Updated result file mysql-test/suite/funcs_1/r/ndb_cursors.result: Updated result file mysql-test/suite/funcs_1/r/ndb_func_view.result: Updated result file mysql-test/suite/funcs_1/r/ndb_storedproc_06.result: Updated result file mysql-test/suite/funcs_1/r/ndb_storedproc_07.result: Updated result file mysql-test/suite/funcs_1/r/ndb_storedproc_08.result: Updated result file mysql-test/suite/funcs_1/r/ndb_storedproc_10.result: Updated result file mysql-test/suite/funcs_1/r/ndb_trig_0102.result: Updated result file mysql-test/suite/funcs_1/r/ndb_trig_03.result: Updated result file mysql-test/suite/funcs_1/r/ndb_trig_03e.result: Updated result file mysql-test/suite/funcs_1/r/ndb_trig_0407.result: Updated result file mysql-test/suite/funcs_1/r/ndb_trig_08.result: Updated result file mysql-test/suite/funcs_1/r/ndb_trig_09.result: Updated result file mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result: Updated result file mysql-test/suite/funcs_1/r/ndb_views.result: Updated result file mysql-test/suite/funcs_1/storedproc/storedproc_06.inc: Updated test file enforcing 'use database' after connect mysql-test/suite/funcs_1/storedproc/storedproc_10.inc: Updated test file enforcing 'use database' after connect mysql-test/suite/funcs_1/views/views_master.inc: Adding order by clauses in missing places
* | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1unknown2007-09-2514-106/+106
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Auto merged
| * | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-09-1914-106/+106
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Auto merged
| | * | | | Many files:unknown2007-09-155-70/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post-merge fix. mysql-test/suite/rpl/r/rpl_row_colSize.result: Post-merge fix. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Post-merge fix. mysql-test/suite/rpl/r/rpl_extraCol_innodb.result: Post-merge fix. mysql-test/suite/rpl/r/rpl_extraCol_myisam.result: Post-merge fix. mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Post-merge fix.
| | * | | | Many files:unknown2007-09-149-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge with 5.0-opt. mysql-test/r/binlog_unsafe.result: Merge with 5.0-opt. mysql-test/r/events_bugs.result: Merge with 5.0-opt. mysql-test/r/events_trans.result: Merge with 5.0-opt. mysql-test/r/sp.result: Merge with 5.0-opt. mysql-test/r/sp_gis.result: Merge with 5.0-opt. mysql-test/r/xml.result: Merge with 5.0-opt. mysql-test/suite/rpl/r/rpl_incident.result: Merge with 5.0-opt. mysql-test/suite/rpl/r/rpl_loaddata_fatal.result: Merge with 5.0-opt. mysql-test/suite/rpl/r/rpl_udf.result: Merge with 5.0-opt. mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result: Merge with 5.0-opt. mysql-test/suite/ndb/r/ndb_dd_basic.result: Merge with 5.0-opt. mysql-test/suite/ndb/r/ndb_dd_ddl.result: Merge with 5.0-opt. mysql-test/suite/ndb/r/ndb_gis.result: Merge with 5.0-opt. mysql-test/suite/ndb/r/ndb_row_format.result: Merge with 5.0-opt. mysql-test/suite/ndb/r/ndb_single_user.result: Merge with 5.0-opt.
* | | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-09-1440-23/+719
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 config/ac-macros/misc.m4: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Auto merged mysql-test/t/disabled.def: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/rpl_record.cc: Auto merged sql/rpl_rli.h: Auto merged sql/rpl_utility.cc: Auto merged sql/rpl_utility.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged
| * | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1unknown2007-09-142-0/+57
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge sql/log_event.cc: Auto merged
| | * | | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-09-132-0/+57
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/sp.result: SCCS merged mysql-test/t/sp.test: SCCS merged sql/sql_lex.h: SCCS merged sql/sql_parse.cc: SCCS merged sql/sql_yacc.yy: SCCS merged
| | | * \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-09-062-0/+57
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_view.cc: Auto merged
| | | | * \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-08-292-0/+57
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into magare.gmz:/home/kgeorge/mysql/autopush/B30244-5.1-opt sql/item_create.cc: Auto merged
| | | | | * | | | Bug #30244: row_count/found_rows does not replicate wellunknown2007-08-292-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions ROW_COUNT/FOUND_ROWS are indeed not safe to be used in statement based replication. Added code to declare them as such and switch the statement they're in to row based logging for mixed mode. sql/item_create.cc: Bug #30244: row_count/found_rows does not replicate well - add the functions to the set of "unsafe functions" for statement based replication mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result: BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test: BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
| * | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbunknown2007-09-1277-2257/+8039
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge sql/ha_ndbcluster.cc: Auto merged
| | * \ \ \ \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1unknown2007-09-1177-2257/+8039
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Auto merged mysql-test/t/disabled.def: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.h: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/rpl_record.cc: Auto merged sql/rpl_rli.h: Auto merged sql/rpl_utility.cc: Auto merged sql/rpl_utility.h: Auto merged
| | | * | | | | | | Test cleanup in rpl_binlog_grant: XID values are unpredictableunknown2007-09-062-3/+5
| | | | | | | | | |
| | | * | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-09-044-0/+236
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge mysql-test/r/sp.result: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/sp.test: Auto merged sql/item_cmpfunc.h: Auto merged sql/rpl_utility.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged
| | | | * | | | | | Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTSunknown2007-09-032-24/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement. mysql-test/suite/rpl/r/rpl_ps.result: Update result file.
| | | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-08-312-0/+107
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ibm.opbmk:/home/alik/Documents/MySQL/devel/5.1-rt-bug25843 sql/mysql_priv.h: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged
| | | | | * | | | | | Fix for BUG#25843: changing default database between PREPARE and EXECUTEunknown2007-08-312-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of statement breaks binlog. There were two problems discovered by this bug: 1. Default (current) database is not fixed at the creation time. That leads to wrong output of DATABASE() function. 2. Database attributes (@@collation_database) are not fixed at the creation time. That leads to wrong resultset. Binlog breakage and Query Cache wrong output happened because of the first problem. The fix is to remember the current database at the PREPARE-time and set it each time at EXECUTE. mysql-test/include/query_cache_sql_prepare.inc: The first part of the test case for BUG#25843. mysql-test/r/query_cache_ps_no_prot.result: Update result file. mysql-test/r/query_cache_ps_ps_prot.result: Update result file. mysql-test/suite/rpl/r/rpl_ps.result: Update result file. mysql-test/suite/rpl/t/rpl_ps.test: The second part of the test case for BUG#25843. sql/mysql_priv.h: Added mysql_opt_change_db() prototype. sql/sp.cc: 1. Polishing; 2. sp_use_new_db() has been removed; 3. Use mysql_opt_change_db() instead of sp_use_new_db(). sql/sp.h: sp_use_new_db() has been removed. This function has nothing to do with a) sp and b) *new* database. It was merely "switch the current database if needed". sql/sp_head.cc: 1. Polishing. 2. Use mysql_opt_change_db() instead of sp_use_new_db(). sql/sql_class.cc: Move THD::{db, db_length} into Statement. sql/sql_class.h: Move THD::{db, db_length} into Statement. sql/sql_db.cc: Introduce mysql_opt_change_db() as a replacement (and inspired by) sp_use_new_db(). sql/sql_prepare.cc: 1. Remember the current database in Prepared_statement::prepare(). 2. Switch/restore the current database in Prepared_statement::execute().
| | | | * | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-08-302-0/+91
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge client/mysql.cc: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/t/query_cache.test: Auto merged sql/item_cmpfunc.h: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged
| | | | | * | | | | | Bug#21975 Grant and revoke statements are non-transactionalunknown2007-08-292-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#21422 GRANT/REVOKE possible inside stored function, probably in a trigger Bug#17244 GRANT gives strange error message when used in a stored function GRANT/REVOKE statements are non-transactional (no explicit transaction boundaries) in nature and hence are forbidden inside stored functions and triggers, but they weren't being effectively forbidden. Furthermore, the absence of implict commits makes changes made by GRANT/REVOKE statements to not be rolled back. The implemented fix is to issue a implicit commit with every GRANT/REVOKE statement, effectively prohibiting these statements in stored functions and triggers. The implicit commit also fixes the replication bug, and looks like being in concert with the behavior of DDL and administrative statements. Since this is a incompatible change, the following sentence should be added to the Manual in the very end of the 3rd paragraph, subclause 13.4.3 "Statements That Cause an Implicit Commit": "Beginning with MySQL 5.0.??, the GRANT and REVOKE statements cause an implicit commit." Patch contributed by Vladimir Shebordaev mysql-test/r/sp-error.result: Test case result for Bug#17244 mysql-test/t/sp-error.test: Test case for Bug#17244 sql/sp_head.cc: Set that a procedure with GRANT/REVOKE command has a (implicit or explicit) commit. sql/sql_parse.cc: End active transaction in SQLCOM_GRANT and SQLCOM_REVOKE, and thus effectively prohibit these statements in stored functions and triggers. An implicit commit also fixes a bug in replication, when GRANT or REVOKE would disappear from the binary log in case of a subsequent ROLLBACK, since they were considered transactional statements. mysql-test/suite/rpl/r/rpl_binlog_grant.result: Add test case result for Bug#21975 mysql-test/suite/rpl/t/rpl_binlog_grant.test: Add test case for Bug#21975
| * | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbunknown2007-09-1229-23/+19
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj sql/ha_ndbcluster.cc: Auto merged
| | * | | | | | | | | moving these tests to suite ndb_teamunknown2007-09-059-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt: Rename: mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt -> mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt mysql-test/suite/ndb_team/t/ndb_autodiscover2.test: Rename: mysql-test/suite/ndb/t/ndb_autodiscover2.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover2.test mysql-test/suite/ndb_team/t/ndb_autodiscover.test: Rename: mysql-test/suite/ndb/t/ndb_autodiscover.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover.test mysql-test/suite/ndb_team/t/ndb_autodiscover3.test: Rename: mysql-test/suite/ndb/t/ndb_autodiscover3.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover3.test mysql-test/suite/ndb_team/r/ndb_autodiscover.result: Rename: mysql-test/suite/ndb/r/ndb_autodiscover.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover.result mysql-test/suite/ndb_team/r/ndb_autodiscover2.result: Rename: mysql-test/suite/ndb/r/ndb_autodiscover2.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover2.result mysql-test/suite/ndb_team/r/ndb_autodiscover3.result: Rename: mysql-test/suite/ndb/r/ndb_autodiscover3.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover3.result mysql-test/suite/ndb_team/t/disabled.def: BitKeeper file /home/tomas/mysql-5.1-new-ndb/mysql-test/suite/ndb_team/t/disabled.def
| | * | | | | | | | | tests actually work in statement basedunknown2007-09-0518-18/+0
| | | | | | | | | | |
| | * | | | | | | | | correct include fileunknown2007-09-051-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22unknown2007-09-041-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
| * | | | | | | | | | BUG#27543 Backup and restore can compatible with different endians for blob ↵unknown2007-09-052-0/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attribute mysql-test/Makefile.am: Add install data for new test case storage/ndb/tools/restore/Restore.cpp: Convert blob(text) length stored in main table mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data: test data for endian test mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data: test data for endian test mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl: test data for endian test mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log: test data for endian test mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl: test data for endian test mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log: test data for endian test mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data: test data for endian test mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data: test data for endian test mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl: test data for endian test mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log: test data for endian test mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl: test data for endian test mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log: test data for endian test mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result: test result for endian test mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test: test case for endian test
| * | | | | | | | | | Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbunknown2007-08-302-0/+11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge mysql-test/Makefile.am: Auto merged sql/ha_ndbcluster.cc: Auto merged storage/ndb/tools/restore/Restore.cpp: Auto merged storage/ndb/tools/restore/restore_main.cpp: Auto merged mysql-test/suite/ndb/r/ndb_restore_compat.result: Auto merged mysql-test/suite/ndb/t/ndb_restore_compat.test: Auto merged
| * | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22unknown2007-08-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge sql/field.cc: Auto merged
| * \ \ \ \ \ \ \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbunknown2007-08-282-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge mysql-test/suite/ndb/r/ndb_restore.result: Auto merged mysql-test/suite/ndb/t/ndb_restore.test: Auto merged sql/ha_ndbcluster.cc: manual merge
| * | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22unknown2007-08-2872-8802/+8938
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge sql/field.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/rpl_record.cc: Auto merged sql/rpl_utility.cc: Auto merged sql/rpl_utility.h: Auto merged
* | \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-09-0491-8766/+10927
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 configure.in: Auto merged mysql-test/t/disabled.def: Auto merged sql/field.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/rpl_record.cc: Auto merged sql/rpl_utility.cc: Auto merged sql/rpl_utility.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged
View Lorry Controller Status