diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-04 15:46:04 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-04 15:46:04 -0600 |
| commit | 89055361b9203be1d4e813b00aa5dfbc6e9b0caa (patch) | |
| tree | f15f127921d230171bb0ac60a5a854a61af3b185 /sql/mysql_priv.h | |
| parent | 5ee900d38a1d20247823ab23a441cbb78ac9942a (diff) | |
| parent | 6bede5bed1add70fb5bb442ba70fe029c4c534f7 (diff) | |
| download | mariadb-git-89055361b9203be1d4e813b00aa5dfbc6e9b0caa.tar.gz | |
Merge
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
acinclude.m4:
SCCS merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 26b1271c6c5..291ccb8a2d7 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -521,7 +521,7 @@ void sql_print_error(const char *format,...) extern uint32 server_id; extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH], max_sort_char, mysql_real_data_home[]; -extern my_string mysql_unix_port,mysql_tmpdir; +extern my_string mysql_tmpdir; extern const char *first_keyword, *localhost, *delayed_user; extern ulong refresh_version,flush_version, thread_id,query_id,opened_tables, created_tmp_tables, created_tmp_disk_tables, @@ -535,7 +535,7 @@ extern ulong filesort_merge_passes; extern ulong select_range_check_count, select_range_count, select_scan_count; extern ulong select_full_range_join_count,select_full_join_count, slave_open_temp_tables; -extern uint test_flags,select_errors,mysql_port,ha_open_options; +extern uint test_flags,select_errors,ha_open_options; extern ulong thd_startup_options, slow_launch_threads, slow_launch_time; extern time_t start_time; extern const char *command_name[]; |