into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/create_not_windows.result:
Auto merged
mysql-test/r/join_nested.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/type_time.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/create_not_windows.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/create.result:
Merge with 5.0-opt.
mysql-test/r/type_enum.result:
Merge with 5.0-opt.
mysql-test/t/type_enum.test:
Merge with 5.0-opt.
sql/field_conv.cc:
Merge with 5.0-opt.
Emit an error instead of doing ASSERT
mysql-test/r/create_not_windows.result:
update result
mysql-test/t/create_not_windows.test:
Add test case for bug #16532: mysql server assert in debug if table definition is removed
sql/sql_table.cc:
it could happen that an user deletes the frm file on OS level.
In addition if the table was already opened, the file system level
check for existance of table.frm will pass but get_cached_table_share()
will return non-NULL value. In this case we will emit the standard
error that the table exist. The error case is quite obscure but error
message is better than a sigabort.
Moved the test case to separate non-windows specific file.
mysql-test/r/create.result:
Moved non-windows specific test case to create_not_windows.test.
mysql-test/t/create.test:
Moved non-windows specific test case to create_not_windows.test.
mysql-test/r/create_not_windows.result:
#19479: mysqldump creates invalid dump
Moved the non-windows specific test case from create.test.
mysql-test/t/create_not_windows.test:
#19479: mysqldump creates invalid dump
Moved the non-windows specific test case from create.test.
