mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
192678e7bf
- Character set code & tests from Alexander Barkov - Integration with ALTER TABLE, REPAIR and open_table from Monty The problem was that MySQL 5.6 added some croatian and vitanamese character set collations that are incompatible with MariaDB. The fix is to move the MariaDB conflicting collation numbers out of the region that MySQL is likely to use. mysql_upgrade, REPAIR TABLE or ALTER TABLE will fix the collations. If one tries to access and old incompatible table, one will get the error "Table upgrade required...." After this patch, MariaDB supports all the MySQL character set collations and the old MariaDB croatian collations, which are closer to the latest standard than the MySQL versions. New character sets: ucs2_croatian_mysql561_uca_ci utf8_croatian_mysql561_uca_ci utf16_croatian_mysql561_uca_ci utf32_croatian_mysql561_uca_ci utf8mb4_croatian_mysql561_uca_ci Other things: - Fixed some compiler warnings - mysql_upgrade prints information about repaired tables. - Increased version number VERSION: Increased VERSION number client/mysqlcheck.c: Print repaired table name when using --verbose include/m_ctype.h: Add new MariaDB collation regions that are not likely to conflict with MySQL include/my_base.h: Added flag to detect if table was opened for ALTER TABLE mysql-test/r/ctype_ldml.result: Updated result mysql-test/r/ctype_uca.result: Updated result mysql-test/r/ctype_upgrade.result: Updated result mysql-test/r/ctype_utf16_uca.result: Updated result mysql-test/r/ctype_utf32_uca.result: Updated result mysql-test/r/ctype_utf8mb4_uca.result: Updated result mysql-test/std_data/ctype_upgrade: Test files for testing upgrading of conflicting collations mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result: New collations added mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result: New collations added mysql-test/suite/innodb/r/innodb_ctype_ldml.result: Updated test result mysql-test/suite/innodb/t/innodb_ctype_ldml.test: Updated test result mysql-test/suite/plugins/r/show_all_plugins.result: Updated version number mysql-test/suite/roles/create_and_drop_role_invalid_user_table.result: Updated version number mysql-test/t/ctype_ldml.test: Updated test mysql-test/t/ctype_uca.test: Testing of new collations mysql-test/t/ctype_upgrade.test: Testing of upgrading tables with old collations The test ensures that: - We will get an error if we try to open a table with old collations. - CHECK TABLE will detect that the table needs to be upgraded. - ALTER TABLE and REPAIR will fix the table. - mysql_upgrade works as expected mysql-test/t/ctype_utf16_uca.test: Testing of new collations mysql-test/t/ctype_utf32_uca.test: Testing of new collations mysql-test/t/ctype_utf8mb4_uca.test: Testing of new collations mysys/charset-def.c: Added new character sets mysys/charset.c: Always give an error, if requested, if a character set didn't exist sql/handler.cc: - Added upgrade_collation() to check if collation is compatible with old version - check_collation_compatibility() checks if we are using an old collation from MariaDB 5.5 or MySQL 5.6 - ha_check_for_upgrade() returns HA_ADMIN_NEEDS_ALTER if we have an incompatible collation sql/handler.h: Added new prototypes sql/sql_table.cc: - Mark that tables are opened for ALTER TABLE - If table needs to be upgraded, ensure we are not using online alter table. sql/table.cc: - If we are using an old incompatible collation, change to use the new one and mark table as incompatible. - Give an error if we try to open an incompatible table. sql/table.h: Added error that table needs to be rebuild storage/connect/ha_connect.cc: Fixed compiler warning strings/ctype-uca.c: New character sets |
||
|---|---|---|
| .. | ||
| array.c | ||
| base64.c | ||
| ChangeLog | ||
| charset-def.c | ||
| charset.c | ||
| checksum.c | ||
| CMakeLists.txt | ||
| errors.c | ||
| file_logger.c | ||
| hash.c | ||
| lf_alloc-pin.c | ||
| lf_dynarray.c | ||
| lf_hash.c | ||
| list.c | ||
| ma_dyncol.c | ||
| md5.c.THIS | ||
| md5_compute.cc | ||
| mf_arr_appstr.c | ||
| mf_cache.c | ||
| mf_dirname.c | ||
| mf_fn_ext.c | ||
| mf_format.c | ||
| mf_getdate.c | ||
| mf_iocache.c | ||
| mf_iocache2.c | ||
| mf_keycache.c | ||
| mf_keycaches.c | ||
| mf_loadpath.c | ||
| mf_pack.c | ||
| mf_path.c | ||
| mf_qsort.c | ||
| mf_qsort2.c | ||
| mf_radix.c | ||
| mf_same.c | ||
| mf_sort.c | ||
| mf_soundex.c | ||
| mf_tempdir.c | ||
| mf_tempfile.c | ||
| mf_unixpath.c | ||
| mf_wcomp.c | ||
| mulalloc.c | ||
| my_access.c | ||
| my_addr_resolve.c | ||
| my_aes.c.THIS | ||
| my_alarm.c | ||
| my_alloc.c | ||
| my_atomic.c | ||
| my_basename.c | ||
| my_bit.c | ||
| my_bitmap.c | ||
| my_chmod.c | ||
| my_chsize.c | ||
| my_compare.c | ||
| my_compress.c | ||
| my_conio.c | ||
| my_context.c | ||
| my_copy.c | ||
| my_crc32.c | ||
| my_create.c | ||
| my_default.c | ||
| my_delete.c | ||
| my_div.c | ||
| my_error.c | ||
| my_file.c | ||
| my_fopen.c | ||
| my_fstream.c | ||
| my_gethwaddr.c | ||
| my_getncpus.c | ||
| my_getopt.c | ||
| my_getpagesize.c | ||
| my_getsystime.c | ||
| my_getwd.c | ||
| my_init.c | ||
| my_largepage.c | ||
| my_lib.c | ||
| my_libwrap.c | ||
| my_lock.c | ||
| my_lockmem.c | ||
| my_malloc.c | ||
| my_memmem.c | ||
| my_mess.c | ||
| my_mkdir.c | ||
| my_mmap.c | ||
| my_new.cc | ||
| my_once.c | ||
| my_open.c | ||
| my_port.c | ||
| my_pread.c | ||
| my_pthread.c | ||
| my_quick.c | ||
| my_rdtsc.c | ||
| my_read.c | ||
| my_redel.c | ||
| my_rename.c | ||
| my_rnd.c | ||
| my_safehash.c | ||
| my_safehash.h | ||
| my_seek.c | ||
| my_sleep.c | ||
| my_static.c | ||
| my_static.h | ||
| my_symlink.c | ||
| my_symlink2.c | ||
| my_sync.c | ||
| my_thr_init.c | ||
| my_timer_cycles.il | ||
| my_uuid.c | ||
| my_wincond.c | ||
| my_windac.c | ||
| my_winerr.c | ||
| my_winfile.c | ||
| my_winthread.c | ||
| my_write.c | ||
| mysys_priv.h | ||
| psi_noop.c | ||
| ptr_cmp.c | ||
| queues.c | ||
| safemalloc.c | ||
| stacktrace.c | ||
| string.c | ||
| test_charset.c | ||
| test_dir.c | ||
| test_thr_mutex.c | ||
| test_xml.c | ||
| testhash.c | ||
| thr_alarm.c | ||
| thr_lock.c | ||
| thr_mutex.c | ||
| thr_rwlock.c | ||
| tree.c | ||
| typelib.c | ||
| waiting_threads.c | ||
| wqueue.c | ||