2887 Tatiana A. Nurnberg 2008-11-04 [merge]
auto-merge
added:
mysql-test/suite/backup/
mysql-test/suite/backup/r/
mysql-test/suite/backup/r/backup_commit_backup.result
mysql-test/suite/backup/t/
mysql-test/suite/backup/t/backup_commit_backup.test
mysql-test/suite/backup/t/disabled.def
mysql-test/suite/backup_engines/include/backup_ptr.inc
mysql-test/suite/backup_engines/include/backup_ptr_commit.inc
mysql-test/suite/backup_engines/include/backup_ptr_objects.inc
mysql-test/suite/backup_engines/include/not_have_falcon.inc
mysql-test/suite/backup_engines/include/not_have_innodb.inc
mysql-test/suite/backup_engines/include/not_have_memory.inc
mysql-test/suite/backup_engines/include/not_have_myisam.inc
mysql-test/suite/backup_engines/r/backup_ptr_commit_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_row.result
mysql-test/suite/backup_engines/r/backup_ptr_commit_stmt.result
mysql-test/suite/backup_engines/r/backup_ptr_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_mixed.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_row.result
mysql-test/suite/backup_engines/r/backup_ptr_objects_stmt.result
mysql-test/suite/backup_engines/r/backup_ptr_row.result
mysql-test/suite/backup_engines/r/backup_ptr_stmt.result
mysql-test/suite/backup_engines/t/backup_ptr_commit_mixed.test
mysql-test/suite/backup_engines/t/backup_ptr_commit_row.test
mysql-test/suite/backup_engines/t/backup_ptr_commit_stmt.test
mysql-test/suite/backup_engines/t/backup_ptr_mixed.test
mysql-test/suite/backup_engines/t/backup_ptr_objects_mixed.test
mysql-test/suite/backup_engines/t/backup_ptr_objects_row.test
mysql-test/suite/backup_engines/t/backup_ptr_objects_stmt.test
mysql-test/suite/backup_engines/t/backup_ptr_row.test
mysql-test/suite/backup_engines/t/backup_ptr_stmt.test
sql/MSG00001.bin
sql/message.h
sql/message.rc
renamed:
mysql-test/r/backup.result => mysql-test/suite/backup/r/backup.result
mysql-test/r/backup_backupdir.result => mysql-test/suite/backup/r/backup_backupdir.result
mysql-test/r/backup_blob.result => mysql-test/suite/backup/r/backup_blob.result
mysql-test/r/backup_charsets.result => mysql-test/suite/backup/r/backup_charsets.result
mysql-test/r/backup_commit_blocker.result => mysql-test/suite/backup/r/backup_commit_blocker.result
mysql-test/r/backup_commit_restore.result => mysql-test/suite/backup/r/backup_commit_restore.result
mysql-test/r/backup_compression.result => mysql-test/suite/backup/r/backup_compression.result
mysql-test/r/backup_concurrent.result => mysql-test/suite/backup/r/backup_concurrent.result
mysql-test/r/backup_db_grants.result => mysql-test/suite/backup/r/backup_db_grants.result
mysql-test/r/backup_ddl_blocker.result => mysql-test/suite/backup/r/backup_ddl_blocker.result
mysql-test/r/backup_default.result => mysql-test/suite/backup/r/backup_default.result
mysql-test/r/backup_errors.result => mysql-test/suite/backup/r/backup_errors.result
mysql-test/r/backup_fkey.result => mysql-test/suite/backup/r/backup_fkey.result
mysql-test/r/backup_lock_myisam.result => mysql-test/suite/backup/r/backup_lock_myisam.result
mysql-test/r/backup_logs.result => mysql-test/suite/backup/r/backup_logs.result
mysql-test/r/backup_logs_output.result => mysql-test/suite/backup/r/backup_logs_output.result
mysql-test/r/backup_many_dbs.result => mysql-test/suite/backup/r/backup_many_dbs.result
mysql-test/r/backup_multi_blocks.result => mysql-test/suite/backup/r/backup_multi_blocks.result
mysql-test/r/backup_myisam1.result => mysql-test/suite/backup/r/backup_myisam1.result
mysql-test/r/backup_myisam2.result => mysql-test/suite/backup/r/backup_myisam2.result
mysql-test/r/backup_no_be.result => mysql-test/suite/backup/r/backup_no_be.result
mysql-test/r/backup_no_data.result => mysql-test/suite/backup/r/backup_no_data.result
mysql-test/r/backup_no_engine.result => mysql-test/suite/backup/r/backup_no_engine.result
mysql-test/r/backup_nodata_driver.result => mysql-test/suite/backup/r/backup_nodata_driver.result
mysql-test/r/backup_objects.result => mysql-test/suite/backup/r/backup_objects.result
mysql-test/r/backup_procedures.result => mysql-test/suite/backup/r/backup_procedures.result
mysql-test/r/backup_securefilepriv.result => mysql-test/suite/backup/r/backup_securefilepriv.result
mysql-test/r/backup_security.result => mysql-test/suite/backup/r/backup_security.result
mysql-test/r/backup_snapshot.result => mysql-test/suite/backup/r/backup_snapshot.result
mysql-test/r/backup_tablespace.result => mysql-test/suite/backup/r/backup_tablespace.result
mysql-test/r/backup_timeout.result => mysql-test/suite/backup/r/backup_timeout.result
mysql-test/r/backup_triggers_and_events.result => mysql-test/suite/backup/r/backup_triggers_and_events.result
mysql-test/r/backup_view_on_view.result => mysql-test/suite/backup/r/backup_view_on_view.result
mysql-test/r/backup_views.result => mysql-test/suite/backup/r/backup_views.result
mysql-test/suite/backup => mysql-test/suite/backup_engines
mysql-test/t/backup.test => mysql-test/suite/backup/t/backup.test
mysql-test/t/backup_backupdir.test => mysql-test/suite/backup/t/backup_backupdir.test
mysql-test/t/backup_blob.test => mysql-test/suite/backup/t/backup_blob.test
mysql-test/t/backup_charsets.test => mysql-test/suite/backup/t/backup_charsets.test
mysql-test/t/backup_commit_blocker.test => mysql-test/suite/backup/t/backup_commit_blocker.test
mysql-test/t/backup_commit_restore.test => mysql-test/suite/backup/t/backup_commit_restore.test
mysql-test/t/backup_compression.test => mysql-test/suite/backup/t/backup_compression.test
mysql-test/t/backup_concurrent.test => mysql-test/suite/backup/t/backup_concurrent.test
mysql-test/t/backup_db_grants.test => mysql-test/suite/backup/t/backup_db_grants.test
mysql-test/t/backup_ddl_blocker.test => mysql-test/suite/backup/t/backup_ddl_blocker.test
mysql-test/t/backup_default.test => mysql-test/suite/backup/t/backup_default.test
mysql-test/t/backup_errors.test => mysql-test/suite/backup/t/backup_errors.test
mysql-test/t/backup_fkey.test => mysql-test/suite/backup/t/backup_fkey.test
mysql-test/t/backup_lock_myisam.test => mysql-test/suite/backup/t/backup_lock_myisam.test
mysql-test/t/backup_logs.test => mysql-test/suite/backup/t/backup_logs.test
mysql-test/t/backup_logs_output.test => mysql-test/suite/backup/t/backup_logs_output.test
mysql-test/t/backup_many_dbs.test => mysql-test/suite/backup/t/backup_many_dbs.test
mysql-test/t/backup_multi_blocks.test => mysql-test/suite/backup/t/backup_multi_blocks.test
mysql-test/t/backup_myisam1-master.opt => mysql-test/suite/backup/t/backup_myisam1-master.opt
mysql-test/t/backup_myisam1.test => mysql-test/suite/backup/t/backup_myisam1.test
mysql-test/t/backup_myisam2.test => mysql-test/suite/backup/t/backup_myisam2.test
mysql-test/t/backup_no_be.test => mysql-test/suite/backup/t/backup_no_be.test
mysql-test/t/backup_no_data.test => mysql-test/suite/backup/t/backup_no_data.test
mysql-test/t/backup_no_engine.test => mysql-test/suite/backup/t/backup_no_engine.test
mysql-test/t/backup_nodata_driver.test => mysql-test/suite/backup/t/backup_nodata_driver.test
mysql-test/t/backup_objects.test => mysql-test/suite/backup/t/backup_objects.test
mysql-test/t/backup_procedures.test => mysql-test/suite/backup/t/backup_procedures.test
mysql-test/t/backup_securefilepriv-master.opt => mysql-test/suite/backup/t/backup_securefilepriv-master.opt
mysql-test/t/backup_securefilepriv.test => mysql-test/suite/backup/t/backup_securefilepriv.test
mysql-test/t/backup_security.test => mysql-test/suite/backup/t/backup_security.test
mysql-test/t/backup_snapshot.opt => mysql-test/suite/backup/t/backup_snapshot.opt
mysql-test/t/backup_snapshot.test => mysql-test/suite/backup/t/backup_snapshot.test
mysql-test/t/backup_tablespace.test => mysql-test/suite/backup/t/backup_tablespace.test
mysql-test/t/backup_timeout.test => mysql-test/suite/backup/t/backup_timeout.test
mysql-test/t/backup_triggers_and_events.test => mysql-test/suite/backup/t/backup_triggers_and_events.test
mysql-test/t/backup_view_on_view.test => mysql-test/suite/backup/t/backup_view_on_view.test
mysql-test/t/backup_views.test => mysql-test/suite/backup/t/backup_views.test
modified:
.bzrignore
include/Makefile.am
include/errmsg.h
libmysql/Makefile.am
libmysql/Makefile.shared
libmysql/errmsg.c
libmysql/libmysql.c
libmysqld/libmysqld.c
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/lib/mtr_report.pl
mysql-test/r/alter_table.result
mysql-test/r/binlog_format_basic.result
mysql-test/r/create.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_ldml.result
mysql-test/r/debug_sync.result
mysql-test/r/explain.result
mysql-test/r/group_by.result
mysql-test/r/locktrans_innodb.result
mysql-test/r/locktrans_myisam.result
mysql-test/r/log_tables.result
mysql-test/r/mysql.result
mysql-test/r/partition.result
mysql-test/r/partition_innodb.result
mysql-test/r/partition_not_windows.result
mysql-test/r/partition_symlink.result
mysql-test/r/partition_windows.result
mysql-test/r/plugin.result
mysql-test/r/sp.result
mysql-test/r/storage_engine_basic.result
mysql-test/r/symlink.result
mysql-test/r/variables.result
mysql-test/r/view.result
mysql-test/r/windows.result
mysql-test/r/xa.result
mysql-test/std_data/Index.xml
mysql-test/suite/backup_engines/t/backup_functions.test
mysql-test/suite/backup_engines/t/backup_procedures.test
mysql-test/suite/backup_engines/t/backup_triggers.test
mysql-test/suite/falcon/r/falcon_bugs.result
mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result
mysql-test/suite/falcon/t/falcon_bugs.test
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
mysql-test/suite/rpl/r/rpl_locktrans_myisam.result
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
mysql-test/t/alter_table.test
mysql-test/t/binlog_format_basic.test
mysql-test/t/ctype_cp1251.test
mysql-test/t/ctype_ldml.test
mysql-test/t/explain.test
mysql-test/t/group_by.test
mysql-test/t/partition_innodb.test
mysql-test/t/partition_not_windows.test
mysql-test/t/ps.test
mysql-test/t/ps_1general.test
mysql-test/t/query_cache.test
mysql-test/t/sp.test
mysql-test/t/subselect3.test
mysql-test/t/view.test
mysql-test/t/xa.test
mysys/my_largepage.c
mysys/my_symlink.c
scripts/make_win_bin_dist
sql-common/client.c
sql/CMakeLists.txt
sql/Makefile.am
sql/backup/backup_info.cc
sql/backup/backup_info.h
sql/backup/backup_kernel.h
sql/backup/backup_test.cc
sql/backup/data_backup.cc
sql/backup/error.h
sql/backup/image_info.h
sql/backup/kernel.cc
sql/backup/logger.cc
sql/backup/logger.h
sql/backup/stream_v1.c
sql/backup/stream_v1_transport.c
sql/field.cc
sql/field.h
sql/filesort.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/item_cmpfunc.cc
sql/key.cc
sql/log.cc
sql/message.mc
sql/mysql_priv.h
sql/mysqld.cc
sql/net_serv.cc
sql/probes.d
sql/probes.h
sql/scheduler.cc
sql/set_var.cc
sql/share/errmsg.txt
sql/si_logs.cc
sql/si_logs.h
sql/si_objects.cc
sql/si_objects.h
sql/sp_head.cc
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_cursor.cc
sql/sql_delete.cc
sql/sql_insert.cc
sql/sql_parse.cc
sql/sql_prepare.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_table.cc
sql/sql_update.cc
sql/sql_view.cc
sql/transaction.cc
storage/falcon/NNode.h
storage/falcon/Types.h
storage/falcon/ha_falcon.cpp
storage/falcon/plug.in
strings/ctype-uca.c
strings/ctype.c
support-files/my-huge.cnf.sh
support-files/my-large.cnf.sh
support-files/my-medium.cnf.sh
support-files/my-small.cnf.sh
support-files/mysql.spec.sh
tests/mysql_client_test.c
zlib/gzio.c
mysql-test/suite/backup/r/backup.result
mysql-test/suite/backup/r/backup_backupdir.result
mysql-test/suite/backup/r/backup_errors.result
mysql-test/suite/backup/t/backup.test
mysql-test/suite/backup/t/backup_errors.test
mysql-test/suite/backup/t/backup_no_data.test
=== modified file 'include/mysql_com.h'
--- a/include/mysql_com.h 2008-09-16 08:34:30 +0000
+++ b/include/mysql_com.h 2008-11-04 08:10:49 +0000
@@ -33,6 +33,7 @@
/*
Maximum length of comments
*/
+#define TABLE_COMMENT_INLINE_MAXLEN 180 /* pre 6.0: 60 characters */
#define TABLE_COMMENT_MAXLEN 2048
#define COLUMN_COMMENT_MAXLEN 1024
#define INDEX_COMMENT_MAXLEN 1024
=== modified file 'sql/unireg.cc'
--- a/sql/unireg.cc 2008-07-24 11:33:35 +0000
+++ b/sql/unireg.cc 2008-11-04 08:10:49 +0000
@@ -219,8 +219,12 @@ bool mysql_create_frm(THD *thd, const ch
create_info->comment.length= tmp_len;
}
- //if table comment is larger than 180 bytes, store into extra segment.
- if (create_info->comment.length > 180)
+ /*
+ If table comment is longer than TABLE_COMMENT_INLINE_MAXLEN bytes,
+ store the comment in an extra segment (up to TABLE_COMMENT_MAXLEN bytes).
+ Pre 6.0, the limit was 60 characters, with no extra segment-handling.
+ */
+ if (create_info->comment.length > TABLE_COMMENT_INLINE_MAXLEN)
{
forminfo[46]=255;
create_info->extra_size+= 2 + create_info->comment.length;
@@ -235,7 +239,8 @@ bool mysql_create_frm(THD *thd, const ch
payload with a magic value to detect wrong buffer-sizes. We
explicitly zero that segment again.
*/
- memset((char*) forminfo+47 + forminfo[46], 0, 61 - forminfo[46]);
+ memset((char*) forminfo+47 + forminfo[46], 0,
+ TABLE_COMMENT_INLINE_MAXLEN + 1 - forminfo[46]);
#endif
}
| Thread |
|---|
| • bzr push into mysql-6.0 branch (azundris:2887) | Tatiana A. Nurnberg | 4 Nov |
