summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@oracle.com>2010-10-06 18:03:27 -0600
committerMarc Alff <marc.alff@oracle.com>2010-10-06 18:03:27 -0600
commitd51cd894dac501d808da0c3bc08636f387014eb3 (patch)
tree1ae61e6cff185521683ed02b0ceefc681fb764e8 /scripts
parent985fa88f8b07743dd3a848c11bc1d93b826d3d62 (diff)
downloadmariadb-git-d51cd894dac501d808da0c3bc08636f387014eb3.tar.gz
Bug#57154 Rename THREADS.ID to THREADS.PROCESSLIST_ID in 5.5
This change is to align the 5.5 performance_schema.THREADS table definition with the 5.6 performance_schema.THREADS table, to facilitate the 5.5 -> 5.6 migration later. In the table performance_schema.THREADS: - renamed ID to PROCESSLIST_ID, removed not null - changed NAME from varchar(64) to varchar(128) to match the columns definitions from 5.6 Adjusted the test cases accordingly. Note: this fix is for 5.5 only, to null merge into 5.6
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_system_tables.sql4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql
index 977907c9c14..d5dd20542ff 100644
--- a/scripts/mysql_system_tables.sql
+++ b/scripts/mysql_system_tables.sql
@@ -467,8 +467,8 @@ DROP PREPARE stmt;
SET @l1="CREATE TABLE performance_schema.THREADS(";
SET @l2="THREAD_ID INTEGER not null,";
-SET @l3="ID INTEGER not null,";
-SET @l4="NAME VARCHAR(64) not null";
+SET @l3="PROCESSLIST_ID INTEGER,";
+SET @l4="NAME VARCHAR(128) not null";
SET @l5=")ENGINE=PERFORMANCE_SCHEMA;";
SET @cmd=concat(@l1,@l2,@l3,@l4,@l5);