4a98f36e59
Use a temporary directory for sockets if the socket path becomes too long.
2006-12-18 13:44:21 +01:00
8187397f8e
Remove junk
2006-12-15 12:54:40 +01:00
82db3278aa
Add support for loading example plugin and add plugin.test
2006-12-15 00:09:56 +01:00
ba6529d7dd
Bug#17642 mysqlbinlog: Restore from row-based binlog fails
...
Problem: mysqlbinlog_base64 failed sporadically.
Reason: Missing "flush logs" before running $MYSQL_BINLOG,
which could start dumping the log file before server
has finished writting into it.
Fix:
- implementing --force-if-open option to "mysqlbinlog"
- adding --disable-force-if-open to make $MYSQL_BINLOG
fail on non-closed log files, to garantee that nobody
will forget "flush logs" in the future.
- adding "flush logs" into all affected tests.
2006-12-14 14:05:25 +04:00
4a59a9cd2c
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-11 12:34:48 +01:00
fdbc84d27c
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-11 12:33:44 +01:00
ba6d2bbf64
Pass --no-defaults to embedded server to avoid that it reads any defaults file
2006-12-11 12:16:20 +01:00
128b73fc36
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00
971c783f7d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
33c248eee5
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:06:42 +01:00
6f0e7a2631
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 21:12:13 +01:00
cde79e4f79
Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema
2006-12-01 15:49:07 +01:00
f1ccd9cb30
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-11-30 22:47:50 +01:00
9a6f9c8c44
late after-merge fix
2006-11-30 22:45:55 +01:00
dc88e57744
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-30 13:04:24 +01:00
e36384fdce
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-30 12:14:28 +01:00
fb2ffbf203
Merge neptunus.(none):/home/msvensson/mysql/bug10608/my41-bug10608
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-30 11:58:23 +01:00
7146466eef
Merge 192.168.0.10:mysql/work/my51-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
2006-11-29 22:52:32 +01:00
eea2bd8421
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-29 22:51:25 +01:00
b23cb23349
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-29 22:50:10 +01:00
9799bbd76f
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-29 22:49:31 +01:00
5f4acf145b
After 5.1.6 just turn on logging, it will be sent to tables by default
2006-11-29 22:49:02 +01:00
f7bbcb71cc
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
2006-11-29 21:31:05 +01:00
521464755c
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
2006-11-29 19:32:36 +01:00
7ddc43e305
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 15:44:09 +01:00
cc71956401
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-29 14:26:47 +01:00
756f104591
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-11-29 10:33:23 +01:00
b6a83ccb7a
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-11-29 10:23:48 +01:00
c134b8c332
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-11-29 10:22:43 +01:00
1c46f7d841
minor fix
2006-11-29 10:21:59 +01:00
3a50528940
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 23:12:22 +01:00
2b98e19bb5
Remove the moved check a second time.
2006-11-28 23:09:17 +01:00
6dd62468bd
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 23:07:02 +01:00
7eb487ab26
Move the check that $opt_vardir could be created and was writable to the function
...
where we know how to creat the vardir
Remove unused variable
2006-11-28 23:06:06 +01:00
bb0d7ed44b
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 22:17:26 +01:00
9235e363a3
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 22:16:52 +01:00
05eb532514
Bug#24335 mysql-test-run.pl fails with ActiveState Perl on Windows
...
- Avoid use of mtr_run when executing "mysqld --verbose --help" to find
version and supported features
2006-11-28 22:16:31 +01:00
0c48000e6c
Fix missing parameter declaration
2006-11-28 21:57:42 +01:00
627a0bf0b4
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 21:20:56 +01:00
cc747a02b3
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 21:11:05 +01:00
04d5a42bbf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 20:59:57 +01:00
e61b7b9f64
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 20:51:09 +01:00
80d6de7e56
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 20:00:54 +01:00
fa8af12651
Look for client binaries also in bin/ directory
2006-11-28 20:00:27 +01:00
7c9d0abb19
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 19:54:52 +01:00
2346ee93ed
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 19:54:37 +01:00
961ae4ab2f
Create new function "run_testcase_mark_logs' and use it to mark start of testcase
...
in all cuurently known log files
2006-11-28 19:54:16 +01:00
998b05f245
Merge kahlann.erinye.com:/home/df/mysql/build/51
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-merge
2006-11-28 19:53:43 +01:00
6de56b75b2
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-28 19:11:02 +01:00
a92c7700bb
Only force mysqld to use log file up until 5.1.6
...
After that it will by default use log tables. That setting can be overruled
by adding a -master.opt file like mysql_client_test has.
2006-11-28 19:10:39 +01:00
