diff options
| author | monty@narttu.mysql.fi <> | 2002-08-30 12:40:40 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2002-08-30 12:40:40 +0300 |
| commit | 7134ffec210edde21860a2b2c2654be481de49b4 (patch) | |
| tree | 1bb81fd601075133af9ee99bd7ac94baf5ffc46c /libmysqld | |
| parent | 921f7c9c551d9e1bdd5083ebe71d204ab6246ba1 (diff) | |
| parent | dd5382187e68ff5337e1fe7ba5f86f0d9cdd31d5 (diff) | |
| download | mariadb-git-7134ffec210edde21860a2b2c2654be481de49b4.tar.gz | |
Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 13 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 10a8459b66b..a8a46e939b0 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -43,17 +43,20 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ hostname.cc init.cc \ item.cc item_buff.cc item_cmpfunc.cc item_create.cc \ item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \ - item_uniq.cc key.cc lock.cc log.cc log_event.cc mf_iocache.cc\ + item_uniq.cc item_subselect.cc \ + key.cc lock.cc log.cc log_event.cc mf_iocache.cc\ mini_client.cc net_pkg.cc net_serv.cc opt_ft.cc opt_range.cc \ opt_sum.cc procedure.cc records.cc sql_acl.cc \ repl_failsafe.cc slave.cc sql_load.cc sql_olap.cc \ sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \ - sql_crypt.cc sql_db.cc sql_delete.cc sql_insert.cc sql_lex.cc \ - sql_list.cc sql_manager.cc sql_map.cc set_var.cc sql_parse.cc \ - sql_rename.cc sql_repl.cc sql_select.cc sql_do.cc sql_show.cc \ + sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \ + sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \ + sql_prepare.cc sql_derived.cc sql_rename.cc sql_repl.cc \ + sql_select.cc sql_do.cc sql_show.cc set_var.cc \ sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \ sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \ - unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc + unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \ + spatial.cc gstream.cc EXTRA_DIST = lib_vio.c diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index f1083991d07..f5934fc93fa 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -400,7 +400,7 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) mysql_server_end(); return 1; } - charsets_list = list_charsets(MYF(MY_COMPILED_SETS|MY_CONFIG_SETS)); + charsets_list = list_charsets(MYF(MY_CS_COMPILED|MY_CS_CONFIG)); /* Parameter for threads created for connections */ (void) pthread_attr_init(&connection_attrib); |