Compare commits

...

2 Commits

Author SHA1 Message Date
Carlos Salguero
aca7e6a83e PT-1528 Ingore UTF8 warning 2020-12-16 15:18:23 -03:00
Carlos Salguero
15ffa974eb PT-1528 [WIP] Proposed solution 2020-11-22 18:58:00 -03:00
3 changed files with 140 additions and 1 deletions

View File

@@ -8387,6 +8387,7 @@ package pt_online_schema_change;
use strict;
use warnings FATAL => 'all';
use utf8;
use English qw(-no_match_vars);
use Percona::Toolkit;
@@ -8474,7 +8475,7 @@ sub main {
@drop_trigger_sqls = ();
@triggers_not_dropped = ();
$dont_interrupt_now = 0;
%ignore_code = (1592 => 1, 1062 => 1);
%ignore_code = (1592 => 1, 1062 => 1, 1300 => 1);
my %stats = (
INSERT => 0,

View File

@@ -0,0 +1,70 @@
#!/usr/bin/env perl
BEGIN {
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
};
use strict;
use warnings FATAL => 'all';
use threads;
use threads::shared;
use Thread::Semaphore;
use English qw(-no_match_vars);
use Test::More;
use Data::Dumper;
use PerconaTest;
use Sandbox;
use SqlModes;
use File::Temp qw/ tempdir /;
if ($sandbox_version lt '5.7') {
plan skip_all => 'This test needs MySQL 5.7+';
} else {
plan tests => 2;
}
require "$trunk/bin/pt-online-schema-change";
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $dbh = $sb->get_dbh_for('master');
my $dsn = $sb->dsn_for("master");
# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
# so we need to specify --set-vars innodb_lock_wait_timeout=3 else the
# tool will die.
my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
my $output;
my $exit_status;
$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1528.sql");
my $rows_before = $dbh->selectall_hashref("SELECT * FROM test.brokenutf8alter", "id");
($output, $exit_status) = full_output(
sub { pt_online_schema_change::main(@args, "$dsn,D=test,t=brokenutf8alter",
'--execute', '--charset=utf8', '--chunk-size', '2', '--alter', 'engine=innodb',
),
},
stderr => 1,
);
my $rows_after = $dbh->selectall_hashref("SELECT * FROM test.brokenutf8alter", "id");
is_deeply(
$rows_before,
$rows_after,
"Should be equal",
);
# #############################################################################
# Done.
# #############################################################################
$sb->wipe_clean($dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;

View File

@@ -0,0 +1,68 @@
-- MySQL dump 10.13 Distrib 5.7.19-17, for debian-linux-gnu (x86_64)
--
-- Host: localhost Database: test
-- ------------------------------------------------------
-- Server version 5.7.19-17-log
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
/*!50717 SELECT COUNT(*) INTO @rocksdb_has_p_s_session_variables FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'performance_schema' AND TABLE_NAME = 'session_variables' */;
/*!50717 SET @rocksdb_get_is_supported = IF (@rocksdb_has_p_s_session_variables, 'SELECT COUNT(*) INTO @rocksdb_is_supported FROM performance_schema.session_variables WHERE VARIABLE_NAME=\'rocksdb_bulk_load\'', 'SELECT 0') */;
/*!50717 PREPARE s FROM @rocksdb_get_is_supported */;
/*!50717 EXECUTE s */;
/*!50717 DEALLOCATE PREPARE s */;
/*!50717 SET @rocksdb_enable_bulk_load = IF (@rocksdb_is_supported, 'SET SESSION rocksdb_bulk_load = 1', 'SET @rocksdb_dummy_bulk_load = 0') */;
/*!50717 PREPARE s FROM @rocksdb_enable_bulk_load */;
/*!50717 EXECUTE s */;
/*!50717 DEALLOCATE PREPARE s */;
--
-- Table structure for table `brokenutf8alter`
--
DROP DATABASE IF EXISTS test;
CREATE DATABASE test;
USE test;
DROP TABLE IF EXISTS `brokenutf8alter`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `brokenutf8alter` (
`ID` binary(16) NOT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `brokenutf8alter`
--
LOCK TABLES `brokenutf8alter` WRITE;
/*!40000 ALTER TABLE `brokenutf8alter` DISABLE KEYS */;
INSERT INTO `brokenutf8alter` VALUES ('.SG<53>:\<5C><>\<5C>B<>\0'),('.SK,:\<5C><>\<5C>B<>\0'),('.SL_:\<5C><>\<5C>B<>\0'),('.SL\<5C>:\<5C><>\<5C>B<>\0'),('.SMB:\<5C><>\<5C>B<>\0'),('.SM<53>:\<5C><>\<5C>B<>\0'),('.SM<53>:\<5C><>\<5C>B<>\0'),('.SOE:\<5C><>\<5C>B<>\0'),('.SO<53>:\<5C><>\<5C>B<>\0'),('.SP:\<5C><>\<5C>B<>\0'),('.SPZ:\<5C><>\<5C>B<>\0'),('.SP<53>:\<5C><>\<5C>B<>\0'),('.SQ:\<5C><>\<5C>B<>\0'),('.SQX:\<5C><>\<5C>B<>\0'),('.SQ<53>:\<5C><>\<5C>B<>\0'),('.SQ<53>:\<5C><>\<5C>B<>\0'),('.SRK:\<5C><>\<5C>B<>\0'),('.ST4:\<5C><>\<5C>B<>\0'),('.SU=:\<5C><>\<5C>B<>\0'),('.SU<53>:\<5C><>\<5C>B<>\0'),('.SU<53>:\<5C><>\<5C>B<>\0'),('.SVC:\<5C><>\<5C>B<>\0'),('.SV<53>:\<5C><>\<5C>B<>\0'),('.SV\<5C>:\<5C><>\<5C>B<>\0'),('.SW8:\<5C><>\<5C>B<>\0'),('.SW<53>:\<5C><>\<5C>B<>\0'),('.SX\<5C>:\<5C><>\<5C>B<>\0'),('.SY\":\<5C><>\<5C>B<>\0'),('.SYr:\<5C><>\<5C>B<>\0'),('.SY\<5C>:\<5C><>\<5C>B<>\0'),('.SZ:\<5C><>\<5C>B<>\0'),('.SZ<53>:\<5C><>\<5C>B<>\0'),('.S[):\<5C><>\<5C>B<>\0'),('.S[<5B>:\<5C><>\<5C>B<>\0'),('.S\\N:\<5C><>\<5C>B<>\0'),('.S\\\<5C>:\<5C><>\<5C>B<>\0'),('.S]>:\<5C><>\<5C>B<>\0'),('.S]<5D>:\<5C><>\<5C>B<>\0'),('.S]\<5C>:\<5C><>\<5C>B<>\0'),('.S^.:\<5C><>\<5C>B<>\0'),('.S^:\<5C><>\<5C>B<>\0'),('.S^\<5C>:\<5C><>\<5C>B<>\0'),('.S_8:\<5C><>\<5C>B<>\0'),('.S_<53>:\<5C><>\<5C>B<>\0'),('.S`W:\<5C><>\<5C>B<>\0'),('.S`<60>:\<5C><>\<5C>B<>\0'),('.Sa~:\<5C><>\<5C>B<>\0'),('.Sb:\<5C><>\<5C>B<>\0'),('.Sb<53>:\<5C><>\<5C>B<>\0'),('.Sc>:\<5C><>\<5C>B<>\0'),('.Sc\<5C>:\<5C><>\<5C>B<>\0'),('.Sd:\<5C><>\<5C>B<>\0'),('.Sdv:\<5C><>\<5C>B<>\0'),('.Sd\<5C>:\<5C><>\<5C>B<>\0'),('.Se:\<5C><>\<5C>B<>\0'),('.Seb:\<5C><>\<5C>B<>\0'),('.Se<53>:\<5C><>\<5C>B<>\0'),('.Sf:\<5C><>\<5C>B<>\0'),('.SfP:\<5C><>\<5C>B<>\0'),('.Sf<53>:\<5C><>\<5C>B<>\0'),('.Sf<53>:\<5C><>\<5C>B<>\0'),('.Sg?:\<5C><>\<5C>B<>\0'),('.Sg<53>:\<5C><>\<5C>B<>\0'),('.Sh:\<5C><>\<5C>B<>\0'),('.Sh<53>:\<5C><>\<5C>B<>\0'),('.Si7:\<5C><>\<5C>B<>\0'),('.Si\<5C>:\<5C><>\<5C>B<>\0'),('.Sji:\<5C><>\<5C>B<>\0'),('.Sk:\<5C><>\<5C>B<>\0'),('.Sk<53>:\<5C><>\<5C>B<>\0'),('.Sk\<5C>:\<5C><>\<5C>B<>\0'),('.Sl(:\<5C><>\<5C>B<>\0'),('.Sl{:\<5C><>\<5C>B<>\0'),('.Sl\<5C>:\<5C><>\<5C>B<>\0'),('.Sm\Z:\<5C><>\<5C>B<>\0'),('.Smh:\<5C><>\<5C>B<>\0'),('.Sm<53>:\<5C><>\<5C>B<>\0'),('.Sn:\<5C><>\<5C>B<>\0'),('.So:\<5C><>\<5C>B<>\0'),('.Sob:\<5C><>\<5C>B<>\0'),('.So<53>:\<5C><>\<5C>B<>\0'),('.Sp:\<5C><>\<5C>B<>\0'),('.SpQ:\<5C><>\<5C>B<>\0'),('.Sp<53>:\<5C><>\<5C>B<>\0'),('.Sp<53>:\<5C><>\<5C>B<>\0'),('.SqA:\<5C><>\<5C>B<>\0'),('.Sq<53>:\<5C><>\<5C>B<>\0'),('.Sq\<5C>:\<5C><>\<5C>B<>\0'),('.Sr+:\<5C><>\<5C>B<>\0'),('.Srv:\<5C><>\<5C>B<>\0'),('.Sr<53>:\<5C><>\<5C>B<>\0'),('.Ss:\<5C><>\<5C>B<>\0'),('.Ss_:\<5C><>\<5C>B<>\0'),('.St :\<5C><>\<5C>B<>\0'),('.St :\<5C><>\<5C>B<>\0'),('.St5:\<5C><>\<5C>B<>\0'),('.StI:\<5C><>\<5C>B<>\0'),('.St^:\<5C><>\<5C>B<>\0'),('.Str:\<5C><>\<5C>B<>\0'),('.St<53>:\<5C><>\<5C>B<>\0'),('.St<53>:\<5C><>\<5C>B<>\0');
/*!40000 ALTER TABLE `brokenutf8alter` ENABLE KEYS */;
UNLOCK TABLES;
/*!50112 SET @disable_bulk_load = IF (@is_rocksdb_supported, 'SET SESSION rocksdb_bulk_load = @old_rocksdb_bulk_load', 'SET @dummy_rocksdb_bulk_load = 0') */;
/*!50112 PREPARE s FROM @disable_bulk_load */;
/*!50112 EXECUTE s */;
/*!50112 DEALLOCATE PREPARE s */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2018-04-07 3:48:50