- 03 Apr, 2008 1 commit
-
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build sql/sql_yacc.yy: Auto merged sql/share/errmsg.txt: Auto merged
-
- 02 Apr, 2008 8 commits
-
-
unknown authored
into five.local.lan:/work/trees/mysql-5.1-build-src-clean
-
unknown authored
into five.local.lan:/work/trees/mysql-5.1-build-src-clean
-
unknown authored
into five.local.lan:/work/trees/mysql-5.0-build-src-clean
-
unknown authored
into five.local.lan:/work/merge/mysql-5.1-funcs_1
-
unknown authored
"funcs_1" data load
-
unknown authored
-
unknown authored
into five.local.lan:/work/trees/mysql-5.0-build-src-clean
-
unknown authored
into five.local.lan:/work/trees/mysql-5.1-build-src-clean mysql-test/mysql-test-run.pl: Auto merged
-
- 01 Apr, 2008 8 commits
-
-
unknown authored
into five.local.lan:/work/trees/mysql-5.1-build-src-clean
-
unknown authored
into five.local.lan:/work/trees/mysql-5.1-build-src-clean
-
unknown authored
into five.local.lan:/work/trees/mysql-5.0-build-src-clean
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build mysql-test/t/type_blob.test: Auto merged sql/field.cc: Auto merged sql/unireg.h: Auto merged
-
unknown authored
-
unknown authored
Based on contributed patch from Martin Friebe, CLA from 2007-02-24. The parser lacked support for field sizes after signed long, when it should extend to 2**32-1. Now, we correct that limitation, and also make the error handling consistent for casts. --- Fix minor complaints of Marc Alff, for patch against B-g#15776. --- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 into zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776 --- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776 into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build --- testing mysql-test/r/type_blob.result: Verify that blobs may be created with the size that is already documented. Additionally, test the limits of several other types. mysql-test/t/type_blob.test: Verify that blobs may be created with the size that is already documented. Additionally, test the limits of several other types. --- Drop table in case we start from a bad state. sql/field.cc: atoi() insufficient to gauge the length of some fields. Change it to strtoul(). sql/item_create.cc: atoi() insufficient to gauge the length of some fields. Change it to strtoul(). If a casted length is too long, raise an error. sql/share/errmsg.txt: Change ER_TOO_BIG_FIELDLENGTH so that it can accept sizes larger than 2**15 -- instead, 2**32. --- Manual merge. sql/sql_yacc.yy: Make lengths take, in addition to NUM, LONG_NUM, ULONGLONG_NUM, and DECIMAL_NUM. --- yacc/bison is left-recursive, so FIXME statement is wrong. --- Manual merge and reformatting. sql/unireg.h: Define new constant.
-
unknown authored
into trift2.:/MySQL/M51/push-5.1
-
unknown authored
ChangeSet@1.2583, 2008-03-31 Merge five.local.lan:/work/merge/mysql-5.0-Bug into five.local.lan:/work/merge/mysql-5.1-Bug Addditional manual fixes will be needed. MERGE: 1.1810.3667.16 Which contains ChangeSet@1.1810.3667.16, 2008-03-31 Fix for Bug #35335 funcs_1: Some tests fail within load_file during pushbuild runs ... mysql-test/std_data/funcs_1/ndb_tb1.txt: Rename: mysql-test/suite/funcs_1/data/ndb_tb1.txt -> mysql-test/std_data/funcs_1/ndb_tb1.txt mysql-test/std_data/funcs_1/ndb_tb2.txt: Rename: mysql-test/suite/funcs_1/data/ndb_tb2.txt -> mysql-test/std_data/funcs_1/ndb_tb2.txt mysql-test/std_data/funcs_1/ndb_tb3.txt: Rename: mysql-test/suite/funcs_1/data/ndb_tb3.txt -> mysql-test/std_data/funcs_1/ndb_tb3.txt mysql-test/std_data/funcs_1/ndb_tb4.txt: Rename: mysql-test/suite/funcs_1/data/ndb_tb4.txt -> mysql-test/std_data/funcs_1/ndb_tb4.txt
-
- 31 Mar, 2008 12 commits
-
-
unknown authored
into five.local.lan:/work/merge/mysql-5.1-Bug Addditional manual fixes will be needed. BitKeeper/deleted/.del-triggers_master.test: Auto merged mysql-test/std_data/funcs_1/innodb_tb1.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb2.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb3.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb4.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb1.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb2.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb3.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb4.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb1.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb2.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb3.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb4.txt: Auto merged mysql-test/std_data/funcs_1/t3.txt: Auto merged mysql-test/std_data/funcs_1/t4.txt: Auto merged mysql-test/std_data/funcs_1/t7.txt: Auto merged mysql-test/std_data/funcs_1/t9.txt: Auto merged mysql-test/suite/funcs_1/README.txt: Auto merged mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/sp_tb.inc: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_frkey.result: Auto merged mysql-test/suite/funcs_1/r/innodb_views.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_innodb.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_memory.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_myisam.result: Auto merged mysql-test/suite/funcs_1/r/is_tables_ndb.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/memory_views.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc: Auto merged mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_02.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_03.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_06.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_10.inc: Auto merged mysql-test/suite/funcs_1/t/innodb_trig_0407.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_02.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_03.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_06.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_07.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_08.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_10.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_02.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_03.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_06.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_07.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_08.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_10.test: Auto merged mysql-test/suite/funcs_1/triggers/trig_frkey2.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc: Auto merged mysql-test/suite/funcs_1/views/views_master.inc: Auto merged mysql-test/mysql-test-run.pl: ul ul
-
unknown authored
Made Federated and Cluster optional support-files/mysql.spec.sh: Made Federated and Cluster optional
-
unknown authored
Bug#35335 funcs_1: Some tests fail within load_file during pushbuild runs Solution: 1. Move files with input data used in load_file, load data etc. from suite/funcs_1/<whatever> to std_data 2. Use for testsuite funcs_1 the server option --secure-file-priv=<MYSQLTEST_VARDIR> 3. Outfiles have to be stored under MYSQLTEST_VARDIR + changes according to WL#4304 Cleanup in funcs_1 tests - backport of fixes/improvements made in 5.1 to 5.0 The differences between scripts in 5.0 and 5.1 cause much additional and annoying work during any upmerge. - replace error numbers with names - improved comments - improved formatting - Unify storage engine names so that result files for storage engine variants do not differ (some tests) - remove a script no more used (tests are done in other scripts) BitKeeper/deleted/.del-triggers_master.test: Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test mysql-test/std_data/funcs_1/innodb_tb1.txt: Rename: mysql-test/suite/funcs_1/data/innodb_tb1.txt -> mysql-test/std_data/funcs_1/innodb_tb1.txt mysql-test/std_data/funcs_1/innodb_tb2.txt: Rename: mysql-test/suite/funcs_1/data/innodb_tb2.txt -> mysql-test/std_data/funcs_1/innodb_tb2.txt mysql-test/std_data/funcs_1/innodb_tb3.txt: Rename: mysql-test/suite/funcs_1/data/innodb_tb3.txt -> mysql-test/std_data/funcs_1/innodb_tb3.txt mysql-test/std_data/funcs_1/innodb_tb4.txt: Rename: mysql-test/suite/funcs_1/data/innodb_tb4.txt -> mysql-test/std_data/funcs_1/innodb_tb4.txt mysql-test/std_data/funcs_1/memory_tb1.txt: Rename: mysql-test/suite/funcs_1/data/memory_tb1.txt -> mysql-test/std_data/funcs_1/memory_tb1.txt mysql-test/std_data/funcs_1/memory_tb2.txt: Rename: mysql-test/suite/funcs_1/data/memory_tb2.txt -> mysql-test/std_data/funcs_1/memory_tb2.txt mysql-test/std_data/funcs_1/memory_tb3.txt: Rename: mysql-test/suite/funcs_1/data/memory_tb3.txt -> mysql-test/std_data/funcs_1/memory_tb3.txt mysql-test/std_data/funcs_1/memory_tb4.txt: Rename: mysql-test/suite/funcs_1/data/memory_tb4.txt -> mysql-test/std_data/funcs_1/memory_tb4.txt mysql-test/std_data/funcs_1/myisam_tb1.txt: Rename: mysql-test/suite/funcs_1/data/myisam_tb1.txt -> mysql-test/std_data/funcs_1/myisam_tb1.txt mysql-test/std_data/funcs_1/myisam_tb2.txt: Rename: mysql-test/suite/funcs_1/data/myisam_tb2.txt -> mysql-test/std_data/funcs_1/myisam_tb2.txt mysql-test/std_data/funcs_1/myisam_tb3.txt: Rename: mysql-test/suite/funcs_1/data/myisam_tb3.txt -> mysql-test/std_data/funcs_1/myisam_tb3.txt mysql-test/std_data/funcs_1/myisam_tb4.txt: Rename: mysql-test/suite/funcs_1/data/myisam_tb4.txt -> mysql-test/std_data/funcs_1/myisam_tb4.txt mysql-test/std_data/funcs_1/t3.txt: Rename: mysql-test/suite/funcs_1/data/t3.txt -> mysql-test/std_data/funcs_1/t3.txt mysql-test/std_data/funcs_1/t4.txt: Rename: mysql-test/suite/funcs_1/data/t4.txt -> mysql-test/std_data/funcs_1/t4.txt mysql-test/std_data/funcs_1/t7.txt: Rename: mysql-test/suite/funcs_1/data/t7.txt -> mysql-test/std_data/funcs_1/t7.txt mysql-test/std_data/funcs_1/t9.txt: Rename: mysql-test/suite/funcs_1/data/t9.txt -> mysql-test/std_data/funcs_1/t9.txt mysql-test/Makefile.am: Introduce installation of funcs_1 files in std_data. mysql-test/mysql-test-run.pl: The tests within funcs_1 need a server started with --secure-file-priv=<MYSQLTEST_VARDIR> like the main regression tests. mysql-test/suite/funcs_1/README.txt: Extended description mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc: Cleanup mysql-test/suite/funcs_1/datadict/datadict_load.inc: Cleanup mysql-test/suite/funcs_1/include/innodb_tb1.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/innodb_tb2.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/innodb_tb3.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/innodb_tb4.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/memory_tb1.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/memory_tb2.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/memory_tb3.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/memory_tb4.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/myisam_tb1.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/myisam_tb2.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/myisam_tb3.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/myisam_tb4.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/include/sp_tb.inc: Adjustment to new storage place of infile. mysql-test/suite/funcs_1/r/innodb_func_view.result: Updated results mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Updated results mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Updated results mysql-test/suite/funcs_1/r/innodb_storedproc_06.result: Updated results mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Updated results mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Updated results mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Updated results mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Updated results mysql-test/suite/funcs_1/r/innodb_trig_03.result: Updated results mysql-test/suite/funcs_1/r/innodb_trig_0407.result: Updated results mysql-test/suite/funcs_1/r/innodb_trig_08.result: Updated results mysql-test/suite/funcs_1/r/innodb_trig_09.result: Updated results mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result: Updated results mysql-test/suite/funcs_1/r/innodb_trig_frkey.result: Updated results mysql-test/suite/funcs_1/r/innodb_views.result: Updated results mysql-test/suite/funcs_1/r/is_columns_innodb.result: Updated results mysql-test/suite/funcs_1/r/is_columns_memory.result: Updated results mysql-test/suite/funcs_1/r/is_columns_myisam.result: Updated results mysql-test/suite/funcs_1/r/is_columns_ndb.result: Updated results mysql-test/suite/funcs_1/r/is_tables_innodb.result: Updated results mysql-test/suite/funcs_1/r/is_tables_memory.result: Updated results mysql-test/suite/funcs_1/r/is_tables_myisam.result: Updated results mysql-test/suite/funcs_1/r/is_tables_ndb.result: Updated results mysql-test/suite/funcs_1/r/memory_func_view.result: Updated results mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Updated results mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Updated results mysql-test/suite/funcs_1/r/memory_storedproc_06.result: Updated results mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Updated results mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Updated results mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Updated results mysql-test/suite/funcs_1/r/memory_trig_0102.result: Updated results mysql-test/suite/funcs_1/r/memory_trig_03.result: Updated results mysql-test/suite/funcs_1/r/memory_trig_0407.result: Updated results mysql-test/suite/funcs_1/r/memory_trig_08.result: Updated results mysql-test/suite/funcs_1/r/memory_trig_09.result: Updated results mysql-test/suite/funcs_1/r/memory_trig_1011ext.result: Updated results mysql-test/suite/funcs_1/r/memory_views.result: Updated results mysql-test/suite/funcs_1/r/myisam_func_view.result: Updated results mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Updated results mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Updated results mysql-test/suite/funcs_1/r/myisam_storedproc_06.result: Updated results mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Updated results mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Updated results mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Updated results mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Updated results mysql-test/suite/funcs_1/r/myisam_trig_03.result: Updated results mysql-test/suite/funcs_1/r/myisam_trig_0407.result: Updated results mysql-test/suite/funcs_1/r/myisam_trig_08.result: Updated results mysql-test/suite/funcs_1/r/myisam_trig_09.result: Updated results mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result: Updated results mysql-test/suite/funcs_1/r/myisam_views.result: Updated results mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc: "--echo" instead of SQL command. mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc: Adjustment to new storage place of infile + correct formatting. mysql-test/suite/funcs_1/storedproc/storedproc_02.inc: Backport from 5.1 + correct formatting. mysql-test/suite/funcs_1/storedproc/storedproc_03.inc: Minor improvements + correct formatting. mysql-test/suite/funcs_1/storedproc/storedproc_06.inc: Backport from 5.1 + correct formatting mysql-test/suite/funcs_1/storedproc/storedproc_10.inc: Backport from 5.1. + correct formatting mysql-test/suite/funcs_1/t/innodb_trig_0407.test: Cleanup mysql-test/suite/funcs_1/t/is_basics_mixed.test: Adjustment to new storage place of outfile. mysql-test/suite/funcs_1/t/memory_storedproc_02.test: Cleanup mysql-test/suite/funcs_1/t/memory_storedproc_03.test: Cleanup mysql-test/suite/funcs_1/t/memory_storedproc_06.test: Cleanup mysql-test/suite/funcs_1/t/memory_storedproc_07.test: Cleanup mysql-test/suite/funcs_1/t/memory_storedproc_08.test: Cleanup mysql-test/suite/funcs_1/t/memory_storedproc_10.test: Cleanup mysql-test/suite/funcs_1/t/myisam_storedproc_02.test: Cleanup mysql-test/suite/funcs_1/t/myisam_storedproc_03.test: Cleanup mysql-test/suite/funcs_1/t/myisam_storedproc_06.test: Cleanup mysql-test/suite/funcs_1/t/myisam_storedproc_07.test: Cleanup mysql-test/suite/funcs_1/t/myisam_storedproc_08.test: Cleanup mysql-test/suite/funcs_1/t/myisam_storedproc_10.test: Cleanup mysql-test/suite/funcs_1/triggers/trig_frkey2.inc: Cleanup mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Cleanup mysql-test/suite/funcs_1/triggers/triggers_03.inc: Backport from 5.1 mysql-test/suite/funcs_1/triggers/triggers_0407.inc: Backport from 5.1 mysql-test/suite/funcs_1/triggers/triggers_08.inc: Backport from 5.1 mysql-test/suite/funcs_1/triggers/triggers_09.inc: Backport from 5.1 mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc: Backport from 5.1 mysql-test/suite/funcs_1/views/func_view.inc: Backport from 5.1 mysql-test/suite/funcs_1/views/views_master.inc: Cleanup mysql-test/std_data/funcs_1/load_file.txt: New BitKeeper file ``mysql-test/std_data/funcs_1/load_file.txt''
-
unknown authored
-
unknown authored
Disabled 'rpl_redirect', failure is sporadic and and the test is superfluous rpl_packet.test, rpl_packet.result: Removing race conditions from rpl_packet causing test to fail mysql-test/suite/rpl/t/disabled.def: Disabled 'rpl_redirect', failure is sporadic and and the test is superfluous mysql-test/suite/rpl/r/rpl_packet.result: Result change. mysql-test/suite/rpl/t/rpl_packet.test: Setting net_buffer_length correctly for the test instead of relying on it being set correctly. Waiting for slave to stop after issuing a SLAVE STOP and waiting for slave to start when issuing a SLAVE START to prevent race conditions causing test failure.
-
unknown authored
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
-
unknown authored
into mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl
-
unknown authored
tables is not zero any more. For row-based logging, there is an extra commit for sending rows changed by the statement to the binary log. mysql-test/include/commit.inc: For row-based logging, an extra commit is done for each statement to commit non-transactional changes to the binary log. mysql-test/r/commit_1innodb.result: Result change.
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam sql/log.cc: Auto merged sql/slave.cc: Auto merged sql/share/errmsg.txt: merged 5.1-main to 5.1-bugteam
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam storage/innobase/handler/ha_innodb.cc: Auto merged
-
unknown authored
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam include/my_dbug.h: Auto merged mysys/mf_keycache.c: Auto merged sql/item_func.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged
-
- 30 Mar, 2008 3 commits
- 29 Mar, 2008 8 commits
-
-
unknown authored
If a binlog file is manually replaced with a namesake directory the internal purging did not handle the error of deleting the file so that eventually a post-execution guards fires an assert. Fixed with reusing a snippet of code for bug@18199 to tolerate lack of the file but no other error at an attempt to delete it. The same applied to the index file deletion. The cset carries pieces of manual merging. mysql-test/r/binlog_index.result: new results mysql-test/r/ctype_big5.result: results changed mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result: new results mysql-test/suite/binlog/r/binlog_stm_blackhole.result: new results mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test: cleanup. still todo: to let the test run multiple times w/o restarting the server (just ./mtr test) mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result: results changed mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test: guarding the test with statement format condition as the logics of the test requires sql/log.cc: two changes. One for the bug, other manual merge. The bug change needs MYF(0) to pass to my_delete because not all error out of the function are critical. The finer check is done on the caller of my_delete similarly how it was implemented for bug@18199 fixes. Non-existance of a file is not a critical error. sql/sql_class.cc: manual merge, removing extra automatically brought hunk.
-
unknown authored
into macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam mysys/mf_keycache.c: null-merge sql/item_func.cc: null-merge sql/lock.cc: null-merge sql/sql_analyse.cc: null-merge storage/csv/ha_tina.cc: null-merge storage/myisam/mi_check.c: null-merge storage/myisam/mi_keycache.c: null-merge
-
unknown authored
-
unknown authored
into macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam BitKeeper/deleted/.del-ha_berkeley.cc: null-merge extra/charset2html.c: Auto merged sql/mysqld.cc: null-merge sql/sql_union.cc: null-merge
-
unknown authored
-
unknown authored
into mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl BitKeeper/deleted/.del-binlog_killed_simulate.result: Auto merged BitKeeper/deleted/.del-show_binlog_events.inc: Auto merged mysql-test/suite/rpl/r/rpl_user.result: Auto merged storage/blackhole/ha_blackhole.cc: Auto merged BitKeeper/deleted/.del-show_binary_logs.inc: Delete: mysql-test/include/show_binary_logs.inc mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: manual merge ul. mysql-test/extra/binlog_tests/blackhole.test: manual merge mysql-test/suite/binlog/r/binlog_stm_blackhole.result: manual merge sql/log.cc: manual merge sql/share/errmsg.txt: manual merge sql/sql_class.cc: manual merge
-
unknown authored
into mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl client/mysqltest.c: Auto merged mysql-test/t/disabled.def: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_class.cc: Auto merged
-
unknown authored
mysql-test/suite/rpl/t/disabled.def: removing the line because there is no such test in the suite anymore.
-