Browse Source
WL#5030: Split and remove mysql_priv.h
WL#5030: Split and remove mysql_priv.h
This patch: - Moves all definitions from the mysql_priv.h file into header files for the component where the variable is defined - Creates header files if the component lacks one - Eliminates all include directives from mysql_priv.h - Eliminates all circular include cycles - Rename time.cc to sql_time.cc - Rename mysql_priv.h to sql_priv.hpull/374/head
Mats Kindahl
16 years ago
325 changed files with 13308 additions and 3166 deletions
-
5.bzrignore
-
4client/Makefile.am
-
1client/client_priv.h
-
2client/mysqlbinlog.cc
-
2include/Makefile.am
-
15include/hash.h
-
3include/keycache.h
-
8include/m_ctype.h
-
16include/m_string.h
-
18include/my_dbug.h
-
2include/my_dir.h
-
2include/my_getopt.h
-
30include/my_global.h
-
2include/my_handler.h
-
3include/my_net.h
-
2include/my_pthread.h
-
3include/my_sys.h
-
1include/my_tree.h
-
2include/mysql/psi/mysql_file.h
-
3include/mysys_err.h
-
32include/password.h
-
3include/queues.h
-
4include/violite.h
-
2libmysql/Makefile.am
-
2libmysqld/CMakeLists.txt
-
2libmysqld/Makefile.am
-
5libmysqld/emb_qcache.cc
-
2libmysqld/emb_qcache.h
-
1libmysqld/libmysqld.c
-
6plugin/daemon_example/daemon_example.cc
-
4plugin/semisync/semisync.h
-
1plugin/semisync/semisync_master_plugin.cc
-
1plugin/semisync/semisync_slave_plugin.cc
-
2sql/CMakeLists.txt
-
19sql/Makefile.am
-
11sql/debug_sync.cc
-
7sql/derror.cc
-
25sql/derror.h
-
5sql/des_key_file.cc
-
40sql/des_key_file.h
-
4sql/discover.cc
-
24sql/discover.h
-
13sql/event_data_objects.cc
-
6sql/event_data_objects.h
-
11sql/event_db_repository.cc
-
4sql/event_parse_data.cc
-
6sql/event_parse_data.h
-
6sql/event_queue.cc
-
4sql/event_queue.h
-
7sql/event_scheduler.cc
-
2sql/event_scheduler.h
-
11sql/events.cc
-
9sql/events.h
-
11sql/field.cc
-
33sql/field.h
-
3sql/field_conv.cc
-
6sql/filesort.cc
-
36sql/filesort.h
-
3sql/frm_crypt.cc
-
23sql/frm_crypt.h
-
4sql/gstream.cc
-
7sql/gstream.h
-
15sql/ha_ndbcluster.cc
-
2sql/ha_ndbcluster.h
-
11sql/ha_ndbcluster_binlog.cc
-
2sql/ha_ndbcluster_binlog.h
-
5sql/ha_ndbcluster_cond.cc
-
7sql/ha_ndbcluster_cond.h
-
8sql/ha_partition.cc
-
3sql/ha_partition.h
-
13sql/handler.cc
-
18sql/handler.h
-
2sql/hash_filo.cc
-
4sql/hash_filo.h
-
11sql/hostname.cc
-
30sql/hostname.h
-
7sql/init.cc
-
24sql/init.h
-
16sql/item.cc
-
24sql/item.h
-
9sql/item_buff.cc
-
4sql/item_cmpfunc.cc
-
21sql/item_cmpfunc.h
-
10sql/item_create.cc
-
6sql/item_create.h
-
14sql/item_func.cc
-
10sql/item_func.h
-
9sql/item_geofunc.cc
-
9sql/item_row.cc
-
17sql/item_strfunc.cc
-
4sql/item_strfunc.h
-
10sql/item_subselect.cc
-
18sql/item_subselect.h
-
2sql/item_sum.cc
-
1sql/item_sum.h
-
23sql/item_timefunc.cc
-
8sql/item_timefunc.h
-
10sql/item_xmlfunc.cc
-
5sql/key.cc
-
39sql/key.h
@ -0,0 +1,32 @@ |
|||
/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. |
|||
|
|||
This program is free software; you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation; version 2 of the License. |
|||
|
|||
This program is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with this program; if not, write to the Free Software |
|||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ |
|||
|
|||
#ifndef PASSWORD_INCLUDED |
|||
#define PASSWORD_INCLUDED |
|||
|
|||
#include "my_global.h" |
|||
|
|||
C_MODE_START |
|||
|
|||
void my_make_scrambled_password_323(char *to, const char *password, |
|||
size_t pass_len); |
|||
void my_make_scrambled_password(char *to, const char *password, |
|||
size_t pass_len); |
|||
|
|||
void hash_password(ulong *result, const char *password, uint password_len); |
|||
|
|||
C_MODE_END |
|||
|
|||
#endif /* PASSWORD_INCLUDED */ |
|||
@ -0,0 +1,25 @@ |
|||
/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. |
|||
|
|||
This program is free software; you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation; version 2 of the License. |
|||
|
|||
This program is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with this program; if not, write to the Free Software |
|||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ |
|||
|
|||
#ifndef DERROR_INCLUDED |
|||
#define DERROR_INCLUDED |
|||
|
|||
#include "my_global.h" /* uint */ |
|||
|
|||
bool init_errmessage(void); |
|||
bool read_texts(const char *file_name, const char *language, |
|||
const char ***point, uint error_messages); |
|||
|
|||
#endif /* DERROR_INCLUDED */ |
|||
@ -0,0 +1,40 @@ |
|||
/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. |
|||
|
|||
This program is free software; you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation; version 2 of the License. |
|||
|
|||
This program is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with this program; if not, write to the Free Software |
|||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ |
|||
|
|||
#ifndef DES_KEY_FILE_INCLUDED |
|||
#define DES_KEY_FILE_INCLUDED |
|||
|
|||
#ifdef HAVE_OPENSSL |
|||
#include <openssl/des.h> |
|||
|
|||
#include "violite.h" /* DES_cblock, DES_key_schedule */ |
|||
|
|||
struct st_des_keyblock |
|||
{ |
|||
DES_cblock key1, key2, key3; |
|||
}; |
|||
|
|||
struct st_des_keyschedule |
|||
{ |
|||
DES_key_schedule ks1, ks2, ks3; |
|||
}; |
|||
|
|||
extern struct st_des_keyschedule des_keyschedule[10]; |
|||
extern uint des_default_key; |
|||
|
|||
bool load_des_key_file(const char *file_name); |
|||
#endif /* HAVE_OPENSSL */ |
|||
|
|||
#endif /* DES_KEY_FILE_INCLUDED */ |
|||
@ -0,0 +1,24 @@ |
|||
/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. |
|||
|
|||
This program is free software; you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation; version 2 of the License. |
|||
|
|||
This program is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with this program; if not, write to the Free Software |
|||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ |
|||
|
|||
#ifndef DISCOVER_INCLUDED |
|||
#define DISCOVER_INCLUDED |
|||
|
|||
#include "my_global.h" /* uchar */ |
|||
|
|||
int readfrm(const char *name, uchar **data, size_t *length); |
|||
int writefrm(const char* name, const uchar* data, size_t len); |
|||
|
|||
#endif /* DISCOVER_INCLUDED */ |
|||
@ -0,0 +1,36 @@ |
|||
/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. |
|||
|
|||
This program is free software; you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation; version 2 of the License. |
|||
|
|||
This program is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with this program; if not, write to the Free Software |
|||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ |
|||
|
|||
#ifndef FILESORT_INCLUDED |
|||
#define FILESORT_INCLUDED |
|||
|
|||
class SQL_SELECT; |
|||
|
|||
#include "my_global.h" /* uint, uchar */ |
|||
#include "my_base.h" /* ha_rows */ |
|||
|
|||
class SQL_SELECT; |
|||
class THD; |
|||
struct TABLE; |
|||
typedef struct st_sort_field SORT_FIELD; |
|||
|
|||
ha_rows filesort(THD *thd, TABLE *table, st_sort_field *sortorder, |
|||
uint s_length, SQL_SELECT *select, |
|||
ha_rows max_rows, bool sort_positions, |
|||
ha_rows *examined_rows); |
|||
void filesort_free_buffers(TABLE *table, bool full); |
|||
void change_double_for_sort(double nr,uchar *to); |
|||
|
|||
#endif /* FILESORT_INCLUDED */ |
|||
@ -0,0 +1,23 @@ |
|||
/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. |
|||
|
|||
This program is free software; you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation; version 2 of the License. |
|||
|
|||
This program is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with this program; if not, write to the Free Software |
|||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ |
|||
|
|||
#ifndef FRM_CRYPT_INCLUDED |
|||
#define FRM_CRYPT_INCLUDED |
|||
|
|||
class SQL_CRYPT; |
|||
|
|||
SQL_CRYPT *get_crypt_for_frm(void); |
|||
|
|||
#endif /* FRM_CRYPT_INCLUDED */ |
|||
@ -0,0 +1,30 @@ |
|||
/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. |
|||
|
|||
This program is free software; you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation; version 2 of the License. |
|||
|
|||
This program is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with this program; if not, write to the Free Software |
|||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ |
|||
|
|||
#ifndef HOSTNAME_INCLUDED |
|||
#define HOSTNAME_INCLUDED |
|||
|
|||
#include "my_global.h" /* uint */ |
|||
|
|||
bool ip_to_hostname(struct sockaddr_storage *ip_storage, |
|||
const char *ip_string, |
|||
char **hostname, uint *connect_errors); |
|||
void inc_host_errors(const char *ip_string); |
|||
void reset_host_errors(const char *ip_string); |
|||
bool hostname_cache_init(); |
|||
void hostname_cache_free(); |
|||
void hostname_cache_refresh(void); |
|||
|
|||
#endif /* HOSTNAME_INCLUDED */ |
|||
@ -0,0 +1,24 @@ |
|||
/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. |
|||
|
|||
This program is free software; you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation; version 2 of the License. |
|||
|
|||
This program is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with this program; if not, write to the Free Software |
|||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ |
|||
|
|||
#ifndef INIT_INCLUDED |
|||
#define INIT_INCLUDED |
|||
|
|||
#include "my_global.h" /* ulong */ |
|||
|
|||
void unireg_init(ulong options); |
|||
void unireg_end(void) __attribute__((noreturn)); |
|||
|
|||
#endif /* INIT_INCLUDED */ |
|||
@ -0,0 +1,39 @@ |
|||
/* Copyright 2006-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. |
|||
|
|||
This program is free software; you can redistribute it and/or modify |
|||
it under the terms of the GNU General Public License as published by |
|||
the Free Software Foundation; version 2 of the License. |
|||
|
|||
This program is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
GNU General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU General Public License |
|||
along with this program; if not, write to the Free Software |
|||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ |
|||
|
|||
#ifndef KEY_INCLUDED |
|||
#define KEY_INCLUDED |
|||
|
|||
#include "my_global.h" /* uchar */ |
|||
|
|||
class Field; |
|||
class String; |
|||
struct TABLE; |
|||
typedef struct st_bitmap MY_BITMAP; |
|||
typedef struct st_key KEY; |
|||
typedef struct st_key_part_info KEY_PART_INFO; |
|||
|
|||
int find_ref_key(KEY *key, uint key_count, uchar *record, Field *field, |
|||
uint *key_length, uint *keypart); |
|||
void key_copy(uchar *to_key, uchar *from_record, KEY *key_info, uint key_length); |
|||
void key_restore(uchar *to_record, uchar *from_key, KEY *key_info, |
|||
uint key_length); |
|||
bool key_cmp_if_same(TABLE *form,const uchar *key,uint index,uint key_length); |
|||
void key_unpack(String *to,TABLE *form,uint index); |
|||
bool is_key_used(TABLE *table, uint idx, const MY_BITMAP *fields); |
|||
int key_cmp(KEY_PART_INFO *key_part, const uchar *key, uint key_length); |
|||
extern "C" int key_rec_cmp(void *key_info, uchar *a, uchar *b); |
|||
|
|||
#endif /* KEY_INCLUDED */ |
|||
Some files were not shown because too many files changed in this diff
Write
Preview
Loading…
Cancel
Save
Reference in new issue