Skip to content

Commit f0ae3ce

Browse files
author
[email protected]/narttu.mysql.fi
committed
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
1 parent a5051aa commit f0ae3ce

171 files changed

Lines changed: 2299 additions & 2584 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.bzrignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2951,3 +2951,4 @@ win/vs71cache.txt
29512951
win/vs8cache.txt
29522952
zlib/*.ds?
29532953
zlib/*.vcproj
2954+
storage/ndb/src/ndbapi/ndberror_check

‎BUILD/SETUP.sh.rej‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎BUILD/compile-pentium‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /bin/sh
22

33
path=`dirname $0`
4-
. "$path/SETUP.sh"
4+
. "$path/SETUP.sh" $@
55

66
extra_flags="$pentium_cflags $fast_cflags"
77
extra_configs="$pentium_configs $static_link"

‎BUILD/compile-pentium64‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
#! /bin/sh
22

33
path=`dirname $0`
4-
. "$path/SETUP.sh" $@ --with-debug=full
4+
. "$path/SETUP.sh" $@
55

66
extra_flags="$pentium64_cflags $fast_cflags"
7-
c_warnings="$c_warnings"
8-
cxx_warnings="$cxx_warnings"
97
extra_configs="$pentium_configs $static_link"
10-
11-
extra_configs="$extra_configs "
128
CC="$CC --pipe"
9+
strip=yes
10+
1311
. "$path/FINISH.sh"

‎BUILD/compile-pentium64-max‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#! /bin/sh
2+
3+
path=`dirname $0`
4+
. "$path/SETUP.sh" $@
5+
6+
extra_flags="$pentium64_cflags $fast_cflags"
7+
extra_configs="$pentium_configs $max_configs $static_link"
8+
CC="$CC --pipe"
9+
strip=yes
10+
11+
. "$path/FINISH.sh"

‎BUILD/compile-solaris-sparc‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1-
#!/usr/bin/bash
1+
#! /bin/sh
2+
3+
make -k clean || true
4+
/bin/rm -f */.deps/*.P config.cache
5+
6+
# gcc is often in /usr/ccs/bin or /usr/local/bin
7+
PATH=$PATH:/usr/ccs/bin:/usr/local/bin
8+
29
path=`dirname $0`
3-
. "$path/SETUP.sh"
4-
extra_flags=""
5-
extra_configs="$max_configs"
10+
. "$path/autorun.sh"
11+
12+
CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client
613

7-
. "$path/FINISH.sh"
14+
make -j 4

‎BUILD/compile-solaris-sparc-debug‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
#!/usr/bin/bash
1+
#!/bin/sh
2+
3+
make -k clean || true
4+
/bin/rm -f */.deps/*.P config.cache
5+
26
path=`dirname $0`
3-
. "$path/SETUP.sh"
4-
extra_flags="$debug_cflags"
5-
extra_configs="$debug_configs $max_configs"
7+
. "$path/autorun.sh"
8+
9+
CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-debug
610

7-
. "$path/FINISH.sh"
11+
make -j 4

‎BUILD/compile-solaris-sparc-forte‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#! /bin/sh
22

3-
gmake -k clean || true
3+
# Assume Forte is installed in /opt/SUNWSpro and ld is installed in
4+
# /usr/ccs/bin
5+
6+
PATH=/opt/SUNWspro/bin/:/usr/ccs/bin:$PATH
7+
8+
make -k clean || true
49
/bin/rm -f */.deps/*.P config.cache
510

611
path=`dirname $0`
712
. "$path/autorun.sh"
813

9-
10-
# Assume Forte is installed in /opt/SUNWSpro
11-
12-
PATH=/opt/SUNWspro/bin/:$PATH
13-
1414
# For "optimal" code for this computer add -fast to EXTRA
1515
# To compile 64 bit, add -xarch=v9 to EXTRA_64_BIT
1616

@@ -27,7 +27,7 @@ CC=cc-5.0 CFLAGS="-Xa -xstrconst $STD" \
2727
CXX=CC CXXFLAGS="-noex $STD" \
2828
./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client
2929

30-
gmake -j 4
30+
make -j 4
3131
if [ $? = 0 ]
3232
then
3333
make test

‎BUILD/compile-solaris-sparc-purify‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ do
3131
shift
3232
done
3333

34-
gmake -k clean || true
34+
make -k clean || true
3535
/bin/rm -f */.deps/*.P config.cache
3636

3737
path=`dirname $0`
3838
. "$path/autorun.sh"
3939

4040
CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS
4141

42-
gmake -j 4
42+
make -j 4
4343

4444
# ----------------------------------------------------------------------
4545

@@ -75,17 +75,17 @@ purifying_binaries ()
7575
fi
7676

7777
if [ -n "$mode" -a $mode = purify ] ; then
78-
gmake CCLD="purify $opts gcc" CXXLD="purify $opts g++" $target
78+
make CCLD="purify $opts gcc" CXXLD="purify $opts g++" $target
7979
mv $binary $binary-purify
8080
fi
8181

8282
if [ -n "$mode" -a $mode = quantify ] ; then
83-
gmake CCLD="quantify $opts gcc" CXXLD="quantify $opts g++" $target
83+
make CCLD="quantify $opts gcc" CXXLD="quantify $opts g++" $target
8484
mv $binary $binary-quantify
8585
fi
8686

8787
if [ -n "$mode" -a $mode = purecov ] ; then
88-
gmake CCLD="purecov $opts gcc" CXXLD="purecov $opts g++" $target
88+
make CCLD="purecov $opts gcc" CXXLD="purecov $opts g++" $target
8989
mv $binary $binary-purecov
9090
fi
9191

‎client/mysqlbinlog.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1481,7 +1481,7 @@ static int dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
14811481

14821482
int main(int argc, char** argv)
14831483
{
1484-
static char **defaults_argv;
1484+
char **defaults_argv;
14851485
int exit_value= 0;
14861486
ulonglong save_stop_position;
14871487
MY_INIT(argv[0]);

0 commit comments

Comments
 (0)