database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into deer.(none):/home/hf/work/mysql-4.1.clean


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown
2003-10-21 16:06:26 +05:00
parent 8c2d17c777 8d94e500e0
commit 9a4aa99769
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysql_priv.h
View File

@ -725,7 +725,7 @@ void key_restore(TABLE *form,byte *key,uint index,uint key_length);
int key_cmp(TABLE *form,const byte *key,uint index,uint key_length);
void key_unpack(String *to,TABLE *form,uint index);
bool check_if_key_used(TABLE *table, uint idx, List<Item> &fields);
void init_errmessage(void);
bool init_errmessage(void);
void sql_perror(const char *message);
void sql_print_error(const char *format,...)
@ -937,7 +937,11 @@ extern String *make_datetime(String *str, TIME *l_time,
int test_if_number(char *str,int *res,bool allow_wildcards);
void change_byte(byte *,uint,char,char);
#ifndef EMBEDDED_LIBRARY
extern "C" void unireg_abort(int exit_code);
#else
#define unireg_abort(exit_code) DBUG_RETURN(exit_code)
#endif
void init_read_record(READ_RECORD *info, THD *thd, TABLE *reg_form,
SQL_SELECT *select,
int use_record_cache, bool print_errors);