Commit graph

66184 commits

Author SHA1 Message Date
Vladislav Vaintroub
1779c2adbf merge 2011-05-12 16:31:54 +02:00
Vladislav Vaintroub
984fa23b45 merge 2011-05-12 15:39:54 +02:00
Vladislav Vaintroub
83ce12ba69 Windows build : Make win\config.js optional in 5.1
Simplifies handling 5.1 in buildbot.
2011-05-12 15:34:02 +02:00
Vladislav Vaintroub
1c95254523 Fix check_table_file_presence:
On Windows, do not attempt access() for special device names like
CON, PRN etc. access() would return 0, this does not mean that fiile
with this name exists.
2011-05-12 15:31:11 +02:00
Oleksandr Byelkin
84505e6e3a db_name can change case, so we need copy of it for case insensitive FS. 2011-05-12 14:56:08 +03:00
unknown
520927a7df Bugfix: New table creation/renaming block added if old encoded table present.
mysql-test/r/create.result:
  test of renaming
mysql-test/r/upgrade.result:
  Now such behaviour prohibited to avoid problems.
mysql-test/t/create.test:
  test of renaming
mysql-test/t/upgrade.test:
  Now such behaviour prohibited to avoid problems.
sql/mysql_priv.h:
  Function to test table name presence added.
sql/sql_rename.cc:
  Rename fixed.
sql/sql_table.cc:
  Function to test table name presence added.
  Create fixed.
2011-05-11 14:09:48 +03:00
Sergei Golubchik
e343a2c134 small enhancement of the create table options feature:
no unnecessary casting from void*, more type safety.
typos fixed.
2011-05-10 18:19:11 +02:00
Vladislav Vaintroub
27fb650b8b Fix Windows embedded warnings 2011-05-10 18:18:25 +02:00
Vladislav Vaintroub
11411f5b6c Cygwin-specific klugde to workaround missing TEMP/TMP variables. 2011-05-10 18:00:28 +02:00
unknown
e1ceb8048c Automatic merge Mariadb 5.1->5.2. 2011-05-09 15:09:40 +02:00
unknown
e2ff288531 Fix buildbot failure in rpl_stop_slave.test.
Problem was setting DEBUG_SYNC twice in a row too fast in the test case; this
could cause the second setting to override the first before the code had time
to react to the first, causing the signal to get lost.

Fixed by waiting for the code to receive the first signal before overwriting
it in the test case.
2011-05-09 15:06:16 +02:00
Michael Widenius
8882d71f3f Make event stop code even more robust.
(Test failed if we added my_sleep(200000) in event_queue::cond_wait() just before pthread_cond_wait();  Not likely scenario but better to get that fixed too)
2011-05-09 15:14:04 +03:00
Michael Widenius
4cb68c0e89 mysqltest: Write command to be executed to the log BEFORE executing the command.
Fixed race condition in event that could cause hang when stopping event scheduler with SET GLOBAL event_scheduler=OFF 

client/mysqltest.cc:
  Write command to be executed to the log BEFORE executing the command.
  This makes it easier to debug crashes as the log will contain the fatal command.
mysql-test/r/mysqltest.result:
  Updated results (we now get more things logged)
sql/event_queue.cc:
  Fixed race condition in event that could cause hang when stopping event scheduler with SET GLOBAL event_scheduler=OFF.
  The reason was that a kill signal could be sent between last check of thd->killed and before thd->enter_cond() in which case the signal
  would be missed and we would be stuck in Event_scheduler::stop() forever.
2011-05-09 14:38:49 +03:00
Michael Widenius
a50a5f64f8 Automatic merge 2011-05-08 12:51:26 +03:00
Michael Widenius
28f708e1e3 Automatic merge with 5.1 2011-05-08 12:37:38 +03:00
Vladislav Vaintroub
ba87d4810a Fix effect of recent mismerge (it made default pid file name ".pid" instead of "hostname.pid") 2011-05-07 19:27:07 +02:00
Michael Widenius
6b8788e425 Reverted unittest/unit.pl back to Test::Harness as some of our build machines didn't support the new recommended TAP::Harness module
unittest/mytap/tap.c:
  Fixed output for some tests that didn't call plan()
2011-05-06 14:01:51 +03:00
Michael Widenius
5cf6ccd29e Speed up pbxt.range test a bit 2011-05-05 23:28:42 +03:00
Michael Widenius
d5caa00161 Improved 'make test-unit' time slightly
storage/maria/unittest/ma_test_loghandler-t.c:
  Don't sync during test
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
  Don't sync during test
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
  Don't sync during test
unittest/mysys/bitmap-t.c:
  Don't test all bit combinations (not needed)
unittest/mysys/thr_template.c:
  Remove sleep as old bug should be fixed nowadays
unittest/mysys/waiting_threads-t.c:
  Only run test with --big
unittest/mytap/tap.c:
  Print total time at end of test.
unittest/unit.pl:
  Use TAP::Harness instead of Test::Harness (recommended according to manual)
  Add times to tests.
2011-05-05 14:51:01 +03:00
Michael Widenius
4249382a65 Automatic merge 2011-05-04 22:33:18 +03:00
Michael Widenius
718ddbb2ca Automatic merge with 5.1 2011-05-04 22:25:56 +03:00
Michael Widenius
a67a5dd6f9 Automatic merge 2011-05-04 21:56:29 +03:00
Michael Widenius
a3af6f0f3d Fixed build errors on centos5-amd64-minimal, where we compile with very few character sets
Fixed compiler warnings

