diff options
| -rw-r--r-- | include/my_alloc.h | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl000009.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/system_mysql_db_fix.test | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 2 | ||||
| -rw-r--r-- | tests/mysql_client_test.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/include/my_alloc.h b/include/my_alloc.h index a3dd35d7ea3..1641b3acf3e 100644 --- a/include/my_alloc.h +++ b/include/my_alloc.h @@ -43,7 +43,7 @@ typedef struct st_mem_root unsigned int block_num; /* allocated blocks counter */ /* first free block in queue test counter (if it exceed - MAX_BLOCK_USAGE_BEFORE_DROP block will be droped in 'used' list) + MAX_BLOCK_USAGE_BEFORE_DROP block will be dropped in 'used' list) */ unsigned int first_block_usage; diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test index a51a64979fa..81e9860c186 100644 --- a/mysql-test/t/rpl000009.test +++ b/mysql-test/t/rpl000009.test @@ -167,7 +167,7 @@ drop database mysqltest2; save_master_pos; connection slave; sync_with_master; -# These has to be droped on slave as they are not replicated +# These have to be dropped on slave because they are not replicated drop database mysqltest2; drop database mysqltest3; diff --git a/mysql-test/t/system_mysql_db_fix.test b/mysql-test/t/system_mysql_db_fix.test index 583ca293baa..dc3047a8564 100644 --- a/mysql-test/t/system_mysql_db_fix.test +++ b/mysql-test/t/system_mysql_db_fix.test @@ -81,7 +81,7 @@ DROP TABLE db, host, user, func, tables_priv, columns_priv, help_category, help_ -- enable_query_log -# check that we droped all system tables +# check that we dropped all system tables show tables; # End of 4.1 tests diff --git a/sql/sql_table.cc b/sql/sql_table.cc index b593aed1453..92db0143980 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2948,7 +2948,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, Field **f_ptr,*field; for (f_ptr=table->field ; (field= *f_ptr) ; f_ptr++) { - /* Check if field should be droped */ + /* Check if field should be dropped */ Alter_drop *drop; drop_it.rewind(); while ((drop=drop_it++)) diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 64c5e7edaf9..ffcf5b6f34d 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -9177,7 +9177,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); @@ -9192,7 +9192,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); |