Commit graph

65831 commits

Author SHA1 Message Date
Vladislav Vaintroub
ad7b636d72 fix CRLF line endings to LF 2011-04-08 01:42:47 +02:00
Vladislav Vaintroub
3fdd009990 Fix SQL syntax error when running mysql --bootstrap. 2011-04-08 01:41:07 +02:00
Vladislav Vaintroub
753bd76de8 merge 2011-04-03 21:12:29 +02:00
Vladislav Vaintroub
aa2b482ec4 Fix error in "make dist" (sql/CMakeLists.txt is not delivered in source distribution) 2011-04-03 20:56:47 +02:00
Vladislav Vaintroub
1d8cfe3c77 LP686006 : maria recovery tests fail.
All failing cases were attempts to use connection after
the server was brought down and restarted. Connections 
used client reconnect option.

The reason for failures is the behavior of sockets on Windows:
for a short period after crash (short enough to make the error 
not reproducible under debugger), write to socket on client
side would succeed but subsequent read would fail. 

MYSQL_OPT_RECONNECT does not really help in this case ,
because  in the case given here ,as  mysql_real_query() 
(which can handle reconnect option)  succeeds and 
mysql_read_results() (can't handle reconnect) fails.

The fix is adding --include wait_until_connected_again.inc to 
appropriate places in test. This ensures that read errors are 
caught and connection is recreated.
2011-03-30 21:26:31 +02:00
Michael Widenius
6f20e3a385 Fixed problem that fill_record() allocated memory for every call. This could be a problem when doing big unions as memory could be filled up.
sql/sql_base.cc:
  Don't allocate memory in fill_record().
  Fix was to remove the list of tables. This was not necessary as this call is only used with one table.
2011-03-30 19:20:22 +03:00
Vladislav Vaintroub
2c0e356ae8 fix VS warning about variable 'unused' being used 2011-03-29 19:15:44 +02:00
Vladislav Vaintroub
c0577f6798 Add optional CMake parameter TINY_VERSION.
Parameter setting has the effect on 4th part of the version string in executable's version info on Windows.
It could be set e.g to bzr revno to uniquely identify  different builds for the same major.minor.patch combo.
2011-03-29 19:01:42 +02:00
Sergei Golubchik
0741f1a902 lp:702084 - myisam_block_size is not reported in SHOW GLOBAL VARIABLES
add a read-only server variable @@myisam_block_size
2011-03-28 16:53:46 +02:00
Vladislav Vaintroub
aa8cc81304 merge 2011-03-28 17:17:41 +02:00
Vladislav Vaintroub
0f51f46034 CMake/code signing:
Use MYSQL_INSTALL_TARGETS() macro for DLLs 
(libmysql and libmysqld) to ensure that libraries
are signed, if signing is requested.
2011-03-28 17:01:40 +02:00
Vladislav Vaintroub
90b5afaab6 Sign MSI if code signing is requested.
Remove SIGNCODE_ENABLED variable from create_msi.cmake.in,
it was already removed from other places.
2011-03-28 12:56:34 +02:00
Michael Widenius
b20efbb119 Fixed test failures with embedded server
mysql-test/mysql-test-run.pl:
  Don't set --log-error when running embedded server as we don't want the mysqltest output into mysqld.1.err
sql/mysqld.cc:
  Allow one to disable --log-error
2011-03-28 12:49:20 +03:00
Vladislav Vaintroub
6058b9ea0a Fix build error (wrong printf-like format) 2011-03-28 02:02:24 +02:00
Vladislav Vaintroub
22a8654a6f CMake fixes for buildbot/MSI package building and signing:
- FIND_PROGRAM (signtool) will now get a hint about location of signtool.exe (Windows SDK)
- Targets "package" or "msi" will now fail, l if signing is requested but does not work
  (e.g invalid certificate)
- During install, do not re-sign binaries, if they are already signed.
- Preserve mysqld_error.h timestamp whenever possible. This helps avoiding situations 
where the whole server is rebuilt, whenever comp_err.exe changes (for example after code 
signing, or also after a minor fix in mysys)
- Fix Wix error in UpgradeVersion, if patch part of the version is 0.
2011-03-28 01:05:34 +02:00
Michael Widenius
eaed26053d Merge with base 5.2 2011-03-23 19:22:38 +02:00
Michael Widenius
7de98f2ffb Added --log-basename to mysqld to allow one to set the prefix for all logs with one command
Changed test suite to use --log-basename (to get the code tested)
Added --sync-sys=1 to test suite to speed it up.
Better error messages if something goes wrong with mysql_install_db


mysql-test/Makefile.am:
  Removed not existing directory
mysql-test/lib/My/ConfigFactory.pm:
  Use log-basename
  We had to also set 'log_error' as some test was explicitely using the old name
  Added 'sync-sys=1' to speed up test suite
mysql-test/r/variables-notembedded.result:
  Updated test results (variable relay_log is now set)
mysql-test/suite/binlog/t/binlog_delete_and_flush_index-master.opt:
  Force specific names for some log files.
mysql-test/suite/binlog/t/binlog_index-master.opt:
  Force specific names for some log files.
mysql-test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt:
  Force specific names for some log files.
mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test:
  Better error message if something goes wrong
mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
  Updated results
mysql-test/suite/rpl/rpl_1slave_base.cnf:
  Use --log-basename
scripts/mysql_install_db.sh:
  More information to --help
  Write url to knowledge base if something goes wrong
  Fail at once if we can't create a database directory (no reason to continue and write a screenful of not related text)
scripts/mysqld_safe.sh:
  Also allow one to use --data for --datadir (common shortening)
  Added support for --log-basename
  Fail at once if we can't create a log directory
  Fixed bug where we used a pid file name without '.pid' extension
sql/log.cc:
  Create a log file name trough my_once_alloc()  (To get it automaticly freed at exit)
sql/mysql_priv.h:
  Added new prototype
sql/mysqld.cc:
  Added support for --log-basename
  Better help for a lot of log-filename related variables.
sql/rpl_rli.cc:
  Write information that one can use --log-basename
sql/set_var.cc:
  Add log_basename as a readonly variable
2011-03-23 17:59:41 +02:00
Michael Widenius
0fae0335d4 Ensure that all clients reads the appropriate 'client', client-mariadb and 'mariadb' sections from my.cnf
The mysqld server and all clients now reads the new client-server section
Fixed that mysqldumpslow supports new slow log formats and new mysqld --slow- options


client/mysql.cc:
  Read also client-server and client-mariadb sections.
client/mysql_upgrade.c:
  Read also client-server and client-mariadb sections.
client/mysqladmin.cc:
  Read also client-server and client-mariadb sections.
client/mysqlbinlog.cc:
  Read also client-server and client-mariadb sections.
client/mysqlcheck.c:
  Read also client-server and client-mariadb sections.
client/mysqldump.c:
  Read also client-server and client-mariadb sections.
client/mysqlimport.c:
  Read also client-server and client-mariadb sections.
client/mysqlshow.c:
  Read also client-server and client-mariadb sections.
client/mysqltest.cc:
  Read also client-server and client-mariadb sections.
extra/my_print_defaults.c:
  Updated help text
scripts/mysql_fix_privilege_tables.sh:
  Read also sections client client-server client-mariadb
scripts/mysql_install_db.pl.in:
  Also allow --data=* option
  Read also groups mariadb, server and client-server.
scripts/mysql_install_db.sh:
  Also allow --data=* option
  Read also groups mariadb, server and client-server.
  Added --lose-skip-pbxt to bootstrap
scripts/mysql_secure_installation.sh:
  Read also groups client-server and client-mariadb
scripts/mysqld_multi.sh:
  Read also group mariadb
scripts/mysqld_safe.sh:
  Read also groups mariadb server and client-server
scripts/mysqldumpslow.sh:
  Fixed to support new slow log formats
  Added sorting on -ae (aggregated number of retreived rows) and e (retrieved rows)
  Read also group 'mariadb'
  If there is many instances of same option, use last one.
  Get slow log file from options log-slow-queries=filename or query-log-file=filename
  Added support for future --log-basename option
sql-common/client.c:
  Read also groups 'client-server' and 'client-mariadb'
tests/mysql_client_test.c:
  Read also groups 'client-server' and 'client-mariadb'
tests/thread_test.c:
  Read also groups 'client-server' and 'client-mariadb'
2011-03-18 17:03:43 +02:00
Vladislav Vaintroub
3e46f488e5 merge 2011-03-11 16:07:09 +01:00
Vladislav Vaintroub
5d843fc702 fix warning 2011-03-11 16:06:35 +01:00
Vladislav Vaintroub
ed3cf5f857 merge 2011-03-11 15:44:04 +01:00
Vladislav Vaintroub
830fc03390 remove unused variable 2011-03-11 15:43:05 +01:00
Vladislav Vaintroub
d9d7e93ef8 merge 2011-03-11 15:12:57 +01:00
Vladislav Vaintroub
41d432462b merge 5.2 2011-03-10 09:39:14 +01:00
Vladislav Vaintroub
d4a3a7b90e mwl#59 - windows installer.
Address Monty's review comments
2011-03-09 20:21:03 +01:00
Michael Widenius
ce675406ca Automatic merge with 5.1 2011-03-08 15:16:13 +02:00
Michael Widenius
251a5fa975 Don't check if LAST_IO_Error has changed as this is not a user variable and it may change depending on timing issues between master and slave 2011-03-08 14:55:36 +02:00
Vladislav Vaintroub
1754c7da96 pass WITH_ARIA_STORAGE_ENGINE to configure.js 2011-03-07 15:10:32 +01:00
Michael Widenius
e1bb14ea6b Automatic merge with 5.2 to fix compiler failure on FreeBSD 2011-03-04 12:39:27 +02:00
Michael Widenius
c4a0d53d21 Updated version number 2011-03-04 12:38:46 +02:00
Michael Widenius
fa4eb9931b Removed wrong #ifdef that caused compile failure on Freebsd. 2011-03-04 12:37:48 +02:00
Michael Widenius
9aa44bb4b3 Fixed wrong alias usage 2011-03-01 23:24:17 +02:00
Sergei Golubchik
1dfb1e7c78 use mtr_verbose() for debug output in suite.pm files 2011-03-01 18:31:33 +01:00
Sergei Golubchik
58a0e492b5 typo (in the yassl error message) fixed 2011-03-01 18:03:38 +01:00
unknown
f8a9d13363 merge 2011-03-01 17:04:17 +02:00
unknown
c60ad7e6cd Fixed for mac sed. 2011-03-01 16:21:27 +02:00
Michael Widenius
b432ceda3d Merge with 5.1 2011-03-01 15:51:35 +02:00
Michael Widenius
97d46a0cd3 Revoked changes from MySQL 5.1.55 merge as Sergei's code is more general 2011-03-01 15:31:24 +02:00
unknown
845afae61e Allow -Wuninitialized without -O only for gcc 4.4 and upper 2011-03-01 15:19:25 +02:00
Michael Widenius
9f2194090c Fixed wrong filenames in maria unittest that caused unittest to fail
mysql-test/suite/sphinx/suite.pm:
  Update test to support 1.10-beta
storage/maria/unittest/ma_test_all-t:
  Fixed old filenames
2011-03-01 13:37:29 +02:00
Michael Widenius
64ceea7a56 Merge with 5.1 to get fixes for tests and compiler warnings 2011-03-01 00:46:13 +02:00
Michael Widenius
7a79fe52fe Fixes to mysql-test-run and tests
- Added ORDER BY to get consistent results to federated_server
- Sort slow tests first

mysql-test/lib/My/ConfigFactory.pm:
  Remove usage of port as the test suite is not using that anymore and it causes some probelms in buildbot
mysql-test/lib/mtr_cases.pm:
  Sort slow tests first
  If a test is marked as 'big_test' also mark it as 'long_test'
mysql-test/suite/federated/federated_server.result:
  Added ORDER BY to get consistent results
mysql-test/suite/federated/federated_server.test:
  Added ORDER BY to get consistent results
2011-03-01 00:35:05 +02:00
Michael Widenius
8fa14ba6e6 Get rid of compiler warnings
mysql-test/suite/parts/t/partition_alter4_innodb.test:
  Removed duplicated big_test marker
sql-common/my_time.c:
  Get rid of compiler warning about uninitialized members
2011-02-28 23:24:19 +02:00
Michael Widenius
5df39c48f8 Increase version number
Taged a couple of tests with --big-test

configure.in:
  Upgrade version number
mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test:
  Removed duplicate big_test tag
mysql-test/suite/parts/t/partition_alter1_2_innodb.test:
  Removed duplicate big_test tag
mysql-test/suite/parts/t/partition_decimal_innodb.test:
  Added big_test tag as this takes forever with valgrind
mysql-test/suite/parts/t/partition_decimal_myisam.test:
  Removed duplicate big_test tag
2011-02-28 19:47:19 +02:00
Michael Widenius
3358cdd504 Merge with 5.1 to get in changes from MySQL 5.1.55 2011-02-28 19:39:30 +02:00
Michael Widenius
869f5d0e81 Merge with alias as String 2011-02-28 13:16:17 +02:00
Michael Widenius
ff3da0f963 Change TABLE->alias to String for less memory reallocation
Changed some String.ptr() -> String.c_ptr() for String that are not guaranteed to end with \0
Removed some c_ptr() usage from parameters to functions that takes ptr & length
Use preallocate buffers to avoid calling malloc() for most operations. 


sql/event_db_repository.cc:
  alias is now a String
sql/event_scheduler.cc:
  c_ptr -> c_ptr_safe() to avoid warnings from valgrind.
sql/events.cc:
  c_ptr -> c_ptr_safe() to avoid warnings from valgrind.
  c_ptr -> ptr() as function takes ptr & length
sql/field.cc:
  alias is now a String
sql/field.h:
  alias is now a String
sql/ha_partition.cc:
  alias is now a String
sql/handler.cc:
  alias is now a String
  ptr() -> c_ptr() as string is not guaranteed to be \0 terminated
sql/item.cc:
  Store error parameter in separarte buffer to ensure correct error message
sql/item_func.cc:
  ptr() -> c_ptr_safe() as string is not guaranteed to be \0 terminated
sql/item_sum.h:
  Use my_strtod() instead of my_atof() to not have to make string \0 terminated
sql/lock.cc:
  alias is now a String
sql/log.cc:
  c_ptr() -> ptr() as function takes ptr & length
sql/log_event.cc:
  c_ptr_quick() -> ptr() as we only want to get the pointer to String buffer
sql/opt_range.cc:
  ptr() -> c_ptr() as string is not guaranteed to be \0 terminated
sql/opt_table_elimination.cc:
  alias is now a String
sql/set_var.cc:
  ptr() -> c_ptr() as string is not guaranteed to be \0 terminated
  c_ptr() -> c_ptr_safe() to avoid warnings from valgrind.
  c_ptr() -> ptr() as function takes ptr & length
  Simplify some code.
sql/sp.cc:
  c_ptr() -> ptr() as function takes ptr & length
sql/sp_rcontext.cc:
  alias is now a String
sql/sql_base.cc:
  alias is now a String.
  Here we win a realloc() for most alias usage.
sql/sql_class.cc:
  Use size descriptor for printf() to avoid accessing bytes outside of buffer
sql/sql_insert.cc:
  Change allocation of TABLE as it's now contains a String
  _ptr() -> ptr() as function takes ptr & length
sql/sql_load.cc:
  Use preallocate buffers to avoid calling malloc() for most operations.
sql/sql_parse.cc:
  Use c_ptr_safe() to ensure string is \0 terminated.
sql/sql_plugin.cc:
  c_ptr_quick() -> ptr() as function takes ptr & length
sql/sql_select.cc:
  alias is now a String
sql/sql_show.cc:
  alias is now a String
sql/sql_string.h:
  Added move() function to change who owns the string (owner does the free)
sql/sql_table.cc:
  alias is now a String
  c_ptr() -> c_ptr_safe() to avoid warnings from valgrind.
sql/sql_test.cc:
  c_ptr() -> c_ptr_safe() to avoid warnings from valgrind.
  alias is now a String
sql/sql_trigger.cc:
  c_ptr() -> c_ptr_safe() to avoid warnings from valgrind.
  Use field->init() to setup pointers to alias.
sql/sql_update.cc:
  alias is now a String
sql/sql_view.cc:
  ptr() -> c_ptr_safe() as string is not guaranteed to be \0 terminated
sql/sql_yacc.yy:
  r() -> c_ptr() as string is not guaranteed to be \0 terminated
sql/table.cc:
  alias is now a String
sql/table.h:
  alias is now a String
storage/federatedx/ha_federatedx.cc:
  Remove extra 1 byte alloc that is automaticly done by strmake()
  Ensure that error message ends with \0
storage/maria/ha_maria.cc:
  alias is now a String
storage/myisam/ha_myisam.cc:
  alias is now a String
2011-02-28 12:48:50 +02:00
Vladislav Vaintroub
f83e594218 Disable variables-big with debug binaries.
When compiled with SAFEMALLOC or with Windows
Debug CRT, it allocates and initializes 5GB of memory.
The effect is 20 minutes of paging and swapping on
a 4GB VM.

Still allow the test to run with optimized binaries.
Memory is not initialized in this case,  malloc() 
of 5GB  size will not bring the whole buffer into 
physical memory.
2011-02-27 01:25:56 +01:00
Vladislav Vaintroub
8b6eb98f78 Build fixes:
- Fix signed/unsigned warning (error -Werror) in readline
- change regex_replace pattern to account for forward or backward slashes 
   in partition_recover_myisam ( fixes Windows/embedded)
2011-02-26 18:46:16 +01:00
Vladislav Vaintroub
c1bb298e36 Fix mtr errors with Windows/embedded/plugins.
Plugins do not work on Windows/embedded,
thus do not set plugin environment variables.
2011-02-26 14:15:34 +01:00