diff options
| -rw-r--r-- | VC++Files/innobase/innobase.dsp | 8 | ||||
| -rwxr-xr-x | VC++Files/libmysql/libmysql.def | 94 | ||||
| -rw-r--r-- | VC++Files/strings/MASM6x/strings.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/strings/strings.dsp | 4 | ||||
| -rw-r--r-- | client/mysqldump.c | 4 | ||||
| -rw-r--r-- | innobase/sync/sync0sync.c | 2 | ||||
| -rw-r--r-- | mysql-test/install_test_db.sh | 2 | ||||
| -rw-r--r-- | mysql-test/r/system_mysql_db.result | 2 | ||||
| -rw-r--r-- | mysys/default.c | 2 |
9 files changed, 14 insertions, 108 deletions
diff --git a/VC++Files/innobase/innobase.dsp b/VC++Files/innobase/innobase.dsp index c50911063ab..2687c48ca32 100644 --- a/VC++Files/innobase/innobase.dsp +++ b/VC++Files/innobase/innobase.dsp @@ -168,14 +168,6 @@ SOURCE=.\buf\buf0rea.c # End Source File # Begin Source File -SOURCE=.\com\com0com.c -# End Source File -# Begin Source File - -SOURCE=.\com\com0shm.c -# End Source File -# Begin Source File - SOURCE=.\data\data0data.c # End Source File # Begin Source File diff --git a/VC++Files/libmysql/libmysql.def b/VC++Files/libmysql/libmysql.def deleted file mode 100755 index 726a53864f3..00000000000 --- a/VC++Files/libmysql/libmysql.def +++ /dev/null @@ -1,94 +0,0 @@ -LIBRARY LIBMYSQL -DESCRIPTION 'MySQL 3.23 Client Library' -VERSION 2.5 -EXPORTS - mysql_affected_rows - mysql_close - mysql_connect - mysql_create_db - mysql_data_seek - mysql_debug - mysql_drop_db - mysql_dump_debug_info - mysql_eof - mysql_errno - mysql_error - mysql_escape_string - mysql_fetch_field - mysql_fetch_field_direct - mysql_fetch_fields - mysql_fetch_lengths - mysql_fetch_row - mysql_field_count - mysql_field_seek - mysql_field_tell - mysql_free_result - mysql_get_client_info - mysql_get_host_info - mysql_get_proto_info - mysql_get_server_info - mysql_info - mysql_init - mysql_insert_id - mysql_kill - mysql_list_dbs - mysql_list_fields - mysql_list_processes - mysql_list_tables - mysql_num_fields - mysql_num_rows - mysql_odbc_escape_string - mysql_options - mysql_ping - mysql_query - mysql_real_connect - mysql_real_query - mysql_refresh - mysql_row_seek - mysql_row_tell - mysql_select_db - mysql_shutdown - mysql_stat - mysql_store_result - mysql_thread_id - mysql_use_result - bmove_upp - delete_dynamic - _dig_vec - init_dynamic_array - insert_dynamic - int2str - is_prefix - list_add - list_delete - max_allowed_packet - my_casecmp - my_init - my_end - my_strdup - my_malloc - my_memdup - my_no_flags_free - my_realloc - my_thread_end - my_thread_init - net_buffer_length - set_dynamic - strcend - strdup_root - strfill - strinstr - strmake - strmov - strxmov - myodbc_remove_escape - mysql_thread_safe - mysql_character_set_name - mysql_change_user - mysql_send_query - mysql_read_query_result - mysql_real_escape_string - load_defaults - free_defaults - - diff --git a/VC++Files/strings/MASM6x/strings.dsp b/VC++Files/strings/MASM6x/strings.dsp index 1f54910bf58..649ce0b8f31 100644 --- a/VC++Files/strings/MASM6x/strings.dsp +++ b/VC++Files/strings/MASM6x/strings.dsp @@ -160,6 +160,10 @@ SOURCE=.\str2int.c # End Source File # Begin Source File +SOURCE=.\strnlen.c +# End Source File +# Begin Source File + SOURCE=.\Strings.asm !IF "$(CFG)" == "strings - Win32 Release" diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp index 28cc1f39c0c..dec308efa60 100644 --- a/VC++Files/strings/strings.dsp +++ b/VC++Files/strings/strings.dsp @@ -164,6 +164,10 @@ SOURCE=.\str2int.c # End Source File # Begin Source File +SOURCE=.\strnlen.c +# End Source File +# Begin Source File + SOURCE=.\Strings.asm !IF "$(CFG)" == "strings - Win32 Release" diff --git a/client/mysqldump.c b/client/mysqldump.c index f93c791564e..4aec31c8ff2 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -131,7 +131,7 @@ static struct my_option my_long_options[] = (gptr*) &opt_delayed, (gptr*) &opt_delayed, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"delete-master-logs", OPT_DELETE_MASTER_LOGS, - "Delete logs on master after backup. This will automagically enable --first-slave.", + "Delete logs on master after backup. This automatically enables --first-slave.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"disable-keys", 'K', "'/*!40000 ALTER TABLE tb_name DISABLE KEYS */; and '/*!40000 ALTER TABLE tb_name ENABLE KEYS */; will be put in the output.", (gptr*) &opt_disable_keys, @@ -173,7 +173,7 @@ static struct my_option my_long_options[] = {"lock-tables", 'l', "Lock all tables for read.", (gptr*) &lock_tables, (gptr*) &lock_tables, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"master-data", OPT_MASTER_DATA, - "This will cause the master position and filename to be appended to your output. This will automagically enable --first-slave.", + "This causes the master position and filename to be appended to your output. This automatically enables --first-slave.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"no-autocommit", OPT_AUTOCOMMIT, "Wrap tables with autocommit/commit statements.", diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index 4f5d27bcc7c..72f6f0be390 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -180,7 +180,7 @@ mutex_create_func( char* cfile_name, /* in: file name where created */ ulint cline) /* in: file line where created */ { -#if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER) && !defined(__NETWARE) +#if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER) mutex_reset_lock_word(mutex); #else os_fast_mutex_init(&(mutex->os_fast_mutex)); diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh index 3b361b8afec..0b95809037f 100644 --- a/mysql-test/install_test_db.sh +++ b/mysql-test/install_test_db.sh @@ -173,7 +173,7 @@ fi if test ! -f $mdata/func.frm then c_f="$c_f CREATE TABLE func (" - c_f="$c_f name char(64) DEFAULT '' NOT NULL," + c_f="$c_f name char(64) binary DEFAULT '' NOT NULL," c_f="$c_f ret tinyint(1) DEFAULT '0' NOT NULL," c_f="$c_f dl char(128) DEFAULT '' NOT NULL," c_f="$c_f type enum ('function','aggregate') NOT NULL," diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index 257b3b13f08..59cb6c38a59 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -85,7 +85,7 @@ user CREATE TABLE `user` ( show create table func; Table Create Table func CREATE TABLE `func` ( - `name` char(64) NOT NULL default '', + `name` char(64) binary NOT NULL default '', `ret` tinyint(1) NOT NULL default '0', `dl` char(128) NOT NULL default '', `type` enum('function','aggregate') NOT NULL default 'function', diff --git a/mysys/default.c b/mysys/default.c index e79b598101d..a913db2c487 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -461,7 +461,7 @@ static char *remove_end_comment(char *ptr) else if (quote == *ptr) quote= 0; } - if (!quote && *ptr == '#') /* We are not inside a comment */ + if (!quote && *ptr == '#') /* We are not inside a string */ { *ptr= 0; return ptr; |