- 14 Jun, 2007 5 commits
-
-
unknown authored
make server crash UPDATE against CSV table may cause server crash or update a table with wrong values. CSV can write only a whole row at once. That means it must read all columns, that it is not going to update, and write them along with updated columns. But only limited set of columns was read, those that were needed for the UPDATE query. With this fix all columns are read in case we're performing an UPDATE. mysql-test/r/csv.result: A test case for BUG#28971. mysql-test/t/csv.test: A test case for BUG#28971. Flush tables is here just to make crash more probable. If we remove it, fields will have old values from previous query and server won't crash. storage/csv/ha_tina.cc: CSV engine is not capable to update single column, because it can only write a row at once. Thus we must read all columns if a table is opened for update.
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
-
unknown authored
Problem: crash on attempt to open a table having "#mysql50#" prefix in db or table name. Fix: This prefix is reserved for "mysql_upgrade" to access 5.0 tables whose file names are not encoded according to "5.1 tablename to filename encoded". Don't try open tables whose db name or table name has this prefix. mysql-test/r/show_check.result: Adding test case. mysql-test/t/show_check.test: Adding test case. sql/mysql_priv.h: Moving 5.0 prefix declarations into mysql_priv.h sql/sql_table.cc: Moving 5.0 prefix declarations into mysql_priv.h sql/table.cc: Don't try to do "normal" open of tables having '#mysql50#' prefix in db or table name. This prefix is reserved to access to unencoded table names when upgrading from 5.0 to 5.1.
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines mysql-test/r/merge.result: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged
-
unknown authored
SHOW CREATE TABLE fails Addition to the fix: report db name + table name instead of table path. This solves embedded merge test failure. mysql-test/r/merge.result: BUG#26976 - Missing table in merge not noted in related error msg + SHOW CREATE TABLE fails Addition to the fix: report db name + table name instead of table path. sql/ha_myisammrg.cc: BUG#26976 - Missing table in merge not noted in related error msg + SHOW CREATE TABLE fails Addition to the fix: report db name + table name instead of table path.
-
- 08 Jun, 2007 1 commit
-
-
unknown authored
SHOW CREATE TABLE fails After merge fixes. mysql-test/r/backup.result: Fixed test result. mysql-test/r/sp.result: Fixed test result. sql/sql_table.cc: Fixed wrongly merged line. Moved "deprecated" warnings from sql_yacc.yy to mysql_backup_tables/mysql_restore_table. sql/sql_yacc.yy: Moved "deprecated" warnings from sql_yacc.yy to mysql_backup_tables/mysql_restore_table. storage/myisam/ha_myisam.cc: Do not report the same error twice. storage/myisammrg/ha_myisammrg.cc: Removed wrongly merged line.
-
- 07 Jun, 2007 2 commits
-
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines mysql-test/r/key_cache.result: Auto merged mysql-test/r/lock.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/preload.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/repair.result: Auto merged mysql-test/r/rpl_failed_optimize.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/merge.test: Auto merged storage/myisammrg/myrg_def.h: Auto merged storage/myisammrg/myrg_open.c: Auto merged mysql-test/r/backup.result: Use local. mysql-test/r/sp.result: Use local. sql/sql_error.cc: Use local. sql/sql_error.h: Use local. sql/share/errmsg.txt: Manual merge. sql/sql_table.cc: Manual merge. storage/myisam/ha_myisam.cc: Manual merge. storage/myisammrg/ha_myisammrg.cc: Manual merge. storage/myisammrg/ha_myisammrg.h: Manual merge.
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines mysql-test/r/ps.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/view.result: Auto merged sql/sql_table.cc: Auto merged
-
- 06 Jun, 2007 8 commits
-
-
unknown authored
into xiphis.org:/home/antony/work2/mysql-5.1-merge configure.in: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
into xiphis.org:/home/antony/work2/mysql-5.0-merge configure.in: Manual merge
-
unknown authored
into xiphis.org:/home/antony/work2/mysql-5.0-engines.merge sql/mysqld.cc: Auto merged
-
unknown authored
into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge mysql-test/mysql-test-run.pl: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
-
unknown authored
into xiphis.org:/home/antony/work2/mysql-4.1-engines.merge
-
unknown authored
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
-
unknown authored
-
unknown authored
Add another exception to the acceptable mysqld errors, for test case for bug 28436 mysql-test/lib/mtr_report.pl: Add another exception to the acceptable mysqld errors, for test case for bug 28436
-
- 05 Jun, 2007 13 commits
-
-
unknown authored
SHOW CREATE TABLE fails Underlying table names, that merge engine fails to open were not reported. With this fix CHECK TABLE issued against merge table reports all underlying table names that it fails to open. Other statements are unaffected, that is underlying table names are not included into error message. This fix doesn't solve SHOW CREATE TABLE issue. myisammrg/myrg_def.h: Added myrg_print_wrong_table declaration. myisammrg/myrg_open.c: If HA_OPEN_FOR_REPAIR is passed to merge engine open function, report names of tables that we fail to open. mysql-test/r/backup.result: Updated test result. mysql-test/r/key_cache.result: Updated test result - removed duplicate error. mysql-test/r/lock.result: Updated test result - added summary row. mysql-test/r/merge.result: A test case for BUG#26976. mysql-test/r/preload.result: Updated test result - removed duplicate error, added summary row. mysql-test/r/ps.result: Updated test result - removed duplicate error, added summary row. mysql-test/r/repair.result: Updated test result - removed duplicate error, added summary row. mysql-test/r/rpl_failed_optimize.result: Updated test result - removed duplicate error, added summary row. mysql-test/r/sp.result: Updated test result - removed duplicate error, added summary row. mysql-test/r/view.result: Updated test result - removed duplicate error, added summary row. mysql-test/t/merge.test: A test case for BUG#26976. sql/ha_myisam.cc: Do not report same error twice. sql/ha_myisammrg.cc: If HA_OPEN_FOR_REPAIR is passed to merge engine open function, report names of tables that we fail to open. Added dummy ha_myisammrg::check to not confuse users with "not implemented" error in case all underlying tables are fine. sql/ha_myisammrg.h: Added ha_myisammrg::check declaration. sql/share/errmsg.txt: Added ER_ADMIN_WRONG_MRG_TABLE errno. It is used instead of ER_WRONG_MRG_TABLE in case HA_OPEN_FOR_REPAIR is passed to merge engine handler open function. sql/sql_error.cc: warning_level_* are now public. It is required by mysql_admin_table to report message level. sql/sql_error.h: warning_level_* are now public. It is required by mysql_admin_table to report message level. sql/sql_table.cc: Reorder mysql_admin_table arguments to meet it's definition. Report errors that are pending in thd->warn_list as results of admin function.
-
unknown authored
Post-merge fix warning strings/ctype-bin.c: Post-merge fix warning
-
unknown authored
Post-merge fix (byte -> uchar) sql/sql_prepare.cc: Post-merge fix (byte -> uchar)
-
unknown authored
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51 client/mysqldump.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51 client/mysqldump.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/innodb_mysql.result: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 client/mysqldump.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51 mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/mysqltest.test: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-axmrg sql/mysqld.cc: Auto merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-axmrg mysql-test/mysql-test-run.pl: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg sql/mysqld.cc: Auto merged
-
unknown authored
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51 client/mysqldump.c: Auto merged include/m_string.h: Auto merged include/mysql_com.h: Auto merged include/violite.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/mysqltest.test: Auto merged mysql-test/t/ps.test: Auto merged mysys/my_init.c: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/net_serv.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_connect.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql-common/client.c: Auto merged sql/sql_yacc.yy: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/strtod.c: Auto merged vio/vio_priv.h: Auto merged vio/viosocket.c: Auto merged client/mysqltest.c: SCCS merged include/my_global.h: SCCS merged sql/field.h: SCCS merged sql/sql_table.cc: Manual merge strings/ctype-bin.c: Manual merge
-
unknown authored
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/mysqltest.test: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
- 04 Jun, 2007 11 commits
-
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG27141/mysql-5.1-engines mysys/my_seek.c: Auto merged
-
unknown authored
Original problem was fixed by Magnus (see BUG25807). Currently only windows debug build causes assertion failure. This patch assures that my_tell gets correct file descriptor on any platform by DBUG_ASSERT macro. mysys/my_seek.c: Added assertion in case my_tell gets wrong file descriptor.
-
unknown authored
into amd64.(none):/src/bug24400/my41-bug24400
-
unknown authored
into amd64.(none):/src/bug24400/my50-bug24400
-
unknown authored
into amd64.(none):/src/bug24400/my51-bug24400
-
unknown authored
into amd64.(none):/src/bug24400/my51-bug24400 BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56: Auto merged
-
unknown authored
into amd64.(none):/src/bug24400/my50-bug24400 VC++Files/sql/mysqld.dsp: Auto merged
-
unknown authored
into olga.mysql.com:/home/igor/mysql-5.1-opt mysql-test/mysql-test-run.pl: Auto merged sql/udf_example.c: Auto merged
-
unknown authored
-
unknown authored
into olga.mysql.com:/home/igor/mysql-5.1-opt-merge include/thr_lock.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/strict.test: Auto merged mysql-test/t/subselect3.test: Auto merged mysql-test/t/trigger.test: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/udf_example.c: Auto merged mysql-test/r/subselect.result: Manual merge. mysql-test/t/subselect.test: Manual merge. sql/sql_view.cc: Manual merge.
-
unknown authored
-