Commit graph

3904 commits

Author SHA1 Message Date
Sergey Petrunya
19c8976d85 Merge MWL#67: MRR Backport and BKA backport. 2009-12-22 15:49:15 +03:00
Sergey Petrunya
da5edf5057 MWL#67: MRR backport
- Make index condition pushdown be controlled by an @@optimizer_switch flag,
  not by @@engine_condition_pushdown
- Make MRR buffer size be controlled by @@mrr_buffer_size, not 
  by @@read_rnd_buffer_size
- Move parts of code to separate files
- Code cleanup
- Add --sorted_result to some SELECTs in tests.
2009-12-22 15:33:21 +03:00
Igor Babaev
4449a5f489 Backport into MariaDB-5.2 the following:
WL#2771 "Block Nested Loop Join and Batched Key Access Join"
2009-12-20 18:26:15 -08:00
Sergey Petrunya
96e092dc73 Backport into MariaDB-5.2 the following:
WL#2474 "Multi Range Read: Change the default MRR implementation to implement new MRR interface"
WL#2475 "Batched range read functions for MyISAM/InnoDb"
        "Index condition pushdown for MyISAM/InnoDB"
Igor's fix from sp1r-igor@olga.mysql.com-20080330055902-07614:
  There could be observed the following problems:
  1. EXPLAIN did not mention pushdown conditions from on expressions in the 
  'extra' column.  As a result if a query had no where conditions pushed 
  down to a table, but had on conditions pushed to this table the 'extra' 
  column in the EXPLAIN for the table missed 'using where'.
  2. Conditions for ref access were not eliminated from on expressions 
  though such conditions were eliminated from the where condition.
2009-12-15 10:16:46 +03:00
Igor Babaev
e4e1ae0d13 Merge of the patch introducing virtual columns into maria-5.2 2009-11-11 20:31:28 -08:00
Igor Babaev
d749c7e600 Merge 2009-11-09 18:32:39 -08:00
unknown
ad368a2b54 Merge Mysql 5.1.39 merge into MariaDB trunk 2009-11-06 18:22:32 +01:00
unknown
716c099363 Add federatedx files for build
storage/federatedx/CMakeLists.txt:
  Add fedrated files for build
2009-11-03 16:39:54 +02:00
unknown
cea82db95c Make federated compiling under windows
storage/federatedx/ha_federatedx.cc:
  lower_case_file_system do not suported for windows dll
2009-11-03 13:08:09 +02:00
unknown
134ac8483a Fixed federatedx building under windows
storage/federatedx/CMakeLists.txt:
  removed the same goals for federated and federatedx
2009-11-02 21:17:58 +02:00
Hakan Kuecuekyilmaz
10aeefce56 Merge. 2009-11-01 18:37:37 +01:00
Hakan Kuecuekyilmaz
70fbd55615 BUILD/compile-dist && make dist was not working due to typos.
Fixed by renaming a file and editing the typo in Makefile.am
2009-11-01 16:09:55 +01:00
unknown
6cabc7abb8 Compilation under windows x64 made possible.
sql/mysqld.cc:
  Explicit type casting required by windows x64 compiler.
storage/xtradb/include/srv0srv.h:
  Parameters should be declared as ulong.
storage/xtradb/srv/srv0srv.c:
  Parameters should be declared as ulong.
2009-10-31 21:22:50 +02:00
Michael Widenius
226f0c7601 Added federatedx storage engine
Fixed compiler warnings


client/mysqladmin.cc:
  Fixed compiler warning
extra/yassl/taocrypt/src/twofish.cpp:
  Fixed compiler warning
libmysqld/Makefile.am:
  Use federatedx instead of federated
  (Should actually be removed)
mysql-test/mysql-test-run.pl:
  Fixed warning
mysql-test/valgrind.supp:
  Removed warning found on 64 bit Linux machine
storage/pbxt/src/cache_xt.cc:
  Fixed compile warning
storage/xtradb/include/buf0buf.ic:
  Fixed compiler warning
2009-10-30 20:50:56 +02:00
Michael Widenius
056cebe61a Automatic merge with 5.1 2009-10-28 16:56:07 +02:00
Igor Babaev
90a4a3dcd7 Merge of the latest 5.1 changes. 2009-10-26 13:48:20 -07:00
Michael Widenius
f3e3fe866b Automatic merge with maria-merge 2009-10-26 13:38:17 +02:00
Michael Widenius
5bddbc44c6 Fixed compiler warning message
- Added checking of return value for system(), freopen(), fgets() and chown()
- Ensure that calls that require a format strings gets a format string
- Other trivial things
Updated test suite results (especially for pbxt and embedded server)
Removed warning for "Invalid (old?) table or database name 'mysqld.1'" from pbxt tests
Speed up some pbxt tests by inserting begin ; commit; around "while loops with inserts"
Added mysqld startup option '--debug-flush'
Create maria_recovery.trace in data directory instead of current directory

