Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-01-02 12:56:48-05:00, cmiller@stripped +1 -0
Bug#23950: misplaced code in mysqld.cc, main()
We should initialize before anything else.
sql/mysqld.cc@stripped, 2007-01-02 12:56:41-05:00, cmiller@stripped +3 -1
Move MY_INIT to the top of main().
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: cmiller
# Host: zippy.cornsilk.net
# Root: /home/cmiller/work/mysql/mysql-5.0-maint
--- 1.584/sql/mysqld.cc 2007-01-02 12:57:05 -05:00
+++ 1.585/sql/mysqld.cc 2007-01-02 12:57:05 -05:00
@@ -3339,8 +3339,10 @@ int win_main(int argc, char **argv)
int main(int argc, char **argv)
#endif
{
- DEBUGGER_OFF;
MY_INIT(argv[0]); // init my_sys library & pthreads
+ /* ^^^ Nothing should be before this line! */
+
+ DEBUGGER_OFF;
#ifdef _CUSTOMSTARTUPCONFIG_
if (_cust_check_startup())
| Thread |
|---|
| • bk commit into 5.0 tree (cmiller:1.2362) BUG#23950 | Chad MILLER | 2 Jan |