- 13 Jul, 2007 1 commit
-
-
unknown authored
storage/archive/ha_archive.cc: Added mutex around flush calls to make read's consistent (and not conflicting) storage/archive/ha_archive.h: Fixed issues for fast count(*) call
-
- 11 Jul, 2007 1 commit
-
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
-
- 10 Jul, 2007 4 commits
-
-
unknown authored
into mysql.com:/home/ram/work/mysql-5.1-maint
-
unknown authored
Problem: we don't take into account the length of the data written to the temporary data file during update on a CSV table. Fix: properly calculate the data file length during update. mysql-test/r/csv.result: Fix for bug #29652: csv.test failure: two changes conflict after merge - test result adjusted. storage/csv/ha_tina.cc: Fix for bug #29652: csv.test failure: two changes conflict after merge - adjust local_saved_data_file_length in case of update as well. storage/csv/ha_tina.h: Fix for bug #29652: csv.test failure: two changes conflict after merge - adjust local_saved_data_file_length in case of update as well.
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Auto merged
-
unknown authored
- correct result files
-
- 09 Jul, 2007 25 commits
-
-
unknown authored
Dont touch & chmod the err_log file if using syslog (mysqld_safe) scripts/mysqld_safe.sh: Dont touch & chmod the err_log file if using syslog
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/51
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/50
-
unknown authored
Fix a few typos in comments (from Paul DuBois) scripts/mysqld_safe.sh: Fix a few typos in comments (from Paul DuBois)
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/51 mysql-test/suite/rpl/r/rpl_misc_functions.result: Auto merged mysql-test/suite/rpl/t/rpl_misc_functions.test: Auto merged
-
unknown authored
Backport from 5.1 a fix to make this test deterministic mysql-test/r/rpl_misc_functions.result: Backport from 5.1 a fix to make this test deterministic mysql-test/t/rpl_misc_functions.test: Backport from 5.1 a fix to make this test deterministic
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/51 sql/log.cc: Auto merged
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/51 mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Auto merged
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/50
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: manual merge storage/ndb/test/run-test/daily-basic-tests.txt: manual merge
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/log_event.cc: manual merge
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
-
unknown authored
post-merge fix: re-enable rpl_udf test mysql-test/suite/rpl/t/disabled.def: post-merge fix: re-enable rpl_udf test
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/51 This merge requires a post-merge fix to remove rpl_udf from suite/rpl/t/disabled.def. mysql-test/lib/mtr_report.pl: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/suite/ndb/r/ndb_dd_basic.result: Auto merged mysql-test/suite/ndb/r/ndb_dd_ddl.result: Auto merged mysql-test/suite/ndb/r/ndb_gis.result: Auto merged mysql-test/suite/ndb/r/ndb_row_format.result: Auto merged mysql-test/suite/ndb/r/ndb_single_user.result: Auto merged mysql-test/suite/ndb/t/ndb_single_user.test: Auto merged mysql-test/suite/rpl/r/rpl_extraCol_innodb.result: Auto merged mysql-test/suite/rpl/r/rpl_extraCol_myisam.result: Auto merged mysql-test/suite/rpl/r/rpl_incident.result: 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/suite/rpl/r/rpl_sp.result: Auto merged mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_show.cc: Auto merged storage/csv/ha_tina.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged mysql-test/r/csv.result: Manual merge mysql-test/t/csv.test: Manual merge mysql-test/t/disabled.def: Manual merge
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/50
-
unknown authored
- correct result files
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/50 sql/log.cc: Auto merged
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/41
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/50
-
unknown authored
-
unknown authored
into mysql.com:/home/ram/work/b28808/b28808.5.1 sql/mysqld.cc: Auto merged sql/unireg.h: Auto merged mysql-test/t/show_check.test: merging sql/sql_parse.cc: merging
-
unknown authored
into mysql.com:/home/ram/work/b28808/b28808.5.0
-
unknown authored
into sita.local:/Users/tsmith/m/bk/maint/50
-
- 08 Jul, 2007 5 commits
-
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.1-opt
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.1-opt sql/field.cc: Auto merged
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.0-opt
-
unknown authored
-
unknown authored
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt sql/field.cc: Auto merged mysql-test/r/type_newdecimal.result: Manual merge sql/item_create.cc: Manual merge mysql-test/t/type_newdecimal.test: Manual merge.
-
- 07 Jul, 2007 4 commits
-
-
unknown authored
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29417 mysql-test/r/type_newdecimal.result: Manual merge. mysql-test/t/type_newdecimal.test: Manual merge.
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.0-opt
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/r/innodb_mysql.result: Auto merged mysql-test/include/mix1.inc: Merge with 5.0-opt.
-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.0-opt
-