tsmith@siva.hindu.god
4a4590cd49
Merge siva.hindu.god:/home/tsmith/m/bk/51
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-05-17 14:21:35 -06:00
kaa@polly.local
722b690743
Merge polly.local:/home/kaa/src/maint/bug28240/my50-bug24240
...
into polly.local:/home/kaa/src/maint/bug28240/my51-bug24240
2007-05-10 17:07:27 +04:00
kaa@polly.local
51af6a4077
Fix for bug #28240 : "isinf()" cannot be used in C++ for lack of prototype
...
Since isinf() portability across various platforms and compilers is a complicated question, we should not use it directly. Instead, the my_isinf() macro should be used, which is defined as an alias to the system-defined isinf() if it is safe to use, or a workaround implementation otherwise.
2007-05-08 21:11:46 +04:00
acurtis/antony@ltamd64.xiphis.org
a4dbc0990c
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
...
into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
2007-05-04 23:35:14 -07:00
kaa@polly.local
4b5079fe99
Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-04-30 13:33:13 +04:00
serg@sergbook.mysql.com
1bd2953c02
compilation/test fixes
2007-04-29 17:46:18 -07:00
serg@sergbook.mysql.com
10057bf4c3
compilation failure
2007-04-29 09:00:08 -07:00
kaa@polly.local
3bed463963
If isinf() is not available on a target platform, use our own imlementation via finite() and isnan(). If either of the last two is not available as well, use simple replacements which are platform-neutral, but slower than compiler intrinsics.
2007-04-29 16:57:17 +04:00
istruewing@chilla.local
e327818c28
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-wl2936-two
2007-04-27 19:09:39 +02:00
msvensson@pilot.blaudden
b841154e65
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-24 14:07:30 +02:00
msvensson@pilot.blaudden
9bd17ef189
Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-24 13:59:44 +02:00
msvensson@pilot.blaudden
4563137549
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-24 11:21:42 +02:00
msvensson@pilot.blaudden
f028e17ab7
Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-24 11:16:56 +02:00
msvensson@pilot.blaudden
01133f8e6f
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-18 14:18:55 +02:00
msvensson@pilot.blaudden
dd0d2146c3
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3
Bug#25452 mysql_upgrade access denied
...
- Improve mysql_upgrade and add comments describing it's logic
- Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
was started from
- Don't look for mysql_fix_privilege_tables.sql randomly, compile
in the mysql_fix_privilege_tables.sql file and use that to upgrade
the system tables of MySQL
- Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
- Fix bug#26639, bug#24248 and bug#25405
2007-04-18 13:21:39 +02:00
serg@sergbook.mysql.com
6bc9bc92df
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
2007-04-16 10:37:50 +02:00
msvensson@pilot.blaudden
c405f94cfb
Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c
...
- Rely only on HAVE_ISINF to determine if 'isinf' can be used.
2007-04-12 10:29:22 +02:00
msvensson@pilot.blaudden
7563ebefca
Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h
...
- Move marcos for __attribute__ usage to my_attribute.h and
include that file where needed
2007-04-12 00:43:25 +02:00
antony@ppcg5.local
d4d37f113e
WL#2936
...
"Server variables for plugins"
Post review fixes.
2007-03-23 10:14:46 -07:00
tsmith@quadxeon.mysql.com
54e7bc8daa
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-22 01:04:39 +01:00
df@pippilotta.erinye.com
8161dcaacb
build fix for netware
2007-03-20 13:32:49 +01:00
kostja@bodhi.local
bdb10baec1
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-03-20 00:42:11 +03: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
malff/marcsql@weblab.(none)
e677c6e70f
Manual merge from 5.0-runtime to 5.1-runtime
2007-03-14 17:38:06 -06:00
anozdrin/alik@booka.opbmk
c666e2f276
Polishing: use constants instead of magic numbers.
2007-03-09 08:05:08 +03: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
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
mats@romeo.(none)
0a2e305c02
Changes to fix building on Windows.
2007-02-24 17:33:58 +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
mats@romeo.(none)
54b04ff5c8
BUG#19033 (RBR: slave does not handle schema changes correctly):
...
Post-merge fixes.
2007-02-23 18:54:26 +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
222e128b34
Fixed unsafe define of uint4korr()
...
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
2007-02-21 13:02:57 +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
serg@janus.mylan
045d704709
move intptr from my_atomic.h to my_global.h
2007-01-28 21:12:58 +01:00
monty@narttu.mysql.fi
8a80e36ac3
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
monty@mysql.com/narttu.mysql.fi
120e3f5ee1
Avoid compiler warnings on powermacg5
...
Fixed compilation error when trying to compile libmysqld on powermac
2007-01-23 16:42:03 +02:00
tsmith@siva.hindu.god
6b729ff2cd
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:30:39 -07:00
tsmith@siva.hindu.god
cc7afe2494
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00
lars/lthalmann@dl145j.mysql.com
1e356251a0
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-12 12:31:44 +01:00
cmiller@zippy.cornsilk.net
896e2623eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:43:44 -05:00
mmj@tiger.mmj.dk
e36b282f1f
Merge tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build
...
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build
2007-01-04 22:24:07 +01:00
mmj@tiger.mmj.dk
37ae5bbbbe
my_global.h:
...
Add patch from Alfredo for TARGET_FAT_BINARY
2007-01-04 22:22:25 +01:00
tsmith/tim@siva.hindu.god
682596d7ce
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-26 22:28:28 -07:00
tsmith/tim@siva.hindu.god
0cb9cee7f4
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
2006-12-26 16:49:10 -07:00
kent@kent-amd64.(none)
be15e3bc15
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
tsmith/tim@siva.hindu.god
126f004a7f
Merge siva.hindu.god:/usr/home/tim/m/bk/50
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-12-14 12:56:57 -07:00