Commit graph

191 commits

Author SHA1 Message Date
Jonathan Perkin
17476e2797 Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith. 2009-08-14 17:18:52 +02:00
Staale Smedseng
f46dba5a5f Bug #43397 mysql headers redefine pthread_mutex_init
unnecessarily
      
The problem is that libmysqlclient.so is built with THREAD
undefined, while a client compiling against the same header
files will see THREAD as defined and definitions in
my_pthread.h will be included, possibly resulting in undefined
symbols that cannot be resolved with libmysqlclient.so.
      
The suggested solution is to require that clients wanting to
link with libmysqlclient.so should be built with
MYSQL_CLIENT_NO_THREADS defined. This requires a documentation
change, and more details for this will be supplied if this
patch is approved.
      
The MYSQL_CLIENT_NO_THREADS define was renamed from
UNDEF_THREADS_HACK, to get a more suitable (less suspicious)
name for the define. (The UNDEF_THREADS_HACK is retained for
backwards compatibility, though.)
      
This patch is also in anticipation of WL#4958, which will
remove this problem altogether by dropping the building of
libmysqlclient.
2009-07-08 16:49:45 +02:00
Staale Smedseng
db1591a7a2 Merge from 5.0 2009-06-29 16:00:47 +02:00
Staale Smedseng
19dfaa5824 Merge from 5.0-bt 2009-06-29 15:17:01 +02:00
Tatiana A. Nurnberg
6723422415 Addendum to Bug #45286: backport macro name form other tree
use same (slightly unwieldy) name in all trees; fix before this version goes "public".
bless ctype to avoid upmerge conflict, le sigh.
2009-06-06 15:05:44 +02:00
Georgi Kodinov
845f968369 merged 5.0-bugteam -> 5.1-bugteam 2009-06-05 19:40:36 +03:00
Georgi Kodinov
c6fdeff0c7 Addendum to Bug #45286 : implement reviewer's remarks. 2009-06-05 19:23:44 +03:00
Georgi Kodinov
5db8276fe3 Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSX
Implemented a way to circumvent the always true comparison by
having nested macros (as suggested on review).
2009-06-05 18:14:56 +03:00
Georgi Kodinov
1a8eb91e06 automerge 2009-06-05 15:30:57 +03:00
Georgi Kodinov
5ec61b304c Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSX
Fixed the 5.0-bugteam MacOSX warnings.
2009-06-05 15:05:26 +03:00
Staale Smedseng
fc35ded3f4 Merge from 5.0-bugteam 2009-04-16 11:47:21 +02:00
Staale Smedseng
4387f01efd Bug#42430 Final commit to 5.0-bugteam 2009-04-16 11:40:51 +02:00
Timothy Smith
a43bab0a8b merge -5.0 into -5.1 (minor conflicts resolved) 2009-04-01 23:19:04 -06:00
kent.boortz@sun.com
677b00faf6 cmd-line-utils/libedit/readline/readline.h
- Header <sys/ttydefaults.h> missing or not usable on QNX and OpenServer 6

include/my_global.h
 - Moved down definition of function rint(), as for some platforms (in
   this case Netware) 'longlong' is not defined until later in
   "my_global.h"
2009-03-19 16:40:54 +01:00
kent.boortz@sun.com
e60cecab80 Back patched libedit portability changes from 5.1.32 2009-03-09 22:16:24 +01:00
kent.boortz@sun.com
a6c1702321 Disabled libedit use of '__weak_reference' on FreeBSD, doesn't compile 2009-02-14 01:43:21 +01:00
jperkin@sun.com
5caead0119 More portability fixes. 2009-02-12 16:01:38 +01:00
kent.boortz@sun.com
8daaad027f Exclude libedit inclusion of <sys/ttydefaults.h> on AIX as well 2009-02-12 03:31:31 +01:00
kent.boortz@sun.com
1d4e64ea07 Changed to use the correct "__sun" and "__hpux" predefined
preprocessor symbols in libedit
2009-02-11 21:33:46 +01:00
Georgi Kodinov
bf63b815fa merged 5.0-bugteam to 5.1-bugteam 2009-02-10 20:22:34 +02:00
Georgi Kodinov
1a7b0ec920 fixed a libedit compilation problem 2009-02-10 20:19:03 +02:00
Georgi Kodinov
6387fe92ea merged 5.0-bugteam -> 5.1-bugteam 2009-02-10 16:26:18 +02:00
Georgi Kodinov
773b18e69a From jperkin : Merge libedit 2.11 and related files,
based on NetBSD CVS as of 2009/02/06 20:09:00.
2009-02-10 14:39:14 +02:00
antony@pcg5ppc.xiphis.org
820068f1b7 Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.1
2008-03-07 13:46:29 -08:00
antony@pcg5ppc.xiphis.org
9c4e4640ad Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/merge.20080307/mysql-5.0
2008-03-07 13:41:11 -08:00
bar@bar.myoffice.izhnet.ru
d079c2c49d Merge mysql.com:/home/bar/mysql-work/mysql-5.0-engines
into  mysql.com:/home/bar/mysql-work/mysql-5.1-engines
2008-03-07 14:58:12 +04:00
bar@mysql.com/bar.myoffice.izhnet.ru
640a4d59fd Bug#23097 mysql can't insert korean on mysql prompt.
Problem: libedit is a very pure-ASCII oriented library,
and it is not aware of extended (0x80..0xFF) or even multi-byte
characters. It considered such characters as non-printable
and didn't allow to input them.
Fix: make libedit think that all bytes >= 0x80 are printable.
2008-03-04 16:13:08 +04:00
df@pippilotta.erinye.com
84efc3cc67 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
2008-01-23 17:43:46 +01:00
df@pippilotta.erinye.com
0ac55ddef2 use correct config_readline.h file 2008-01-03 14:26:41 +01:00
df@pippilotta.erinye.com
af3e8cb12d Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-18431
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-18431
2007-11-19 14:55:15 +01:00
df@pippilotta.erinye.com
44ab4b2e7d Update readline to version 5.2. This fixes bug#18431. 2007-11-19 14:38:08 +01:00
kent@kent-amd64.(none)
b5e97b4b04 Merge mysql.com:/home/kent/bk/bug24809/mysql-5.0-build
into  mysql.com:/home/kent/bk/bug24809/mysql-5.1-build
2007-10-31 10:52:18 +01:00
kent@mysql.com/kent-amd64.(none)
2f88dce6ff Makefile.am:
Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)
2007-10-30 20:54:31 +01:00
kent@mysql.com/kent-amd64.(none)
18acdc7581 make_binary_distribution.sh:
Use 'make install' to create the package
Makefile.am:
  Added 'pkgsuppdir' to control location separately
  Pass on mandir and infodir
  Don't install headers
