mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
61679 commits 2784 branches 343 tags 1.6 GiB
Commit graph

155 commits

Author SHA1 Message Date
Alexander Nozdrin
04b8cb1882 Manual merge from mysql-trunk-merge. 
Conflicts:
  - client/mysql.cc
  - client/mysqldump.c
  - configure.in
  - mysql-test/r/csv.result
  - mysql-test/r/func_time.result
  - mysql-test/r/show_check.result
  - mysql-test/r/sp-error.result
  - mysql-test/r/sp.result
  - mysql-test/r/sp_trans.result
  - mysql-test/r/type_blob.result
  - mysql-test/r/type_timestamp.result
  - mysql-test/r/warnings.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - sql/mysql_priv.h
  - sql/mysqld.cc
  - sql/sp.cc
  - sql/sql_base.cc
  - sql/sql_table.cc
  - sql/sql_trigger.cc
  - sql/sql_view.cc
  - sql/table.h
  - sql/share/errmsg.txt
  - mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
 2010-02-24 16:52:27 +03:00
Alexey Kopytov
92a5dd0323 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 
Conflicts:

Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
 2010-02-23 16:26:45 +03:00
Staale Smedseng
5181551dee Bug #43414 Parenthesis (and other) warnings compiling 
MySQL with gcc 4.3.2
      
This is the final patch in the context of this bug.
 2010-02-22 14:23:47 +01:00
Vladislav Vaintroub
5c7a62287e Fix build with LDFLAGS=--Wl,--as-needed on Linux 2009-12-19 22:15:10 +01:00
Vladislav Vaintroub
2ff2d1873a merge 2009-12-16 15:34:11 +01:00
Alexander Nozdrin
2ae8acc294 Remove .cvsignore files (attempt #2). 2009-12-16 11:24:30 +03:00
Vladislav Vaintroub
3d6465d987 Fix libedit out-of-source build 2009-11-10 18:24:59 +01:00
Vladislav Vaintroub
2dced72b27 remove debug output 2009-11-10 02:43:23 +01:00
Vladislav Vaintroub
c69715f36b refactor libedit, generate files in binary tree, not in source tree 2009-11-10 02:19:58 +01:00
Vladislav Vaintroub
13cd7170cc WL#5161 : Cross-platform build with CMake 2009-11-09 12:32:48 +01:00
Staale Smedseng
8b9843408d Bug #43414 Parenthesis (and other) warnings compiling MySQL 
with gcc 4.3.2

Cleaning up warnings not present in 5.0.
 2009-09-23 15:21:29 +02:00
Jonathan Perkin
b74d8fa21e Merge from mysql-5.1.38-release 2009-09-03 01:48:06 +02:00
Staale Smedseng
f59ef9eafa Merge from 5.0 for 43414 2009-08-28 18:21:54 +02:00
Staale Smedseng
2217de2513 Bug #43414 Parenthesis (and other) warnings compiling MySQL 
with gcc 4.3.2
      
This patch fixes a number of GCC warnings about variables used
before initialized. A new macro UNINIT_VAR() is introduced for
use in the variable declaration, and LINT_INIT() usage will be
gradually deprecated. (A workaround is used for g++, pending a
patch for a g++ bug.)
      
GCC warnings for unused results (attribute warn_unused_result)
for a number of system calls (present at least in later
Ubuntus, where the usual void cast trick doesn't work) are
also fixed.
 2009-08-28 17:51:31 +02:00
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