summaryrefslogtreecommitdiff
path: root/cmd-line-utils
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'mysql-5.5.44' into bb-5.5-sergSergei Golubchik2015-06-054-13/+22
|\
| * Merge branch 'mysql-5.1' into mysql-5.5Arun Kuruvila2015-04-244-13/+22
| |\
| | * Bug#20318154 : NEGATIVE ARRAY INDEX WRITE V2Arun Kuruvila2015-04-244-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Description:- There is a possibility of negative array index write associated with the function "terminal_writec()". This is due to the assumption that there is a possibility of getting -1 return value from the function call "ct_visual_char()". Analysis:- The function "terminal_writec()" is called only from "em_delete_or_list()" and "vi_list_or_eof()" and both these functions deal with the "^D" (ctrl+D) signal. So the "size_t len" and "Char c" passed to "ct_visual_char()" (when called from "terminal_writec()") is always 8 (macro VISUAL_WIDTH_MAX is passed whose value is 8) and 4 (ASCII value for "^D"/"ctrl+D") respectively. Since the value of "c" is 4, "ct_chr_class()" returns -1 (macro CHTYPE_ASCIICTL is associated with -1 value). And since value of "len" is 8, "ct_visual_char()" will always return 2 when it is called from "terminal_writec()". So there is no possible case so that we encounter a negative array index write in "terminal_writec()". But since there is a rare posibility of using "terminal_writec()" in future enhancements, it is good handle the error case as well. Fix:- A condition is added in "terminal_writec()" to check whether "ct_visual_char()" is returning -1 or not. If the return value is -1, then value 0 is returned to its calling function "em_delete_or_list()" or "vi_list_or_eof()", which in turn will return CC_ERROR. NOTE:- No testcase is added since currently there is no possible scenario to encounter this error case.
| | * Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1958-61/+65
| | |
| | * Updated/added copyright headers.Murthy Narkedimilli2013-02-251-1/+1
| | |
| * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1957-59/+59
| | |
| * | weave merge of mysql-5.1->mysql-5.5Georgi Kodinov2012-01-123-5/+5
| |\ \ | | |/ | | | | | | merge of Nirbhay's AIX compilation fix for 5.1.61
| | * Fixes required to build on AIXKaren Langford2012-01-113-5/+5
| | |
| * | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2011-11-184-9/+21
| |\ \ | | |/ | | | | | | | | | | | | | | | I manually checked that all the conflicting InnoDB changes are in 5.5 already. Two things I am not sure about - I commented them with XXX in this patch. I will further check with the authors of the changesets whether these things should be present or not.
| | * Patch to fix stdint.h missing from pre Solaris 10 versions.Karen Langford2011-10-292-0/+12
| | |
| | * Patch to fix libedit vis.h problem (OSX/FreeBSD)Karen Langford2011-10-283-9/+9
| | |
| * | Local merge from mysql-5.1.Nirbhay Choubey2011-10-242-3/+3
| |\ \ | | |/
| | * WL#5945 - Improve libedit libraryNirbhay Choubey2011-10-242-3/+3
| | | | | | | | | | | | | | | Fixed a misplaced parenthesis, injected due to syncing from libedit CVS head.
| * | Merge of fix for bug#13106585 from mysql-5.1.Nirbhay Choubey2011-10-216-18/+15
| |\ \ | | |/
| | * Bug#13106585 PUSH FOR "WL#5945 : IMPROVE LIBEDIT LIBRARY"Nirbhay Choubey2011-10-216-22/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BREAKS SOURCE RELEASE BUILD Some of the required files were not getting copied while performing 'make dist' and hence the build failed for the created distribution source. Added the missing files to Makefile.am.
| * | Merge of fix for bug#13102538 from mysql-5.1.Nirbhay Choubey2011-10-185-5/+0
| |\ \ | | |/
| | * Bug#13102538 : COMPILE ERROR ON SOLARIS WHEN COMPILINGNirbhay Choubey2011-10-185-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WITH LIBEDIT Libedit won't build on platforms that do not provide "sys/cdefs.h". Removed the inclusion of cdefs.h from all files other that sys.h, which includes this file only when the header is found while configuring.
| * | Merge of changeset of WL#5945 from mysql-5.1.Nirbhay Choubey2011-10-1452-2989/+5373
| |\ \ | | |/
| | * WL#5945 : Improve libedit libraryNirbhay Choubey2011-10-1452-2994/+5373
| | | | | | | | | | | | Updated libedit library.
| * | Updated/added copyright headersKent Boortz2011-06-301-1/+1
| |\ \
| * \ \ Merge of fix for bug#11757855 from mysql-5.1 -> mysql-5.5.Nirbhay Choubey2011-04-301-5/+16
| |\ \ \ | | | |/ | | |/|
| | * | Bug#11757855 - 49967: built-in libedit doesn't readNirbhay Choubey2011-04-291-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .editrc on linux. MySQL client when build with libedit support ignores .editrc at startup. The reason for this regression was the incluison of a safety check, issetugid(), which is not available on some linux platforms. Fixed by adding an equivalent check for platforms which have get[e][u|g]id() set of functions.
| * | | Merge of fix for bug#12329909 from mysql-5.1 -> mysql-5.5.Nirbhay Choubey2011-04-271-2/+10
| |\ \ \ | | |/ /
| | * | BUG#12329909 - BUILDING MYSQL WITH DEBUG SUPPORTNirbhay Choubey2011-04-271-2/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | FAILS WITH LIBEDIT Fixed by checking the return value of the write() function calls and handling the open files and fd appropriately.
| * | Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and 'THREAD_SAFE_CLIENT'. As of MySQL 5.5, we no longer support non-threaded builds. This patch removes all references to the obsolete THREAD and THREAD_SAFE_CLIENT preprocessor symbols. These were used to distinguish between threaded and non-threaded builds.
| * | Fix detection of tgoto declaration:Vladislav Vaintroub2010-11-271-0/+15
| | | | | | | | | | | | | | | it needs curses.h to be included before term.h on Solaris Express 11
| * | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-203-147/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotools-based build system has been superseded and is being removed in order to ease the maintenance burden on developers tweaking and maintaining the build system. In order to support tools that need to extract the server version, a new file that (only) contains the server version, called VERSION, is introduced. The file contents are human and machine-readable. The format is: MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=5 MYSQL_VERSION_PATCH=8 MYSQL_VERSION_EXTRA=-rc The CMake based version extraction in cmake/mysql_version.cmake is changed to extract the version from this file. The configure to CMake wrapper is retained for backwards compatibility and to support the BUILD/ scripts. Also, a new a makefile target show-dist-name that prints the server version is introduced.
| * | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-11-161-1/+1
| |\ \ | | |/
| | * Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#57995: Compiler flag change build error on OSX 10.4: my_getncpus.c Bug#57996: Compiler flag change build error on OSX 10.5 : bind.c Bug#57994: Compiler flag change build error : my_redel.c Bug#57993: Compiler flag change build error on FreeBsd 7.0 : regexec.c Bug#57992: Compiler flag change build error on FreeBsd : mf_keycache.c Bug#57997: Compiler flag change build error on OSX 10.6: debug_sync.cc Fix assorted compiler generated warnings.
| * | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-10-207-13/+16
| |\ \ | | |/
| | * Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-207-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fix assorted warnings that are generated in optimized builds. Most of it is silencing variables that are set but unused. This patch also introduces the MY_ASSERT_UNREACHABLE macro which helps the compiler to deduce that a certain piece of code is unreachable.
| * | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-10-193-24/+33
| |\ \ | | |/
| | * Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-194-26/+34
| | | | | | | | | Tag or remove unused arguments and variables.
| * | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-10-191-4/+4
| |\ \ | | |/
| | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-10-191-4/+4
| | | | | | | | | Fix assorted compiler warnings on Mac OS X.
| * | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-122-6/+6
| | | | | | | | | Fixing copyright text.
| * | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-1/+1
| |\ \ | | |/
| | * Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-022-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apart strict-aliasing warnings, fix the remaining warnings generated by GCC 4.4.4 -Wall and -Wextra flags. One major source of warnings was the in-house function my_bcmp which (unconventionally) took pointers to unsigned characters as the byte sequences to be compared. Since my_bcmp and bcmp are deprecated functions whose only difference with memcmp is the return value, every use of the function is replaced with memcmp as the special return value wasn't actually being used by any caller. There were also various other warnings, mostly due to type mismatches, missing return values, missing prototypes, dead code (unreachable) and ignored return values.
| * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix various mismatches between function's language linkage. Any particular function that is declared in C++ but should be callable from C must have C linkage. Note that function types with different linkages are also distinct. Thus, if a function type is declared in C code, it will have C linkage (same if declared in a extern "C" block).
| * | Bug #53445 Build with -Wall and fix warnings that it generatesTor Didriksen2010-05-261-2/+1
| | | | | | | | | | | | | | | Add -Wall to gcc/g++ Fix most warnings reported in dbg and opt mode.
| * | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-192-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | (make relies GNU extentions). The patch was partially backport from 6.0. Original comment: bug#30708: make relies GNU extensions. Now that we no longer use BitKeeper we can safely remove the SCCS handling with no loss of functionality.
| * | 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
| | |