diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-20 18:51:43 +0200 |
| commit | a09574517b1bb9170b33f48ab97233d6e308df78 (patch) | |
| tree | 1b46ea0f72dce27532f0c87c60ba8a1baa453fa0 /win | |
| parent | 1f3b7a187bdcd60982f40c0e04a03e1689a716b0 (diff) | |
| parent | 7540fc7707acbbcb965bb55c477d5ba6f8861999 (diff) | |
| download | mariadb-git-a09574517b1bb9170b33f48ab97233d6e308df78.tar.gz | |
Merge with MySQL 5.1.55
- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria"
- Fixed wrong assert in Aria
Now need to merge with latest xtradb before pushing
sql/ha_partition.cc:
Ensure that m_ordered_rec_buffer is not freed before close.
sql/mysqld.cc:
Changed to use opt_stack_trace instead of opt_pstack.
Removed references to pstack
sql/partition_element.h:
Ensure that connect_string is initialized
storage/maria/ma_key_recover.c:
Fixed wrong assert
Diffstat (limited to 'win')
| -rw-r--r-- | win/configure.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/win/configure.js b/win/configure.js index a2059f17f83..0b3157a7d2a 100644 --- a/win/configure.js +++ b/win/configure.js @@ -116,8 +116,7 @@ try GetValue(configureIn, "DOT_FRM_VERSION") + "\")"); configfile.WriteLine("SET (MYSQL_TCP_PORT_DEFAULT \"" + default_port + "\")"); configfile.WriteLine("SET (MYSQL_TCP_PORT \"" + actual_port + "\")"); - configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"" + - GetValue(configureIn, "MYSQL_UNIX_ADDR_DEFAULT") + "\")"); + configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"MySQL\")"); var version = GetVersion(configureIn); configfile.WriteLine("SET (VERSION \"" + version + "\")"); configfile.WriteLine("SET (MYSQL_BASE_VERSION \"" + |