diff options
| -rw-r--r-- | Docs/Flags/new-zealand.eps | 98 | ||||
| -rw-r--r-- | Docs/Flags/new-zealand.gif | bin | 0 -> 661 bytes | |||
| -rw-r--r-- | Docs/Flags/new-zealand.pdf | bin | 0 -> 1331 bytes | |||
| -rw-r--r-- | Docs/Flags/new-zealand.txt | 0 | ||||
| -rw-r--r-- | mysql-test/r/type_enum.result | 14 | ||||
| -rw-r--r-- | mysql-test/r/type_set.result | 6 | ||||
| -rw-r--r-- | mysys/Makefile.am | 2 |
7 files changed, 119 insertions, 1 deletions
diff --git a/Docs/Flags/new-zealand.eps b/Docs/Flags/new-zealand.eps new file mode 100644 index 00000000000..9177154f8f7 --- /dev/null +++ b/Docs/Flags/new-zealand.eps @@ -0,0 +1,98 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Creator: pnmtops +%%Title: new-zealand.ps +%%Pages: 1 +%%BoundingBox: 290 385 321 407 +%%EndComments +/readstring { + currentfile exch readhexstring pop +} bind def +/rpicstr 32 string def +/gpicstr 32 string def +/bpicstr 32 string def +%%EndProlog +%%Page: 1 1 +gsave +290.64 385.44 translate +30.72 21.12 scale +32 22 8 +[ 32 0 0 -22 0 22 ] +{ rpicstr readstring } +{ gpicstr readstring } +{ bpicstr readstring } +true 3 +colorimage +000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000 +00000000000000ce770d08080874c6770808080c77ce0808080808080808 +0808080808080800003e58050000004d005000000005583e000000000000 +000000000000000000000042b4b6b5b5b5aa00abb5b5b5b6b442b5b5b5b5 +b5b5b5b5b5b5b5b5b5b5b50000aed2b433080874c677080833b4d2ae0808 +0808080808080808080808080800008a3d5e2b00004d005000002b5e3d8a +0000000000000000000000000000000000bb3d81bfb5b5aa00abb5b5bf81 +3dbbb5b5b5b5b5b5b5b5b5b5b5b5b5b5b500000967d3ce770d74c6770c77 +ced36709080808080808083e230808080808080000015f733e58054d0050 +05583e735f0100000000000000341c0000000000000000b5cb7d42b4b6aa +00abb6b4427dcbb5b5b5b5b5b5b5b5bfbcb5b5b5b5b5b50000080825aed2 +b49bc69db3d2ae25080808080808080a65a49a5a0808080808000000001e +893d5e7400765d3d8a1e000000000000000253444c4d00000000000000b5 +b5bdbb3d81b300b4813dbbbdb5b5b5b5b5b5b5b6bf7285c3b5b5b5b5b500 +00d3d3d3d3d6d5d3c6d3d5d6d3d3d3d30808080808081ccfc01308080808 +0800004d4d4d4d4f4d4200424d4f4d4d4d4d00000000000015484a0b0000 +00000000004f4f4f4f4f4d4200424d4f4f4f4f4fb5b5b5b5b5b5ba4e5fb8 +b5b5b5b5b50000d6d6d6d6d6d6d3c6d3d6d6d6d6d6d60808080808082c59 +6b1808080808080000505050505050420042505050505050000000000000 +25475a1000000000000000505050505050420042505050505050b5b5b5b5 +b5b5bfbdc2b9b5b5b5b5b50000080825aed2b49bc69db4d2ae2508080808 +08080908080808080832080808000000001e8a3d5e7400775e3d8a1e0000 +00000000010000000000002c0000000000b5b5bdbb3d81b300b4813dbbbd +b5b5b5b5b5b5b5b5b5b5b5b5b5c1b5b5b500000967d3ce770d74c6770c77 +ced36709080808086408080808183eb14528080000015f733e58054d0050 +05583e735f010000000058000000001138714021000000b5cb7d42b4b6aa +00abb6b4427dcbb5b5b5b5b5c6b5b5b5b5b9c49bc6beb50000aed2b43308 +0874c677080833b4d2ae08083188c8821e08080a7ec8a6190800008a3d5e +2b00004d005000002b5e3d8a00002b534b591700000252074912000000bb +3d81bfb5b5aa00abb5b5bf813dbbb5b5c09f58abbbb5b5b6a70776bab500 +00ce770d08080874c6770808080c77ce08080882cd5f0808080861798a08 +0800003e58050000004d005000000005583e0000004b2649000000005249 +660000000042b4b6b5b5b5aa00abb5b5b5b6b442b5b5b59a26b9b5b5b5b5 +c2a1b3b5b50000080808080808080808080808080808080808622d540808 +080810081008080000000000000000000000000000000000000000552548 +0000000008000800000000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5c4 +bec2b5b5b5b5b7b5b7b5b500000808080808080808080808080808080808 +080808080808080808080808080000000000000000000000000000000000 +0000000000000000000000000000000000b5b5b5b5b5b5b5b5b5b5b5b5b5 +b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b500000808080808080808080808 +080808080808080808080808080808080808080000000000000000000000 +0000000000000000000000000000000000000000000000b5b5b5b5b5b5b5 +b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b500000808080808 +080808080808080808080808080808080808080808080808080000000000 +0000000000000000000000000000000000000000000000000000000000b5 +b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b500 +00080808080808080808080808080808080808080808081c080808080808 +080000000000000000000000000000000000000000000000001400000000 +0000000000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5bab5b5 +b5b5b5b5b500000808080808080808080808080808080808080808080886 +200808080808080000000000000000000000000000000000000000000000 +005f190000000000000000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5 +b5b5b5adbcb5b5b5b5b5b500000808080808080808080808080808080808 +0808081196cdc94808080808080000000000000000000000000000000000 +00000000000a7728674100000000000000b5b5b5b5b5b5b5b5b5b5b5b5b5 +b5b5b5b5b5b5b5b8bc2978c5b5b5b5b5b500000808080808080808080808 +080808080808080808083dada00808080808080000000000000000000000 +0000000000000000000000003555670000000000000000b5b5b5b5b5b5b5 +b5b5b5b5b5b5b5b5b5b5b5b5b5b5c17e9fb5b5b5b5b5b500000808080808 +08080808080808080808080808080808240a250908080808080000000000 +0000000000000000000000000000000000001d021e0100000000000000b5 +b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5bdb5bdb5b5b5b5b5b500 +000808080808080808080808080808080808080808080808080808080808 +080000000000000000000000000000000000000000000000000000000000 +0000000000b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5 +b5b5b5b5b500000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000 +grestore +showpage +%%Trailer diff --git a/Docs/Flags/new-zealand.gif b/Docs/Flags/new-zealand.gif Binary files differnew file mode 100644 index 00000000000..5d74f71ecc0 --- /dev/null +++ b/Docs/Flags/new-zealand.gif diff --git a/Docs/Flags/new-zealand.pdf b/Docs/Flags/new-zealand.pdf Binary files differnew file mode 100644 index 00000000000..040f8bdb7b0 --- /dev/null +++ b/Docs/Flags/new-zealand.pdf diff --git a/Docs/Flags/new-zealand.txt b/Docs/Flags/new-zealand.txt new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Docs/Flags/new-zealand.txt diff --git a/mysql-test/r/type_enum.result b/mysql-test/r/type_enum.result index 355133532bf..ee3bd077798 100644 --- a/mysql-test/r/type_enum.result +++ b/mysql-test/r/type_enum.result @@ -1622,3 +1622,17 @@ field 429002 429003 drop table t1; +create table t1 (a enum (' ','a','b') not null); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` enum('','a','b') NOT NULL default '' +) TYPE=MyISAM +drop table t1; +create table t1 (a enum (' ','a','b ') not null default 'b '); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` enum('','a','b') NOT NULL default 'b' +) TYPE=MyISAM +drop table t1; diff --git a/mysql-test/r/type_set.result b/mysql-test/r/type_set.result index 8b065618742..858bf5f3ba2 100644 --- a/mysql-test/r/type_set.result +++ b/mysql-test/r/type_set.result @@ -1,8 +1,14 @@ +create table t1 (a set (' ','a','b') not null); +show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` set('','a','b') NOT NULL default '' ) TYPE=MyISAM +drop table t1; +create table t1 (a set (' ','a','b ') not null default 'b '); +show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` set('','a','b') NOT NULL default 'b' ) TYPE=MyISAM +drop table t1; diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 0630d663fe5..31b0947af9f 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -45,7 +45,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\ my_chsize.c my_lread.c my_lwrite.c my_clock.c \ my_quick.c my_lockmem.c my_static.c \ my_getopt.c getvar.c my_mkdir.c \ - default.c my_compress.c checksum.c raid.cc raid2.c \ + default.c my_compress.c checksum.c raid.cc \ my_net.c \ my_vsnprintf.c charset.c my_bitmap.c my_bit.c md5.c \ my_gethostbyname.c |
