summaryrefslogtreecommitdiff
path: root/mysql-test/r/federated.result
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-03-16 16:11:01 +0200
committerunknown <monty@mysql.com>2005-03-16 16:11:01 +0200
commit284b8b8b63bec8f2d246f6748ab695baa9aaf746 (patch)
tree91072764c1f84696f62c39d4e54fea6a1c35c516 /mysql-test/r/federated.result
parentbfe19493c5c8c4f4a9e394091f79a9e569382333 (diff)
downloadmariadb-git-284b8b8b63bec8f2d246f6748ab695baa9aaf746.tar.gz
Cleanup during reviews
Removed some optional arguments Fixed portability problem in federated tests client/sql_string.cc: update from sql/sql_string.cc client/sql_string.h: update from sql/sql_string.h mysql-test/r/federated.result: Fixed error message sql/field.cc: Cleanup during review Remove const in 'const unsigned int' sql/field.h: Remove const in 'const unsigned int' sql/ha_federated.cc: Better error string. Add missing argument to error (before 'errno' was picked up from stack) sql/handler.cc: Removed compiler warning sql/item_func.cc: Cleanup during review sql/item_sum.cc: Cleanup during review sql/lock.cc: Remove optional arguments sql/log_event.cc: Remove optional arguments sql/mysql_priv.h: Remove optional arguments cahnge preapre_create_fields to use pointers instead of references sql/opt_range.cc: Fix arguments so that return value is last sql/sql_base.cc: Remove optional arguments sql/sql_delete.cc: Remove optional arguments sql/sql_error.cc: Remove optional arguments sql/sql_help.cc: Remove optional arguments sql/sql_parse.cc: Remove optional arguments sql/sql_prepare.cc: Remove optional arguments sql/sql_rename.cc: Remove optional arguments sql/sql_select.cc: Remove optional arguments sql/sql_show.cc: Cleanup during review sql/sql_string.cc: Simple optimization sql/sql_table.cc: Remove optional arguments Fixed indentation sql/sql_update.cc: Remove optional arguments sql/sql_yacc.yy: Change references to pointers
Diffstat (limited to 'mysql-test/r/federated.result')
-rw-r--r--mysql-test/r/federated.result6
1 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index 9c524dd7264..1d24707034b 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -20,16 +20,14 @@ CREATE TABLE federated.t1 (
)
ENGINE="FEDERATED" DEFAULT CHARSET=latin1
COMMENT='mysql://root@127.0.0.1:@/too/many/items/federated/t1';
-ERROR HY000: Can't create table 'this connection string is not in the correct format!
-' (errno: 0)
+ERROR HY000: Can't create table 'connection string is not in the correct format' (errno: 0)
CREATE TABLE federated.t1 (
`id` int(20) NOT NULL,
`name` varchar(32) NOT NULL default ''
)
ENGINE="FEDERATED" DEFAULT CHARSET=latin1
COMMENT='mysql://root@127.0.0.1';
-ERROR HY000: Can't create table 'this connection string is not in the correct format!
-' (errno: 0)
+ERROR HY000: Can't create table 'connection string is not in the correct format' (errno: 0)
CREATE TABLE federated.t1 (
`id` int(20) NOT NULL,
`name` varchar(32) NOT NULL default ''