summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Automatic mergeMichael Widenius2009-11-3059-214/+254
|\
| * Ignore temporary directoryMichael Widenius2009-11-301-0/+1
| |
| * Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-3052-210/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use static link by default (in compile-pentium) as some new systems doesn't have all static libraries available Change type for functions in plugin.h:str_mysql_ftparser_param() to const unsigned char and string lengths to size_t. One effect of the above change is that one needs to include mysql_global.h or define size_t before including plugin.h This fixes a case where mysql_client_test failed with newer gcc that enables strict-aliasing by default BUILD/compile-pentium: Don't use static link by default as some new systems doesn't have all static libraries available client/mysql_upgrade.c: Remove not used variable cmd-line-utils/readline/config_readline.h: Define some constants to get rid of compiler warnings on Linux cmd-line-utils/readline/display.c: Get rid of compiler warnings cmd-line-utils/readline/history.c: Got rid of compiler warnings: - Defining some strings as const - Added cast cmd-line-utils/readline/rlmbutil.h: Added cast to get rid of compiler warnings cmd-line-utils/readline/text.c: Remove not needed initialization to get rid of compiler warnings cmd-line-utils/readline/xmalloc.c: Changed types to 'const char* to get rid of compiler warnings configure.in: Ensure that we use MariaDB as suffix include/mysql/plugin.h: Changed types to 'const unsigned char* to get rid of compiler warnings (in other parts of the code) Change length for not \0 terminated string to size_t include/mysql/plugin.h.pp: Update related to plugin.h libmysql/libmysql.c: Fixed bug that caused core dump with newer gcc when strict aliasing is not turned off mysql-test/t/information_schema.test: Test is depending on innodb mysql-test/t/not_partition.test: Fixed wrong directory name (Not noticed before as we don't ususally run this test) mysys/lf_hash.c: Got rid of compiler warnings from -Wstrict-aliasing mysys/my_redel.c: Removed not used variable regex/engine.c: Changed types to 'const char* to get rid of compiler warnings regex/engine.ih: Changed types to 'const char* to get rid of compiler warnings sql/sp_head.cc: Got rid of compiler warning from -Wstrict-aliasing sql/sql_base.cc: Got rid of compiler warnings from -Wstrict-aliasing (The original code was probably wrong as nj_col->table_field was sql/sql_builtin.cc.in: plugin.h needs to have size_t defined sql/sql_parse.cc: Remove used variable sql/sql_select.cc: Got rid of compiler warnings from -Wstrict-aliasing sql/sql_show.cc: Added #ifdef to get rid of compiler warning when not using partition engine sql/table.cc: Got rid of compiler warning from -Wstrict-aliasing storage/maria/ha_maria.cc: Got rid of compiler warnings from -Wstrict-aliasing: - Use the thd_killed() API function storage/maria/lockman.c: Got rid of compiler warnings from -Wstrict-aliasing storage/maria/ma_check.c: Got rid of compiler warnings from -Wstrict-aliasing Change to use new version of _ma_killed_ptr; Don't call it as often as before storage/maria/ma_check_standalone.h: Update to compatible _ma_killed_ptr() from ha_maria.cc storage/maria/ma_ft_boolean_search.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/maria/ma_ft_nlq_search.c: Got rid of compiler warnings from -Wstrict-aliasing Ensure that 'subkeys' is 32 bit storage/maria/ma_ft_parser.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/maria/ma_ftdefs.h: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/maria/ma_sort.c: Change to use new version of _ma_killed_ptr; Don't call it as often as before storage/maria/ma_state.c: Got rid of compiler warnings from -Wstrict-aliasing storage/maria/maria_def.h: Redefine ma_killed_ptr() storage/maria/maria_ftdump.c: Got rid of compiler warnings from -Wstrict-aliasing storage/maria/trnman.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/ft_boolean_search.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ft_nlq_search.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/ft_parser.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ft_stopwords.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ftdefs.h: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ha_myisam.cc: Got rid of compiler warnings from -Wstrict-aliasing: - Use the thd_killed() API function storage/myisam/mi_check.c: Use new killed_ptr() function storage/myisam/myisam_ftdump.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/myisamchk.c: Update to compatible killed_ptr() from ha_myisam.cc storage/myisam/myisamdef.h: Redefine killed_ptr() storage/myisam/myisamlog.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/sort.c: Change to use new version of killed_ptr; Don't call it as often as before storage/xtradb/fil/fil0fil.c: Fixedc ompiler warning storage/xtradb/trx/trx0i_s.c: Include mysql_plugin.h later to ensure that size_t is defined
| * Added protection around usage of thd->mysys_varMichael Widenius2009-11-266-3/+21
| | | | | | | | | | (May be changed to 0 by scheduler)
| * Fix for Bug #48357 SHOW BINLOG EVENTS: Wrong offset or I/O errorMichael Widenius2009-11-261-4/+4
| | | | | | | | | | | | sql/log_event.cc: gcc 4.4.1 assumes that variables that you cast away will not change (strict-aliasing) The symptom was that mysql-test-run binlog.binglog_database got errors in the log
* | Apply the strict aliasing patch from http://lists.mysql.com/commits/89843Bo Thorsen2009-11-261-4/+4
|/
* Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug ↵Michael Widenius2009-11-262-29/+7
| | | | | | | | | | | | | build) maria do not builds Added 'mariadb_SERVER' as extra config group for MariaDB embedded server client/mysql.cc: Cleanup Added 'mariadb_SERVER' as extra config group for MariaDB embedded server mysys/thr_mutex.c: Fixed LPBUG#485443 --with-fast-mutexes and without safe mutexes (debug build) maria do not builds
* Automatic mergeMichael Widenius2009-11-255-8/+19
|\
| * Added error handling for my_seek() & my_tell() failuresMichael Widenius2009-11-075-8/+19
| | | | | | | | | | | | | | | | | | mysys/my_seek.c: Give error if MY_WME is used sql/sql_insert.cc: Fixed compiler warning storage/maria/ha_maria.cc: Changed driver of Maria storage engine project
* | Safety change to ensure read/black trees (used with heap tables) works on 64 ↵Michael Widenius2009-11-164-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bit setups where ulong <> size_t Don't retry test cases by default Fixed bug where we could (under unlikely error conditions) access not initialized variable include/my_tree.h: Safety change to ensure read/black trees (used with heap tables) works on 64 bit setups where ulong <> size_t (Pointed out by Bryan Aker) mysql-test/mysql-test-run.pl: Don't retry test cases by default This makes it too easy to miss failures and we have anyway to fix race conditions, not ignore them. mysys/tree.c: Safety change to ensure read/black trees (used with heap tables) works on 64 bit setups where ulong <> size_t sql/sql_delete.cc: Fixed bug where we could (under unlikely error conditions) access not initialized variable. (Pointed out by Bryan Aker)
* | Merge MariaDB 5.1.39 release, including XtraDB 8 merge, into MariaDB 5.1 trunk.unknown2009-11-14324-27751/+32131
|\ \
| * | XtraDB 8 after-merge fix: Fix windows build.mariadb-5.1.39-betaunknown2009-11-141-1/+1
| | |
| * | XtraDB 8 after-merge fixes: fix forgotten manual merge of patch file.unknown2009-11-143-4/+6
| | |
| * | XtraDB 8 after-merge fix: Add missing header to `make dist`.unknown2009-11-131-0/+1
| | |
| * | Merge XtraDB 8.unknown2009-11-132-3/+2
| |\ \
| | * | Fix double declaration of Makefile variable for FederatedX.unknown2009-11-101-1/+0
| | | | | | | | | | | | | | | | This eliminates a warning from Automake about the double declaration.
| | * | Apply Monty's fix for warning about wrong FEDERATED typecode.unknown2009-11-101-2/+2
| | | |
| * | | Merge XtraDB 8 into MariaDB.unknown2009-11-13318-27743/+32121
| |\ \ \ | | |/ / | |/| |
| | * | Sync with rev. 107Aleksandr Kuzminsky2009-09-305-4/+115
| | | |
| | * | Sync with rev.105Aleksandr Kuzminsky2009-09-2343-181/+2436
| | | |
| | * | sync with rev.96Aleksandr Kuzminsky2009-09-07320-28375/+30766
| | | |
| * | | Bump revision number for MariaDB 5.1.39 release.unknown2009-11-071-1/+1
| | |/ | |/|
* | | Fixed typos of --engine help text.Hakan Kuecuekyilmaz2009-11-111-2/+2
|\ \ \ | |/ / |/| |
| * | Fixed typos of --engine help text.Hakan Kuecuekyilmaz2009-11-111-2/+2
|/ /
* | Result file update for new FederatedXunknown2009-11-071-3/+3
| |
* | Merge 5.1-release branch into MariaDB trunk.unknown2009-11-063-0/+15
|\ \
| * | Fix running test suite from installed package.unknown2009-11-052-0/+10
| | | | | | | | | | | | | | | Some files are in different locations in this case.
| * | libevent fixup required for Debian 4 (Etch)Arjen Lentz2009-10-311-0/+5
| | | | | | | | | | | | | | | | | | Also missing copyright for copied macros. Fix by Antony Curtis.
* | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-06148-1039/+6248
|\ \ \
| * | | Fixed problem with schema tables and DECIMALMichael Widenius2009-11-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | sql/sql_show.cc: Change decimal item to type holder, to be able to define the decimals and max_length for the DECIMAL field from the schema specification instead of the value of the item.
| * | | When running with --skip-safemalloc, still do some basic, but cheap, overrun ↵unknown2009-10-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | checks. This greatly helps with eg. slow hosts in Buildbot.
| * | | After-merge fixes for MySQL 5.1.39 merge.unknown2009-10-163-4/+4
| | | | | | | | | | | | | | | | | | | | Some pbxt test suite files needed updating due to similar changes after bugfixes in MySQL 5.1.39.
| * | | Merge with latest MariaDB 5.1 trunk.unknown2009-10-1571-813/+1618
| |\ \ \
| * \ \ \ Merge MySQL 5.1.39 into MariaDB 5.1.mariadb-merge-mysql-5.1.39unknown2009-10-15145-1040/+6241
| |\ \ \ \
| | * | | | Install mysqld.libmysql-5.1.39Jonathan Perkin2009-09-041-0/+1
| | | | | |
| | * | | | Merge from mysql-5.1.38-releaseclone-5.1.39-buildJonathan Perkin2009-09-039-20/+58
| | |\ \ \ \
| | * \ \ \ \ null merge of 5.0 fixes backported from 5.1Georgi Kodinov2009-09-020-0/+0
| | |\ \ \ \ \
| | | * | | | | Backported the --parallel=str option from mtr2 for backward compatibilityGeorgi Kodinov2009-09-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the newer pb2 testing environments
| | | * | | | | mergeGeorgi Kodinov2009-09-021-0/+2
| | | |\ \ \ \ \
| | | | * \ \ \ \ mergeclone-5.0.86-buildGeorgi Kodinov2009-09-022-7/+11
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | moved version to 5.0-mainGeorgi Kodinov2009-09-021-1/+1
| | | | | | | | |
| | * | | | | | | fixed a valgrind warning in partition_pruningGeorgi Kodinov2009-09-021-0/+1
| | | | | | | | |
| | * | | | | | | automergeGeorgi Kodinov2009-09-022-8/+16
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Manual merge.Davi Arnaut2009-09-021-7/+10
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Post-merge fix. Observe C declaration placement rules.Davi Arnaut2009-09-021-7/+9
| | | | |/ / / / /
| | | | * | | | | auto-mergeTatiana A. Nurnberg2009-08-317-161/+97
| | | | |\ \ \ \ \
| | | * | | | | | | Increase thread stack size on HP-UX when built with debug.Davi Arnaut2009-09-021-1/+6
| | | | | | | | | |
| | * | | | | | | | fixed a valgrind warning in partitioning codeGeorgi Kodinov2009-09-021-0/+1
| | |/ / / / / / /
| | * | | | | | | Fixed win32 compilation warningsGeorgi Kodinov2009-09-022-1/+3
| | | | | | | | |
| | * | | | | | | fixed compilation warningsGeorgi Kodinov2009-09-021-6/+6
| | | | | | | | |