summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-12-15 17:58:15 +0200
committerunknown <monty@mysql.com>2003-12-15 17:58:15 +0200
commitec2e2c3af6f73b4d0a734510bc6ba74d2bb30e8c (patch)
treec239203a39c21349557d871ff1f29dd16ab0a5bc /sql/mysqld.cc
parent8bc3575eebe7110466ef4fb0250fe7bffe48c9ee (diff)
downloadmariadb-git-ec2e2c3af6f73b4d0a734510bc6ba74d2bb30e8c.tar.gz
Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0) nitialize system_charset_info() early. Fixes core dump when starting windows service heap/hp_hash.c: Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0) mysql-test/r/create.result: More test for type returned by if_null() mysql-test/t/create.test: More test for type returned by if_null() sql/field.h: Remove not needed functions sql/item.cc: Use normal field create function instead of special functions just made for tmp_table_field_from_field_type sql/mysqld.cc: Initialize system_charset_info() early. Fixes core dump when starting windows service vio/vio.c: Added missing timeouts for named pipes and shared memory (fixes core dump on windows) vio/vio_priv.h: Added missing timeout function for named pipes and shared memory (fixes core dump on windows) vio/viosocket.c: Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 805e6860f65..49f0b753549 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2787,6 +2787,9 @@ int main(int argc, char **argv)
int2str((int) GetCurrentProcessId(),strmov(shutdown_event_name,
"MySQLShutdown"), 10);
+ /* Must be initialized early for comparison of service name */
+ system_charset_info= &my_charset_utf8_general_ci;
+
if (Service.GetOS()) /* true NT family */
{
char file_path[FN_REFLEN];