summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Collapse)AuthorAgeFilesLines
* Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-121-2/+2
| | | | Fixing copyright text.
* WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-1/+1
| | | | | | | | Remove unused string functions. include/m_string.h: Remove prototypes for unused string functions and for functions that do not exist anymore.
* WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-134/+0
| | | | | | | Remove unused macros or macro which are always defined. include/my_global.h: Remove unused macros and move macros which aren't used globally.
* WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-2/+2
| | | | | Remove the ancient and dead raid code. By now, even the server side has been removed.
* WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-3/+2
| | | | Remove unused source code and associated paraphernalia.
* WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-232-109/+2
| | | | Remove Windows related files which aren't used anymore.
* WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-7/+0
| | | | Remove unused variables.
* Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-155-76/+38
|\
| * WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-2/+2
| | | | | | | | Remove VMS specific code.
| * WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-152-43/+23
| | | | | | | | Remove MS-DOS specific code.
| * WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-152-22/+4
| | | | | | | | Remove Netware specific code.
| * Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-091-1/+1
| | | | | | | | Post-merge fix: remove reference to file that is now gone.
| * Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-083-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Essentially, the problem is that safemalloc is excruciatingly slow as it checks all allocated blocks for overrun at each memory management primitive, yielding a almost exponential slowdown for the memory management functions (malloc, realloc, free). The overrun check basically consists of verifying some bytes of a block for certain magic keys, which catches some simple forms of overrun. Another minor problem is violation of aliasing rules and that its own internal list of blocks is prone to corruption. Another issue with safemalloc is rather the maintenance cost as the tool has a significant impact on the server code. Given the magnitude of memory debuggers available nowadays, especially those that are provided with the platform malloc implementation, maintenance of a in-house and largely obsolete memory debugger becomes a burden that is not worth the effort due to its slowness and lack of support for detecting more common forms of heap corruption. Since there are third-party tools that can provide the same functionality at a lower or comparable performance cost, the solution is to simply remove safemalloc. Third-party tools can provide the same functionality at a lower or comparable performance cost. The removal of safemalloc also allows a simplification of the malloc wrappers, removing quite a bit of kludge: redefinition of my_malloc, my_free and the removal of the unused second argument of my_free. Since free() always check whether the supplied pointer is null, redudant checks are also removed. Also, this patch adds unit testing for my_malloc and moves my_realloc implementation into the same file as the other memory allocation primitives. client/mysqldump.c: Pass my_free directly as its signature is compatible with the callback type -- which wasn't the case for free_table_ent.
* | mergeGeorgi Kodinov2010-07-071-0/+1
|\ \
| * | Fix what is probably the result of a bad merge. No functional change.Davi Arnaut2010-07-061-0/+1
| | |
* | | Unset the execute bit where it's not needed.Davi Arnaut2010-07-031-0/+0
| | |
* | | 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-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. BUILD/SETUP.sh: Remove flags that are implied by -Wall and -Wextra. Do not warn about unused parameters in C++. BUILD/check-cpu: Print only the compiler version instead of verbose banner. Although the option is gcc specific, the check was only being used for GCC specific checks anyway. client/mysql.cc: bcmp is no longer defined. client/mysqltest.cc: Pass a string to function expecting a format string. Replace use of bcmp with memcmp. cmd-line-utils/readline/Makefile.am: Always define _GNU_SOURCE when compiling GNU readline. Required to make certain prototypes visible. cmd-line-utils/readline/input.c: Condition for the code to be meaningful. configure.in: Remove check for bcmp. extra/comp_err.c: Use appropriate type. extra/replace.c: Replace use of bcmp with memcmp. extra/yassl/src/crypto_wrapper.cpp: Do not ignore the return value of fgets. Retrieve the file position if fgets succeed -- if it fails, the function will bail out and return a error. extra/yassl/taocrypt/include/blowfish.hpp: Use a single array instead of accessing positions of the sbox_ through a subscript to pbox_. extra/yassl/taocrypt/include/runtime.hpp: One definition of such functions is enough. extra/yassl/taocrypt/src/aes.cpp: Avoid potentially ambiguous conditions. extra/yassl/taocrypt/src/algebra.cpp: Rename arguments to avoid shadowing related warnings. extra/yassl/taocrypt/src/blowfish.cpp: Avoid potentially ambiguous conditions. extra/yassl/taocrypt/src/integer.cpp: Do not define type within a anonymous union. Use a variable to return a value instead of leaving the result in a register -- compiler does not know the logic inside the asm. extra/yassl/taocrypt/src/misc.cpp: Define handler for pure virtual functions. Remove unused code. extra/yassl/taocrypt/src/twofish.cpp: Avoid potentially ambiguous conditions. extra/yassl/testsuite/test.hpp: Function must have C language linkage. include/m_string.h: Remove check which relied on bcmp being defined -- they weren't being used as bcmp is only visible when _BSD_SOURCE is defined. include/my_bitmap.h: Remove bogus helpers which were used only in a few files and were causing warnings about dead code. include/my_global.h: Due to G++ bug, always silence false-positive uninitialized variables warnings when compiling C++ code with G++. Remove bogus helper. libmysql/Makefile.shared: Remove built-in implementation of bcmp. mysql-test/lib/My/SafeProcess/safe_process.cc: Cast pid to largest possible type for a process identifier. mysys/mf_loadpath.c: Leave space of the ending nul. mysys/mf_pack.c: Replace bcmp with memcmp. mysys/my_bitmap.c: Dead code removal. mysys/my_gethwaddr.c: Remove unused variable. mysys/my_getopt.c: Silence bogus uninitialized variable warning. Do not cast away the constant qualifier. mysys/safemalloc.c: Cast to expected type. mysys/thr_lock.c: Silence bogus uninitialized variable warning. sql/field.cc: Replace bogus helper with a more appropriate logic which is used throughout the code. sql/item.cc: Remove bogus logical condition which always evaluates to TRUE. sql/item_create.cc: Simplify code to avoid signedness related warnings. sql/log_event.cc: Replace use of bcmp with memcmp. No need to use helpers for simple bit operations. sql/log_event_old.cc: Replace bmove_align with memcpy. sql/mysqld.cc: Move use declaration of variable to the ifdef block where it is used. Remove now-unnecessary casts and arguments. sql/set_var.cc: Replace bogus helpers with simple and classic bit operations. sql/slave.cc: Cast to expected type and silence bogus warning. sql/sql_class.h: Don't use enum values as bit flags, the supposed type safety is bogus as the combined bit flags are not a value in the enumeration. sql/udf_example.c: Only declare variable when necessary. sql/unireg.h: Replace use of bmove_align with memcpy. storage/innobase/os/os0file.c: Silence bogus warning. storage/myisam/mi_open.c: Remove bogus cast, DBUG_DUMP expects a pointer to unsigned char. storage/myisam/mi_page.c: Remove bogus cast, DBUG_DUMP expects a pointer to unsigned char. strings/bcmp.c: Remove built-in bcmp. strings/ctype-ucs2.c: Silence bogus warning. tests/mysql_client_test.c: Use a appropriate type as expected by simple_command().
| * | Automerge.Alexey Kopytov2010-07-011-1/+1
| |\ \
* | \ \ Automerge.Alexey Kopytov2010-07-011-1/+1
|\ \ \ \
| * \ \ \ Manual merge from 5.1.Alexey Kopytov2010-07-011-1/+1
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | | | | | conflicts: conflict include/my_alarm.h
| | * | Bug#54667: Unnecessary signal handler redefinitionAlexey Kopytov2010-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POSIX requires that a signal handler defined with sigaction() is not reset on delivering a signal unless SA_NODEFER or SA_RESETHAND is set. It is therefore unnecessary to redefine the handler on signal delivery on platforms where sigaction() is used without those flags. include/my_alarm.h: Renamed DONT_REMEMBER_SIGNAL -> SIGNAL_HANDLER_RESET_ON_DELIVERY. include/my_global.h: Renamed DONT_REMEMBER_SIGNAL -> SIGNAL_HANDLER_RESET_ON_DELIVERY. The latter is now defined only on non-BSD platforms missing the POSIX sigaction() function. libmysql/libmysql.c: Renamed DONT_REMEMBER_SIGNAL -> SIGNAL_HANDLER_RESET_ON_DELIVERY mysys/thr_alarm.c: Renamed DONT_REMEMBER_SIGNAL -> SIGNAL_HANDLER_RESET_ON_DELIVERY sql/mysqld.cc: Renamed DONT_REMEMBER_SIGNAL -> SIGNAL_HANDLER_RESET_ON_DELIVERY
* | | | AutomergeStaale Smedseng2010-06-301-4/+24
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bug #53899 Wrong mysql_stmt_errno() after connection loss withStaale Smedseng2010-06-301-4/+24
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automatic reconnect A client with automatic reconnect enabled will see the error message "Lost connection to MySQL server during query" if the connection is lost between mysql_stmt_prepare() and mysql_stmt_execute(). The mysql_stmt_errno() number, however, is 0 -- not the corresponding value 2013. This patch checks for the case where the prepared statement has been pruned due to a connection loss (i.e., stmt->mysql has been set to NULL) during a call to cli_advanced_command(), and avoids changing the last_errno to the result of the last reconnect attempt.
* | mergeDaniel Fischer2010-06-181-5/+5
|\ \
| * | post-merge fixDaniel Fischer2010-04-301-2/+2
| | |
| * | mergeDaniel Fischer2010-04-301-10/+25
| |\ \
| | * | Try new RPM layout.Jonathan Perkin2010-04-261-6/+12
| | | | | | | | | | | | | | | | | | | | Fix libmysqlclient_r symlinks.
| | * | Remove duplicates.Jonathan Perkin2010-04-261-2/+4
| | | |
| | * | Try to fix libmysqlclient symlinks on per-OS basis.Jonathan Perkin2010-04-261-3/+10
| | | |
| * | | MergeDaniel Fischer2010-04-211-2/+29
| |\ \ \ | | |/ /
| | * | Need to add .a extension now.Jonathan Perkin2010-03-311-1/+1
| | | |
| | * | Put back libmysqlclient_r.a, not sure it was supposed to be removed.Jonathan Perkin2010-03-311-0/+1
| | | | | | | | | | | | | | | | | | | | Remove libmysqld-debug.a, it doesn't exist in current packages?
| | * | Apply wlad fixes from mysql-next-mr-bugfixingJonathan Perkin2010-03-311-4/+25
| | | |
| * | | Add components to INSTALL, some eraly Wix supportVladislav Vaintroub2010-02-101-4/+4
| | | |
* | | | Post-merge fix: rename filename in shared make file.Davi Arnaut2010-05-311-1/+1
| | | |
* | | | 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.
* | | | Changes to build using CMake according to existing release packages:Jonathan Perkin2010-05-121-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update/fix file layouts for each package type, add new types for native package formats including deb, rpm and svr4. - Build all plugins, including debug versions - Update compiler flags to match current release - Add missing @VAR@ expansions - Install correct mysqclient library symlinks - Fix icc/ia64 builds - Fix install of libmysqld-debug - Don't include mysql_embedded - Remove unpackaged manual pages to avoid missing files warnings - Don't install mtr's test suite
* | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch: - Moves all definitions from the mysql_priv.h file into header files for the component where the variable is defined - Creates header files if the component lacks one - Eliminates all include directives from mysql_priv.h - Eliminates all circular include cycles - Rename time.cc to sql_time.cc - Rename mysql_priv.h to sql_priv.h
* | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-246-181/+225
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Text conflict in client/mysqlbinlog.cc Text conflict in mysql-test/Makefile.am Text conflict in mysql-test/collections/default.daily Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test Text conflict in mysys/charset.c Text conflict in sql/field.cc Text conflict in sql/field.h Text conflict in sql/item.h Text conflict in sql/item_func.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysqld.cc Text conflict in sql/rpl_utility.cc Text conflict in sql/rpl_utility.h Text conflict in sql/set_var.cc Text conflict in sql/share/Makefile.am Text conflict in sql/sql_delete.cc Text conflict in sql/sql_plugin.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in storage/example/ha_example.h Text conflict in storage/federated/ha_federated.cc Text conflict in storage/myisammrg/ha_myisammrg.cc Text conflict in storage/myisammrg/myrg_open.c
| * | | | Bug #52149 - packaging differences in CMake buildVladislav Vaintroub2010-03-171-4/+25
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected some packaging bugs: - install mysqlservices library - install libmysqlclient_r.so.{16,16.0.0} as links to libmysqlclient.so - install libmysqld-debug.a - install my_safe_process, my_safe_kill and symlinks to mysql-test-run.pl (mtr, mysql-test-run) into correct place ${INSTALL_MYSQLTESTDIR} cmake/install_layout.cmake: Fix typo cmake/install_macros.cmake: Refactor INSTALL_SYMLINK to allow arbitrary symlink paths. Old version of this macro would make link extension the same as in target. This was not sufficient in some scenarios (would not allow for example libmysqlclient_r.so.16=>./libmysqlclient.so link) libmysql/CMakeLists.txt: Install extra symlinks to libmysqlclient.so (libmysqlclient_r.so.16 and libmysqlclient_r.so.16.0.0) for backward compatiblity. libmysqld/CMakeLists.txt: install libmysqld-debug.a libservices/CMakeLists.txt: install mysqlservices library mysql-test/lib/My/SafeProcess/CMakeLists.txt: install my_safe_process, my_safe_kill into correct place
| * | | Install static client and embedded debug librariesVladislav Vaintroub2010-02-201-0/+5
| |/ /
| * | mergeVladislav Vaintroub2010-02-061-4/+7
| |\ \
| | * \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-184-39/+26
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: - sql/sql_plugin.cc
| | * \ \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-4/+7
| | |\ \ \
| * | | | | Handle different installation layouts.Vladislav Vaintroub2010-01-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using cmake option INSTALL_LAYOUT=STANDALONE would produce the layout as in tar.gz or zip packages. INSTALL_LAYOUT=UNIX will produce unixish install layout (with mysqld being in sbin subdirectory , libs in lib/mysql etc). This layout is used for RPM packages. Subtle differences in both packages unfortunately lead to the need to recompile MySQL to use with other package type - as otherwise for example default plugins or data directories would be wrong set. There are numerous other variables that allow fine-tuning packaging layout. (INSTALL_BINDIR, INSTALL_LIBDIR , INSTALL_PLUGINDIR etc). This options are different from autotools as they do not expect full paths to directories, but only subdirectory of CMAKE_INSTALL_PREFIX. There are 2 special options that expect full directory paths - MYSQL_DATADIR that defines default MYSQL data directory (autotools equivalent is --localstatedir) - SYSCONFDIR can be added to search my.cnf search path (autotools equivalent is --sysconfdir)
| * | | | | mergeVladislav Vaintroub2010-01-141-1/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Enable WL#4435.Alexander Nozdrin2010-01-121-1/+2
| | | | | |
| * | | | | mergeVladislav Vaintroub2009-12-252-36/+22
| |\ \ \ \ \ | | |/ / / /
| | * | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-251-2/+1
| | |\ \ \ \ | | | |/ / /
View Lorry Controller Status