rafal@quant.(none)
8aee1f6e89
Fixes of compilation warnings and errors.
2007-03-01 08:41:13 +01:00
malff/marcsql@weblab.(none)
dc98aa82ab
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-02-28 18:14:56 -07:00
kostja@bodhi.local
8b07431927
Remove dead code: flush_version was never increased in the server,
...
therefore the logic associated with it never worked.
2007-03-01 00:25:50 +03:00
msvensson@pilot.blaudden
9591b9e922
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 16:41:30 +01:00
msvensson@pilot.blaudden
6fac51be9f
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 16:40:03 +01:00
msvensson@pilot.blaudden
b0ab925389
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 16:39:26 +01:00
msvensson@pilot.blaudden
6ca22c6672
Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages
...
- Add printout of current time when mysqld is killed by an
unhandled signal
2007-02-28 16:37:50 +01:00
msvensson@pilot.blaudden
b03f54df25
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-27 14:55:00 +01:00
msvensson@pilot.blaudden
14cfc7e1ba
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-27 14:54:33 +01:00
lars/lthalmann@dl145j.mysql.com
e1867c3156
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-02-25 00:12:14 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
1a09fb81fc
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-02-25 00:10:51 +01:00
lars/lthalmann@dl145h.mysql.com
8b39189ee4
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-02-24 11:52:08 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
1777f04e39
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-02-24 11:41:31 +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
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
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
kaa@polly.local
41eccda1df
Merge polly.local:/tmp/maint/bug25137/my51-bug25137
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-02-20 23:16:18 +03:00
kaa@polly.local
b7e6df7cc9
Merge polly.local:/tmp/maint/bug25137/my50-bug25137
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-02-20 22:23:51 +03:00
msvensson@pilot.blaudden
0af1b19568
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Fixes for 5.1
2007-02-20 16:29:56 +01:00
msvensson@pilot.blaudden
0cc2e14040
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
...
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
2007-02-20 16:26:30 +01:00
msvensson@pilot.blaudden
6caa0a232e
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
...
- Part 2, add @@hostname system variable
2007-02-20 16:24:38 +01:00
kaa@polly.local
52100678bd
Merge polly.local:/tmp/maint/bug25137/my50-bug25137
...
into polly.local:/tmp/maint/bug25137/my51-bug25137
2007-02-19 14:04:38 +03:00
kaa@polly.local
315819fed0
Bug#18743: Several test cases fails if "classic" configuration in 5.0
...
The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are:
- some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
- some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test"
2007-02-19 13:57:06 +03:00
guilhem@gbichot3.local
03dfe4ab3f
Merge gbichot3.local:/home/mysql_src/mysql-5.0-rpl-25507
...
into gbichot3.local:/home/mysql_src/mysql-5.1-rpl-25507
2007-02-15 16:05:22 +01:00
guilhem@gbichot3.local
2f75c9cd69
Backport from the Falcon tree.
...
When opening/creating the transaction coordinator's log, if binlog is
used, the tc log is the binlog so we use the binlog's name; otherwise
we use the mmap-based log, named after the mandatory argument of the
--log-tc option (meant for that).
2007-02-15 15:50:56 +01:00
msvensson@pilot.mysql.com
b6f78aa153
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-14 14:51:49 +01:00
msvensson@pilot.mysql.com
24a242bee1
Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-14 14:45:15 +01:00
msvensson@pilot.mysql.com
45fe5879f4
Bug#18628 mysql-test-run: security problem(part1)
...
- Implement --secure-file-priv=<dir> option that limits
"load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work
with files in specified dir.
- Use above option for mysqld in mysql-test-run.pl
2007-02-14 14:44:34 +01:00
tomas@poseidon.mysql.com
18d227b1b0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-14 10:18:02 +07:00
mskold/marty@mysql.com/linux.site
113a84bd33
Enabled engine_condition_pushdown (on) as default
2007-02-09 21:04:43 +01:00
tsmith@siva.hindu.god
498756195a
Merge siva.hindu.god:/home/tsmith/m/bk/51
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-02-08 16:02:58 -07:00
svoj@mysql.com/april.(none)
db8a7b513c
Excluded wrongly merged changeset.
2007-02-07 01:37:21 +04: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
msvensson@pilot.mysql.com
256cb08ba9
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:44:05 +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
dde4f421f1
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-03 09:44:40 +01: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
77e99fe2ce
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 23:05:46 +01:00
istruewing@chilla.local
177a366e53
After merge fix
2007-02-02 20:19:13 +01: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
istruewing@chilla.local
33e1d1091a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 15:51:25 +01:00
gluh@mysql.com/eagle.(none)
010dc0b55c
Valgrind error fixes
...
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
2007-02-01 18:00:24 +04:00
istruewing@chilla.local
1c34270464
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 10:19:22 +01:00
istruewing@chilla.local
73e61944f7
Merge chilla.local:/home/mydev/mysql-4.0-axmrg
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 08:09:36 +01:00
cmiller@zippy.cornsilk.net
a795b7097f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-31 16:26:12 -05:00
cmiller@zippy.cornsilk.net
522d6fb0cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-31 16:24:28 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-31 16:23:05 -05:00
bar@mysql.com
b81d6b8f66
Merge mysql.com:/home/bar/mysql-5.0.b25815
...
into mysql.com:/home/bar/mysql-5.1.b25815
2007-01-31 17:01:28 +04:00