client/readline.cc:
  Fixed compiler warning
mysql-test/suite/innodb/t/innodb_bug60049.test:
  This test failed when running with --mysqld=--loose-innodb-fast-shutdown=2 which we do on some machines
mysql-test/t/mysqldump.test:
  Only run test if utf8 is used
sql/log.cc:
  Fixed compiler warning
sql/mysql_priv.h:
  Fixed compiler warnings
tests/mysql_client_test.c:
  Don't abort test if ucs2 is not in use.
2011-05-04 21:51:44 +03:00
Michael Widenius
3c9ae014ca Fixed build errors on centos5-amd64-minimal, where we compile with very few character sets
Fixed compiler warnings

client/readline.cc:
  Fixed compiler warning
mysql-test/t/mysqldump.test:
  Only run test if utf8 is used
sql/log.cc:
  Fixed compiler warning
sql/mysql_priv.h:
  Fixed compiler warnings
tests/mysql_client_test.c:
  Don't abort test if ucs2 is not in use.
2011-05-04 21:28:02 +03:00
Vladislav Vaintroub
10438588a3 merge 2011-05-04 17:11:54 +02:00
Vladislav Vaintroub
ca67f01bae merge 2011-05-04 16:12:39 +02:00
Vladislav Vaintroub
aff371f662 Cherrypick fix for maria recovery bug LPBUG#686006 from 5.2
into 5.1
2011-05-04 16:03:52 +02:00
Vladislav Vaintroub
c34e5a9152 Avoid mtr warning on Windows during startup
The reason for mtr warning is that collect_mysqld_features() starts mysqld with --datadir=/tmp and this 
directory does not exist on Windows.

Fix : instead of passing --datadir=$opt_vardir/tmp in collect_mysqld_features() just use --datadir=.
mysqld does not need a correct directory, just an existing one, as it is started with --help ---verbose -skip-grant-tables.
2011-05-04 15:45:39 +02:00
Vladislav Vaintroub
e4732a765e fix noisy warnings in header files 2011-05-04 14:47:27 +02:00
Michael Widenius
7191a44b4c Automatic merge 2011-05-04 12:04:13 +03:00
Michael Widenius
a9d14f5134 Automatic merge 2011-05-04 11:59:16 +03:00
Michael Widenius
52e4fce886 Automatic merge with 5.1 2011-05-04 11:35:51 +03:00
Michael Widenius
173820a553 Fixed typo that caused compiler warning 2011-05-04 11:31:06 +03:00
Michael Widenius
d2472af7f5 Fixed compiler warning 2011-05-04 11:28:02 +03:00
Vladislav Vaintroub
a9dd346c9b merge 2011-05-03 19:36:06 +02:00
Vladislav Vaintroub
713c86c079 merge 2011-05-03 19:32:17 +02:00
Vladislav Vaintroub
7d8a918c64 Fix warning (unused local variable) 2011-05-03 19:30:21 +02:00
Michael Widenius
547ef66609 Automatic merge with MariaDB 5.1 2011-05-03 19:11:39 +03:00
Michael Widenius
1be5462d59 Merge with MariaDB 5.1 2011-05-03 19:10:10 +03:00
Michael Widenius
f74853053f Automatic merge 2011-05-03 18:27:14 +03:00
Michael Widenius
96c1a87455 Fixed after-merge failures found by buildbot
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Updated test results
mysql-test/suite/pbxt/r/client_xml.result:
  Updated test results
mysys/Makefile.am:
  Added back my_port.c
storage/xtradb/buf/buf0buddy.c:
  Removed not used variables
storage/xtradb/fil/fil0fil.c:
  Added casts to fix compiler warnings
2011-05-03 18:17:13 +03:00
Vladislav Vaintroub
b46f14352b Fix Xtradb compile error on Win64 - conversion between pointers of different size 2011-05-03 12:50:09 +02:00
Vladislav Vaintroub
e6926b06da Fix compile errors:
- from xtradb merge
- portability error in bitmap-t.c ( variable size  array in non-portable)
2011-05-02 23:03:26 +02:00
Michael Widenius
90e058e0c6 Automatic merge 2011-05-02 21:42:52 +03:00
Michael Widenius
ee1950dab1 Merge with xtradb fixes 2011-05-02 21:41:02 +03:00
Michael Widenius
e415ba0fb2 Merge with MySQL 5.1.57/58
Moved some BSD string functions from Unireg
2011-05-02 20:58:45 +03:00
unknown
8b046db411 Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1. 2011-04-29 16:16:42 +02:00
unknown
fecd255a16 Updated with changes from Percona Server 5.1.56-12.7, from
lp:~percona-dev/percona-server/release-5.1.56-12.7 percona-server-5.1.56-12.7
as of April 29, 2011.

Merged: revid:ignacio.nin@percona.com-20110427224434-e5a4kpyfwvj641q3
2011-04-29 14:49:04 +02:00
Michael Widenius
046418ad95 Added calls to cleanup_mutexes() for embedded library. 2011-04-28 23:58:00 +03:00
Nirbhay Choubey
a1f7ceb281 BUG#12329909 - BUILDING MYSQL WITH DEBUG SUPPORT
FAILS WITH LIBEDIT

Fixed by checking the return value of the write()
function calls and handling the open files and fd
appropriately.


cmd-line-utils/libedit/vi.c:
  BUG#12329909 - BUILDING MYSQL WITH DEBUG SUPPORT
                 FAILS WITH LIBEDIT
  
  Added a check on the return value of the write()
  function calls.
2011-04-27 17:24:10 +05:30