kent@kent-amd64.(none)
0544355385
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-28 23:08:00 +02:00
kent@mysql.com/kent-amd64.(none)
4ad479b891
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-27 17:51:30 +02:00
kent@mysql.com/kent-amd64.(none)
ef530348cd
mysql.spec.sh, Makefile.am:
...
Don't use explicit calls to mysql-test-run in spec
2007-03-27 17:42:55 +02:00
tsmith@quadxeon.mysql.com
2670f149d0
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/50
2007-03-20 20:59:41 +01:00
mtaylor@qualinost.(none)
1f1bb54c19
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-03-20 11:18:40 -07:00
serg@janus.mylan
e9fb4a686f
dbug/dbug.c: unused variable removed
...
include/config-win.h: SIZEOF_INT
include/my_global.h: win64 fix
support-files/Makefile.am: automake magic
2007-03-17 11:19:21 +01:00
serg@janus.mylan
f813272125
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-03-16 14:09:30 +01:00
mtaylor@qualinost.(none)
1c3f9ce727
BUG#26952: mysql.server needs to be able to not timeout in certain situations
...
For systems running MySQL through heartbeat, it is imperitive that the startup scripts
not only return correct return values, but do not return until success or failure has been
determined. This is a different behavior than is typically wanted for the startup
of a normal machine.
This patch adds support for a timeout variable for mysql.server. Read from my.cnf, this
variable defaults to 900 (the current default). A value of 0 means not to wait at all for
startup confirmation. A negative value means to wait forever.
2007-03-13 06:06:09 -07:00
df@pippilotta.erinye.com
1052f8702b
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-03-08 18:13:06 +01:00
df@pippilotta.erinye.com
7665f50e9c
add comment to compiler_warnings.supp
2007-03-08 18:12:16 +01:00
kent@mysql.com/kent-amd64.(none)
8b2a4b2c47
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-07 23:05:46 +01:00
serg@janus.mylan
6aa5c001c5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-03-06 13:44:57 +01:00
joerg@trift2.
a91f84eb09
Merge trift2.:/MySQL/M50/manpages-5.0
...
into trift2.:/MySQL/M51/manpages-5.1
2007-03-02 17:15:13 +01:00
joerg@trift2.
9cdd21515b
Merge trift2.:/MySQL/M41/manpages-4.1
...
into trift2.:/MySQL/M50/manpages-5.0
2007-03-02 17:01:24 +01:00
joerg@trift2.
57bc6066e3
Merge trift2.:/MySQL/M40/manpages-4.0
...
into trift2.:/MySQL/M41/manpages-4.1
2007-03-02 16:34:29 +01:00
joerg@trift2.
6158657090
More man pages for the RPMs.
2007-03-02 16:32:27 +01:00
joerg@trift2.
c1c22df202
Another man page in the RPMs.
2007-03-02 16:30:22 +01:00
joerg@trift2.
ce9452152e
Add man pages for NDB to the RPMs.
2007-03-02 14:13:13 +01:00
joerg@trift2.
dfce4c8ffd
Add the man pages for NDB to the RPMs.
2007-03-02 14:08:32 +01:00
joerg@trift2.
3e2e58d60e
Add the man pages for NDB to the RPMs.
2007-03-02 14:05:43 +01:00
joerg@trift2.
1775f82d58
Add missing man pages to the RPMs.
2007-03-02 14:03:28 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
a934e46ebd
Fixed compiler warnings.
2007-03-01 11:28:33 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
ff5376986f
Disabled compiler warnings.
2007-03-01 10:52:25 +02:00
jani@ua141d10.elisa.omakaista.fi
bcbc0031eb
Fixed compiler warnings.
2007-02-28 22:23:35 +02:00
monty@mysql.com/narttu.mysql.fi
0cabe9d4f2
Fix (last) compiler warnings
2007-02-27 20:06:37 +02:00
monty@mysql.com/narttu.mysql.fi
cfef5d04b3
Remove compiler warnings
2007-02-27 19:31:49 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
6163508f85
Fixes for compiler warnings.
2007-02-27 11:27:04 +02:00
serg@janus.mylan
30321673a2
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-02-26 16:12:40 +01:00
knielsen@ymer.(none)
83a5eac0a4
Merge ymer.(none):/tmp/mysql-5.0
...
into ymer.(none):/tmp/mysql-5.1
2007-02-26 08:12:02 +01:00
knielsen@ymer.(none)
01ea1aa44d
Compiler warning suppression fix: Add missing file to 'make dist'.
2007-02-26 08:11:10 +01:00
monty@mysql.com/narttu.mysql.fi
f0ae3ce9b9
Fixed compiler warnings
...
Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.
Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.
Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
2007-02-23 13:13:55 +02:00
monty@mysql.com/narttu.mysql.fi
8f4fef291d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-02-22 20:32:19 +02:00
monty@mysql.com/narttu.mysql.fi
510c1238ac
Portability fix
...
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
2007-02-22 20:20:49 +02:00
serg@janus.mylan
e55719ac3b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-02-22 17:05:24 +01:00
monty@mysql.com/narttu.mysql.fi
e5cc397f33
Fixed compiler warnings (for linux and win32 and win64)
...
Fixed a couple of usage of not initialized warnings (unlikely cases)
2007-02-22 16:59:57 +02:00
monty@mysql.com/narttu.mysql.fi
6946fa682f
After merge fixes
...
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
2007-02-21 19:38:40 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-02-21 14:07:08 +02:00
serg@janus.mylan
689eed7406
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-02-21 11:36:23 +01:00
joerg@trift2.
b2d20b04fc
Merge trift2.:/MySQL/M50/merge-5.0
...
into trift2.:/MySQL/M51/merge-5.1
2007-02-21 09:45:13 +01:00
joerg@trift2.
4cb11ae425
Merge trift2.:/MySQL/M41/merge-4.1
...
into trift2.:/MySQL/M50/merge-5.0
2007-02-20 20:18:29 +01:00
serg@janus.mylan
3dafdf7de2
/usr/share/aclocal/mysql.m4
2007-02-14 12:42:11 +01:00
msvensson@neptunus.(none)
e4001b3b5a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-02-06 15:46:17 +01:00
msvensson@neptunus.(none)
ede3afe470
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 14:45:08 +01:00
svoj@june.mysql.com
4a6770e06e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-02-05 15:31:20 +04:00
istruewing@chilla.local
bdf18a85f9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-03 09:43:38 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2007-02-03 00:58:09 +02:00
istruewing@chilla.local
ed09987083
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 19:41:04 +01:00
cmiller@zippy.cornsilk.net
b81f4a8314
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-31 16:14:42 -05:00
cmiller@zippy.cornsilk.net
5a0ac8afe7
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-31 16:14:12 -05:00
cmiller@zippy.cornsilk.net
a3a9d8bd84
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
2007-01-31 16:09:36 -05:00