Commit graph

59448 commits

Author SHA1 Message Date
unknown
898f6f48b7 Merge XtraDB 8 into MariaDB. 2009-11-13 22:26:08 +01:00
unknown
275c0a7f96 Bump revision number for MariaDB 5.1.39 release. 2009-11-07 16:56:51 +01:00
unknown
9b7a0fddbe Result file update for new FederatedX 2009-11-07 07:29:10 +01:00
unknown
e33e42769a Merge 5.1-release branch into MariaDB trunk. 2009-11-06 18:24:38 +01:00
unknown
ad368a2b54 Merge Mysql 5.1.39 merge into MariaDB trunk 2009-11-06 18:22:32 +01:00
unknown
3dcbe769fb Fix running test suite from installed package.
Some files are in different locations in this case.
2009-11-05 14:40:01 +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
Michael Widenius
a6793a48e2 Fixed problem with schema tables and DECIMAL
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.
2009-11-02 11:30:21 +02:00
Hakan Kuecuekyilmaz
578f4b651e Merge. 2009-11-01 18:41:16 +01: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
Arjen Lentz
0673379006 libevent fixup required for Debian 4 (Etch)
Also missing copyright for copied macros.
Fix by Antony Curtis.
2009-10-31 15:29:16 +10:00
Michael Widenius
316111dd89 Merge with 5.1-release 2009-10-30 22:28:11 +02:00
Michael Widenius
d6f4b9755c Merge of FederatedX code 2009-10-30 22:16:08 +02:00
Michael Widenius
60c4f0f87b Added ignore for symlinked build file 2009-10-30 20:51:46 +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
Sergey Petrunya
182aa542bc Dummy change to push the release tag. 2009-10-30 13:50:48 +03:00
Sergey Petrunya
1d13500373 MWL#17: Table elimination
- add debug tests (were accidentally not pushed with the bulk of WL)
2009-10-29 20:50:33 +03:00
Michael Widenius
664fa25e0e Compile by default MySQL clients with libmysqldclient.a (not .so)
This makes them suitable for tar archices right away and also are easier to copy
Don't disable federated storage engine by default.
Don't allow one to disable the Maria storage engine if it's used for temp tables

BUILD/SETUP.sh:
  Compile by default MySQL clients with libmysqldclient.a (not .so)
  This makes them suitable for tar archices right away and also are easier to copy
scripts/make_binary_distribution.sh:
  Abort it clients are compiled with the shared libmysqlclient.so library
sql/mysqld.cc:
  Don't call kill_mysql() if signal handler is not setup (causes a core dump).
  This is only relevant when starting with --gdb.
sql/sql_plugin.cc:
  Don't disable federated storage engine by default.
  Don't allow one to disable the Maria storage engine if it's used for temp tables
2009-10-29 02:04:56 +02:00
Michael Widenius
a5637077fb Added missing 'source' command. 2009-10-28 10:08:54 +02:00
Michael Widenius
358327618d Speed up of test suite:
- Added --disable_query_log ; begin ; .... commit; --enable_query_log around all while loops that does insert
2009-10-28 09:52:34 +02:00
Michael Widenius
b587e79bc9 Added symbolic link to from scripts/mysql_install_db to bin to address a documented problem
Test if libexec exists, to go around problem if configure was done with --libexecdir=/usr/local/mysql/bin
2009-10-26 17:01:05 +02: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
b9ea90b064 Automatic merge 2009-10-23 22:26:26 +03: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
unknown
b9f5aba8e4 Merge Peter Lieverdink's fixes:
- configtest target in rc script.
 - type fix usefull -> useful.
2009-10-23 13:43:17 +02:00
Michael Widenius
1b7d4b37b4 Updated make_binary_distribution for MariaDB
- Changed tar file base name
- Added binaries needed by the Maria storage engine
2009-10-21 02:32:21 +03:00
Sergey Petrunya
52cb234460 MBUG#452116: MariaDB: mysql_install_db causes server segfault
- Increase thread_stack_size on 64-bit platforms to 240K, so that 
  it can accomodate the HA_CHECK structure which is 130K.
2009-10-16 19:44:58 +04:00
unknown
51186f1d3d When running with --skip-safemalloc, still do some basic, but cheap, overrun checks.
This greatly helps with eg. slow hosts in Buildbot.
2009-10-16 17:01:36 +02:00
unknown
79181a1c69 After-merge fixes for MySQL 5.1.39 merge.
Some pbxt test suite files needed updating due to similar changes after
bugfixes in MySQL 5.1.39.
2009-10-16 14:45:42 +02:00
Peter Lieverdink
c4f5fc85c4 Merged with itself. Win! 2009-10-16 17:18:37 +11:00
Peter Lieverdink
31ffbadb75 Add `configtest' option to the init script to check for a valid my.cnf file. 2009-10-16 17:15:30 +11:00
Sergey Petrunya
26c31ed688 backport the patch: Georgi Kodinov 2009-09-17:
Bug #46917: mysqd-nt installs wrong
      
When parsing the service installation parameter in 
default_service_handling() make sure the value of the
optional parameter doesn't overwrite it's name.
2009-10-16 02:28:33 +04: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
75a949fb41 Automatic merge with 5.1-merge 2009-10-14 11:09:56 +03:00
Michael Widenius
fb146de092 Removed not used declarations 2009-10-13 19:57:36 +03:00
Michael Widenius
c13f68fa14 Force restart before maria_showlog_error to get rid of status from previous connections
This fixes a race condition in the test system

mysql-test/include/maria_empty_logs.inc:
  Added comment
mysql-test/include/wait_for_status_var.inc:
  Fixed type in variable name. Add ' around variables for better error message
mysql-test/mysql-test-run.pl:
  Remove -skip-falcon (not to be used), add skip-pbxt to bootstrap
mysql-test/suite/maria/t/maria_showlog_error-master.opt:
  Force restart before maria_showlog_error to get rid of status from previous connection
2009-10-13 15:47:17 +03:00
Sergey Petrunya
9f3a7c30e2 Cosmetic fixes to win/make_mariadb_win_dist 2009-10-12 20:50:20 +04:00
Sergey Petrunya
3ce0def211 Fix typo bug in make_mariadb_win_dist 2009-10-12 17:14:31 +04:00
Sergey Petrunya
870900c9c0 Fix win32 binary zipfile name and contents to match the usual expectations 2009-10-12 15:26:48 +04:00
Sergey Petrunya
17494737bd Fix typo bug, s/$ZIPFILE/$ZIPNAME/ 2009-10-12 13:03:53 +04:00
Sergey Petrunya
6ccdfa3d18 Remove leftover "echo" 2009-10-12 11:15:23 +04:00
Sergey Petrunya
14715cc177 Make devenv print the build log to stdout (otherwise buildbot times out
while waiting for output): attempt 2
2009-10-12 00:25:08 +04:00
Sergey Petrunya
f9f6d2a468 Make devenv print the build log to stdout (otherwise buildbot times out
while waiting for output)
2009-10-11 23:27:24 +04:00
unknown
16e7757e74 Modify the test-bt target for OurDelta packaging.
Remove the run of the parts suite (as it is now included in default list of suite).
Add run of PBXT.
2009-10-11 17:38:37 +02:00