diff options
| author | unknown <venu@myvenu.com> | 2003-06-08 09:11:14 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-06-08 09:11:14 -0700 |
| commit | 0bb5b9eadddfc911bfaa7c6ee69db92fc7785c94 (patch) | |
| tree | 417b2e1492cc310b34ff873d3459039b3bce215e /include | |
| parent | 7fac151beaf476189878204bbee60f762174a760 (diff) | |
| download | mariadb-git-0bb5b9eadddfc911bfaa7c6ee69db92fc7785c94.tar.gz | |
Fix for mysql_list_fields & reset stmt buffers from stmt_free_result
Windows build fix
VC++Files/sql/mysqld.dsp:
Added sql_state.c to wrk space
include/mysql_com.h:
Windows build fix (mismatch declaration of my_bool and bool from defination)
include/thr_alarm.h:
Windows build fix
libmysql/libmysql.c:
Fix for mysql_list_fields & reset stmt buffers from stmt_free_result
tests/client_test.c:
Updated test for DEFAULT value for mysql_list_fields()
New tests for mysql_stmt_free_result()
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 2 | ||||
| -rw-r--r-- | include/thr_alarm.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 2ed5038b275..faa025c934e 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -324,7 +324,7 @@ my_bool check_scramble(const char *, const char *message, unsigned long *salt,my_bool old_ver); char *get_tty_password(char *opt_message); void hash_password(unsigned long *result, const char *password); -const char *mysql_errno_to_sqlstate(uint mysql_errno); +const char *mysql_errno_to_sqlstate(unsigned int mysql_errno); /* Some other useful functions */ diff --git a/include/thr_alarm.h b/include/thr_alarm.h index 8ff4472f700..439f046252f 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -100,7 +100,7 @@ typedef struct st_alarm { #define thr_alarm_init(A) (*(A))=0 #define thr_alarm_in_use(A) (*(A)!= 0) void init_thr_alarm(uint max_alarm); -my_bool thr_alarm(thr_alarm_t *alarmed, uint sec, ALARM *buff); +bool thr_alarm(thr_alarm_t *alarmed, uint sec, ALARM *buff); void thr_alarm_kill(pthread_t thread_id); void thr_end_alarm(thr_alarm_t *alarmed); void end_thr_alarm(my_bool free_structures); |