← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/r/information_schema.result

Committer: Brian Aker
Date: 2010-02-09 21:34:29 UTC
mfrom: (1284 build)
mto: (1273.15.2 update_to_use_data_dict)
mto: This revision was merged to the branch mainline in revision 1300.
Revision ID: brian@gaz-20100209213429-t6vgc9wioi23q4jo

Merge main code.

files removed:
tests/t/warnings-master.opt

files modified:
drizzled/internal/default.cc

drizzled/plugin/loader.cc

tests/r/data_dictionary.result

tests/r/data_dictionary_like_info.result

tests/r/information_schema.result

tests/t/myisam-blob-master.opt

tests/test-run.pl

Show diffs side-by-side

added added

removed removed

tests/r/information_schema.result

421

421

FROM data_dictionary.character_sets

422

422

ORDER BY character_set_name;

423

423

CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN

424

binary binary 1

424

binary binary UTF-8 Unicode 1

425

425

utf8 utf8_general_ci UTF-8 Unicode 4

426

426

SELECT *

427

427

FROM data_dictionary.collations

Older »