diff options
| author | unknown <konstantin@mysql.com> | 2005-11-25 13:57:13 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-11-25 13:57:13 +0300 |
| commit | 61e454c0a9758a2c12fc8b949706d6f356a02041 (patch) | |
| tree | cee4e8f13e8c0b9e324e58db5a2e995b60fe5ea0 /sql/mysql_priv.h | |
| parent | 1be7a7afa58d241895e73a45292c4a111c98a74c (diff) | |
| parent | 2a1ae3a5e3cbc7bb076c91ba0f8b5e6242319b28 (diff) | |
| download | mariadb-git-61e454c0a9758a2c12fc8b949706d6f356a02041.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/table.cc:
Auto merged
vio/vio.c:
Auto merged
vio/viossl.c:
Auto merged
include/my_base.h:
Manual merge.
mysql-test/r/ps.result:
Manual merge.
mysql-test/r/select.result:
Manual merge.
mysql-test/t/ndb_alter_table.test:
Manual merge.
mysql-test/t/ndb_basic.test:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql-common/client.c:
k
sql/ha_ndbcluster.cc:
Manual merge.
sql/item.cc:
Manual merge.
sql/sql_table.cc:
Manual merge.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 4f5a0032531..6a1a65b963a 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1362,7 +1362,7 @@ int calc_weekday(long daynr,bool sunday_first_day_of_week); uint calc_week(TIME *l_time, uint week_behaviour, uint *year); void find_date(char *pos,uint *vek,uint flag); TYPELIB *convert_strings_to_array_type(my_string *typelibs, my_string *end); -TYPELIB *typelib(List<String> &strings); +TYPELIB *typelib(MEM_ROOT *mem_root, List<String> &strings); ulong get_form_pos(File file, uchar *head, TYPELIB *save_names); ulong make_new_entry(File file,uchar *fileinfo,TYPELIB *formnames, const char *newname); |