summaryrefslogtreecommitdiff
path: root/cmd-line-utils
Commit message (Collapse)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-242-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-02-232-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in client/mysqltest.cc Text conflict in configure.in Text conflict in mysql-test/include/mtr_warnings.sql
| | * Bug #43414 Parenthesis (and other) warnings compiling Staale Smedseng2010-02-222-3/+3
| | | | | | | | | | | | | | | MySQL with gcc 4.3.2 This is the final patch in the context of this bug.
* | | Fix build with LDFLAGS=--Wl,--as-needed on LinuxVladislav Vaintroub2009-12-191-1/+1
| | |
* | | mergeVladislav Vaintroub2009-12-161-3/+0
|\ \ \ | |/ /
| * | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-3/+0
| |/
* | Fix libedit out-of-source buildVladislav Vaintroub2009-11-101-1/+1
| |
* | remove debug outputVladislav Vaintroub2009-11-101-1/+0
| |
* | refactor libedit, generate files in binary tree, not in source treeVladislav Vaintroub2009-11-101-82/+83
| |
* | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-094-2/+229
|/
* Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-3/+3
| | | | | | with gcc 4.3.2 Cleaning up warnings not present in 5.0.
* Merge from mysql-5.1.38-releaseJonathan Perkin2009-09-031-2/+7
|\
| * Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-141-2/+7
| |
* | Merge from 5.0 for 43414Staale Smedseng2009-08-283-8/+8
|\ \ | |/ |/|
| * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-283-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Bug #43397 mysql headers redefine pthread_mutex_initStaale Smedseng2009-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge from 5.0Staale Smedseng2009-06-2924-201/+217
|\ \ | |/
| * Merge from 5.0-btStaale Smedseng2009-06-2924-201/+217
| |
* | Addendum to Bug #45286: backport macro name form other treeTatiana A. Nurnberg2009-06-063-4/+4
| | | | | | | | use same (slightly unwieldy) name in all trees; fix before this version goes "public". bless ctype to avoid upmerge conflict, le sigh.
* | merged 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2009-06-053-6/+5
|\ \ | |/
| * Addendum to Bug #45286 : implement reviewer's remarks.Georgi Kodinov2009-06-051-4/+2
| |
| * Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSXGeorgi Kodinov2009-06-052-2/+3
| | | | | | | | | | Implemented a way to circumvent the always true comparison by having nested macros (as suggested on review).
* | automergeGeorgi Kodinov2009-06-052-2/+4
|\ \ | |/
| * Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSXGeorgi Kodinov2009-06-052-2/+4
| | | | | | Fixed the 5.0-bugteam MacOSX warnings.
* | Merge from 5.0-bugteamStaale Smedseng2009-04-161-1/+1
|\ \ | |/
| * Bug#42430 Final commit to 5.0-bugteamStaale Smedseng2009-04-161-1/+1
| |
* | merge -5.0 into -5.1 (minor conflicts resolved)Timothy Smith2009-04-011-1/+1
|\ \ | |/
| * cmd-line-utils/libedit/readline/readline.hkent.boortz@sun.com2009-03-191-1/+1
| | | | | | | | | | | | | | | | | | - 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"
| * Back patched libedit portability changes from 5.1.32kent.boortz@sun.com2009-03-094-9/+6
| |
* | Disabled libedit use of '__weak_reference' on FreeBSD, doesn't compilekent.boortz@sun.com2009-02-141-2/+2
| |
* | More portability fixes.jperkin@sun.com2009-02-122-6/+3
| |
* | Exclude libedit inclusion of <sys/ttydefaults.h> on AIX as wellkent.boortz@sun.com2009-02-121-1/+1
| |
* | Changed to use the correct "__sun" and "__hpux" predefinedkent.boortz@sun.com2009-02-111-1/+1
| | | | | | | | preprocessor symbols in libedit
* | merged 5.0-bugteam to 5.1-bugteamGeorgi Kodinov2009-02-102-1/+3
|\ \ | |/
| * fixed a libedit compilation problemGeorgi Kodinov2009-02-102-1/+3
| |
* | merged 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2009-02-1055-3920/+2268
|\ \ | |/
| * From jperkin : Merge libedit 2.11 and related files, Georgi Kodinov2009-02-1055-3917/+2265
| | | | | | | | based on NetBSD CVS as of 2009/02/06 20:09:00.
| * Merge ↵antony@pcg5ppc.xiphis.org2008-03-075-7/+9
| |\ | | | | | | | | | | | | | | | 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
* | \ Merge ↵antony@pcg5ppc.xiphis.org2008-03-075-7/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | 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
| * \ \ Merge mysql.com:/home/bar/mysql-work/mysql-5.0-enginesbar@bar.myoffice.izhnet.ru2008-03-075-7/+9
| |\ \ \ | | | |/ | | |/| | | | | into mysql.com:/home/bar/mysql-work/mysql-5.1-engines
| | * | Bug#23097 mysql can't insert korean on mysql prompt.bar@mysql.com/bar.myoffice.izhnet.ru2008-03-045-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2008-01-2335-35/+35
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| * | use correct config_readline.h filedf@pippilotta.erinye.com2008-01-0335-35/+35
| |/
* | Merge ↵df@pippilotta.erinye.com2007-11-1943-1507/+3610
|\ \ | |/ | | | | | | | | 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
| * Update readline to version 5.2. This fixes bug#18431.df@pippilotta.erinye.com2007-11-1943-1507/+3610
| |
* | Merge mysql.com:/home/kent/bk/bug24809/mysql-5.0-buildkent@kent-amd64.(none)2007-10-311-3/+9
|\ \ | |/ | | | | into mysql.com:/home/kent/bk/bug24809/mysql-5.1-build
| * Makefile.am:kent@mysql.com/kent-amd64.(none)2007-10-301-3/+9
| | | | | | | | | | Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS, work around for problem with automake 1.10 (bug#24809)
* | make_binary_distribution.sh:kent@mysql.com/kent-amd64.(none)2007-09-262-7/+7
| | | | | | | | | | | | | | | | Use 'make install' to create the package Makefile.am: Added 'pkgsuppdir' to control location separately Pass on mandir and infodir Don't install headers
* | Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-buildkent@kent-amd64.(none)2007-07-301-2/+2
|\ \ | |/ | | | | into mysql.com:/home/kent/bk/config_h/mysql-5.1-build
| * Generate "config.h" directly into the "include" directory, later copiedkent@mysql.com/kent-amd64.(none)2007-07-301-2/+2
| | | | | | | | | | | | 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.
View Lorry Controller Status