~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to mysql-test/suite/funcs_1/r/is_tables_is.result

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
DROP DATABASE IF EXISTS db_datadict;
2
 
CREATE DATABASE db_datadict;
 
1
DROP DATABASE IF EXISTS test1;
 
2
CREATE DATABASE test1;
3
3
SELECT *,
4
4
LEFT( table_comment,
5
5
IF(INSTR(table_comment,'InnoDB free') = 0
86
86
TABLE_SCHEMA    information_schema
87
87
TABLE_NAME      COLUMNS
88
88
TABLE_TYPE      SYSTEM VIEW
89
 
ENGINE  MyISAM
 
89
ENGINE  MYISAM_OR_MARIA
90
90
VERSION 10
91
 
ROW_FORMAT      Dynamic
 
91
ROW_FORMAT      DYNAMIC_OR_PAGE
92
92
TABLE_ROWS      #TBLR#
93
93
AVG_ROW_LENGTH  #ARL#
94
94
DATA_LENGTH     #DL#
155
155
TABLE_SCHEMA    information_schema
156
156
TABLE_NAME      EVENTS
157
157
TABLE_TYPE      SYSTEM VIEW
158
 
ENGINE  MyISAM
 
158
ENGINE  MYISAM_OR_MARIA
159
159
VERSION 10
160
 
ROW_FORMAT      Dynamic
 
160
ROW_FORMAT      DYNAMIC_OR_PAGE
161
161
TABLE_ROWS      #TBLR#
162
162
AVG_ROW_LENGTH  #ARL#
163
163
DATA_LENGTH     #DL#
270
270
TABLE_SCHEMA    information_schema
271
271
TABLE_NAME      PARAMETERS
272
272
TABLE_TYPE      SYSTEM VIEW
273
 
ENGINE  MyISAM
 
273
ENGINE  MYISAM_OR_MARIA
274
274
VERSION 10
275
 
ROW_FORMAT      Dynamic
 
275
ROW_FORMAT      DYNAMIC_OR_PAGE
276
276
TABLE_ROWS      #TBLR#
277
277
AVG_ROW_LENGTH  #ARL#
278
278
DATA_LENGTH     #DL#
293
293
TABLE_SCHEMA    information_schema
294
294
TABLE_NAME      PARTITIONS
295
295
TABLE_TYPE      SYSTEM VIEW
296
 
ENGINE  MyISAM
 
296
ENGINE  MYISAM_OR_MARIA
297
297
VERSION 10
298
 
ROW_FORMAT      Dynamic
 
298
ROW_FORMAT      DYNAMIC_OR_PAGE
299
299
TABLE_ROWS      #TBLR#
300
300
AVG_ROW_LENGTH  #ARL#
301
301
DATA_LENGTH     #DL#
316
316
TABLE_SCHEMA    information_schema
317
317
TABLE_NAME      PLUGINS
318
318
TABLE_TYPE      SYSTEM VIEW
319
 
ENGINE  MyISAM
 
319
ENGINE  MYISAM_OR_MARIA
320
320
VERSION 10
321
 
ROW_FORMAT      Dynamic
 
321
ROW_FORMAT      DYNAMIC_OR_PAGE
322
322
TABLE_ROWS      #TBLR#
323
323
AVG_ROW_LENGTH  #ARL#
324
324
DATA_LENGTH     #DL#
339
339
TABLE_SCHEMA    information_schema
340
340
TABLE_NAME      PROCESSLIST
341
341
TABLE_TYPE      SYSTEM VIEW
342
 
ENGINE  MyISAM
 
342
ENGINE  MYISAM_OR_MARIA
343
343
VERSION 10
344
 
ROW_FORMAT      Dynamic
 
344
ROW_FORMAT      DYNAMIC_OR_PAGE
345
345
TABLE_ROWS      #TBLR#
346
346
AVG_ROW_LENGTH  #ARL#
347
347
DATA_LENGTH     #DL#
385
385
TABLE_SCHEMA    information_schema
386
386
TABLE_NAME      ROUTINES
387
387
TABLE_TYPE      SYSTEM VIEW
388
 
ENGINE  MyISAM
 
388
ENGINE  MYISAM_OR_MARIA
389
389
VERSION 10
390
 
ROW_FORMAT      Dynamic
 
390
ROW_FORMAT      DYNAMIC_OR_PAGE
391
391
TABLE_ROWS      #TBLR#
392
392
AVG_ROW_LENGTH  #ARL#
393
393
DATA_LENGTH     #DL#
592
592
TABLE_SCHEMA    information_schema
593
593
TABLE_NAME      TRIGGERS
594
594
TABLE_TYPE      SYSTEM VIEW
595
 
ENGINE  MyISAM
 
595
ENGINE  MYISAM_OR_MARIA
596
596
VERSION 10
597
 
ROW_FORMAT      Dynamic
 
597
ROW_FORMAT      DYNAMIC_OR_PAGE
598
598
TABLE_ROWS      #TBLR#
599
599
AVG_ROW_LENGTH  #ARL#
600
600
DATA_LENGTH     #DL#
638
638
TABLE_SCHEMA    information_schema
639
639
TABLE_NAME      VIEWS
640
640
TABLE_TYPE      SYSTEM VIEW
641
 
ENGINE  MyISAM
 
641
ENGINE  MYISAM_OR_MARIA
642
642
VERSION 10
643
 
ROW_FORMAT      Dynamic
 
643
ROW_FORMAT      DYNAMIC_OR_PAGE
644
644
TABLE_ROWS      #TBLR#
645
645
AVG_ROW_LENGTH  #ARL#
646
646
DATA_LENGTH     #DL#
659
659
Separator       -----------------------------------------------------
660
660
DROP   USER testuser1@localhost;
661
661
CREATE USER testuser1@localhost;
662
 
GRANT SELECT ON db_datadict.* TO testuser1@localhost;
 
662
GRANT SELECT ON test1.* TO testuser1@localhost;
663
663
# Establish connection testuser1 (user=testuser1)
664
664
SELECT *,
665
665
LEFT( table_comment,
747
747
TABLE_SCHEMA    information_schema
748
748
TABLE_NAME      COLUMNS
749
749
TABLE_TYPE      SYSTEM VIEW
750
 
ENGINE  MyISAM
 
750
ENGINE  MYISAM_OR_MARIA
751
751
VERSION 10
752
 
ROW_FORMAT      Dynamic
 
752
ROW_FORMAT      DYNAMIC_OR_PAGE
753
753
TABLE_ROWS      #TBLR#
754
754
AVG_ROW_LENGTH  #ARL#
755
755
DATA_LENGTH     #DL#
816
816
TABLE_SCHEMA    information_schema
817
817
TABLE_NAME      EVENTS
818
818
TABLE_TYPE      SYSTEM VIEW
819
 
ENGINE  MyISAM
 
819
ENGINE  MYISAM_OR_MARIA
820
820
VERSION 10
821
 
ROW_FORMAT      Dynamic
 
821
ROW_FORMAT      DYNAMIC_OR_PAGE
822
822
TABLE_ROWS      #TBLR#
823
823
AVG_ROW_LENGTH  #ARL#
824
824
DATA_LENGTH     #DL#
931
931
TABLE_SCHEMA    information_schema
932
932
TABLE_NAME      PARAMETERS
933
933
TABLE_TYPE      SYSTEM VIEW
934
 
ENGINE  MyISAM
 
934
ENGINE  MYISAM_OR_MARIA
935
935
VERSION 10
936
 
ROW_FORMAT      Dynamic
 
936
ROW_FORMAT      DYNAMIC_OR_PAGE
937
937
TABLE_ROWS      #TBLR#
938
938
AVG_ROW_LENGTH  #ARL#
939
939
DATA_LENGTH     #DL#
954
954
TABLE_SCHEMA    information_schema
955
955
TABLE_NAME      PARTITIONS
956
956
TABLE_TYPE      SYSTEM VIEW
957
 
ENGINE  MyISAM
 
957
ENGINE  MYISAM_OR_MARIA
958
958
VERSION 10
959
 
ROW_FORMAT      Dynamic
 
959
ROW_FORMAT      DYNAMIC_OR_PAGE
960
960
TABLE_ROWS      #TBLR#
961
961
AVG_ROW_LENGTH  #ARL#
962
962
DATA_LENGTH     #DL#
977
977
TABLE_SCHEMA    information_schema
978
978
TABLE_NAME      PLUGINS
979
979
TABLE_TYPE      SYSTEM VIEW
980
 
ENGINE  MyISAM
 
980
ENGINE  MYISAM_OR_MARIA
981
981
VERSION 10
982
 
ROW_FORMAT      Dynamic
 
982
ROW_FORMAT      DYNAMIC_OR_PAGE
983
983
TABLE_ROWS      #TBLR#
984
984
AVG_ROW_LENGTH  #ARL#
985
985
DATA_LENGTH     #DL#
1000
1000
TABLE_SCHEMA    information_schema
1001
1001
TABLE_NAME      PROCESSLIST
1002
1002
TABLE_TYPE      SYSTEM VIEW
1003
 
ENGINE  MyISAM
 
1003
ENGINE  MYISAM_OR_MARIA
1004
1004
VERSION 10
1005
 
ROW_FORMAT      Dynamic
 
1005
ROW_FORMAT      DYNAMIC_OR_PAGE
1006
1006
TABLE_ROWS      #TBLR#
1007
1007
AVG_ROW_LENGTH  #ARL#
1008
1008
DATA_LENGTH     #DL#
1046
1046
TABLE_SCHEMA    information_schema
1047
1047
TABLE_NAME      ROUTINES
1048
1048
TABLE_TYPE      SYSTEM VIEW
1049
 
ENGINE  MyISAM
 
1049
ENGINE  MYISAM_OR_MARIA
1050
1050
VERSION 10
1051
 
ROW_FORMAT      Dynamic
 
1051
ROW_FORMAT      DYNAMIC_OR_PAGE
1052
1052
TABLE_ROWS      #TBLR#
1053
1053
AVG_ROW_LENGTH  #ARL#
1054
1054
DATA_LENGTH     #DL#
1253
1253
TABLE_SCHEMA    information_schema
1254
1254
TABLE_NAME      TRIGGERS
1255
1255
TABLE_TYPE      SYSTEM VIEW
1256
 
ENGINE  MyISAM
 
1256
ENGINE  MYISAM_OR_MARIA
1257
1257
VERSION 10
1258
 
ROW_FORMAT      Dynamic
 
1258
ROW_FORMAT      DYNAMIC_OR_PAGE
1259
1259
TABLE_ROWS      #TBLR#
1260
1260
AVG_ROW_LENGTH  #ARL#
1261
1261
DATA_LENGTH     #DL#
1299
1299
TABLE_SCHEMA    information_schema
1300
1300
TABLE_NAME      VIEWS
1301
1301
TABLE_TYPE      SYSTEM VIEW
1302
 
ENGINE  MyISAM
 
1302
ENGINE  MYISAM_OR_MARIA
1303
1303
VERSION 10
1304
 
ROW_FORMAT      Dynamic
 
1304
ROW_FORMAT      DYNAMIC_OR_PAGE
1305
1305
TABLE_ROWS      #TBLR#
1306
1306
AVG_ROW_LENGTH  #ARL#
1307
1307
DATA_LENGTH     #DL#
1320
1320
Separator       -----------------------------------------------------
1321
1321
# Switch to connection default and close connection testuser1
1322
1322
DROP USER testuser1@localhost;
1323
 
DROP DATABASE db_datadict;
 
1323
DROP DATABASE test1;