client/mysql.cc:
  Check return value from system()
client/mysql_upgrade.c:
  Check return value from fgets()
client/mysqladmin.cc:
  Check return value from fgets()
client/mysqlslap.c:
  Check return value from system() (but ignore it, as it's not critical)
extra/yassl/src/crypto_wrapper.cpp:
  Check return value from fgets() (but ignore it, as it's internal file)
extra/yassl/taocrypt/src/aes.cpp:
  Added extra {} to remove compiler warning
extra/yassl/taocrypt/src/blowfish.cpp:
  Added extra {} to remove compiler warning
extra/yassl/taocrypt/src/misc.cpp:
  Ifdef not used code
include/mysys_err.h:
  Added error message for failing chown()
mysql-test/mysql-test-run.pl:
  Don't give warning for skipping ndbcluster (never enabled in MariaDB)
mysql-test/suite/funcs_1/r/is_columns_is_embedded.result:
  Update with new information schema information
mysql-test/suite/funcs_1/r/is_tables_is_embedded.result:
  New test
mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result:
  Update test results (has not been tested for a long time)
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result:
  Update test results (has not been tested for a long time)
mysql-test/suite/funcs_1/t/is_tables_is.test:
  Don't run with embedded server (as results differ)
  I added a new test for embedded server
mysql-test/suite/funcs_1/t/is_tables_is_embedded.test:
  New test
mysql-test/suite/pbxt/my.cnf:
  Allow one to run pbxt tests without having to specify --mysqld=--default-storage-engine=pbxt
mysql-test/suite/pbxt/t/count_distinct3.test:
  Speed up test by inserting begin; ... commit;
mysql-test/suite/pbxt/t/subselect.test:
  Speed up test by inserting begin; ... commit;
mysys/errors.c:
  Added error message for failing chown()
mysys/my_copy.c:
  Added error message for failing chown()
mysys/my_redel.c:
  Added error message for failing chown()
mysys/safemalloc.c:
  Added cast to get rid of compiler warning
sql/ha_partition.cc:
  Fixed wrong argument to sql_print_error() (it requires a format string)
sql/log.cc:
  Test return value of freopen()
sql/mysqld.cc:
  Test return value of freopen()
  Added startup option '--debug-flush' to be used when one gets a core dump (easy to explain to people on IRC)
sql/rpl_rli.cc:
  Fixed wrong argument to sql_print_error() (it requires a format string)
sql/set_var.cc:
  Added {} to get rid of compiler warnings
sql/slave.cc:
  Fixed wrong argument to mi->report() and sql_print...() (they require a format string)
sql/sql_cache.cc:
  Fixed wrong argument to sql_printinformation() (it requires a format string)
sql/sql_parse.cc:
  Test return value of fgets()
sql/sql_plugin.cc:
  Fixed wrong argument to sql_print_error() (it requires a format string)
sql/sql_select.cc:
  Use unique table name for internal temp tables instead of full path
  (Simple speed & space optimization)
sql/udf_example.c:
  Removed compiler warning about not used variable
storage/maria/ha_maria.cc:
  Fixed wrong argument to sql_print_error() and ma_check_print_error() (they require a format string)
storage/maria/ma_recovery.c:
  Create maria_recovery.trace in data directory instead of current directory
storage/maria/unittest/ma_test_loghandler-t.c:
  Fixed wrong argument to ok();  Requires a format string
storage/pbxt/src/strutil_xt.cc:
  Detect temporary tables by checking if that path for the table is in the mysql data directory.
  The database for temporary tables is after this patch, from PBXT point of view, ""
  This is needed to stop PBXT from calling filename_to_tablename() with the base directory as an argument, which caused
  ERROR: Invalid (old?) table or database name 'mysqld.1'" in the log when running the test suite.
tests/mysql_client_test.c:
  Fixed compiler warnings
unittest/mysys/base64-t.c:
  Fixed wrong argument to diag() (it requires a format string)
  Added a comment that the current 'print' of differing buffers doesn't print the right thing,
  but didn't fix this as it's not important (unless we find a bug in the real code)
2009-10-26 13:35:42 +02:00
Michael Widenius
afd0a45639 Fixes for binary distribution in tar file
- mysql_install_db doesn't require --basedir option anymore
- Fix that mysql_install_db mysqld_safe mysql_fix_privilege_tables has right paths for tar binary install
- Move some files from share/mysql to where they have always been (1.0 - 5.0)
- Move scripts used when installing MariaDB to the scripts directory (Added symlinks in old place for compatibility)
- Move man files to 'man' (from 'share/man')
- Ensure that all scripts are executable

mysql_secure_installation.sh
- Added support for --basedir flag
- Don't assume that the mysql binary is in the path

Other:
- Fixed crash when one got kill signal during bootstrap

Docs/INSTALL-BINARY:
  Change references from MySQL to MariaDB
Docs/mysql.info:
  Change references from MySQL to MariaDB
README:
  Removed duplicate row
configure.in:
  Change references from MySQL to MariaDB
libmysql/libmysql.c:
  Assume that if version string contains '-maria-' we are also using MariaDB
scripts/make_binary_distribution.sh:
  Fix that mysql_install_db mysqld_safe mysql_fix_privilege_tables has right paths for tar binary install
  Remove some files that should not be part of a MariaDB binary install
  Move some files from share/mysql to where they have always been (1.0 - 5.0)
  Move man files to 'man' (from 'share/man')
  Move scripts used when installing MariaDB to the scripts directory (Added symlinks in old place for compatibility)
  Removed generation of 'netware/init_db.sql', as it was never used
  Remove old reference to bk tree
scripts/mysql_secure_installation.sh:
  Added support for --basedir flag
  Don't assume that the mysql binary is in the path
  Use .my.cnf files
  Removed a lot of useless 'echo' rows
sql/mysqld.cc:
  Fixed crash when one got kill signal during bootstrap
storage/maria/Makefile.am:
  Don't add internal test files to binary distributions
storage/myisam/Makefile.am:
  Don't add internal test files to binary distributions
support-files/Makefile.am:
  Make scripts executable
support-files/config.huge.ini.sh:
  Removed execution bit
support-files/config.medium.ini.sh:
  Removed execution bit
support-files/config.small.ini.sh:
  Removed execution bit
support-files/mysql.server.sh:
  Ensure this works also mysqld is in the 'bin' directory
2009-10-23 19:48:54 +03:00
Igor Babaev
fcc78bbcb7 Merge 2009-10-17 12:12:28 -07:00
Igor Babaev
f7a75b999b The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.
The original patch has been ameliorated by Sanja and Igor.
2009-10-16 15:57:48 -07:00
unknown
95270c9c43 Merge with latest MariaDB 5.1 trunk. 2009-10-15 23:52:31 +02:00
unknown
6aad537a6a Merge MySQL 5.1.39 into MariaDB 5.1. 2009-10-15 23:38:29 +02:00
Michael Widenius
daccf17483 Merge with 5.1 2009-10-14 15:58:53 +03:00
Michael Widenius
75a949fb41 Automatic merge with 5.1-merge 2009-10-14 11:09:56 +03:00
unknown
698cebb677 Merge Sanja's fix of BUG#39249 into MariaDB 5.1.38 release clone. 2009-10-09 12:18:49 +02:00
unknown
eebb0da333 Add missing PBXT windows file to make dist. 2009-10-07 09:40:56 +02:00
unknown
8ea19fa73e Merge a bunch of small fixes from release tree into main lp:maria. 2009-10-06 20:37:55 +02:00
unknown
3bc025506b Fix make dist after CMakeLists.txt rename in previous push. 2009-10-06 20:26:11 +02:00
unknown
445ad6bd37 Merge fixes for --big tests and compiler warnings. 2009-10-06 20:05:49 +02:00
Sergey Petrunya
1d6e50c6d6 Fix PBXT build on windows by backporting some of their changes (under advise of Vlad Kolesnikov):
- Adjust CMakeLists.txt to follow latest mysql's expectations about plugins
- Add typecasts
- wrap pbms_enabled.cc in #ifdef
2009-10-06 19:16:01 +04:00
unknown
d8049a62ff merge 2009-10-06 17:53:46 +03:00
unknown
0c0e1f2e35 BUG#39249 Maria:query cache returns out of date results
BUG#41098 Query Cache returns wrong result with concurent insert

BUILD/SETUP.sh:
  test build without query cache setup
BUILD/compile-pentium-debug-max-no-qc:
  test build without query cache
sql/mysql_priv.h:
  removed double declaration
storage/maria/ha_maria.cc:
  query cache invalidation fixed
storage/maria/ma_state.c:
  query cache invalidation fixed
storage/maria/maria_def.h:
  last transaction ID added
  invalidation fixed
storage/myisam/ha_myisam.cc:
  invalidation fixed
storage/myisam/mi_locking.c:
  invalidation fixed
storage/myisam/myisamdef.h:
  invalidation fixed
2009-10-06 09:57:22 +03:00
Michael Widenius
e147ca1561 Don't call _ma_decrement_open_count() for ma_extra(HA_EXTRA_PREPARE_FOR_DROP).
Don't call _mi_decrement_open_count() for mi_extra(HA_EXTRA_PREPARE_FOR_DROP).
This ensures that if we empty the key cache and a drop table fails later, the index will be automaticly rebuilt

storage/maria/ma_extra.c:
  Don't call _ma_decrement_open_count() for ma_extra(HA_EXTRA_PREPARE_FOR_DROP).
  This ensures that if we empty the key cache and a drop table fails later, the index will be automaticly rebuilt
storage/maria/ma_locking.c:
  Simple optimization: Don't call maria_lock_database() if locking is disabled
storage/myisam/mi_extra.c:
  Don't call _mi_decrement_open_count() for mi_extra(HA_EXTRA_PREPARE_FOR_DROP).
  Simplify code to remove if
2009-10-06 09:13:56 +03:00
unknown
59f80387ba Fix some compiler warnings cause by GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478
storage/maria/ma_blockrec.c:
  GCC warns about const vs. non-const despite cast
  (but it is in any case cleaner to avoid the cast completely)
support-files/compiler_warnings.supp:
  Silence a wrong compiler warning caused by GCC bug.
2009-10-03 22:13:58 +02:00
unknown
cadcc55bab Completely disable the innodb plugin.
Don't ever build it, and don't include it in source tarballs.
(we keep the sources in bzr to not get conflicts on every upstream change).
2009-09-30 09:25:12 +02:00
Igor Babaev
cbb8c3f0b0 Fixed bug #47455 - a failure with main.myisam_crash_before_flush_keys.test
on Windows.
2009-09-19 14:21:29 -07:00
Sergey Petrunya
f974f10cf1 Apply Igor's fix:
Fixed a failure of the merge_innodb test on windows.


storage/myisammrg/ha_myisammrg.cc:
  Fixed a failure of the merge_innodb test on windows.
2009-09-18 03:01:09 +04:00
Igor Babaev
a9ea2d3535 Fix of bug #417751 by Yasufumi Kinoshita. 2009-09-16 10:43:01 -07:00
Sergey Petrunya
3d60f05f98 MySQL 5.1 -> Maria 5.1 merge: Fix windows build
- Fix XtraDB to be built as a static library.

storage/xtradb/buf/buf0flu.c:
  Fix previous merge error (was harmless except for on win32)
storage/xtradb/plug.in:
  Make it sync with innobase/plug.in.disabled
2009-09-16 01:20:58 +04:00
unknown
e8d7e27fed More after-merge fixes for merging MySQL 5.1.38 into MariaDB.
mysql-test/t/mysqldump.test:
  Make test case work when build directory is not world readable
  (this is the case for Buildbot checkouts).
mysys/my_getopt.c:
  Restore bugfix which was lost in previous merge.
storage/xtradb/buf/buf0flu.c:
  Fix extranous line caused by bad merge.
2009-09-15 14:53:07 +02:00
unknown
2a4c97fc3e MySQL 5.1.38 merge into MariaDB.
Merge remaining bits of mysql-5.1.38 into MariaDB (9 commits were missing
from the original merge).
2009-09-15 14:12:51 +02:00
Sergey Petrunya
9f6c4ad8a8 Post-merge fixes 2009-09-15 15:22:39 +04:00
Sergey Petrunya
151e5d586c Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge 2009-09-15 14:46:35 +04:00
Sergey Petrunya
2083b7ddfd Make MariaDB work on windows:
- fix xtradb compile failures on windows (why do we have to do it again?)
2009-09-15 05:04:15 +04:00
Sergey Petrunya
362009fe79 MySQL 5.1 -> MariaDB 5.1 merge: windows build fixes 2009-09-15 02:45:48 +04:00
Sergey Petrunya
30ce64cbee Exclude innodb_plugin form MariaDB's max and max-no-ndb configurations and
from the default build. We have xtradb instead.
2009-09-10 12:11:23 +04:00
Sergey Petrunya
8282ed39f2 MySQL 5.1 -> MariaDB 5.1 merge
- Post-merge fixes
2009-09-10 01:06:57 +04:00
Igor Babaev
b495b3db23 Added a missing dependency to build maria lib 2009-09-09 11:11:31 -07:00
Sergey Petrunya
241c1977dd Merge xtradb-7 -> MariaDB 2009-09-08 20:04:58 +04:00