#At file:///home/bzr/merges/merge-6.0-rpl-merge/
2692 Mats Kindahl 2008-10-01 [merge]
Merge 6.0 into 6.0-rpl-merge
removed:
mysql-test/suite/falcon/t/falcon_page_size_1-master.opt
mysql-test/suite/falcon_team/r/falcon_bug_23692.result
mysql-test/suite/falcon_team/r/read_many_rows_falcon.result
mysql-test/suite/falcon_team/t/falcon_bug_23692.test
mysql-test/suite/falcon_team/t/read_many_rows_falcon.test
added:
mysql-test/suite/falcon/r/falcon_bug_39692.result
mysql-test/suite/falcon/t/falcon_bug_39692.test
mysql-test/suite/falcon_team/t/test2bug.def
renamed:
mysql-test/suite/falcon_team/r/falcon_bug_23189.result => mysql-test/suite/falcon/r/falcon_bug_23189.result
mysql-test/suite/falcon_team/r/falcon_bug_30282.result => mysql-test/suite/falcon/r/falcon_bug_30282.result
mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result => mysql-test/suite/falcon/r/falcon_bug_30480_A.result
mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result => mysql-test/suite/falcon/r/falcon_bug_30480_B.result
mysql-test/suite/falcon_team/r/falcon_bug_30826.result => mysql-test/suite/falcon/r/falcon_bug_30826.result
mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result => mysql-test/suite/falcon/r/falcon_bug_34351_C.result
mysql-test/suite/falcon_team/r/ps_8falcon.result => mysql-test/suite/falcon/r/ps_8falcon.result
mysql-test/suite/falcon_team/t/falcon_bug_23189.test => mysql-test/suite/falcon/t/falcon_bug_23189.test
mysql-test/suite/falcon_team/t/falcon_bug_30282.test => mysql-test/suite/falcon/t/falcon_bug_30282.test
mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test => mysql-test/suite/falcon/t/falcon_bug_30480_A.test
mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test => mysql-test/suite/falcon/t/falcon_bug_30480_B.test
mysql-test/suite/falcon_team/t/falcon_bug_30826.test => mysql-test/suite/falcon/t/falcon_bug_30826.test
mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test => mysql-test/suite/falcon/t/falcon_bug_34351_C.test
mysql-test/suite/falcon_team/t/ps_8falcon.test => mysql-test/suite/falcon/t/ps_8falcon.test
modified:
mysql-test/r/information_schema.result
mysql-test/suite/falcon/r/falcon_bug_22154-big.result
mysql-test/suite/falcon/t/falcon_bug_22154-big.test
mysql-test/suite/falcon_team/r/falcon_bug_36294.result
mysql-test/suite/falcon_team/t/falcon_bug_36294.test
mysql-test/suite/funcs_1/datadict/tables2.inc
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_tables.result
mysql-test/suite/funcs_1/r/is_tables_innodb.result
mysql-test/suite/funcs_1/r/is_tables_is.result
mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
mysql-test/suite/funcs_1/r/is_tables_memory.result
mysql-test/suite/funcs_1/r/is_tables_myisam.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
mysys/stacktrace.c
sql/sql_show.cc
storage/falcon/Cache.cpp
storage/falcon/DataPage.h
storage/falcon/MemoryManager.h
storage/falcon/SerialLogFile.cpp
storage/falcon/StorageParameters.h
storage/falcon/TableSpaceManager.cpp
storage/falcon/TableSpaceManager.h
mysql-test/suite/falcon/r/falcon_bug_23189.result
mysql-test/suite/falcon/r/falcon_bug_30480_A.result
mysql-test/suite/falcon/r/falcon_bug_30480_B.result
mysql-test/suite/falcon/r/falcon_bug_30826.result
mysql-test/suite/falcon/r/falcon_bug_34351_C.result
mysql-test/suite/falcon/r/ps_8falcon.result
mysql-test/suite/falcon/t/falcon_bug_23189.test
mysql-test/suite/falcon/t/falcon_bug_30480_A.test
mysql-test/suite/falcon/t/falcon_bug_30480_B.test
mysql-test/suite/falcon/t/falcon_bug_30826.test
mysql-test/suite/falcon/t/falcon_bug_34351_C.test
mysql-test/suite/falcon/t/ps_8falcon.test
=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result 2008-09-19 09:55:21 +0000
+++ b/mysql-test/r/information_schema.result 2008-09-29 06:50:26 +0000
@@ -1419,7 +1419,7 @@ SELECT *
FROM tables ta
JOIN collations co ON ( co.collation_name = ta.table_catalog )
JOIN character_sets cs ON ( cs.character_set_name = ta.table_catalog );
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT TABLESPACE_NAME COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN
DROP TABLE test.t1;
SET max_heap_table_size = DEFAULT;
USE test;
@@ -1503,7 +1503,7 @@ AS SELECT *
FROM information_schema.tables;
SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS where TABLE_NAME = 'v1';
VIEW_DEFINITION
-select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `information_schema`.`tables`
+select `tables`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`tables`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`tables`.`TABLE_NAME` AS `TABLE_NAME`,`tables`.`TABLE_TYPE` AS `TABLE_TYPE`,`tables`.`ENGINE` AS `ENGINE`,`tables`.`VERSION` AS `VERSION`,`tables`.`ROW_FORMAT` AS `ROW_FORMAT`,`tables`.`TABLE_ROWS` AS `TABLE_ROWS`,`tables`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`tables`.`DATA_LENGTH` AS `DATA_LENGTH`,`tables`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`tables`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`tables`.`DATA_FREE` AS `DATA_FREE`,`tables`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`tables`.`CREATE_TIME` AS `CREATE_TIME`,`tables`.`UPDATE_TIME` AS `UPDATE_TIME`,`tables`.`CHECK_TIME` AS `CHECK_TIME`,`tables`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`tables`.`CHECKSUM` AS `CHECKSUM`,`tables`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`tables`.`TABLE_COMMENT` AS `TABLE_COMMENT`,`tables`.`TABLESPACE_NAME` AS `TABLESPACE_NAME` from `information_schema`.`tables`
DROP VIEW v1;
SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA
WHERE SCHEMA_NAME ='information_schema';
@@ -1536,11 +1536,11 @@ TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NO
select * from `information_schema`.`STATISTICS` where `TABLE_NAME` = NULL;
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT INDEX_COMMENT
select * from information_schema.tables where table_schema = NULL;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT TABLESPACE_NAME
select * from information_schema.tables where table_catalog = NULL;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT TABLESPACE_NAME
select * from information_schema.tables where table_name = NULL;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT TABLESPACE_NAME
select * from `information_schema`.`TABLE_CONSTRAINTS` where `TABLE_SCHEMA` = NULL;
CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_SCHEMA TABLE_NAME CONSTRAINT_TYPE
select * from `information_schema`.`TABLE_CONSTRAINTS` where `TABLE_NAME` = NULL;
@@ -1622,7 +1622,7 @@ CREATE TABLE t1 (c1 int);
CREATE TABLE t2 (c2 int);
GRANT SELECT ON testdb1.t1 TO mysqluser_35955@localhost;
SELECT * FROM INFORMATION_SCHEMA.tables, t1;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT c1
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT TABLESPACE_NAME c1
SELECT * FROM t2;
ERROR 42000: SELECT command denied to user 'mysqluser_35955'@'localhost' for table 't2'
SELECT * FROM t2, INFORMATION_SCHEMA.tables;
=== modified file 'mysql-test/suite/falcon/r/falcon_bug_22154-big.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_22154-big.result 2008-04-25 10:46:09 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_22154-big.result 2008-09-19 09:12:48 +0000
@@ -7,7 +7,6 @@ create procedure pj9 ()
begin
declare v int default 1;
while v < 500 do
-select 'alter',v;
set @v = concat('alter table tj9 add column s',v,' char(64) default ''Hello World''');
prepare stmt1 from @v;
execute stmt1;
@@ -15,13 +14,11 @@ set v = v + 1;
end while;
set v = 1;
while v < 500 do
-select 'insert',v;
insert into tj9 (s1) values (v);
set v = v + 1;
end while;
set v = 1;
while v < 500 do
-select 'update',v;
set @v = concat('update tj9 set s',v,'=concat(s2,s1)');
prepare stmt1 from @v;
execute stmt1;
@@ -29,3002 +26,8 @@ set v = v + 1;
end while;
end//
call pj9();
-alter v
-alter 1
-alter v
-alter 2
-alter v
-alter 3
-alter v
-alter 4
-alter v
-alter 5
-alter v
-alter 6
-alter v
-alter 7
-alter v
-alter 8
-alter v
-alter 9
-alter v
-alter 10
-alter v
-alter 11
-alter v
-alter 12
-alter v
-alter 13
-alter v
-alter 14
-alter v
-alter 15
-alter v
-alter 16
-alter v
-alter 17
-alter v
-alter 18
-alter v
-alter 19
-alter v
-alter 20
-alter v
-alter 21
-alter v
-alter 22
-alter v
-alter 23
-alter v
-alter 24
-alter v
-alter 25
-alter v
-alter 26
-alter v
-alter 27
-alter v
-alter 28
-alter v
-alter 29
-alter v
-alter 30
-alter v
-alter 31
-alter v
-alter 32
-alter v
-alter 33
-alter v
-alter 34
-alter v
-alter 35
-alter v
-alter 36
-alter v
-alter 37
-alter v
-alter 38
-alter v
-alter 39
-alter v
-alter 40
-alter v
-alter 41
-alter v
-alter 42
-alter v
-alter 43
-alter v
-alter 44
-alter v
-alter 45
-alter v
-alter 46
-alter v
-alter 47
-alter v
-alter 48
-alter v
-alter 49
-alter v
-alter 50
-alter v
-alter 51
-alter v
-alter 52
-alter v
-alter 53
-alter v
-alter 54
-alter v
-alter 55
-alter v
-alter 56
-alter v
-alter 57
-alter v
-alter 58
-alter v
-alter 59
-alter v
-alter 60
-alter v
-alter 61
-alter v
-alter 62
-alter v
-alter 63
-alter v
-alter 64
-alter v
-alter 65
-alter v
-alter 66
-alter v
-alter 67
-alter v
-alter 68
-alter v
-alter 69
-alter v
-alter 70
-alter v
-alter 71
-alter v
-alter 72
-alter v
-alter 73
-alter v
-alter 74
-alter v
-alter 75
-alter v
-alter 76
-alter v
-alter 77
-alter v
-alter 78
-alter v
-alter 79
-alter v
-alter 80
-alter v
-alter 81
-alter v
-alter 82
-alter v
-alter 83
-alter v
-alter 84
-alter v
-alter 85
-alter v
-alter 86
-alter v
-alter 87
-alter v
-alter 88
-alter v
-alter 89
-alter v
-alter 90
-alter v
-alter 91
-alter v
-alter 92
-alter v
-alter 93
-alter v
-alter 94
-alter v
-alter 95
-alter v
-alter 96
-alter v
-alter 97
-alter v
-alter 98
-alter v
-alter 99
-alter v
-alter 100
-alter v
-alter 101
-alter v
-alter 102
-alter v
-alter 103
-alter v
-alter 104
-alter v
-alter 105
-alter v
-alter 106
-alter v
-alter 107
-alter v
-alter 108
-alter v
-alter 109
-alter v
-alter 110
-alter v
-alter 111
-alter v
-alter 112
-alter v
-alter 113
-alter v
-alter 114
-alter v
-alter 115
-alter v
-alter 116
-alter v
-alter 117
-alter v
-alter 118
-alter v
-alter 119
-alter v
-alter 120
-alter v
-alter 121
-alter v
-alter 122
-alter v
-alter 123
-alter v
-alter 124
-alter v
-alter 125
-alter v
-alter 126
-alter v
-alter 127
-alter v
-alter 128
-alter v
-alter 129
-alter v
-alter 130
-alter v
-alter 131
-alter v
-alter 132
-alter v
-alter 133
-alter v
-alter 134
-alter v
-alter 135
-alter v
-alter 136
-alter v
-alter 137
-alter v
-alter 138
-alter v
-alter 139
-alter v
-alter 140
-alter v
-alter 141
-alter v
-alter 142
-alter v
-alter 143
-alter v
-alter 144
-alter v
-alter 145
-alter v
-alter 146
-alter v
-alter 147
-alter v
-alter 148
-alter v
-alter 149
-alter v
-alter 150
-alter v
-alter 151
-alter v
-alter 152
-alter v
-alter 153
-alter v
-alter 154
-alter v
-alter 155
-alter v
-alter 156
-alter v
-alter 157
-alter v
-alter 158
-alter v
-alter 159
-alter v
-alter 160
-alter v
-alter 161
-alter v
-alter 162
-alter v
-alter 163
-alter v
-alter 164
-alter v
-alter 165
-alter v
-alter 166
-alter v
-alter 167
-alter v
-alter 168
-alter v
-alter 169
-alter v
-alter 170
-alter v
-alter 171
-alter v
-alter 172
-alter v
-alter 173
-alter v
-alter 174
-alter v
-alter 175
-alter v
-alter 176
-alter v
-alter 177
-alter v
-alter 178
-alter v
-alter 179
-alter v
-alter 180
-alter v
-alter 181
-alter v
-alter 182
-alter v
-alter 183
-alter v
-alter 184
-alter v
-alter 185
-alter v
-alter 186
-alter v
-alter 187
-alter v
-alter 188
-alter v
-alter 189
-alter v
-alter 190
-alter v
-alter 191
-alter v
-alter 192
-alter v
-alter 193
-alter v
-alter 194
-alter v
-alter 195
-alter v
-alter 196
-alter v
-alter 197
-alter v
-alter 198
-alter v
-alter 199
-alter v
-alter 200
-alter v
-alter 201
-alter v
-alter 202
-alter v
-alter 203
-alter v
-alter 204
-alter v
-alter 205
-alter v
-alter 206
-alter v
-alter 207
-alter v
-alter 208
-alter v
-alter 209
-alter v
-alter 210
-alter v
-alter 211
-alter v
-alter 212
-alter v
-alter 213
-alter v
-alter 214
-alter v
-alter 215
-alter v
-alter 216
-alter v
-alter 217
-alter v
-alter 218
-alter v
-alter 219
-alter v
-alter 220
-alter v
-alter 221
-alter v
-alter 222
-alter v
-alter 223
-alter v
-alter 224
-alter v
-alter 225
-alter v
-alter 226
-alter v
-alter 227
-alter v
-alter 228
-alter v
-alter 229
-alter v
-alter 230
-alter v
-alter 231
-alter v
-alter 232
-alter v
-alter 233
-alter v
-alter 234
-alter v
-alter 235
-alter v
-alter 236
-alter v
-alter 237
-alter v
-alter 238
-alter v
-alter 239
-alter v
-alter 240
-alter v
-alter 241
-alter v
-alter 242
-alter v
-alter 243
-alter v
-alter 244
-alter v
-alter 245
-alter v
-alter 246
-alter v
-alter 247
-alter v
-alter 248
-alter v
-alter 249
-alter v
-alter 250
-alter v
-alter 251
-alter v
-alter 252
-alter v
-alter 253
-alter v
-alter 254
-alter v
-alter 255
-alter v
-alter 256
-alter v
-alter 257
-alter v
-alter 258
-alter v
-alter 259
-alter v
-alter 260
-alter v
-alter 261
-alter v
-alter 262
-alter v
-alter 263
-alter v
-alter 264
-alter v
-alter 265
-alter v
-alter 266
-alter v
-alter 267
-alter v
-alter 268
-alter v
-alter 269
-alter v
-alter 270
-alter v
-alter 271
-alter v
-alter 272
-alter v
-alter 273
-alter v
-alter 274
-alter v
-alter 275
-alter v
-alter 276
-alter v
-alter 277
-alter v
-alter 278
-alter v
-alter 279
-alter v
-alter 280
-alter v
-alter 281
-alter v
-alter 282
-alter v
-alter 283
-alter v
-alter 284
-alter v
-alter 285
-alter v
-alter 286
-alter v
-alter 287
-alter v
-alter 288
-alter v
-alter 289
-alter v
-alter 290
-alter v
-alter 291
-alter v
-alter 292
-alter v
-alter 293
-alter v
-alter 294
-alter v
-alter 295
-alter v
-alter 296
-alter v
-alter 297
-alter v
-alter 298
-alter v
-alter 299
-alter v
-alter 300
-alter v
-alter 301
-alter v
-alter 302
-alter v
-alter 303
-alter v
-alter 304
-alter v
-alter 305
-alter v
-alter 306
-alter v
-alter 307
-alter v
-alter 308
-alter v
-alter 309
-alter v
-alter 310
-alter v
-alter 311
-alter v
-alter 312
-alter v
-alter 313
-alter v
-alter 314
-alter v
-alter 315
-alter v
-alter 316
-alter v
-alter 317
-alter v
-alter 318
-alter v
-alter 319
-alter v
-alter 320
-alter v
-alter 321
-alter v
-alter 322
-alter v
-alter 323
-alter v
-alter 324
-alter v
-alter 325
-alter v
-alter 326
-alter v
-alter 327
-alter v
-alter 328
-alter v
-alter 329
-alter v
-alter 330
-alter v
-alter 331
-alter v
-alter 332
-alter v
-alter 333
-alter v
-alter 334
-alter v
-alter 335
-alter v
-alter 336
-alter v
-alter 337
-alter v
-alter 338
-alter v
-alter 339
-alter v
-alter 340
-alter v
-alter 341
-alter v
-alter 342
-alter v
-alter 343
-alter v
-alter 344
-alter v
-alter 345
-alter v
-alter 346
-alter v
-alter 347
-alter v
-alter 348
-alter v
-alter 349
-alter v
-alter 350
-alter v
-alter 351
-alter v
-alter 352
-alter v
-alter 353
-alter v
-alter 354
-alter v
-alter 355
-alter v
-alter 356
-alter v
-alter 357
-alter v
-alter 358
-alter v
-alter 359
-alter v
-alter 360
-alter v
-alter 361
-alter v
-alter 362
-alter v
-alter 363
-alter v
-alter 364
-alter v
-alter 365
-alter v
-alter 366
-alter v
-alter 367
-alter v
-alter 368
-alter v
-alter 369
-alter v
-alter 370
-alter v
-alter 371
-alter v
-alter 372
-alter v
-alter 373
-alter v
-alter 374
-alter v
-alter 375
-alter v
-alter 376
-alter v
-alter 377
-alter v
-alter 378
-alter v
-alter 379
-alter v
-alter 380
-alter v
-alter 381
-alter v
-alter 382
-alter v
-alter 383
-alter v
-alter 384
-alter v
-alter 385
-alter v
-alter 386
-alter v
-alter 387
-alter v
-alter 388
-alter v
-alter 389
-alter v
-alter 390
-alter v
-alter 391
-alter v
-alter 392
-alter v
-alter 393
-alter v
-alter 394
-alter v
-alter 395
-alter v
-alter 396
-alter v
-alter 397
-alter v
-alter 398
-alter v
-alter 399
-alter v
-alter 400
-alter v
-alter 401
-alter v
-alter 402
-alter v
-alter 403
-alter v
-alter 404
-alter v
-alter 405
-alter v
-alter 406
-alter v
-alter 407
-alter v
-alter 408
-alter v
-alter 409
-alter v
-alter 410
-alter v
-alter 411
-alter v
-alter 412
-alter v
-alter 413
-alter v
-alter 414
-alter v
-alter 415
-alter v
-alter 416
-alter v
-alter 417
-alter v
-alter 418
-alter v
-alter 419
-alter v
-alter 420
-alter v
-alter 421
-alter v
-alter 422
-alter v
-alter 423
-alter v
-alter 424
-alter v
-alter 425
-alter v
-alter 426
-alter v
-alter 427
-alter v
-alter 428
-alter v
-alter 429
-alter v
-alter 430
-alter v
-alter 431
-alter v
-alter 432
-alter v
-alter 433
-alter v
-alter 434
-alter v
-alter 435
-alter v
-alter 436
-alter v
-alter 437
-alter v
-alter 438
-alter v
-alter 439
-alter v
-alter 440
-alter v
-alter 441
-alter v
-alter 442
-alter v
-alter 443
-alter v
-alter 444
-alter v
-alter 445
-alter v
-alter 446
-alter v
-alter 447
-alter v
-alter 448
-alter v
-alter 449
-alter v
-alter 450
-alter v
-alter 451
-alter v
-alter 452
-alter v
-alter 453
-alter v
-alter 454
-alter v
-alter 455
-alter v
-alter 456
-alter v
-alter 457
-alter v
-alter 458
-alter v
-alter 459
-alter v
-alter 460
-alter v
-alter 461
-alter v
-alter 462
-alter v
-alter 463
-alter v
-alter 464
-alter v
-alter 465
-alter v
-alter 466
-alter v
-alter 467
-alter v
-alter 468
-alter v
-alter 469
-alter v
-alter 470
-alter v
-alter 471
-alter v
-alter 472
-alter v
-alter 473
-alter v
-alter 474
-alter v
-alter 475
-alter v
-alter 476
-alter v
-alter 477
-alter v
-alter 478
-alter v
-alter 479
-alter v
-alter 480
-alter v
-alter 481
-alter v
-alter 482
-alter v
-alter 483
-alter v
-alter 484
-alter v
-alter 485
-alter v
-alter 486
-alter v
-alter 487
-alter v
-alter 488
-alter v
-alter 489
-alter v
-alter 490
-alter v
-alter 491
-alter v
-alter 492
-alter v
-alter 493
-alter v
-alter 494
-alter v
-alter 495
-alter v
-alter 496
-alter v
-alter 497
-alter v
-alter 498
-alter v
-alter 499
-insert v
-insert 1
-insert v
-insert 2
-insert v
-insert 3
-insert v
-insert 4
-insert v
-insert 5
-insert v
-insert 6
-insert v
-insert 7
-insert v
-insert 8
-insert v
-insert 9
-insert v
-insert 10
-insert v
-insert 11
-insert v
-insert 12
-insert v
-insert 13
-insert v
-insert 14
-insert v
-insert 15
-insert v
-insert 16
-insert v
-insert 17
-insert v
-insert 18
-insert v
-insert 19
-insert v
-insert 20
-insert v
-insert 21
-insert v
-insert 22
-insert v
-insert 23
-insert v
-insert 24
-insert v
-insert 25
-insert v
-insert 26
-insert v
-insert 27
-insert v
-insert 28
-insert v
-insert 29
-insert v
-insert 30
-insert v
-insert 31
-insert v
-insert 32
-insert v
-insert 33
-insert v
-insert 34
-insert v
-insert 35
-insert v
-insert 36
-insert v
-insert 37
-insert v
-insert 38
-insert v
-insert 39
-insert v
-insert 40
-insert v
-insert 41
-insert v
-insert 42
-insert v
-insert 43
-insert v
-insert 44
-insert v
-insert 45
-insert v
-insert 46
-insert v
-insert 47
-insert v
-insert 48
-insert v
-insert 49
-insert v
-insert 50
-insert v
-insert 51
-insert v
-insert 52
-insert v
-insert 53
-insert v
-insert 54
-insert v
-insert 55
-insert v
-insert 56
-insert v
-insert 57
-insert v
-insert 58
-insert v
-insert 59
-insert v
-insert 60
-insert v
-insert 61
-insert v
-insert 62
-insert v
-insert 63
-insert v
-insert 64
-insert v
-insert 65
-insert v
-insert 66
-insert v
-insert 67
-insert v
-insert 68
-insert v
-insert 69
-insert v
-insert 70
-insert v
-insert 71
-insert v
-insert 72
-insert v
-insert 73
-insert v
-insert 74
-insert v
-insert 75
-insert v
-insert 76
-insert v
-insert 77
-insert v
-insert 78
-insert v
-insert 79
-insert v
-insert 80
-insert v
-insert 81
-insert v
-insert 82
-insert v
-insert 83
-insert v
-insert 84
-insert v
-insert 85
-insert v
-insert 86
-insert v
-insert 87
-insert v
-insert 88
-insert v
-insert 89
-insert v
-insert 90
-insert v
-insert 91
-insert v
-insert 92
-insert v
-insert 93
-insert v
-insert 94
-insert v
-insert 95
-insert v
-insert 96
-insert v
-insert 97
-insert v
-insert 98
-insert v
-insert 99
-insert v
-insert 100
-insert v
-insert 101
-insert v
-insert 102
-insert v
-insert 103
-insert v
-insert 104
-insert v
-insert 105
-insert v
-insert 106
-insert v
-insert 107
-insert v
-insert 108
-insert v
-insert 109
-insert v
-insert 110
-insert v
-insert 111
-insert v
-insert 112
-insert v
-insert 113
-insert v
-insert 114
-insert v
-insert 115
-insert v
-insert 116
-insert v
-insert 117
-insert v
-insert 118
-insert v
-insert 119
-insert v
-insert 120
-insert v
-insert 121
-insert v
-insert 122
-insert v
-insert 123
-insert v
-insert 124
-insert v
-insert 125
-insert v
-insert 126
-insert v
-insert 127
-insert v
-insert 128
-insert v
-insert 129
-insert v
-insert 130
-insert v
-insert 131
-insert v
-insert 132
-insert v
-insert 133
-insert v
-insert 134
-insert v
-insert 135
-insert v
-insert 136
-insert v
-insert 137
-insert v
-insert 138
-insert v
-insert 139
-insert v
-insert 140
-insert v
-insert 141
-insert v
-insert 142
-insert v
-insert 143
-insert v
-insert 144
-insert v
-insert 145
-insert v
-insert 146
-insert v
-insert 147
-insert v
-insert 148
-insert v
-insert 149
-insert v
-insert 150
-insert v
-insert 151
-insert v
-insert 152
-insert v
-insert 153
-insert v
-insert 154
-insert v
-insert 155
-insert v
-insert 156
-insert v
-insert 157
-insert v
-insert 158
-insert v
-insert 159
-insert v
-insert 160
-insert v
-insert 161
-insert v
-insert 162
-insert v
-insert 163
-insert v
-insert 164
-insert v
-insert 165
-insert v
-insert 166
-insert v
-insert 167
-insert v
-insert 168
-insert v
-insert 169
-insert v
-insert 170
-insert v
-insert 171
-insert v
-insert 172
-insert v
-insert 173
-insert v
-insert 174
-insert v
-insert 175
-insert v
-insert 176
-insert v
-insert 177
-insert v
-insert 178
-insert v
-insert 179
-insert v
-insert 180
-insert v
-insert 181
-insert v
-insert 182
-insert v
-insert 183
-insert v
-insert 184
-insert v
-insert 185
-insert v
-insert 186
-insert v
-insert 187
-insert v
-insert 188
-insert v
-insert 189
-insert v
-insert 190
-insert v
-insert 191
-insert v
-insert 192
-insert v
-insert 193
-insert v
-insert 194
-insert v
-insert 195
-insert v
-insert 196
-insert v
-insert 197
-insert v
-insert 198
-insert v
-insert 199
-insert v
-insert 200
-insert v
-insert 201
-insert v
-insert 202
-insert v
-insert 203
-insert v
-insert 204
-insert v
-insert 205
-insert v
-insert 206
-insert v
-insert 207
-insert v
-insert 208
-insert v
-insert 209
-insert v
-insert 210
-insert v
-insert 211
-insert v
-insert 212
-insert v
-insert 213
-insert v
-insert 214
-insert v
-insert 215
-insert v
-insert 216
-insert v
-insert 217
-insert v
-insert 218
-insert v
-insert 219
-insert v
-insert 220
-insert v
-insert 221
-insert v
-insert 222
-insert v
-insert 223
-insert v
-insert 224
-insert v
-insert 225
-insert v
-insert 226
-insert v
-insert 227
-insert v
-insert 228
-insert v
-insert 229
-insert v
-insert 230
-insert v
-insert 231
-insert v
-insert 232
-insert v
-insert 233
-insert v
-insert 234
-insert v
-insert 235
-insert v
-insert 236
-insert v
-insert 237
-insert v
-insert 238
-insert v
-insert 239
-insert v
-insert 240
-insert v
-insert 241
-insert v
-insert 242
-insert v
-insert 243
-insert v
-insert 244
-insert v
-insert 245
-insert v
-insert 246
-insert v
-insert 247
-insert v
-insert 248
-insert v
-insert 249
-insert v
-insert 250
-insert v
-insert 251
-insert v
-insert 252
-insert v
-insert 253
-insert v
-insert 254
-insert v
-insert 255
-insert v
-insert 256
-insert v
-insert 257
-insert v
-insert 258
-insert v
-insert 259
-insert v
-insert 260
-insert v
-insert 261
-insert v
-insert 262
-insert v
-insert 263
-insert v
-insert 264
-insert v
-insert 265
-insert v
-insert 266
-insert v
-insert 267
-insert v
-insert 268
-insert v
-insert 269
-insert v
-insert 270
-insert v
-insert 271
-insert v
-insert 272
-insert v
-insert 273
-insert v
-insert 274
-insert v
-insert 275
-insert v
-insert 276
-insert v
-insert 277
-insert v
-insert 278
-insert v
-insert 279
-insert v
-insert 280
-insert v
-insert 281
-insert v
-insert 282
-insert v
-insert 283
-insert v
-insert 284
-insert v
-insert 285
-insert v
-insert 286
-insert v
-insert 287
-insert v
-insert 288
-insert v
-insert 289
-insert v
-insert 290
-insert v
-insert 291
-insert v
-insert 292
-insert v
-insert 293
-insert v
-insert 294
-insert v
-insert 295
-insert v
-insert 296
-insert v
-insert 297
-insert v
-insert 298
-insert v
-insert 299
-insert v
-insert 300
-insert v
-insert 301
-insert v
-insert 302
-insert v
-insert 303
-insert v
-insert 304
-insert v
-insert 305
-insert v
-insert 306
-insert v
-insert 307
-insert v
-insert 308
-insert v
-insert 309
-insert v
-insert 310
-insert v
-insert 311
-insert v
-insert 312
-insert v
-insert 313
-insert v
-insert 314
-insert v
-insert 315
-insert v
-insert 316
-insert v
-insert 317
-insert v
-insert 318
-insert v
-insert 319
-insert v
-insert 320
-insert v
-insert 321
-insert v
-insert 322
-insert v
-insert 323
-insert v
-insert 324
-insert v
-insert 325
-insert v
-insert 326
-insert v
-insert 327
-insert v
-insert 328
-insert v
-insert 329
-insert v
-insert 330
-insert v
-insert 331
-insert v
-insert 332
-insert v
-insert 333
-insert v
-insert 334
-insert v
-insert 335
-insert v
-insert 336
-insert v
-insert 337
-insert v
-insert 338
-insert v
-insert 339
-insert v
-insert 340
-insert v
-insert 341
-insert v
-insert 342
-insert v
-insert 343
-insert v
-insert 344
-insert v
-insert 345
-insert v
-insert 346
-insert v
-insert 347
-insert v
-insert 348
-insert v
-insert 349
-insert v
-insert 350
-insert v
-insert 351
-insert v
-insert 352
-insert v
-insert 353
-insert v
-insert 354
-insert v
-insert 355
-insert v
-insert 356
-insert v
-insert 357
-insert v
-insert 358
-insert v
-insert 359
-insert v
-insert 360
-insert v
-insert 361
-insert v
-insert 362
-insert v
-insert 363
-insert v
-insert 364
-insert v
-insert 365
-insert v
-insert 366
-insert v
-insert 367
-insert v
-insert 368
-insert v
-insert 369
-insert v
-insert 370
-insert v
-insert 371
-insert v
-insert 372
-insert v
-insert 373
-insert v
-insert 374
-insert v
-insert 375
-insert v
-insert 376
-insert v
-insert 377
-insert v
-insert 378
-insert v
-insert 379
-insert v
-insert 380
-insert v
-insert 381
-insert v
-insert 382
-insert v
-insert 383
-insert v
-insert 384
-insert v
-insert 385
-insert v
-insert 386
-insert v
-insert 387
-insert v
-insert 388
-insert v
-insert 389
-insert v
-insert 390
-insert v
-insert 391
-insert v
-insert 392
-insert v
-insert 393
-insert v
-insert 394
-insert v
-insert 395
-insert v
-insert 396
-insert v
-insert 397
-insert v
-insert 398
-insert v
-insert 399
-insert v
-insert 400
-insert v
-insert 401
-insert v
-insert 402
-insert v
-insert 403
-insert v
-insert 404
-insert v
-insert 405
-insert v
-insert 406
-insert v
-insert 407
-insert v
-insert 408
-insert v
-insert 409
-insert v
-insert 410
-insert v
-insert 411
-insert v
-insert 412
-insert v
-insert 413
-insert v
-insert 414
-insert v
-insert 415
-insert v
-insert 416
-insert v
-insert 417
-insert v
-insert 418
-insert v
-insert 419
-insert v
-insert 420
-insert v
-insert 421
-insert v
-insert 422
-insert v
-insert 423
-insert v
-insert 424
-insert v
-insert 425
-insert v
-insert 426
-insert v
-insert 427
-insert v
-insert 428
-insert v
-insert 429
-insert v
-insert 430
-insert v
-insert 431
-insert v
-insert 432
-insert v
-insert 433
-insert v
-insert 434
-insert v
-insert 435
-insert v
-insert 436
-insert v
-insert 437
-insert v
-insert 438
-insert v
-insert 439
-insert v
-insert 440
-insert v
-insert 441
-insert v
-insert 442
-insert v
-insert 443
-insert v
-insert 444
-insert v
-insert 445
-insert v
-insert 446
-insert v
-insert 447
-insert v
-insert 448
-insert v
-insert 449
-insert v
-insert 450
-insert v
-insert 451
-insert v
-insert 452
-insert v
-insert 453
-insert v
-insert 454
-insert v
-insert 455
-insert v
-insert 456
-insert v
-insert 457
-insert v
-insert 458
-insert v
-insert 459
-insert v
-insert 460
-insert v
-insert 461
-insert v
-insert 462
-insert v
-insert 463
-insert v
-insert 464
-insert v
-insert 465
-insert v
-insert 466
-insert v
-insert 467
-insert v
-insert 468
-insert v
-insert 469
-insert v
-insert 470
-insert v
-insert 471
-insert v
-insert 472
-insert v
-insert 473
-insert v
-insert 474
-insert v
-insert 475
-insert v
-insert 476
-insert v
-insert 477
-insert v
-insert 478
-insert v
-insert 479
-insert v
-insert 480
-insert v
-insert 481
-insert v
-insert 482
-insert v
-insert 483
-insert v
-insert 484
-insert v
-insert 485
-insert v
-insert 486
-insert v
-insert 487
-insert v
-insert 488
-insert v
-insert 489
-insert v
-insert 490
-insert v
-insert 491
-insert v
-insert 492
-insert v
-insert 493
-insert v
-insert 494
-insert v
-insert 495
-insert v
-insert 496
-insert v
-insert 497
-insert v
-insert 498
-insert v
-insert 499
-update v
-update 1
-update v
-update 2
-update v
-update 3
-update v
-update 4
-update v
-update 5
-update v
-update 6
-update v
-update 7
-update v
-update 8
-update v
-update 9
-update v
-update 10
-update v
-update 11
-update v
-update 12
-update v
-update 13
-update v
-update 14
-update v
-update 15
-update v
-update 16
-update v
-update 17
-update v
-update 18
-update v
-update 19
-update v
-update 20
-update v
-update 21
-update v
-update 22
-update v
-update 23
-update v
-update 24
-update v
-update 25
-update v
-update 26
-update v
-update 27
-update v
-update 28
-update v
-update 29
-update v
-update 30
-update v
-update 31
-update v
-update 32
-update v
-update 33
-update v
-update 34
-update v
-update 35
-update v
-update 36
-update v
-update 37
-update v
-update 38
-update v
-update 39
-update v
-update 40
-update v
-update 41
-update v
-update 42
-update v
-update 43
-update v
-update 44
-update v
-update 45
-update v
-update 46
-update v
-update 47
-update v
-update 48
-update v
-update 49
-update v
-update 50
-update v
-update 51
-update v
-update 52
-update v
-update 53
-update v
-update 54
-update v
-update 55
-update v
-update 56
-update v
-update 57
-update v
-update 58
-update v
-update 59
-update v
-update 60
-update v
-update 61
-update v
-update 62
-update v
-update 63
-update v
-update 64
-update v
-update 65
-update v
-update 66
-update v
-update 67
-update v
-update 68
-update v
-update 69
-update v
-update 70
-update v
-update 71
-update v
-update 72
-update v
-update 73
-update v
-update 74
-update v
-update 75
-update v
-update 76
-update v
-update 77
-update v
-update 78
-update v
-update 79
-update v
-update 80
-update v
-update 81
-update v
-update 82
-update v
-update 83
-update v
-update 84
-update v
-update 85
-update v
-update 86
-update v
-update 87
-update v
-update 88
-update v
-update 89
-update v
-update 90
-update v
-update 91
-update v
-update 92
-update v
-update 93
-update v
-update 94
-update v
-update 95
-update v
-update 96
-update v
-update 97
-update v
-update 98
-update v
-update 99
-update v
-update 100
-update v
-update 101
-update v
-update 102
-update v
-update 103
-update v
-update 104
-update v
-update 105
-update v
-update 106
-update v
-update 107
-update v
-update 108
-update v
-update 109
-update v
-update 110
-update v
-update 111
-update v
-update 112
-update v
-update 113
-update v
-update 114
-update v
-update 115
-update v
-update 116
-update v
-update 117
-update v
-update 118
-update v
-update 119
-update v
-update 120
-update v
-update 121
-update v
-update 122
-update v
-update 123
-update v
-update 124
-update v
-update 125
-update v
-update 126
-update v
-update 127
-update v
-update 128
-update v
-update 129
-update v
-update 130
-update v
-update 131
-update v
-update 132
-update v
-update 133
-update v
-update 134
-update v
-update 135
-update v
-update 136
-update v
-update 137
-update v
-update 138
-update v
-update 139
-update v
-update 140
-update v
-update 141
-update v
-update 142
-update v
-update 143
-update v
-update 144
-update v
-update 145
-update v
-update 146
-update v
-update 147
-update v
-update 148
-update v
-update 149
-update v
-update 150
-update v
-update 151
-update v
-update 152
-update v
-update 153
-update v
-update 154
-update v
-update 155
-update v
-update 156
-update v
-update 157
-update v
-update 158
-update v
-update 159
-update v
-update 160
-update v
-update 161
-update v
-update 162
-update v
-update 163
-update v
-update 164
-update v
-update 165
-update v
-update 166
-update v
-update 167
-update v
-update 168
-update v
-update 169
-update v
-update 170
-update v
-update 171
-update v
-update 172
-update v
-update 173
-update v
-update 174
-update v
-update 175
-update v
-update 176
-update v
-update 177
-update v
-update 178
-update v
-update 179
-update v
-update 180
-update v
-update 181
-update v
-update 182
-update v
-update 183
-update v
-update 184
-update v
-update 185
-update v
-update 186
-update v
-update 187
-update v
-update 188
-update v
-update 189
-update v
-update 190
-update v
-update 191
-update v
-update 192
-update v
-update 193
-update v
-update 194
-update v
-update 195
-update v
-update 196
-update v
-update 197
-update v
-update 198
-update v
-update 199
-update v
-update 200
-update v
-update 201
-update v
-update 202
-update v
-update 203
-update v
-update 204
-update v
-update 205
-update v
-update 206
-update v
-update 207
-update v
-update 208
-update v
-update 209
-update v
-update 210
-update v
-update 211
-update v
-update 212
-update v
-update 213
-update v
-update 214
-update v
-update 215
-update v
-update 216
-update v
-update 217
-update v
-update 218
-update v
-update 219
-update v
-update 220
-update v
-update 221
-update v
-update 222
-update v
-update 223
-update v
-update 224
-update v
-update 225
-update v
-update 226
-update v
-update 227
-update v
-update 228
-update v
-update 229
-update v
-update 230
-update v
-update 231
-update v
-update 232
-update v
-update 233
-update v
-update 234
-update v
-update 235
-update v
-update 236
-update v
-update 237
-update v
-update 238
-update v
-update 239
-update v
-update 240
-update v
-update 241
-update v
-update 242
-update v
-update 243
-update v
-update 244
-update v
-update 245
-update v
-update 246
-update v
-update 247
-update v
-update 248
-update v
-update 249
-update v
-update 250
-update v
-update 251
-update v
-update 252
-update v
-update 253
-update v
-update 254
-update v
-update 255
-update v
-update 256
-update v
-update 257
-update v
-update 258
-update v
-update 259
-update v
-update 260
-update v
-update 261
-update v
-update 262
-update v
-update 263
-update v
-update 264
-update v
-update 265
-update v
-update 266
-update v
-update 267
-update v
-update 268
-update v
-update 269
-update v
-update 270
-update v
-update 271
-update v
-update 272
-update v
-update 273
-update v
-update 274
-update v
-update 275
-update v
-update 276
-update v
-update 277
-update v
-update 278
-update v
-update 279
-update v
-update 280
-update v
-update 281
-update v
-update 282
-update v
-update 283
-update v
-update 284
-update v
-update 285
-update v
-update 286
-update v
-update 287
-update v
-update 288
-update v
-update 289
-update v
-update 290
-update v
-update 291
-update v
-update 292
-update v
-update 293
-update v
-update 294
-update v
-update 295
-update v
-update 296
-update v
-update 297
-update v
-update 298
-update v
-update 299
-update v
-update 300
-update v
-update 301
-update v
-update 302
-update v
-update 303
-update v
-update 304
-update v
-update 305
-update v
-update 306
-update v
-update 307
-update v
-update 308
-update v
-update 309
-update v
-update 310
-update v
-update 311
-update v
-update 312
-update v
-update 313
-update v
-update 314
-update v
-update 315
-update v
-update 316
-update v
-update 317
-update v
-update 318
-update v
-update 319
-update v
-update 320
-update v
-update 321
-update v
-update 322
-update v
-update 323
-update v
-update 324
-update v
-update 325
-update v
-update 326
-update v
-update 327
-update v
-update 328
-update v
-update 329
-update v
-update 330
-update v
-update 331
-update v
-update 332
-update v
-update 333
-update v
-update 334
-update v
-update 335
-update v
-update 336
-update v
-update 337
-update v
-update 338
-update v
-update 339
-update v
-update 340
-update v
-update 341
-update v
-update 342
-update v
-update 343
-update v
-update 344
-update v
-update 345
-update v
-update 346
-update v
-update 347
-update v
-update 348
-update v
-update 349
-update v
-update 350
-update v
-update 351
-update v
-update 352
-update v
-update 353
-update v
-update 354
-update v
-update 355
-update v
-update 356
-update v
-update 357
-update v
-update 358
-update v
-update 359
-update v
-update 360
-update v
-update 361
-update v
-update 362
-update v
-update 363
-update v
-update 364
-update v
-update 365
-update v
-update 366
-update v
-update 367
-update v
-update 368
-update v
-update 369
-update v
-update 370
-update v
-update 371
-update v
-update 372
-update v
-update 373
-update v
-update 374
-update v
-update 375
-update v
-update 376
-update v
-update 377
-update v
-update 378
-update v
-update 379
-update v
-update 380
-update v
-update 381
-update v
-update 382
-update v
-update 383
-update v
-update 384
-update v
-update 385
-update v
-update 386
-update v
-update 387
-update v
-update 388
-update v
-update 389
-update v
-update 390
-update v
-update 391
-update v
-update 392
-update v
-update 393
-update v
-update 394
-update v
-update 395
-update v
-update 396
-update v
-update 397
-update v
-update 398
-update v
-update 399
-update v
-update 400
-update v
-update 401
-update v
-update 402
-update v
-update 403
-update v
-update 404
-update v
-update 405
-update v
-update 406
-update v
-update 407
-update v
-update 408
-update v
-update 409
-update v
-update 410
-update v
-update 411
-update v
-update 412
-update v
-update 413
-update v
-update 414
-update v
-update 415
-update v
-update 416
-update v
-update 417
-update v
-update 418
-update v
-update 419
-update v
-update 420
-update v
-update 421
-update v
-update 422
-update v
-update 423
-update v
-update 424
-update v
-update 425
-update v
-update 426
-update v
-update 427
-update v
-update 428
-update v
-update 429
-update v
-update 430
-update v
-update 431
-update v
-update 432
-update v
-update 433
-update v
-update 434
-update v
-update 435
-update v
-update 436
-update v
-update 437
-update v
-update 438
-update v
-update 439
-update v
-update 440
-update v
-update 441
-update v
-update 442
-update v
-update 443
-update v
-update 444
-update v
-update 445
-update v
-update 446
-update v
-update 447
-update v
-update 448
-update v
-update 449
-update v
-update 450
-update v
-update 451
-update v
-update 452
-update v
-update 453
-update v
-update 454
-update v
-update 455
-update v
-update 456
-update v
-update 457
-update v
-update 458
-update v
-update 459
-update v
-update 460
-update v
-update 461
-update v
-update 462
-update v
-update 463
-update v
-update 464
-update v
-update 465
-update v
-update 466
-update v
-update 467
-update v
-update 468
-update v
-update 469
-update v
-update 470
-update v
-update 471
-update v
-update 472
-update v
-update 473
-update v
-update 474
-update v
-update 475
-update v
-update 476
-update v
-update 477
-update v
-update 478
-update v
-update 479
-update v
-update 480
-update v
-update 481
-update v
-update 482
-update v
-update 483
-update v
-update 484
-update v
-update 485
-update v
-update 486
-update v
-update 487
-update v
-update 488
-update v
-update 489
-update v
-update 490
-update v
-update 491
-update v
-update 492
-update v
-update 493
-update v
-update 494
-update v
-update 495
-update v
-update 496
-update v
-update 497
-update v
-update 498
-update v
-update 499
-SELECT count(*) FROM t1;
+SELECT count(*) FROM tj9;
count(*)
-500
+499
DROP TABLE tj9;
DROP PROCEDURE pj9;
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_23189.result' => 'mysql-test/suite/falcon/r/falcon_bug_23189.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_23189.result 2008-07-02 11:20:15 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_23189.result 2008-09-15 12:07:42 +0000
@@ -1,5 +1,5 @@
-SET STORAGE_ENGINE = Falcon;
*** Bug #23189 ***
+SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
CREATE TABLE t1 (a varchar(1100));
@@ -11,6 +11,11 @@ CREATE INDEX i ON t2 (a);
Warnings:
Warning 1071 Specified key was too long; max key length is 1100 bytes
Warning 1071 Specified key was too long; max key length is 1100 bytes
-Warning 1071 Specified key was too long; max key length is 1100 bytes
+SELECT count(*) FROM t1;
+count(*)
+1
+SELECT count(*) FROM t2;
+count(*)
+1
DROP TABLE t1;
DROP TABLE t2;
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_30282.result' => 'mysql-test/suite/falcon/r/falcon_bug_30282.result'
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result' => 'mysql-test/suite/falcon/r/falcon_bug_30480_A.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result 2008-04-23 08:50:47 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_30480_A.result 2008-09-12 23:28:15 +0000
@@ -1,21 +1,18 @@
-SET storage_engine = Falcon;
*** Bug #30480 ***
+SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
-CREATE TABLE t1 (s1 varchar(5) CHARACTER SET latin1);
SET NAMES utf8;
-CREATE INDEX id on t1 (s1);
+CREATE TABLE t1 (s1 varchar(5) CHARACTER SET latin1, INDEX id (s1));
+CREATE TABLE t2 (s1 varchar(5) CHARACTER SET latin1, INDEX id (s1)) partition by key(s1);
INSERT INTO t1 VALUES (0x8e);
INSERT INTO t1 VALUES ('AA');
+INSERT INTO t2 VALUES (0x8e);
+INSERT INTO t2 VALUES ('AA');
SELECT s1, HEX(s1) FROM t1;
s1 HEX(s1)
Ž 8E
AA 4141
-CREATE TABLE t2 (s1 varchar(5) CHARACTER SET latin1) partition by key(s1);
-SET NAMES utf8;
-CREATE INDEX id on t2 (s1);
-INSERT INTO t2 VALUES (0x8e);
-INSERT INTO t2 VALUES ('AA');
SELECT s1, HEX(s1) FROM t2;
s1 HEX(s1)
Ž 8E
@@ -26,4 +23,11 @@ AA 4141
SELECT s1, HEX(s1) FROM t2 WHERE s1 like 'A%';
s1 HEX(s1)
AA 4141
+SELECT count(*) FROM t1;
+count(*)
+2
+SELECT count(*) FROM t2;
+count(*)
+2
DROP TABLE t1;
+DROP TABLE t2;
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result' => 'mysql-test/suite/falcon/r/falcon_bug_30480_B.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result 2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_30480_B.result 2008-09-12 23:44:47 +0000
@@ -1,11 +1,12 @@
-SET storage_engine = Falcon;
*** Bug #30480 ***
+SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
-CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2);
-CREATE INDEX i1 on t1 (s1);
-INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
SET NAMES utf8;
+CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1));
+CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1)) partition by key(s1);
+INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
+INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
SELECT s1, HEX(s1) FROM t1;
s1 HEX(s1)
c 0063
@@ -17,10 +18,6 @@ s1 HEX(s1)
SELECT s1, HEX(s1) FROM t1 WHERE s1 = 'Ã';
s1 HEX(s1)
à 00C3
-CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2) partition by key(s1);
-CREATE INDEX i1 on t2 (s1);
-INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
-SET NAMES utf8;
SELECT s1, HEX(s1) FROM t2;
s1 HEX(s1)
c 0063
@@ -32,5 +29,11 @@ s1 HEX(s1)
SELECT s1, HEX(s1) FROM t2 WHERE s1 = 'Ã';
s1 HEX(s1)
à 00C3
+SELECT count(*) FROM t1;
+count(*)
+3
+SELECT count(*) FROM t2;
+count(*)
+3
DROP TABLE t1;
DROP TABLE t2;
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_30826.result' => 'mysql-test/suite/falcon/r/falcon_bug_30826.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_30826.result 2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_30826.result 2008-09-14 14:09:45 +0000
@@ -1,20 +1,27 @@
*** Bug #30826 ***
-SET @@storage_engine = Falcon;
+SET @@storage_engine = 'Falcon';
DROP TABLE IF EXISTS t1;
------- Test 1 - optimize with records -------
-CREATE TABLE t1 (PRIMARY KEY (`id`),
-`id` BIGINT NOT NULL AUTO_INCREMENT ,
-`field1` CHAR(50) NOT NULL)ENGINE = FALCON
+CREATE TABLE t1 (
+`id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+`field1` CHAR(50) NOT NULL)
PARTITION BY Hash (id) PARTITIONS 4;
INSERT INTO t1 (`id`, `field1`) VALUES('3','value3');
INSERT INTO t1 (`id`, `field1`) VALUES('5','value5');
INSERT INTO t1 (`id`, `field1`) VALUES('7','value7');
ALTER TABLE t1 OPTIMIZE PARTITION `p1`;
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
+SELECT count(*) FROM t1;
+count(*)
+3
------- Test 2 - optimize without records ------
DROP TABLE t1;
-CREATE TABLE t1 (PRIMARY KEY (`id`),
-`id` BIGINT NOT NULL AUTO_INCREMENT ,
-`field1` CHAR(50) NOT NULL)ENGINE = FALCON
+CREATE TABLE t1 (
+`id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+`field1` CHAR(50) NOT NULL)
PARTITION BY Hash (id) PARTITIONS 4;
ALTER TABLE t1 OPTIMIZE PARTITION `p1`;
+Table Op Msg_type Msg_text
+test.t1 optimize status OK
DROP TABLE t1;
=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result' => 'mysql-test/suite/falcon/r/falcon_bug_34351_C.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result 2008-04-24 04:09:39 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_34351_C.result 2008-09-28 08:07:30 +0000
@@ -35,7 +35,5 @@ CALL p1();
CALL p1();
# Switch to connection default
# Pull the results of the preceeding call p1()
-SELECT count(*) FROM t1;
-count(*)
-0
DROP PROCEDURE p1;
+DROP TABLE t1;
=== added file 'mysql-test/suite/falcon/r/falcon_bug_39692.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_39692.result 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_39692.result 2008-09-27 06:35:07 +0000
@@ -0,0 +1,8 @@
+*** Bug #39692 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a int);
+SELECT file FROM information_schema.falcon_system_memory_detail
+WHERE file = 'SectorCache.cpp';
+file
+DROP TABLE t1;
=== renamed file 'mysql-test/suite/falcon_team/r/ps_8falcon.result' => 'mysql-test/suite/falcon/r/ps_8falcon.result'
--- a/mysql-test/suite/falcon_team/r/ps_8falcon.result 2008-04-23 08:50:47 +0000
+++ b/mysql-test/suite/falcon/r/ps_8falcon.result 2008-09-19 09:12:48 +0000
@@ -1738,7 +1738,7 @@ set @arg14= 'abc';
set @arg14= NULL ;
set @arg15= CAST('abc' as binary) ;
set @arg15= NULL ;
-create table t5 as select
+create table t5 engine = MyISAM as select
8 as const01, @arg01 as param01,
8.0 as const02, @arg02 as param02,
80.00000000000e-1 as const03, @arg03 as param03,
=== modified file 'mysql-test/suite/falcon/t/falcon_bug_22154-big.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_22154-big.test 2008-04-25 10:46:09 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_22154-big.test 2008-09-19 09:12:48 +0000
@@ -1,5 +1,6 @@
--source include/have_falcon.inc
--source include/big_test.inc
+
#
# Bug #22154: Crash after 500 alters, 500 inserts, and a few updates
#
@@ -23,7 +24,6 @@ create procedure pj9 ()
begin
declare v int default 1;
while v < 500 do
- select 'alter',v;
set @v = concat('alter table tj9 add column s',v,' char(64) default ''Hello World''');
prepare stmt1 from @v;
execute stmt1;
@@ -31,13 +31,11 @@ begin
end while;
set v = 1;
while v < 500 do
- select 'insert',v;
insert into tj9 (s1) values (v);
set v = v + 1;
end while;
set v = 1;
while v < 500 do
- select 'update',v;
set @v = concat('update tj9 set s',v,'=concat(s2,s1)');
prepare stmt1 from @v;
execute stmt1;
=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_23189.test' => 'mysql-test/suite/falcon/t/falcon_bug_23189.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_23189.test 2008-07-02 11:20:15 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_23189.test 2008-09-15 12:07:42 +0000
@@ -1,14 +1,25 @@
--source include/have_falcon.inc
-SET STORAGE_ENGINE = Falcon;
+
#
# Bug #23189 Falcon: crash if create index for long varchar
#
--echo *** Bug #23189 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
--disable_warnings
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
--enable_warnings
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
+
CREATE TABLE t1 (a varchar(1100));
INSERT INTO t1 VALUES (repeat('r',1100));
CREATE INDEX i ON t1 (a);
@@ -17,6 +28,14 @@ CREATE TABLE t2 (a varchar(20000));
INSERT INTO t2 VALUES (repeat('r',20000));
CREATE INDEX i ON t2 (a);
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+SELECT count(*) FROM t2;
+
+# ----------------------------------------------------- #
+# --- Final cleanup --- #
+# ----------------------------------------------------- #
DROP TABLE t1;
DROP TABLE t2;
=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_30282.test' => 'mysql-test/suite/falcon/t/falcon_bug_30282.test'
=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test' => 'mysql-test/suite/falcon/t/falcon_bug_30480_A.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test 2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_30480_A.test 2008-09-15 01:36:19 +0000
@@ -1,45 +1,47 @@
--source include/have_falcon.inc
---disable_abort_on_error
-SET storage_engine = Falcon;
+--source include/have_partition.inc
+
#
# Bug #30480: Falcon: searches fail if LIKE and key partition
#
--echo *** Bug #30480 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
--disable_warnings
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
--enable_warnings
-###########################################################################
-# Description:
-# create a Falcon table with a latin1 column with a default collation.
-# The table is partitioned and indexed.
-# insert two rows, containing '� and 'AA'.
-# search for LIKE 'A%'.
-# get no rows, even though I inserted 'AA'.
-#
-# The result is similar to Bug#28527
-# But Bug#28527 requires an ascii() function, which should soon be
-# illegal, so it will probably disappear.
-# This is different: a key partition, no
-# ascii() function, a non-ASCII value, and a default collation.
-
-CREATE TABLE t1 (s1 varchar(5) CHARACTER SET latin1);
SET NAMES utf8;
-CREATE INDEX id on t1 (s1);
+CREATE TABLE t1 (s1 varchar(5) CHARACTER SET latin1, INDEX id (s1));
+CREATE TABLE t2 (s1 varchar(5) CHARACTER SET latin1, INDEX id (s1)) partition by key(s1);
INSERT INTO t1 VALUES (0x8e);
INSERT INTO t1 VALUES ('AA');
-SELECT s1, HEX(s1) FROM t1;
-
-CREATE TABLE t2 (s1 varchar(5) CHARACTER SET latin1) partition by key(s1);
-SET NAMES utf8;
-CREATE INDEX id on t2 (s1);
INSERT INTO t2 VALUES (0x8e);
INSERT INTO t2 VALUES ('AA');
+
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
+SELECT s1, HEX(s1) FROM t1;
SELECT s1, HEX(s1) FROM t2;
SELECT s1, HEX(s1) FROM t1 WHERE s1 like 'A%';
SELECT s1, HEX(s1) FROM t2 WHERE s1 like 'A%';
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+SELECT count(*) FROM t2;
+
+# ----------------------------------------------------- #
+# --- Final cleanup --- #
+# ----------------------------------------------------- #
DROP TABLE t1;
+DROP TABLE t2;
=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test' => 'mysql-test/suite/falcon/t/falcon_bug_30480_B.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test 2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_30480_B.test 2008-09-15 01:36:19 +0000
@@ -1,36 +1,47 @@
--source include/have_falcon.inc
---disable_abort_on_error
-SET storage_engine = Falcon;
+--source include/have_partition.inc
+
#
# Bug #30480: Falcon: searches fail if LIKE and key partition
#
--echo *** Bug #30480 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
--disable_warnings
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
--enable_warnings
-###########################################################################
-# Here is another test case, this time with a ucs2 column.
-# The character 'A with tilde', '�, is U+00C3.
-# Both selects should return 0x00c3.
-
-CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2);
-CREATE INDEX i1 on t1 (s1);
-INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
SET NAMES utf8;
+CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1));
+CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1)) partition by key(s1);
+INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
+INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
+
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
SELECT s1, HEX(s1) FROM t1;
SELECT s1, HEX(s1) FROM t1 WHERE s1 like 'Ã%';
SELECT s1, HEX(s1) FROM t1 WHERE s1 = 'Ã';
-CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2) partition by key(s1);
-CREATE INDEX i1 on t2 (s1);
-INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
-SET NAMES utf8;
SELECT s1, HEX(s1) FROM t2;
SELECT s1, HEX(s1) FROM t2 WHERE s1 like 'Ã%';
SELECT s1, HEX(s1) FROM t2 WHERE s1 = 'Ã';
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+SELECT count(*) FROM t2;
+
+# ----------------------------------------------------- #
+# --- Final cleanup --- #
+# ----------------------------------------------------- #
DROP TABLE t1;
DROP TABLE t2;
=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_30826.test' => 'mysql-test/suite/falcon/t/falcon_bug_30826.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_30826.test 2008-04-28 21:07:04 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_30826.test 2008-09-14 14:09:45 +0000
@@ -1,5 +1,6 @@
--source include/have_falcon.inc
--source include/have_partition.inc
+
#
# Bug #30826: Falcon: crash if OPTIMIZE PARTITION and no records
#
@@ -8,7 +9,7 @@
# ----------------------------------------------------- #
# --- Initialisation --- #
# ----------------------------------------------------- #
-SET @@storage_engine = Falcon;
+SET @@storage_engine = 'Falcon';
--disable_warnings
DROP TABLE IF EXISTS t1;
@@ -18,37 +19,29 @@ DROP TABLE IF EXISTS t1;
# --- Test 1 - optimize with records --- #
# ----------------------------------------------------- #
--echo ------- Test 1 - optimize with records -------
-CREATE TABLE t1 (PRIMARY KEY (`id`),
- `id` BIGINT NOT NULL AUTO_INCREMENT ,
- `field1` CHAR(50) NOT NULL)ENGINE = FALCON
+CREATE TABLE t1 (
+ `id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ `field1` CHAR(50) NOT NULL)
PARTITION BY Hash (id) PARTITIONS 4;
INSERT INTO t1 (`id`, `field1`) VALUES('3','value3');
INSERT INTO t1 (`id`, `field1`) VALUES('5','value5');
INSERT INTO t1 (`id`, `field1`) VALUES('7','value7');
-#at the moment, alter table returns not implemented, will return 0 after WL#4176 is done
---disable_result_log
---error 0,ER_CHECK_NOT_IMPLEMENTED
ALTER TABLE t1 OPTIMIZE PARTITION `p1`;
---enable_result_log
+SELECT count(*) FROM t1;
# ----------------------------------------------------- #
-# --- Test 2 - optimize without records --- #
+# --- Test 2 - optimize without records --- #
# ----------------------------------------------------- #
--echo ------- Test 2 - optimize without records ------
DROP TABLE t1;
-CREATE TABLE t1 (PRIMARY KEY (`id`),
- `id` BIGINT NOT NULL AUTO_INCREMENT ,
- `field1` CHAR(50) NOT NULL)ENGINE = FALCON
+CREATE TABLE t1 (
+ `id` BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ `field1` CHAR(50) NOT NULL)
PARTITION BY Hash (id) PARTITIONS 4;
-# This caused Falcon to crash...
-#at the moment, alter table returns not implemented, will return 0 after WL#4176 is done
---disable_result_log
---error 0,ER_CHECK_NOT_IMPLEMENTED
ALTER TABLE t1 OPTIMIZE PARTITION `p1`;
---enable_result_log
# ----------------------------------------------------- #
=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test' => 'mysql-test/suite/falcon/t/falcon_bug_34351_C.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test 2008-04-24 04:09:39 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_34351_C.test 2008-09-28 08:07:30 +0000
@@ -1,4 +1,5 @@
--source include/have_falcon.inc
+
#
# Bug #34351_C: Update Conflict on non-overlapping transactions
# This test works because it uses FALCON_CONSISTENT_READ=OFF
@@ -30,8 +31,6 @@ CREATE TABLE t1 (
PRIMARY KEY (t1_autoinc), key(t1_uuid)
) ENGINE = Falcon;
-# declare continue handler for sqlexception
-
delimiter //;
CREATE PROCEDURE p1 ()
begin
@@ -77,14 +76,14 @@ connection default;
--echo # Pull the results of the preceeding call p1()
--reap
-
# ----------------------------------------------------- #
# --- Check --- #
# ----------------------------------------------------- #
# Checking row count is not applicable here.
-SELECT count(*) FROM t1;
+#SELECT count(*) FROM t1;
# ----------------------------------------------------- #
# --- Final cleanup --- #
# ----------------------------------------------------- #
DROP PROCEDURE p1;
+DROP TABLE t1;
=== added file 'mysql-test/suite/falcon/t/falcon_bug_39692.test'
--- a/mysql-test/suite/falcon/t/falcon_bug_39692.test 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_39692.test 2008-09-27 18:04:19 +0000
@@ -0,0 +1,36 @@
+--source include/have_falcon.inc
+--source include/have_debug.inc
+
+#
+# Bug #39692: Falcon allocates SectorCache even if falcon_use_sectorcache is OFF
+#
+--echo *** Bug #39692 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE t1 (a int);
+
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
+SELECT file FROM information_schema.falcon_system_memory_detail
+ WHERE file = 'SectorCache.cpp';
+
+# ----------------------------------------------------- #
+# --- Check --- #
+# ----------------------------------------------------- #
+# Check not applicable in this test.
+#SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup --- #
+# ----------------------------------------------------- #
+DROP TABLE t1;
=== removed file 'mysql-test/suite/falcon/t/falcon_page_size_1-master.opt'
--- a/mysql-test/suite/falcon/t/falcon_page_size_1-master.opt 2007-11-28 18:46:31 +0000
+++ b/mysql-test/suite/falcon/t/falcon_page_size_1-master.opt 1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---loose-falcon_page_size=1024
=== renamed file 'mysql-test/suite/falcon_team/t/ps_8falcon.test' => 'mysql-test/suite/falcon/t/ps_8falcon.test'
--- a/mysql-test/suite/falcon_team/t/ps_8falcon.test 2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/t/ps_8falcon.test 2008-09-19 09:12:48 +0000
@@ -4,23 +4,21 @@
# #
###############################################
-#
+#
# NOTE: PLEASE SEE ps_1general.test (bottom)
# BEFORE ADDING NEW TEST CASES HERE !!!
use test;
--- source include/have_falcon.inc
+--source include/have_falcon.inc
let $type= 'Falcon' ;
--- source include/ps_create.inc
--- source include/ps_renew.inc
+--source include/ps_create.inc
+--source include/ps_renew.inc
--- source include/ps_query.inc
--- source include/ps_modify.inc
--- source include/ps_modify1.inc
--- source include/ps_conv.inc
+--source include/ps_query.inc
+--source include/ps_modify.inc
+--source include/ps_modify1.inc
+--source include/ps_conv.inc
drop table t1, t9;
-
-# End of 4.1 tests
=== removed file 'mysql-test/suite/falcon_team/r/falcon_bug_23692.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_23692.result 2008-04-28 21:07:04 +0000
+++ b/mysql-test/suite/falcon_team/r/falcon_bug_23692.result 1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-SET @@storage_engine = Falcon;
-*** Bug #23692 ***
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-DROP TABLE IF EXISTS t3;
-DROP TABLE IF EXISTS t4;
-CREATE TABLE t1 (a char(1), key (a));
-INSERT INTO t1 VALUES (0x00);
-SELECT count(*) FROM t1 WHERE a < '';
-count(*)
-1
-SELECT count(*) FROM t1 WHERE a = '';
-count(*)
-0
-SELECT count(*) FROM t1 WHERE a > '';
-count(*)
-0
-CREATE TABLE t2 (a varbinary(5));
-CREATE INDEX i ON t2 (a);
-INSERT INTO t2 VALUES (0x02), (0x0202);
-SELECT count(*) FROM t2 WHERE a >= 0x02 OR a = 0x0202;
-count(*)
-2
-SELECT hex(a) FROM t2 WHERE a < 0x02;
-hex(a)
-SELECT hex(a) FROM t2 WHERE a = 0x02;
-hex(a)
-02
-SELECT hex(a) FROM t2 WHERE a > 0x02;
-hex(a)
-0202
-CREATE TABLE t3 (a char(5));
-CREATE INDEX i ON t3 (a);
-INSERT INTO t3 VALUES (0x4200), (0x4209), (0x42), (0x4220), (0x4242);
-SELECT hex(a) FROM t3 WHERE a < 0x42;
-hex(a)
-4200
-4209
-SELECT hex(a) FROM t3 WHERE a = 0x42;
-hex(a)
-42
-4220
-SELECT hex(a) FROM t3 WHERE a > 0x42;
-hex(a)
-4242
-SELECT hex(a) FROM t3 WHERE a LIKE 'a%';
-hex(a)
-4200
-4209
-42
-4220
-4242
-CREATE TABLE t4 (a varchar(5) character set ucs2, key(a)) engine=falcon;
-INSERT INTO t4 VALUES (0x00420000), (0x00420009), (0x0041001f), (0x0042), (0x00420020), (0x00420042);
-SELECT hex(a) FROM t4 WHERE a < 'a';
-hex(a)
-00420000
-00420009
-0042001f
-SELECT hex(a) FROM t4 WHERE a = 'a';
-hex(a)
-0042
-00400220
-SELECT hex(a) FROM t4 WHERE a > 'a';
-hex(a)
-00420042
-SELECT hex(a) FROM t4 WHERE a LIKE 'a%';
-hex(a)
-00420000
-00420009
-0042001f
-0042
-00420020
-00420042
-DROP TABLE t1;
-DROP TABLE t2;
-DROP TABLE t3;
-DROP TABLE t4;
=== modified file 'mysql-test/suite/falcon_team/r/falcon_bug_36294.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_36294.result 2008-04-25 09:44:03 +0000
+++ b/mysql-test/suite/falcon_team/r/falcon_bug_36294.result 2008-09-27 22:01:35 +0000
@@ -1 +1,8 @@
-hello,world
+*** Bug #36294 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS ftest;
+CREATE TABLESPACE gimdata ADD DATAFILE 'gimdata.fts' ENGINE 'Falcon';
+CREATE TABLE ftest (id serial, col1 varchar(500)) ENGINE 'Falcon' TABLESPACE gimdata;
+Hello, world!
+DROP TABLE ftest;
+DROP TABLESPACE gimdata ENGINE 'Falcon';
=== removed file 'mysql-test/suite/falcon_team/r/read_many_rows_falcon.result'
--- a/mysql-test/suite/falcon_team/r/read_many_rows_falcon.result 2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon_team/r/read_many_rows_falcon.result 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-SET SESSION STORAGE_ENGINE = Falcon;
-DROP TABLE IF EXISTS t1, t2, t3, t4;
-CREATE TABLE t1 (id INTEGER) ENGINE=MyISAM;
-CREATE TABLE t2 (id INTEGER PRIMARY KEY);
-CREATE TABLE t3 (a CHAR(32) PRIMARY KEY,id INTEGER);
-CREATE TABLE t4 (a CHAR(32) PRIMARY KEY,id INTEGER) ENGINE=MyISAM;
-INSERT INTO t1 (id) VALUES (1);
-INSERT INTO t1 SELECT id+1 FROM t1;
-INSERT INTO t1 SELECT id+2 FROM t1;
-INSERT INTO t1 SELECT id+4 FROM t1;
-INSERT INTO t1 SELECT id+8 FROM t1;
-INSERT INTO t1 SELECT id+16 FROM t1;
-INSERT INTO t1 SELECT id+32 FROM t1;
-INSERT INTO t1 SELECT id+64 FROM t1;
-INSERT INTO t1 SELECT id+128 FROM t1;
-INSERT INTO t1 SELECT id+256 FROM t1;
-INSERT INTO t1 SELECT id+512 FROM t1;
-INSERT INTO t1 SELECT id+1024 FROM t1;
-INSERT INTO t1 SELECT id+2048 FROM t1;
-INSERT INTO t1 SELECT id+4096 FROM t1;
-INSERT INTO t1 SELECT id+8192 FROM t1;
-INSERT INTO t1 SELECT id+16384 FROM t1;
-INSERT INTO t1 SELECT id+32768 FROM t1;
-INSERT INTO t1 SELECT id+65536 FROM t1;
-INSERT INTO t1 SELECT id+131072 FROM t1;
-INSERT INTO t1 SELECT id+262144 FROM t1;
-INSERT INTO t1 SELECT id+524288 FROM t1;
-INSERT INTO t1 SELECT id+1048576 FROM t1;
-INSERT INTO t2 SELECT * FROM t1;
-INSERT INTO t3 SELECT CONCAT(id),id FROM t2 ORDER BY -id;
-INSERT INTO t4 SELECT * FROM t3 ORDER BY CONCAT(a);
-SELECT SUM(id) FROM t3;
-SUM(id)
-2199024304128
-DROP TABLE t1,t2,t3,t4;
=== removed file 'mysql-test/suite/falcon_team/t/falcon_bug_23692.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_23692.test 2008-04-28 21:07:04 +0000
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_23692.test 1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
---source include/have_falcon.inc
-SET @@storage_engine = Falcon;
-#
-# Bug #23692: Falcon: searches fail if data is 0x00
-#
---echo *** Bug #23692 ***
---disable_warnings
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
-DROP TABLE IF EXISTS t3;
-DROP TABLE IF EXISTS t4;
---enable_warnings
-
-CREATE TABLE t1 (a char(1), key (a));
-INSERT INTO t1 VALUES (0x00);
-SELECT count(*) FROM t1 WHERE a < '';
-SELECT count(*) FROM t1 WHERE a = '';
-SELECT count(*) FROM t1 WHERE a > '';
-
-CREATE TABLE t2 (a varbinary(5));
-CREATE INDEX i ON t2 (a);
-INSERT INTO t2 VALUES (0x02), (0x0202);
-SELECT count(*) FROM t2 WHERE a >= 0x02 OR a = 0x0202;
-SELECT hex(a) FROM t2 WHERE a < 0x02;
-SELECT hex(a) FROM t2 WHERE a = 0x02;
-SELECT hex(a) FROM t2 WHERE a > 0x02;
-
-CREATE TABLE t3 (a char(5));
-CREATE INDEX i ON t3 (a);
-INSERT INTO t3 VALUES (0x4200), (0x4209), (0x42), (0x4220), (0x4242);
-SELECT hex(a) FROM t3 WHERE a < 0x42;
-SELECT hex(a) FROM t3 WHERE a = 0x42;
-SELECT hex(a) FROM t3 WHERE a > 0x42;
-SELECT hex(a) FROM t3 WHERE a LIKE 'a%';
-
-CREATE TABLE t4 (a varchar(5) character set ucs2, key(a)) engine=falcon;
-INSERT INTO t4 VALUES (0x00420000), (0x00420009), (0x0041001f), (0x0042), (0x00420020), (0x00420042);
-SELECT hex(a) FROM t4 WHERE a < 'a';
-SELECT hex(a) FROM t4 WHERE a = 'a';
-SELECT hex(a) FROM t4 WHERE a > 'a';
-SELECT hex(a) FROM t4 WHERE a LIKE 'a%';
-
-# Final cleanup.
-DROP TABLE t1;
-DROP TABLE t2;
-DROP TABLE t3;
-DROP TABLE t4;
=== modified file 'mysql-test/suite/falcon_team/t/falcon_bug_36294.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_36294.test 2008-04-27 01:34:10 +0000
+++ b/mysql-test/suite/falcon_team/t/falcon_bug_36294.test 2008-09-27 22:01:35 +0000
@@ -1,52 +1,66 @@
--source include/have_falcon.inc
+
#
# Bug#36294: Assertion in Cache::writePage
# This test produces no output. It is only here to crash the server
# once insert/select runs into error 305 (record memory exhaused).
# Exact point of crash is generally unpredictable.
#
+--echo *** Bug #36294 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation --- #
+# ----------------------------------------------------- #
let $engine = 'Falcon';
eval SET @@storage_engine = $engine;
+--disable_warnings
+DROP TABLE IF EXISTS ftest;
+--enable_warnings
+
+eval CREATE TABLESPACE gimdata ADD DATAFILE 'gimdata.fts' ENGINE $engine;
+eval CREATE TABLE ftest (id serial, col1 varchar(500)) ENGINE $engine TABLESPACE gimdata;
+
+# ----------------------------------------------------- #
+# --- Test --- #
+# ----------------------------------------------------- #
--disable_abort_on_error
--disable_warnings
--disable_query_log
-drop table if exists ftest;
-create tablespace gimdata add datafile 'gimdata.fts' engine=$engine;
-create table ftest (id serial, col1 varchar(500)) engine=$engine tablespace gimdata;
-insert into ftest values (null,repeat("a",500));
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-insert into ftest(col1) select col1 from ftest;
-drop table ftest;
-drop tablespace gimdata engine=$engine;
+INSERT INTO ftest VALUES (null,repeat("a",500));
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
+INSERT INTO ftest(col1) SELECT col1 FROM ftest;
--enable_warnings
--enable_abort_on_error
--enable_query_log
+
# ----------------------------------------------------- #
# --- Check --- #
# ----------------------------------------------------- #
---echo hello,world
+--echo Hello, world!
# ----------------------------------------------------- #
# --- Final cleanup --- #
# ----------------------------------------------------- #
+DROP TABLE ftest;
+eval DROP TABLESPACE gimdata ENGINE $engine;
=== removed file 'mysql-test/suite/falcon_team/t/read_many_rows_falcon.test'
--- a/mysql-test/suite/falcon_team/t/read_many_rows_falcon.test 2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon_team/t/read_many_rows_falcon.test 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# t/read_many_rows_falcon.test
-#
-# Check how filesort and buffered-record-reads works with InnoDB.
-# This test takes a long time.
-#
-# Last update:
-# 2006-08-30 ML create this test
-#
-
-
---source include/have_falcon.inc
-let $engine_type= Falcon;
-let $other_engine_type= MyISAM;
-
---source include/read_many_rows.inc
=== added file 'mysql-test/suite/falcon_team/t/test2bug.def'
--- a/mysql-test/suite/falcon_team/t/test2bug.def 1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/falcon_team/t/test2bug.def 2008-09-28 07:16:36 +0000
@@ -0,0 +1,24 @@
+#
+# The falcon_team test suite is intended for unstable or otherwise
+# intermittently failing Falcon-related tests.
+# Stable Falcon tests are located in the falcon test suite.
+#
+# All tests in the falcon_team test suite should be associated with
+# a bug report describing the test failure or issue related to the test.
+#
+# Note that a separate bug report is usually needed for this, it is
+# not sufficient to list the ID of the bug whose fix this test is
+# supposed to verify.
+#
+# Format:
+# Test case: BugId - BugDescription
+#
+# Do not use TAB characters for whitespace.
+# Keep the list sorted by test name.
+#
+
+falcon_bug_23945: Bug#34892 - Transaction handling in select_create::abort let's Falcon fail
+falcon_bug_26433: Bug#39314 - falcon_bug_26433 fails with an offset of 1 in row numbers in expected warnings
+falcon_bug_28048: Bug#36700 - Running falcon_bug_28048 shows increasing memory usage and run time
+falcon_bug_34892: Bug#34892 - Transaction handling in select_create::abort let's Falcon fail
+falcon_deadlock: Bug#34182 - SELECT ... FOR UPDATE does not lock when in subquery
=== modified file 'mysql-test/suite/funcs_1/datadict/tables2.inc'
--- a/mysql-test/suite/funcs_1/datadict/tables2.inc 2008-07-04 08:28:36 +0000
+++ b/mysql-test/suite/funcs_1/datadict/tables2.inc 2008-09-23 08:39:48 +0000
@@ -32,7 +32,7 @@ let $ndb_pattern = 'number_of_replica
# We do not unify the engine name here, because the rowformat is
# specific to the engine.
--replace_result Dynamic DYNAMIC_OR_PAGE Page DYNAMIC_OR_PAGE MyISAM MYISAM_OR_MARIA MARIA MYISAM_OR_MARIA
---replace_column 8 "#TBLR#" 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "#CRT#" 16 "#UT#" 17 "#CT#" 20 "#CO#" 21 "#TC#"
+--replace_column 8 "#TBLR#" 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "#CRT#" 16 "#UT#" 17 "#CT#" 20 "#CO#" 21 "#TC#" 22 "#TN#"
eval
SELECT *,
LEFT( table_comment,
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result 2008-08-02 18:22:09 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result 2008-09-23 08:39:48 +0000
@@ -268,6 +268,7 @@ NULL information_schema TABLES ENGINE 5
NULL information_schema TABLES INDEX_LENGTH 12 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select Default Default
NULL information_schema TABLES MAX_DATA_LENGTH 11 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select Default Default
NULL information_schema TABLES ROW_FORMAT 7 NULL YES varchar 10 40 NULL NULL utf8 utf8_general_ci varchar(10) select Default Default
+NULL information_schema TABLES TABLESPACE_NAME 22 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema TABLES TABLE_CATALOG 1 NULL YES varchar 512 2048 NULL NULL utf8 utf8_general_ci varchar(512) select Default Default
NULL information_schema TABLES TABLE_COLLATION 18 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema TABLES TABLE_COMMENT 21 NO varchar 2048 8192 NULL NULL utf8 utf8_general_ci varchar(2048) select Default Default
@@ -666,6 +667,7 @@ NULL information_schema TABLES CHECK_TIM
NULL information_schema TABLES CHECKSUM bigint NULL NULL NULL NULL bigint(21) unsigned
4.0000 information_schema TABLES CREATE_OPTIONS varchar 255 1020 utf8 utf8_general_ci varchar(255)
4.0000 information_schema TABLES TABLE_COMMENT varchar 2048 8192 utf8 utf8_general_ci varchar(2048)
+4.0000 information_schema TABLES TABLESPACE_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
4.0000 information_schema TABLESPACES TABLESPACE_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
4.0000 information_schema TABLESPACES ENGINE varchar 64 256 utf8 utf8_general_ci varchar(64)
4.0000 information_schema TABLESPACES TABLESPACE_TYPE varchar 64 256 utf8 utf8_general_ci varchar(64)
=== modified file 'mysql-test/suite/funcs_1/r/is_tables.result'
--- a/mysql-test/suite/funcs_1/r/is_tables.result 2008-03-10 19:00:02 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables.result 2008-09-23 08:39:48 +0000
@@ -49,6 +49,7 @@ TABLE_COLLATION varchar(64) YES NULL
CHECKSUM bigint(21) unsigned YES NULL
CREATE_OPTIONS varchar(255) YES NULL
TABLE_COMMENT varchar(2048) NO
+TABLESPACE_NAME varchar(64) YES NULL
SHOW CREATE TABLE information_schema.TABLES;
Table Create Table
TABLES CREATE TEMPORARY TABLE `TABLES` (
@@ -72,7 +73,8 @@ TABLES CREATE TEMPORARY TABLE `TABLES` (
`TABLE_COLLATION` varchar(64) DEFAULT NULL,
`CHECKSUM` bigint(21) unsigned DEFAULT NULL,
`CREATE_OPTIONS` varchar(255) DEFAULT NULL,
- `TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT ''
+ `TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT '',
+ `TABLESPACE_NAME` varchar(64) DEFAULT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.TABLES;
Field Type Null Key Default Extra
@@ -97,6 +99,7 @@ TABLE_COLLATION varchar(64) YES NULL
CHECKSUM bigint(21) unsigned YES NULL
CREATE_OPTIONS varchar(255) YES NULL
TABLE_COMMENT varchar(2048) NO
+TABLESPACE_NAME varchar(64) YES NULL
SELECT table_catalog, table_schema, table_name
FROM information_schema.tables WHERE table_catalog IS NOT NULL;
table_catalog table_schema table_name
@@ -128,11 +131,11 @@ CREATE VIEW v3 AS SELECT * FROM tb3;
GRANT SELECT ON db_datadict.v3 to 'testuser3'@'localhost';
SELECT * FROM information_schema.tables
WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
-NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict tb2 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL VIEW
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT TABLESPACE_NAME
+NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict tb2 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL VIEW NULL
SHOW TABLES FROM db_datadict;
Tables_in_db_datadict
tb1
@@ -142,9 +145,9 @@ v3
# Establish connection testuser2 (user=testuser2)
SELECT * FROM information_schema.tables
WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
-NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT TABLESPACE_NAME
+NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
SHOW TABLES FROM db_datadict;
Tables_in_db_datadict
tb1
@@ -152,9 +155,9 @@ tb3
# Establish connection testuser3 (user=testuser3)
SELECT * FROM information_schema.tables
WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
-NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL VIEW
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT TABLESPACE_NAME
+NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL VIEW NULL
SHOW TABLES FROM db_datadict;
Tables_in_db_datadict
tb3
@@ -162,11 +165,11 @@ v3
# Switch to connection default (user=root)
SELECT * FROM information_schema.tables
WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
-NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict tb2 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL VIEW
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT TABLESPACE_NAME
+NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict tb2 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL VIEW NULL
SHOW TABLES FROM db_datadict;
Tables_in_db_datadict
tb1
@@ -213,6 +216,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM #CS#
CREATE_OPTIONS
TABLE_COMMENT Initial Comment
+TABLESPACE_NAME NULL
SELECT table_name FROM information_schema.tables
WHERE table_name LIKE 't1_my_table%';
table_name
@@ -365,6 +369,7 @@ TABLE_COLLATION NULL
CHECKSUM NULL
CREATE_OPTIONS NULL
TABLE_COMMENT VIEW
+TABLESPACE_NAME NULL
DROP VIEW test.t1_my_tablex;
SELECT table_name FROM information_schema.tables
WHERE table_name = 't1_my_tablex';
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_innodb.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_innodb.result 2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_innodb.result 2008-09-23 08:39:48 +0000
@@ -38,6 +38,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -61,6 +62,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -84,6 +86,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
SHOW TABLES FROM test1;
@@ -130,6 +133,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -153,6 +157,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
SHOW TABLES FROM test1;
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_is.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_is.result 2008-08-02 18:22:09 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_is.result 2008-09-23 08:39:48 +0000
@@ -34,6 +34,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -57,6 +58,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -80,6 +82,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -103,6 +106,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -126,6 +130,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -149,6 +154,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -172,6 +178,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -195,6 +202,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -218,6 +226,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -241,6 +250,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -264,6 +274,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -287,6 +298,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -310,6 +322,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -333,6 +346,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -356,6 +370,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -379,6 +394,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -402,6 +418,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -425,6 +442,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -448,6 +466,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -471,6 +490,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -494,6 +514,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -517,6 +538,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -540,6 +562,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -563,6 +586,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -586,6 +610,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -609,6 +634,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -632,6 +658,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -655,6 +682,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -678,6 +706,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
DROP USER testuser1@localhost;
@@ -718,6 +747,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -741,6 +771,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -764,6 +795,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -787,6 +819,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -810,6 +843,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -833,6 +867,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -856,6 +891,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -879,6 +915,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -902,6 +939,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -925,6 +963,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -948,6 +987,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -971,6 +1011,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -994,6 +1035,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1017,6 +1059,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1040,6 +1083,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1063,6 +1107,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1086,6 +1131,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1109,6 +1155,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1132,6 +1179,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1155,6 +1203,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1178,6 +1227,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1201,6 +1251,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1224,6 +1275,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1247,6 +1299,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1270,6 +1323,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1293,6 +1347,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1316,6 +1371,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1339,6 +1395,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -1362,6 +1419,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
# Switch to connection default and close connection testuser1
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_is_falcon.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_is_falcon.result 2008-09-03 09:00:56 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_is_falcon.result 2008-09-23 08:39:48 +0000
@@ -34,6 +34,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -57,6 +58,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -80,6 +82,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -103,6 +106,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -126,6 +130,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -149,6 +154,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -172,6 +178,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -195,6 +202,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -218,6 +226,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -241,6 +250,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
DROP USER testuser1@localhost;
@@ -281,6 +291,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -304,6 +315,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -327,6 +339,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -350,6 +363,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -373,6 +387,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -396,6 +411,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -419,6 +435,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -442,6 +459,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -465,6 +483,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -488,6 +507,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
# Switch to connection default and close connection testuser1
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_memory.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_memory.result 2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_memory.result 2008-09-23 08:39:48 +0000
@@ -39,6 +39,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -62,6 +63,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -85,6 +87,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
SHOW TABLES FROM test1;
@@ -131,6 +134,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -154,6 +158,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
SHOW TABLES FROM test1;
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_myisam.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_myisam.result 2008-07-04 08:28:36 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_myisam.result 2008-09-23 08:39:48 +0000
@@ -39,6 +39,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -62,6 +63,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -85,6 +87,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
SHOW TABLES FROM test1;
@@ -131,6 +134,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -154,6 +158,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
SHOW TABLES FROM test1;
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_mysql.result 2008-09-04 09:58:22 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_mysql.result 2008-09-29 06:50:26 +0000
@@ -33,6 +33,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -56,6 +57,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -79,6 +81,7 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Column privileges
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -102,6 +105,7 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Database privileges
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -125,6 +129,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Events
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -148,6 +153,7 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment User defined functions
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -171,6 +177,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment General log
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -194,6 +201,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment help categories
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -217,6 +225,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment help keywords
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -240,6 +249,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment keyword-topic relation
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -263,6 +273,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment help topics
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -286,6 +297,7 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Host privileges; Merged with database privileges
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -309,6 +321,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -332,6 +345,7 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment MySQL plugins
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -355,6 +369,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Stored Procedures
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -378,6 +393,7 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Procedure privileges
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -401,6 +417,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment MySQL Foreign Servers table
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -424,6 +441,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Slow log
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -447,6 +465,7 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Table privileges
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -470,6 +489,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Time zones
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -493,6 +513,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Leap seconds information for time zones
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -516,6 +537,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Time zone names
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -539,6 +561,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Time zone transitions
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -562,6 +585,7 @@ TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Time zone transition types
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -585,6 +609,7 @@ TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment Users and global privileges
Separator -----------------------------------------------------
DROP USER testuser1@localhost;
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_ndb.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_ndb.result 2008-06-28 09:54:53 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_ndb.result 2008-09-23 08:39:48 +0000
@@ -38,6 +38,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -61,6 +62,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -84,6 +86,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
SHOW TABLES FROM test1;
@@ -130,6 +133,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
TABLE_CATALOG NULL
@@ -153,6 +157,7 @@ TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
+TABLESPACE_NAME #TN#
user_comment
Separator -----------------------------------------------------
SHOW TABLES FROM test1;
=== modified file 'mysys/stacktrace.c'
--- a/mysys/stacktrace.c 2008-09-05 00:35:12 +0000
+++ b/mysys/stacktrace.c 2008-09-26 11:24:20 +0000
@@ -314,6 +314,7 @@ void my_write_core(int sig)
#else /* __WIN__*/
#include <dbghelp.h>
+#include <tlhelp32.h>
/*
Stack tracing on Windows is implemented using Debug Helper library(dbghelp.dll)
@@ -406,6 +407,68 @@ void my_set_exception_pointers(EXCEPTION
exception_ptrs = ep;
}
+
+/*
+ Get symbol path - semicolon-separated list of directories to search for debug
+ symbols. We expect PDB in the same directory as corresponding exe or dll,
+ so the path is build from directories of the loaded modules. If environment
+ variable _NT_SYMBOL_PATH is set, it's value appended to the symbol search path
+*/
+static void get_symbol_path(char *path, size_t size)
+{
+ HANDLE hSnap;
+ char *envvar;
+
+ path[0]= '\0';
+ /*
+ Enumerate all modules, and add their directories to the path.
+ Avoid duplicate entries.
+ */
+ hSnap= CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
+ if (hSnap != INVALID_HANDLE_VALUE)
+ {
+ BOOL ret;
+ MODULEENTRY32 mod;
+ mod.dwSize= sizeof(MODULEENTRY32);
+ for (ret= Module32First(hSnap, &mod); ret; ret= Module32Next(hSnap, &mod))
+ {
+ char *module_dir= mod.szExePath;
+ char *p= strrchr(module_dir,'\\');
+ if (!p)
+ {
+ /*
+ Path separator was not found. Not known to happen, if ever happens,
+ will indicate current directory.
+ */
+ module_dir[0]= '.';
+ p= module_dir + 1;
+ }
+ *p++= ';';
+ *p= '\0';
+
+ if (!strstr(path, module_dir))
+ {
+ size_t dir_len = strlen(module_dir);
+ if (size > dir_len)
+ {
+ strncat(path, module_dir, size-1);
+ size -= dir_len;
+ }
+ }
+ }
+ CloseHandle(hSnap);
+ }
+
+ /* Add _NT_SYMBOL_PATH, if present. */
+ envvar= getenv("_NT_SYMBOL_PATH");
+ if(envvar && size)
+ {
+ strncat(path, envvar, size-1);
+ }
+}
+
+#define MAX_SYMBOL_PATH 32768
+
/* Platform SDK in VS2003 does not have definition for SYMOPT_NO_PROMPTS*/
#ifndef SYMOPT_NO_PROMPTS
#define SYMOPT_NO_PROMPTS 0
@@ -422,6 +485,7 @@ void my_print_stacktrace(uchar* unused1,
int i;
CONTEXT context;
STACKFRAME64 frame={0};
+ static char symbol_path[MAX_SYMBOL_PATH];
if(!exception_ptrs || !init_dbghelp_functions())
return;
@@ -430,7 +494,8 @@ void my_print_stacktrace(uchar* unused1,
context = *(exception_ptrs->ContextRecord);
/*Initialize symbols.*/
pSymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_NO_PROMPTS|SYMOPT_DEFERRED_LOADS|SYMOPT_DEBUG);
- pSymInitialize(hProcess,NULL,TRUE);
+ get_symbol_path(symbol_path, sizeof(symbol_path));
+ pSymInitialize(hProcess, symbol_path, TRUE);
/*Prepare stackframe for the first StackWalk64 call*/
frame.AddrFrame.Mode= frame.AddrPC.Mode= frame.AddrStack.Mode= AddrModeFlat;
=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc 2008-09-16 17:58:49 +0000
+++ b/sql/sql_show.cc 2008-09-25 07:15:02 +0000
@@ -3641,6 +3641,12 @@ static int get_schema_tables_record(THD
if (share->comment.str)
table->field[20]->store(share->comment.str, share->comment.length, cs);
+ if (share->tablespace)
+ {
+ table->field[21]->store(share->tablespace, strlen(share->tablespace), cs);
+ table->field[21]->set_notnull();
+ }
+
if(file)
{
file->info(HA_STATUS_VARIABLE | HA_STATUS_TIME | HA_STATUS_AUTO);
@@ -6397,6 +6403,7 @@ ST_FIELD_INFO tables_fields_info[]=
{"CREATE_OPTIONS", 255, MYSQL_TYPE_STRING, 0, 1, "Create_options",
OPEN_FRM_ONLY},
{"TABLE_COMMENT", TABLE_COMMENT_MAXLEN, MYSQL_TYPE_STRING, 0, 0, "Comment", OPEN_FRM_ONLY},
+ {"TABLESPACE_NAME", NAME_CHAR_LEN, MYSQL_TYPE_STRING, 0, 1, 0, OPEN_FRM_ONLY},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
};
=== modified file 'storage/falcon/Cache.cpp'
--- a/storage/falcon/Cache.cpp 2008-09-09 20:57:57 +0000
+++ b/storage/falcon/Cache.cpp 2008-09-27 18:04:19 +0000
@@ -80,13 +80,16 @@ Cache::Cache(Database *db, int pageSz, i
// if there are more than 4096 buckets then lets round down
// else lets round up
- if (highBit >= 0x00001000) {
+ if (highBit >= 0x00001000)
+ {
// use power of two rounded down
hashSize = highBit << 1;
- } else {
+ }
+ else
+ {
// use power of two rounded up
hashSize = highBit;
- }
+ }
hashMask = hashSize - 1;
numberBuffers = numBuffers;
@@ -101,6 +104,7 @@ Cache::Cache(Database *db, int pageSz, i
syncHashTable = new SyncObject [DEBUG_SYNC_HASH_TABLE_SIZE];
for (int loop = 0; loop < DEBUG_SYNC_HASH_TABLE_SIZE; loop ++)
syncHashTable[loop].setName("Cache::syncHashTable");
+
#else /* DEBUG_SYNC_HASH_TABLE_SIZE */
syncHashTable = new SyncObject [hashSize];
for (int loop = 0; loop < hashSize; loop ++)
@@ -110,7 +114,8 @@ Cache::Cache(Database *db, int pageSz, i
syncHashTable[loop].setName(tmpName);
}
#endif /* DEBUG_SYNC_HASH_TABLE_SIZE */
- sectorCache = new SectorCache(sectorCacheSize / SECTOR_BUFFER_SIZE, pageSize);
+ if (falcon_use_sectorcache)
+ sectorCache = new SectorCache(sectorCacheSize / SECTOR_BUFFER_SIZE, pageSize);
uint64 n = ((uint64) pageSize * numberBuffers + cacheHunkSize - 1) / cacheHunkSize;
numberHunks = (int) n;
@@ -128,7 +133,7 @@ Cache::Cache(Database *db, int pageSz, i
ioThreads = new Thread*[numberIoThreads];
memset(ioThreads, 0, numberIoThreads * sizeof(ioThreads[0]));
flushing = false;
-
+
try
{
// non-protected access to bdbs,endBdbs is OK during initialization
@@ -184,8 +189,9 @@ Cache::~Cache()
delete [] bdbs;
delete [] ioThreads;
delete flushBitmap;
- delete sectorCache;
-
+ if (falcon_use_sectorcache)
+ delete sectorCache;
+
if (bufferHunks)
{
for (int n = 0; n < numberHunks; ++n)
@@ -199,7 +205,7 @@ Bdb* Cache::probePage(Dbb *dbb, int32 pa
{
ASSERT (pageNumber >= 0);
Bdb *bdb;
-
+
/* If we already have a buffer for this, we're done */
bdb = lockFindBdbIncrementUseCount(dbb, pageNumber);
if (bdb)
@@ -207,7 +213,7 @@ Bdb* Cache::probePage(Dbb *dbb, int32 pa
if (bdb->buffer->pageType == PAGE_free)
{
bdb->decrementUseCount(REL_HISTORY);
-
+
return NULL;
}
@@ -223,7 +229,7 @@ Bdb* Cache::probePage(Dbb *dbb, int32 pa
Bdb* Cache::findBdb(Dbb* dbb, int32 pageNumber, int slot)
{
for (Bdb *bdb = hashTable [slot]; bdb; bdb = bdb->hash)
-{
+ {
if (bdb->pageNumber == pageNumber && bdb->dbb == dbb)
{
return bdb;
@@ -272,12 +278,12 @@ Bdb* Cache::fetchPage(Dbb *dbb, int32 pa
if (panicShutdown)
{
Thread *thread = Thread::getThread("Cache::fetchPage");
-
+
if (thread->pageMarks == 0)
throw SQLError(RUNTIME_ERROR, "Emergency shut is underway");
}
-#ifdef STOP_PAGE
+#ifdef STOP_PAGE
if (pageNumber == STOP_PAGE)
Log::debug("fetching page %d/%d\n", pageNumber, dbb->tableSpaceId);
#endif
@@ -316,25 +322,27 @@ Bdb* Cache::fetchPage(Dbb *dbb, int32 pa
lockHash.unlock();
bdb = bdbAvailable;
-#ifdef STOP_PAGE
+#ifdef STOP_PAGE
if (bdb->pageNumber == STOP_PAGE)
Log::debug("reading page %d/%d\n", bdb->pageNumber, dbb->tableSpaceId);
#endif
-
+
Priority priority(database->ioScheduler);
- priority.schedule(PRIORITY_MEDIUM);
+ priority.schedule(PRIORITY_MEDIUM);
if (falcon_use_sectorcache)
sectorCache->readPage(bdb);
else
dbb->readPage(bdb);
+
priority.finished();
#ifdef HAVE_PAGE_NUMBER
ASSERT(bdb->buffer->pageNumber == pageNumber);
-#endif
+#endif
if (Exclusive != lockType)
bdb->downGrade(lockType);
+
}
- else
+ else
{
//syncObject.validateExclusive("Cache::fetchPage (retry)");
bdb->incrementUseCount(ADD_HISTORY);
@@ -351,7 +359,7 @@ Bdb* Cache::fetchPage(Dbb *dbb, int32 pa
bdbAvailable->release(REL_HISTORY);
}
}
- else
+ else
{
bdb->addRef(lockType COMMA_ADD_HISTORY);
bdb->decrementUseCount(REL_HISTORY);
@@ -359,13 +367,13 @@ Bdb* Cache::fetchPage(Dbb *dbb, int32 pa
}
Page *page = bdb->buffer;
-
+
/***
if (page->checksum != (short) pageNumber)
FATAL ("page %d wrong page number, got %d\n",
bdb->pageNumber, page->checksum);
***/
-
+
if (pageType && page->pageType != pageType)
{
/*** future code
@@ -388,7 +396,7 @@ Bdb* Cache::fakePage(Dbb *dbb, int32 pag
{
Bdb *bdb;
-#ifdef STOP_PAGE
+#ifdef STOP_PAGE
if (pageNumber == STOP_PAGE)
Log::debug("faking page %d/%d\n",pageNumber, dbb->tableSpaceId);
#endif
@@ -425,7 +433,7 @@ Bdb* Cache::fakePage(Dbb *dbb, int32 pag
bdb = bdbAvailable;
}
- else
+ else
{
//syncObject.validateExclusive("Cache::fetchPage (retry)");
bdb->incrementUseCount(ADD_HISTORY);
@@ -442,7 +450,7 @@ Bdb* Cache::fakePage(Dbb *dbb, int32 pag
bdbAvailable->release(REL_HISTORY);
}
}
- else
+ else
{
bdb->addRef(Exclusive COMMA_ADD_HISTORY);
bdb->decrementUseCount(REL_HISTORY);
@@ -451,7 +459,7 @@ Bdb* Cache::fakePage(Dbb *dbb, int32 pag
if (!dbb->isReadOnly)
bdb->mark(transId);
-
+
memset(bdb->buffer, 0, pageSize);
bdb->setPageHeader(type);
@@ -463,7 +471,7 @@ void Cache::flush(int64 arg)
Sync flushLock(&syncFlush, "Cache::flush(1)");
Sync dirtyLock(&syncDirty, "Cache::flush(2)");
flushLock.lock(Exclusive);
-
+
if (flushing)
return;
@@ -472,7 +480,7 @@ void Cache::flush(int64 arg)
flushArg = arg;
flushPages = 0;
physicalWrites = 0;
-
+
dirtyLock.lock(Shared);
for (Bdb *bdb = firstDirty; bdb; bdb = bdb->nextDirty)
{
@@ -480,6 +488,7 @@ void Cache::flush(int64 arg)
flushBitmap->set(bdb->pageNumber);
++flushPages;
}
+
dirtyLock.unlock();
analyzeFlush();
@@ -487,7 +496,7 @@ void Cache::flush(int64 arg)
flushStart = database->timestamp;
flushing = true;
flushLock.unlock();
-
+
for (int n = 0; n < numberIoThreads; ++n)
if (ioThreads[n])
ioThreads[n]->wake();
@@ -535,6 +544,7 @@ Bdb* Cache::getFreeBuffer(void)
bdb = NULL;
break;
}
+
if (bdb->useCount == 0)
{
if (!bdb->isDirty)
@@ -544,15 +554,16 @@ Bdb* Cache::getFreeBuffer(void)
break;
}
}
- else
+ else
{
- // get this one out of the way so we don't search it every time
- moveToHeadAlreadyLocked(bdb);
+ // get this one out of the way so we don't search it every time
+ moveToHeadAlreadyLocked(bdb);
#ifdef CHECK_STALLED_BDB
- bdb->stallCount++;
- if ((bdb->stallCount & 0x03) == 0x03) {
- Log::debug("Page %d is in use and aged %d times\n",
- bdb->pageNumber, bdb->stallCount);
+ bdb->stallCount++;
+ if ((bdb->stallCount & 0x03) == 0x03)
+ {
+ Log::debug("Page %d is in use and aged %d times\n",
+ bdb->pageNumber, bdb->stallCount);
}
#endif // CHECK_STALLED_BDB
}
@@ -566,13 +577,14 @@ Bdb* Cache::getFreeBuffer(void)
moveToHeadAlreadyLocked(bdb);
break;
}
+
bufferQueueLock.unlock();
if (!bdb)
throw SQLError(RUNTIME_ERROR, "buffer pool is exhausted\n");
-
+
if (bdb->pageNumber >= 0)
- {
+ {
int slotRemove = PAGENUM_2_SLOT(bdb->pageNumber);
Sync lockHashRemove (&syncHashTable[PAGENUM_2_LOCK_INDEX(bdb->pageNumber, slotRemove)], "Cache::getFreeBuffer");
lockHashRemove.lock(Exclusive);
@@ -597,7 +609,8 @@ Bdb* Cache::getFreeBuffer(void)
}
else
ASSERT (*ptr);
- }
+
+ }
break;
}
@@ -652,9 +665,9 @@ void Cache::markClean(Bdb *bdb)
if (bdb->flushIt)
Log::debug(" Cleaning page %d in %s marked for flush\n", bdb->pageNumber, (const char*) bdb->dbb->fileName);
***/
-
+
bdb->flushIt = false;
-
+
if (bdb == lastDirty)
lastDirty = bdb->priorDirty;
@@ -696,6 +709,7 @@ void Cache::writePage(Bdb *bdb, int type
{
if (falcon_use_sectorcache)
sectorCache->writePage(bdb);
+
dbb->writePage(bdb, type);
}
catch (SQLException& exception)
@@ -748,7 +762,7 @@ void Cache::writePage(Bdb *bdb, int type
#endif
bdb->isDirty = false;
-
+
if (pageWriter && bdb->isRegistered)
{
bdb->isRegistered = false;
@@ -778,10 +792,10 @@ void Cache::analyze(Stream *stream)
for (bdb = bdbs; bdb < endBdbs; ++bdb)
{
++total;
-
+
if (bdb->isDirty)
++dirty;
-
+
if (bdb->useCount)
++inUse;
}
@@ -789,6 +803,7 @@ void Cache::analyze(Stream *stream)
dirtyLock.lock (Shared);
for (bdb = firstDirty; bdb; bdb = bdb->nextDirty)
++dirtyList;
+
dirtyLock.unlock();
stream->format ("Cache: %d pages, %d in use, %d dirty, %d in dirty chain\n",
@@ -819,7 +834,7 @@ void Cache::freePage(Dbb *dbb, int32 pag
{
markClean (bdb);
}
-
+
bdb->isDirty = false;
break;
}
@@ -872,7 +887,7 @@ Bdb* Cache::trialFetch(Dbb* dbb, int32 p
if (panicShutdown)
{
Thread *thread = Thread::getThread("Cache::trialFetch");
-
+
if (thread->pageMarks == 0)
throw SQLError(RUNTIME_ERROR, "Emergency shut is underway");
}
@@ -887,7 +902,7 @@ Bdb* Cache::trialFetch(Dbb* dbb, int32 p
bdb->addRef(lockType COMMA_ADD_HISTORY);
bdb->decrementUseCount(REL_HISTORY);
moveToHead(bdb);
- }
+ }
return bdb;
}
@@ -898,13 +913,14 @@ void Cache::syncFile(Dbb *dbb, const cha
int writes = dbb->writesSinceSync;
time_t start = database->timestamp;
dbb->sync();
-
+
if (Log::isActive(LogInfo))
{
time_t delta = database->timestamp - start;
-
+
if (delta > 1)
- Log::log(LogInfo, "%d: %s %s sync: %d pages in %d seconds\n", database->deltaTime, fileName, text, writes, delta);
+ Log::log(LogInfo, "%d: %s %s sync: %d pages in %d seconds\n",
+ database->deltaTime, fileName, text, writes, delta);
}
}
@@ -924,14 +940,14 @@ void Cache::ioThread(void)
UCHAR *buffer = (UCHAR*) (((UIPTR) rawBuffer + pageSize - 1) / pageSize * pageSize);
UCHAR *end = (UCHAR*) ((UIPTR) (rawBuffer + ASYNC_BUFFER_SIZE) / pageSize * pageSize);
flushLock.lock(Exclusive);
-
+
// This is the main loop. Write blocks until there's nothing to do, then sleep
-
+
for (;;)
{
int32 pageNumber = flushBitmap->nextSet(0);
int count;
-
+
if (pageNumber >= 0)
{
Bdb *bdb;
@@ -940,7 +956,7 @@ void Cache::ioThread(void)
bool hit = false;
Bdb *bdbList = NULL;
UCHAR *p = buffer;
-
+
// Look for the page to flush.
bdb = lockFindBdbIncrementUseCount(pageNumber, slot);
if (bdb && bdb->flushIt && bdb->isDirty)
@@ -948,19 +964,19 @@ void Cache::ioThread(void)
hit = true;
count = 0;
dbb = bdb->dbb;
-
+
flushBitmap->clear(pageNumber);
-
+
// get all his friends
while (p < end)
{
++count;
bdb->addRef(Shared COMMA_ADD_HISTORY);
-
+
bdb->syncWrite.lock(NULL, Exclusive);
bdb->ioThreadNext = bdbList;
bdbList = bdb;
-
+
//ASSERT(!(bdb->flags & BDB_write_pending));
//bdb->flags |= BDB_write_pending;
memcpy(p, bdb->buffer, pageSize);
@@ -969,23 +985,23 @@ void Cache::ioThread(void)
markClean(bdb);
bdb->isDirty = false;
bdb->release(REL_HISTORY);
-
+
bdb = lockFindBdbIncrementUseCount(dbb, bdb->pageNumber + 1);
if (!bdb)
break;
-
+
if (!bdb->isDirty && !continueWrite(bdb))
{
bdb->decrementUseCount(REL_HISTORY);
break;
}
}
-
+
flushLock.unlock();
//Log::debug(" %d Writing %s %d pages: %d - %d\n", thread->threadId, (const char*) dbb->fileName, count, pageNumber, pageNumber + count - 1);
int length = p - buffer;
priority.schedule(PRIORITY_LOW);
-
+
try
{
priority.schedule(PRIORITY_LOW);
@@ -994,12 +1010,12 @@ void Cache::ioThread(void)
catch (SQLException& exception)
{
priority.finished();
-
+
if (exception.getSqlcode() != DEVICE_FULL)
throw;
-
+
database->setIOError(&exception);
-
+
for (bool error = true; error;)
{
if (thread->shutdownInProgress)
@@ -1013,12 +1029,12 @@ void Cache::ioThread(void)
bdb->syncWrite.unlock();
bdb->decrementUseCount(REL_HISTORY);
}
-
+
return;
}
-
+
thread->sleep(1000);
-
+
try
{
priority.schedule(PRIORITY_LOW);
@@ -1029,7 +1045,7 @@ void Cache::ioThread(void)
catch (SQLException& exception2)
{
priority.finished();
-
+
if (exception2.getSqlcode() != DEVICE_FULL)
throw;
}
@@ -1047,23 +1063,23 @@ void Cache::ioThread(void)
bdb->syncWrite.unlock();
bdb->decrementUseCount(REL_HISTORY);
}
-
+
flushLock.lock(Exclusive);
++physicalWrites;
-
+
}
else
{
- if (bdb)
- bdb->decrementUseCount(REL_HISTORY);
+ if (bdb)
+ bdb->decrementUseCount(REL_HISTORY);
}
-
- if (!hit)
+
+ if (!hit)
{
flushBitmap->clear(pageNumber);
}
}
- else
+ else
{
if (flushing)
{
@@ -1075,26 +1091,26 @@ void Cache::ioThread(void)
flushArg = 0;
flushLock.unlock();
syncWait.unlock();
-
+
if (writes > 0 && Log::isActive(LogInfo))
Log::log(LogInfo, "%d: Cache flush: %d pages, %d writes in %d seconds (%d pps)\n",
- database->deltaTime, pages, writes, delta, pages / MAX(delta, 1));
+ database->deltaTime, pages, writes, delta, pages / MAX(delta, 1));
if (callbackArg != 0)
database->pageCacheFlushed(callbackArg);
}
else
flushLock.unlock();
-
+
if (thread->shutdownInProgress)
break;
thread->sleep();
flushLock.lock(Exclusive);
- }
+ }
} // for ever
-
- delete [] rawBuffer;
+
+ delete [] rawBuffer;
}
bool Cache::continueWrite(Bdb* startingBdb)
@@ -1102,25 +1118,26 @@ bool Cache::continueWrite(Bdb* startingB
Dbb *dbb = startingBdb->dbb;
int clean = 1;
int dirty = 0;
-
+
for (int32 pageNumber = startingBdb->pageNumber + 1, end = pageNumber+ 5; pageNumber < end; ++pageNumber)
{
Bdb *bdb;
-
+
if (dirty > clean)
return true;
bdb = lockFindBdbIncrementUseCount(dbb, pageNumber);
if (!bdb)
return dirty >= clean;
-
+
if (bdb->isDirty)
++dirty;
else
++clean;
+
bdb->decrementUseCount(REL_HISTORY);
}
-
+
return (dirty >= clean);
}
@@ -1147,7 +1164,7 @@ void Cache::shutdownThreads(void)
ioThreads[n]->shutdown();
ioThreads[n] = 0;
}
-
+
Sync lockThreads(&syncThreads, "Cache::shutdownThreads");
lockThreads.lock(Exclusive);
}
@@ -1158,20 +1175,20 @@ void Cache::analyzeFlush(void)
Dbb *dbb = NULL;
Bdb *bdb;
Sync dirtyLock (&syncDirty, "Cache::hasDirtyPages");
-
+
dirtyLock.lock (Shared);
for (bdb = firstDirty; bdb; bdb = bdb->nextDirty)
if (bdb->dbb->tableSpaceId == 1)
{
dbb = bdb->dbb;
-
+
break;
}
dirtyLock.unlock();
-
+
if (!dbb)
return;
-
+
fprintf(traceFile, "-------- time %d -------\n", database->deltaTime);
for (int pageNumber = 0; (pageNumber = flushBitmap->nextSet(pageNumber)) >= 0;)
@@ -1180,33 +1197,33 @@ void Cache::analyzeFlush(void)
{
int start = pageNumber;
int type = bdb->buffer->pageType;
-
+
// non-protected access to hash table via findBdb()!
for (; (bdb = findBdb(dbb, ++pageNumber)) && bdb->flushIt;)
;
-
+
fprintf(traceFile, " %d flushed: %d to %d, first type %d\n", pageNumber - start, start, pageNumber - 1, type);
-
+
// non-protected access to hash table via findBdb()!
for (int max = pageNumber + 5; pageNumber < max && (bdb = findBdb(dbb, pageNumber)) && !bdb->flushIt; ++pageNumber)
{
if (bdb->isDirty)
fprintf(traceFile, " %d dirty not flushed, type %d \n", pageNumber, bdb->buffer->pageType);
else
- fprintf(traceFile," %d not dirty, type %d\n", pageNumber, bdb->buffer->pageType);
+ fprintf(traceFile, " %d not dirty, type %d\n", pageNumber, bdb->buffer->pageType);
}
}
else
++pageNumber;
-
- fflush(traceFile);
+
+ fflush(traceFile);
}
void Cache::openTraceFile(void)
{
if (traceFile)
closeTraceFile();
-
+
traceFile = fopen(TRACE_FILE, "a+");
fprintf(traceFile, "Starting\n");
//KEL
@@ -1226,9 +1243,11 @@ void Cache::closeTraceFile(void)
void Cache::analyzeFlush(void)
{
}
+
void Cache::openTraceFile(void)
{
}
+
void Cache::closeTraceFile(void)
{
}
@@ -1239,4 +1258,3 @@ void Cache::flushWait(void)
Sync waitLock(&syncWait, "Cache::flushWait");
waitLock.lock(Exclusive);
}
-
=== modified file 'storage/falcon/DataPage.h'
--- a/storage/falcon/DataPage.h 2008-06-17 17:41:54 +0000
+++ b/storage/falcon/DataPage.h 2008-09-27 18:37:54 +0000
@@ -35,8 +35,8 @@ struct RecordIndex;
struct SectionAnalysis;
struct LineIndex {
- short offset;
- short length; // negative means record has overflow page
+ uint16 offset;
+ int16 length; // negative means record has overflow page
};
class DataPage : public Page
=== modified file 'storage/falcon/MemoryManager.h'
--- a/storage/falcon/MemoryManager.h 2008-05-14 18:39:57 +0000
+++ b/storage/falcon/MemoryManager.h 2008-09-14 20:12:37 +0000
@@ -31,8 +31,10 @@
#ifdef _WIN32
#define ALWAYS_INLINE inline /* for windows */
-#else
+#elif __GNUC__
#define ALWAYS_INLINE extern inline __attribute__ ((always_inline)) /* for gcc */
+#else
+#define ALWAYS_INLINE extern inline
#endif
class Stream;
=== modified file 'storage/falcon/SerialLogFile.cpp'
--- a/storage/falcon/SerialLogFile.cpp 2008-09-05 22:36:19 +0000
+++ b/storage/falcon/SerialLogFile.cpp 2008-09-12 17:01:24 +0000
@@ -263,15 +263,23 @@ uint32 SerialLogFile::read(int64 positio
overlapped.Offset = pos.LowPart;
overlapped.OffsetHigh = pos.HighPart;
- DWORD ret;
+ DWORD n;
- if (!ReadFile(handle, data, effectiveLength, &ret, &overlapped))
- throw SQLError(IO_ERROR, "serial log ReadFile failed with %d", GetLastError());
+ if (!ReadFile(handle, data, effectiveLength, &n, &overlapped))
+ {
+ DWORD lastError = GetLastError();
+ if(lastError != ERROR_HANDLE_EOF)
+ throw SQLError(IO_ERROR, "serial log ReadFile failed with %d",
+ GetLastError());
+ else
+ n = 0; // reached end of file
+ }
- offset = position + effectiveLength;
+
+ offset = position + n;
highWater = MAX(offset, highWater);
- return ret;
+ return n;
#else
#if defined(HAVE_PREAD) && !defined(HAVE_BROKEN_PREAD)
=== modified file 'storage/falcon/StorageParameters.h'
--- a/storage/falcon/StorageParameters.h 2008-07-10 19:00:14 +0000
+++ b/storage/falcon/StorageParameters.h 2008-09-28 11:32:52 +0000
@@ -21,7 +21,7 @@ PARAMETER_UINT(index_chill_threshold, "B
PARAMETER_UINT(io_threads, "Number of Falcon I/O threads", 2, 2, 20, 0, NULL)
PARAMETER_UINT(large_blob_threshold, "Threshold for large blobs", 0, 160000, INT_MAX, 0, NULL)
PARAMETER_UINT(lock_wait_timeout, "Transaction lock time period (seconds)", 0, 50, INT_MAX, 0, NULL)
-PARAMETER_UINT(page_size, "The page size used when creating a Falcon tablespace.", 1024, 4096, 32768, 0x0200, NULL)
+PARAMETER_UINT(page_size, "The page size used when creating a Falcon tablespace.", 2048, 4096, 32768, 0x0200, NULL)
PARAMETER_UINT(record_chill_threshold, "Bytes of pending record data that is 'frozen' to the Falcon serial log.", 1, 5*1024*1024, 1024*1024*1024, 0, &updateRecordChillThreshold)
PARAMETER_UINT(record_scavenge_floor, "A percentage of falcon_record_memory_threshold that defines the amount of record data that will remain in the record cache after a scavenge run.", 10, 50, 90, 0x2000, &StorageInterface::updateRecordScavengeFloor)
PARAMETER_UINT(record_scavenge_threshold, "The percentage of falcon_record_memory_max that will cause the scavenger thread to start scavenging records from the record cache.", 10, 67, 100, 0x2000, &StorageInterface::updateRecordScavengeThreshold)
=== modified file 'storage/falcon/TableSpaceManager.cpp'
--- a/storage/falcon/TableSpaceManager.cpp 2008-09-03 09:00:56 +0000
+++ b/storage/falcon/TableSpaceManager.cpp 2008-09-22 09:24:39 +0000
@@ -501,6 +501,18 @@ void TableSpaceManager::getTableSpaceInf
}
}
+JString TableSpaceManager::tableSpaceFileType(JString name)
+{
+ JString type;
+
+ if (name == "FALCON_USER" || name == "FALCON_TEMPORARY" || name == "FALCON_SYSTEM_BASE")
+ type = "SYSTEM DATAFILE";
+ else
+ type = "USER DATAFILE";
+
+ return type;
+}
+
void TableSpaceManager::getTableSpaceFilesInfo(InfoTable* infoTable)
{
PStatement statement = database->systemConnection->prepareStatement(
@@ -512,7 +524,7 @@ void TableSpaceManager::getTableSpaceFil
infoTable->putInt(0, 0); // FILE_ID NOT NULL, unused for now
infoTable->setNotNull(1); // FILE_NAME
infoTable->putString(1, resultSet->getString(2));
- infoTable->putString(2, "DATAFILE"); // FILE_TYPE NOT NULL
+ infoTable->putString(2, tableSpaceFileType(resultSet->getString(1))); // FILE_TYPE NOT NULL
infoTable->setNotNull(3); // TABLESPACE_NAME
infoTable->putString(3, resultSet->getString(1));
infoTable->setNull(4); // TABLE_CATALOG
=== modified file 'storage/falcon/TableSpaceManager.h'
--- a/storage/falcon/TableSpaceManager.h 2008-07-17 20:38:45 +0000
+++ b/storage/falcon/TableSpaceManager.h 2008-09-22 09:24:39 +0000
@@ -55,6 +55,7 @@ public:
JString tableSpaceType(JString name);
void getIOInfo(InfoTable* infoTable);
void getTableSpaceInfo(InfoTable* infoTable);
+ JString tableSpaceFileType(JString name);
void getTableSpaceFilesInfo(InfoTable* infoTable);
void validate(int optionMask);
void sync();
| Thread |
|---|
| • bzr commit into mysql-6.0 branch (mats:2692) | Mats Kindahl | 1 Oct |
