test: Adapt legacy_resharding.py to new schema (multi-column primary key) as well.

test/legacy_resharding.py

@@ -121,11 +121,14 @@ class TestResharding(unittest.TestCase, base_sharding.BaseShardingTest):
       t = 'varbinary(64)'
     else:
       t = 'bigint(20) unsigned'
+    # Note that the primary key columns are not defined first on purpose to test
+    # that a reordered column list is correctly used everywhere in vtworker.
     create_table_template = '''create table %s(
-id bigint not null,
 msg varchar(64),
 custom_ksid_col ''' + t + ''' not null,
-primary key (id),
+id bigint not null,
+parent_id bigint not null,
+primary key (parent_id, id),
 index by_msg (msg)
 ) Engine=InnoDB'''
     create_view_template = (