← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/r/information_schema.result

  • Committer: Stewart Smith
  • Author(s): Marko Mäkelä, Stewart Smith
  • Date: 2010-11-17 05:52:09 UTC
  • mto: (2021.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1971.
  • Revision ID: stewart@flamingspork.com-20101117055209-69m035q6h7e1txrc
Merge Revision revid:marko.makela@oracle.com-20100629113248-fvl48lnzr44z94gg from MySQL InnoDB

Original revid:marko.makela@oracle.com-20100629113248-fvl48lnzr44z94gg

Original Authors: Marko Mkel <marko.makela@oracle.com>
Original commit message:
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4

Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
  ------------------------------------------------------------------------
  r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines

  branches/6.0: Allow the minimum length of a multi-byte character to be
  up to 4 bytes. (Bug #35391)

  dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
  In this way, the 5 bits can hold two values of 0..4, and the storage size
  of the fields will not cross the 64-bit boundary.  Encode the values as
  DATA_MBMAX * mbmaxlen + mbminlen.  Define the auxiliary macros
  DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
  DB_MINMAXLEN(mbminlen, mbmaxlen).

  Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.

  Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
  ha_innobase::store_key_val_for_row() now does that, but the added function
  row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.

  rb://49 approved by Heikki Tuuri
  ------------------------------------------------------------------------

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/r/information_schema.result
27
27
a       INTEGER YES             YES     
28
28
select * from data_dictionary.columns where table_name="t1"
29
29
and column_name= "a";
30
 
TABLE_SCHEMA    TABLE_NAME      COLUMN_NAME     COLUMN_TYPE     ORDINAL_POSITION        COLUMN_DEFAULT  COLUMN_DEFAULT_IS_NULL  COLUMN_DEFAULT_UPDATE   IS_SIGNED       IS_AUTO_INCREMENT       IS_NULLABLE     IS_INDEXED      IS_USED_IN_PRIMARY      IS_UNIQUE       IS_MULTI        IS_FIRST_IN_MULTI       INDEXES_FOUND_IN        DATA_TYPE       DATA_ARCHETYPE  CHARACTER_MAXIMUM_LENGTH        CHARACTER_OCTET_LENGTH  NUMERIC_PRECISION       NUMERIC_SCALE   ENUM_VALUES     COLLATION_NAME  COLUMN_COMMENT
31
 
mysqltest       t1      a       INTEGER 0       NULL    YES             NULL    NO      YES     NO      NO      NO      NO      NO      0       INTEGER INTEGER 0       0       0       0       NULL            NULL
 
30
TABLE_SCHEMA    TABLE_NAME      COLUMN_NAME     COLUMN_TYPE     ORDINAL_POSITION        COLUMN_DEFAULT  COLUMN_DEFAULT_IS_NULL  COLUMN_DEFAULT_UPDATE   IS_AUTO_INCREMENT       IS_NULLABLE     IS_INDEXED      IS_USED_IN_PRIMARY      IS_UNIQUE       IS_MULTI        IS_FIRST_IN_MULTI       INDEXES_FOUND_IN        DATA_TYPE       CHARACTER_MAXIMUM_LENGTH        CHARACTER_OCTET_LENGTH  NUMERIC_PRECISION       NUMERIC_SCALE   ENUM_VALUES     COLLATION_NAME  COLUMN_COMMENT
 
31
mysqltest       t1      a       INTEGER 0       NULL    YES             NO      YES     NO      NO      NO      NO      NO      0       INTEGER 0       0       0       0       NULL            NULL
32
32
select table_name, column_name from data_dictionary.columns 
33
33
where table_schema = 'mysqltest' and table_name = 't1';
34
34
table_name      column_name
100
100
where table_name='t1';
101
101
column_name     data_type       CHARACTER_OCTET_LENGTH  CHARACTER_MAXIMUM_LENGTH
102
102
f1      BLOB    0       0
103
 
f2      TEXT    0       0
 
103
f2      BLOB    0       0
104
104
drop table t1;
105
105
create table t1(f1 int, f2 int, f3 BIGINT, f4 int,
106
106
f5 BIGINT, f6 int, f7 int);
187
187
AND t.table_name NOT LIKE 'falcon%'
188
188
  ORDER BY t.table_name, c1.column_name;
189
189
table_name      column_name
190
 
CATALOGS        CATALOG_CREATION_TIME
191
190
CHARACTER_SETS  DEFAULT_COLLATE_NAME
192
191
COLLATIONS      COLLATION_NAME
193
192
COLUMNS TABLE_SCHEMA
194
193
CUMULATIVE_SQL_COMMANDS COUNT_SELECT
195
194
CUMULATIVE_USER_STATS   BYTES_RECEIVED
196
195
CURRENT_SQL_COMMANDS    IP
197
 
ERRORS  ERROR_NAME
 
196
DRIZZLE_PROTOCOL_STATUS VARIABLE_VALUE
198
197
FOREIGN_KEYS    CONSTRAINT_SCHEMA
199
198
GLOBAL_STATEMENTS       VARIABLE_VALUE
200
199
GLOBAL_STATUS   VARIABLE_VALUE
207
206
INNODB_CMP_RESET        COMPRESS_OPS
208
207
INNODB_LOCKS    LOCK_TRX_ID
209
208
INNODB_LOCK_WAITS       REQUESTED_LOCK_ID
210
 
INNODB_REPLICATION_LOG  TRANSACTION_SEGMENT_ID
211
209
INNODB_STATUS   VARIABLE_VALUE
212
210
INNODB_SYS_COLUMNS      NAME
213
211
INNODB_SYS_FIELDS       NAME
218
216
INNODB_SYS_TABLESTATS   NAME
219
217
INNODB_TRX      TRX_STATE
220
218
MODULES MODULE_VERSION
 
219
MYSQL_PROTOCOL_STATUS   VARIABLE_VALUE
221
220
PLUGINS PLUGIN_TYPE
222
 
PROCESSLIST     USERNAME
223
 
PROTOCOL_COUNTERS       COUNTER
 
221
PROCESSLIST     USER
224
222
REPLICATION_STREAMS     APPLIER
225
223
SCHEMAS SCHEMA_NAME
226
224
SCOREBOARD_STATISTICS   NUMBER_OF_RANGE_LOCKS
227
225
SESSION_STATEMENTS      VARIABLE_VALUE
228
226
SESSION_STATUS  VARIABLE_VALUE
229
227
SESSION_VARIABLES       VARIABLE_VALUE
230
 
SYS_REPLICATION_LOG     SEGID
231
228
TABLES  TABLE_SCHEMA
232
229
TABLE_CACHE     TABLE_SCHEMA
233
230
TABLE_CONSTRAINTS       CONSTRAINT_SCHEMA
234
231
TABLE_DEFINITION_CACHE  TABLE_SCHEMA
235
 
USER_DEFINED_BARRIERS   SESSION_ID
236
 
USER_DEFINED_LOCKS      SESSION_ID
237
232
USER_DEFINED_VARIABLES  VARIABLE_VALUE
 
233
USER_LOCKS      SESSION_ID
238
234
SELECT t.table_name, c1.column_name
239
235
FROM data_dictionary.tables t
240
236
INNER JOIN
252
248
AND t.table_name NOT LIKE 'falcon%'
253
249
  ORDER BY t.table_name, c1.column_name;
254
250
table_name      column_name
255
 
CATALOGS        CATALOG_CREATION_TIME
256
251
CHARACTER_SETS  DEFAULT_COLLATE_NAME
257
252
COLLATIONS      COLLATION_NAME
258
253
COLUMNS TABLE_SCHEMA
259
254
CUMULATIVE_SQL_COMMANDS COUNT_SELECT
260
255
CUMULATIVE_USER_STATS   BYTES_RECEIVED
261
256
CURRENT_SQL_COMMANDS    IP
262
 
ERRORS  ERROR_NAME
 
257
DRIZZLE_PROTOCOL_STATUS VARIABLE_VALUE
263
258
FOREIGN_KEYS    CONSTRAINT_SCHEMA
264
259
GLOBAL_STATEMENTS       VARIABLE_VALUE
265
260
GLOBAL_STATUS   VARIABLE_VALUE
272
267
INNODB_CMP_RESET        COMPRESS_OPS
273
268
INNODB_LOCKS    LOCK_TRX_ID
274
269
INNODB_LOCK_WAITS       REQUESTED_LOCK_ID
275
 
INNODB_REPLICATION_LOG  TRANSACTION_SEGMENT_ID
276
270
INNODB_STATUS   VARIABLE_VALUE
277
271
INNODB_SYS_COLUMNS      NAME
278
272
INNODB_SYS_FIELDS       NAME
283
277
INNODB_SYS_TABLESTATS   NAME
284
278
INNODB_TRX      TRX_STATE
285
279
MODULES MODULE_VERSION
 
280
MYSQL_PROTOCOL_STATUS   VARIABLE_VALUE
286
281
PLUGINS PLUGIN_TYPE
287
 
PROCESSLIST     USERNAME
288
 
PROTOCOL_COUNTERS       COUNTER
 
282
PROCESSLIST     USER
289
283
REPLICATION_STREAMS     APPLIER
290
284
SCHEMAS SCHEMA_NAME
291
285
SCOREBOARD_STATISTICS   NUMBER_OF_RANGE_LOCKS
292
286
SESSION_STATEMENTS      VARIABLE_VALUE
293
287
SESSION_STATUS  VARIABLE_VALUE
294
288
SESSION_VARIABLES       VARIABLE_VALUE
295
 
SYS_REPLICATION_LOG     SEGID
296
289
TABLES  TABLE_SCHEMA
297
290
TABLE_CACHE     TABLE_SCHEMA
298
291
TABLE_CONSTRAINTS       CONSTRAINT_SCHEMA
299
292
TABLE_DEFINITION_CACHE  TABLE_SCHEMA
300
 
USER_DEFINED_BARRIERS   SESSION_ID
301
 
USER_DEFINED_LOCKS      SESSION_ID
302
293
USER_DEFINED_VARIABLES  VARIABLE_VALUE
 
294
USER_LOCKS      SESSION_ID
303
295
SELECT MAX(table_name) FROM data_dictionary.tables;
304
296
MAX(table_name)
305
297
VIEW_TABLE_USAGE
313
305
create table t2 (f1 int, f2 int);
314
306
drop table t1,t2;
315
307
select 1 as f1 from data_dictionary.tables  where "CHARACTER_SETS"=
316
 
(select cast(table_name as char)  from data_dictionary.tables WHERE TABLE_SCHEMA=schema()
317
 
AND TABLE_NAME = "CHARACTER_SETS"
318
 
 order by table_name limit 1) AND TABLE_SCHEMA=schema() limit 1;
 
308
(select cast(table_name as char)  from data_dictionary.tables
 
309
order by table_name limit 1) limit 1;
319
310
f1
 
311
1
320
312
select t.table_name, group_concat(t.table_schema, '.', t.table_name),
321
313
count(*) as num1
322
314
from data_dictionary.tables t
357
349
f5      BIGINT  NO              NO      
358
350
f6      BIGINT  NO      10      NO      
359
351
f7      DATETIME        NO              NO      
360
 
f8      DATETIME        YES     2006-01-01 00:00:00.000000      NO      
 
352
f8      DATETIME        YES     2006-01-01 00:00:00     NO      
361
353
drop table t1;
362
354
SET max_heap_table_size = DEFAULT;
363
355
USE test;
365
357
SELECT SCHEMA_NAME FROM data_dictionary.schemas
366
358
WHERE SCHEMA_NAME ='data_dictionary';
367
359
SCHEMA_NAME
368
 
DATA_DICTIONARY
 
360
data_dictionary
369
361
SELECT TABLE_COLLATION FROM data_dictionary.tables
370
362
WHERE TABLE_SCHEMA='mysql' and TABLE_NAME= 'db';
371
363
TABLE_COLLATION