diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-31 11:54:36 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-31 11:54:36 +0200 |
| commit | 5f6b100ed0eaacd644352972939a77f0a964c1af (patch) | |
| tree | db7782f75178512900e6e862142d57d3d0d96cf4 /mysql-test/t | |
| parent | 6de8b295a7dd53b47f7e0d4ebc109dabb07c6397 (diff) | |
| parent | a006453fad260a35df973a8785f0d9a8977c1cac (diff) | |
| download | mariadb-git-5f6b100ed0eaacd644352972939a77f0a964c1af.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
client/mysqlimport.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
support-files/my-huge.cnf.sh:
Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
Auto merged
support-files/my-large.cnf.sh:
Auto merged
mysql-test/mysql-test-run.sh:
Merged from 4.1.
mysql-test/r/mysqldump.result:
Merged from 4.1.
mysql-test/t/gis.test:
Merged from 4.1.
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/gis.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump.test | 12 | ||||
| -rw-r--r-- | mysql-test/t/not_embedded_server-master.opt | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index 142bd29fa2d..bb3f621d194 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -372,6 +372,9 @@ insert into t1 values (pointfromtext('point(1,1)')); drop table t1; +select (asWKT(geomfromwkb((0x000000000140240000000000004024000000000000)))); +select (asWKT(geomfromwkb((0x010100000000000000000024400000000000002440)))); + # End of 4.1 tests # diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 31957e0db0d..4481bc62dfa 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -697,6 +697,18 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir --exec $MYSQL_DUMP --skip-comments --xml --no-create-info test drop table t1, t2; +# +# BUG #12123 +# +create table t1 (a text character set utf8, b text character set latin1); +insert t1 values (0x4F736E616272C3BC636B, 0x4BF66C6E); +select * from t1; +--exec $MYSQL_DUMP --tab=$MYSQL_TEST_DIR/var/tmp/ test +--exec $MYSQL test < $MYSQL_TEST_DIR/var/tmp/t1.sql +--exec $MYSQL_IMPORT test $MYSQL_TEST_DIR/var/tmp/t1.txt +select * from t1; + +drop table t1; # End of 4.1 tests # diff --git a/mysql-test/t/not_embedded_server-master.opt b/mysql-test/t/not_embedded_server-master.opt new file mode 100644 index 00000000000..35fcc5f30c6 --- /dev/null +++ b/mysql-test/t/not_embedded_server-master.opt @@ -0,0 +1 @@ +--loose-to-force-a-restart |