2007-09-26 20:19:33 +02:00
kent@kent-amd64.(none)
fd3b865149 Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build
into  mysql.com:/home/kent/bk/config_h/mysql-5.1-build
2007-07-30 21:45:06 +02:00
kent@mysql.com/kent-amd64.(none)
a9d2569cba Generate "config.h" directly into the "include" directory, later copied
to "my_config.h". Not to pollute the top directory, and to get more control
over what is included. Made the include path for "libedit" pick up its own
"config.h" first.
2007-07-30 21:09:45 +02:00
msvensson@pilot.(none)
f8c036a052 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-07 09:22:26 +02:00
msvensson@pilot.(none)
7368985cfa Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-07 09:21:33 +02:00
msvensson@pilot.(none)
5df790445a Bug#10218 Command line recall rolls into Segmentation Fault(coredump)'
- Declare 'tgoto' if not already declared in system header files.
2007-06-04 16:42:42 +02:00
istruewing@chilla.local
581b8504f3 WL#2936 - Falcon & MySQL plugin interface: server variables
Avoid compiler warnings
2007-04-30 18:49:38 +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
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
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
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
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
joerg@trift2.
852321c7f8 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-01-31 18:20:23 +01:00
joerg@trift2.
e56eb2288c Fix bug#23293 "readline detection broken on NetBSD":
Its root cause is a difference between the "readline" and "libedit" (header files)
definitions of "rl_completion_entry_function", where the "libedit" one is wrong anyway:
This variable is used as a pointer to a function returning "char *",
but "libedit" declares it as returning "int" and then adds casts on usage.

Change it to "CPFunction *" and get rid of the casts.
2007-01-31 15:25:56 +01:00
msvensson@pilot.mysql.com
3bc4d45e29 Merge pilot.mysql.com:/home/msvensson/mysql/bug19474/my50-bug19474
into  pilot.mysql.com:/home/msvensson/mysql/bug19474/my51-bug19474
2007-01-29 12:24:49 +01:00
msvensson@pilot.mysql.com
d42b919a0b Bug#19474 readline bug: mysql: free(): invalid pointer
- Write to uninitialised memory occured since _rl_rapped_lines buffer
   was not extended in CHECK_INV_LBREAKS macro
 - Patch submitted to bug-readline@gnu.org
