diff options
| author | unknown <jimw@mysql.com> | 2005-08-31 15:24:06 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-31 15:24:06 -0700 |
| commit | bdddd8c089c05ac8e74ab4996c601175d52a5dc8 (patch) | |
| tree | 63161ccb51465f90409872099f902b79a9d23837 /tests | |
| parent | c6b54efea2f564d7a4d9fda7bc79f2601395250a (diff) | |
| parent | 92e2b9edb1660a2f9d7dcd7543fc5140abd3ff0d (diff) | |
| download | mariadb-git-bdddd8c089c05ac8e74ab4996c601175d52a5dc8.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.hpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_table.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
ndb/src/ndbapi/ndberror.c:
Resolve conflicts
sql/ha_innodb.cc:
Resolve conflicts
sql/item_strfunc.cc:
Resolve conflicts
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 4bf03938f03..84a32b52284 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -9483,7 +9483,7 @@ static void test_create_drop() rc= mysql_stmt_execute(stmt_drop); check_execute(stmt_drop, rc); if (!opt_silent) - fprintf(stdout, "droped %i\n", i); + fprintf(stdout, "dropped %i\n", i); rc= mysql_stmt_execute(stmt_create_select); check_execute(stmt_create, rc); @@ -9498,7 +9498,7 @@ static void test_create_drop() rc= mysql_stmt_execute(stmt_drop); check_execute(stmt_drop, rc); if (!opt_silent) - fprintf(stdout, "droped %i\n", i); + fprintf(stdout, "dropped %i\n", i); } mysql_stmt_close(stmt_create); |