2007-01-29 12:24:08 +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
a04157fbb3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2007-01-22 14:04:40 +02:00
joerg@trift2.
9d4f594ac9 cmd-line-utils/readline/undo.c : Replace an "uint" cast by the expanded "unsigned int" (compile problem on QNX). 2007-01-19 11:58:29 +01: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
7c82a06dcf Remove warnings by casting 2006-12-19 20:17:33 -07:00
monty@mysql.com/narttu.mysql.fi
88dd873de0 Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
2006-12-15 00:51:37 +02:00
monty@narttu.mysql.fi
430d215c58 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-11-30 22:38:12 +02:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a Fixed compiler warnings
Don't assert if my_thread_end() is called twice (common case)
2006-11-30 21:56:03 +02:00
monty@mysql.com/nosik.monty.fi
93f246d4c1 Fixed portablity problem
Removed warnings from mysqltest scripts
2006-11-28 05:43:30 +02:00
monty@mysql.com/nosik.monty.fi
0e149b7170 Removed compiler warnings
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
2006-11-27 18:16:08 +02:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
msvensson@neptunus.(none)
7786d075e7 Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:58:19 +01:00
msvensson@neptunus.(none)
db9538c3bb Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557
into  neptunus.(none):/home/msvensson/mysql/bug16557/my51-bug16557
2006-02-21 08:57:18 +01:00
msvensson@neptunus.(none)
26d5e2d832 Bug#16557 mysql cmd-line client does not rename .mysql_history.TMP to .mysql_history
- Return error only if 'history' returns -1
2006-02-13 14:02:39 +01:00
konstantin@mysql.com
92b41ba92a Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 16:57:34 +03:00
serg@serg.mylan
14f94dc0ca many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
kent@mysql.com
37788da790 Reapplied portability changes, from changesets by kent, joerg and msvensson 2005-11-06 02:19:51 +01:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
bar@mysql.com
d99146ce2c complete.c:
Fixed compilation problem on FreeBSD,
  after discussion with Jani.
  Doesn't FreeBSD follow the standard?
2005-10-11 16:56:42 +05:00
jani@ua141d10.elisa.omakaista.fi
eaff73807c Changed __USE_XOPEN to _XOPEN_SOURCE and got rid of
some extra code.
2005-10-04 20:22:39 +03:00
jani@ua141d10.elisa.omakaista.fi
17e87da298 Some fixes including implicit declaration of a function,
using wrong type in assignment etc.
2005-10-04 18:20:57 +03:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in:
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
acf218b708 Several fixes revelaled by Intel compiler. 2005-09-23 16:47:08 +03:00
jimw@mysql.com
48536b7668 Merge mysqldev@production.mysql.com:jimw/mysql-5.0-readline
into  mysql.com:/home/jimw/my/mysql-5.0-readline
2005-07-18 18:04:52 -07:00
jimw@mysql.com
7d7a4626fc Reimplement use of "config_readline.h" to get readline configuration. 2005-07-18 18:00:19 -07:00
jimw@mysql.com
7cf58d1f86 Upgrade bundled readline to version 5.0. 2005-07-18 17:22:38 -07:00
joerg@mysql.com
b323a77375 QNX does not know "uint", so the cast is rewritten as "unsigned int". 2005-07-18 13:52:18 +02:00
joerg@mysql.com
e3feff334f cmd-line-utils/libedit/chared.c: Fix compile problem caused by use of "uint" which is undefined on QNX. 2005-07-11 15:59:49 +02:00
kent@mysql.com
a7be42163a Makefile.am:
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
matt@mysql.com
8ed0aaacdf Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-05-18 04:06:27 +02:00
kent@mysql.com
a628878bbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-14 23:48:15 +02:00
jimw@mysql.com
20037b11fd Merge mysql.com:/home/jimw/my/mysql-4.1-9603
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-13 10:03:16 -07:00
kent@mysql.com
3eebfde644 readline.h:
Include <sys/ttydefaults.h> for CodeWarrior and CTRL define
2005-05-13 11:59:17 +02:00
lenz@mysql.com
27ab139dfa - don't include sys.h directly in the autogenerated libedit source
files - include config.h instead (compile fix for FreeBSD and AIX
  4.3/5.2)
2005-05-13 10:04:35 +02:00
kent@mysql.com
7209906093 readline.c:
Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2
search.c:
  FreeBSD needs <sys/types.h> to get 'off_t' defined
2005-05-12 19:02:26 +02:00
lenz@mysql.com
b8a94814c9 - added cmd-line-utils/libedit/vis.h to the source distribution 2005-05-09 00:35:48 +02:00
jimw@mysql.com
45058e100a Eliminate gcc 4.0 warning in libedit code. (Bug #9603) 2005-05-07 08:16:43 -07:00
kent@mysql.com
c4acdc6e0f terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:
Initial Metrowerks CodeWarrior compiler support
2005-05-05 09:15:14 +02:00
lenz@mysql.com
210969a3d9 - added missing el_term.h to the source distribution (BUG#10352) 2005-05-04 10:49:42 +02:00
msvensson@neptunus.(none)
b5e96531a7 Merge neptunus.(none):/home/msvensson/mysql/bug9954
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:19:18 +02:00
msvensson@neptunus.(none)
f3c72cc891 Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
- Changed makelist.sh
  - Bump up required version of autoconf
  - Use new style to init mutex in my_thr_init
2005-04-27 09:59:12 +02:00
msvensson@neptunus.(none)
06d29ea2b7 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug2596
2005-04-21 21:52:31 +02:00
lenz@mysql.com
11bb365f68 - added missing file config_readline.h to the source distribution 2005-04-21 21:15:35 +02:00
msvensson@neptunus.(none)
0c8c032f0d Reverting back to original path of readline.h 2005-04-21 12:36:23 +02:00
msvensson@neptunus.(none)
3aecb8acce Upgrade to libedit-2.9 2005-04-21 12:06:46 +02:00