Commit graph

157 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
0b60b7d59a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 19:19:02 +01:00
msvensson@neptunus.(none)
29d1e3230b Use mysql-test-run.pl 2006-11-13 19:12:34 +01:00
msvensson@shellback.(none)
45a8c28498 Fix spelling error in Makefile 2006-09-18 13:24:03 +02:00
msvensson@shellback.(none)
0a59967cb0 Remove trailing whitespace
Add linebreak
2006-09-18 11:27:21 +02:00
msvensson@shellback.(none)
dd76996955 Move mysql-test-run.sh to new name mysql-test-run-shell.sh
Symlink mysql-test-run to mysql-test-run.pl
2006-09-18 11:22:51 +02:00
msvensson@shellback.(none)
a63285a647 Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
into  shellback.(none):/home/msvensson/mysql/mtr/my51-mtr
2006-09-01 10:32:20 +02:00
msvensson@shellback.(none)
7afee46c55 Merge shellback.(none):/home/msvensson/mysql/mtr/my41-mtr
into  shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
2006-09-01 10:25:50 +02:00
msvensson@shellback.(none)
324cf4ccb3 Add target to make "mtr", shortcut for running test suite 2006-09-01 10:21:08 +02:00
kroki/tomash@moonlight.intranet
aca2c3761a Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-10 16:11:55 +04:00
evgen@moonbone.local
7f0a080660 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 16:46:55 +04:00
msvensson@neptunus.(none)
d89f177377 Bug#21125 mysqldump: Problem with non-standard table names
- The mysql-test/std_data/bug15328.cnf file was not copied to install or dist dir.
2006-07-24 14:31:37 +02:00
stewart@willster.(none)
1496303771 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main
into  willster.(none):/home/stewart/Documents/MySQL/5.1/main
2006-07-24 02:32:49 +10:00
pekka@orca.ndb.mysql.com
79cc3bed10 mysql-test/Makefile.am: fix cp of mode 444 files (re-commit) 2006-07-10 11:09:32 +02:00
msvensson@neptunus.(none)
7d9efcc206 Make cert's in std_data that we cpoy from SSL/ depend on the cert's in SSL/ 2006-05-03 12:05:04 +02:00
tomas@poseidon.ndb.mysql.com
7dbc18bd07 ndb: corrected install dir
ndb: corrected initialization of records
2006-04-21 13:51:58 +02:00
tomas@poseidon.ndb.mysql.com
9a2938b571 added one more missing install path for new files 2006-04-21 09:43:21 +02:00
tomas@poseidon.ndb.mysql.com
b9b202327d added missing install paths for new files 2006-04-21 08:53:25 +02:00
jimw@mysql.com
515da4679b Don't remove mysql-test/std_data/*.pem in 'make clean' 2006-04-13 12:36:14 -07:00
jimw@mysql.com
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
2006-04-11 18:54:24 -07:00
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
kent@mysql.com
0298bfaac6 Merge 2006-04-03 03:52:22 +02:00
kent@mysql.com
6783064d02 Makefile.am:
Distribute mysql-test-run.pl
2006-04-03 03:47:28 +02:00
kent@mysql.com
52db1e450a Makefile.am:
Install Perl mysql-test-run into test directory
2006-04-02 02:10:41 +02:00
kent@mysql.com
5e28df35af Merge 2006-04-01 05:53:37 +02:00
kent@mysql.com
02c661dbcc Makefile.am:
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
2006-04-01 05:44:10 +02:00
knielsen@mysql.com
6b2771fe92 Revert error in changeset "1.1979 05/12/22 06:39:02 lars@mysql.com" which
caused wrong permissions in "make dist".
2006-01-01 22:57:48 +01:00
lars@mysql.com
ad126d90e0 WL#1012: All changes as one single changeset.
This includes both code and test cases.
2005-12-22 06:39:02 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-04 01:15:35 +01:00
kent@mysql.com
85ab53357b thread_registry.h, thread_registry.cc:
Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files
2005-10-16 06:49:19 +02:00
kent@mysql.com
94ea4f188a make_binary_distribution.sh:
Copy *.cnf files in mysql-test/std_data/
Makefile.am:
  Added std_data/*.cnf to copy ndb config
2005-10-12 22:49:33 +02:00
kent@mysql.com
82615d8b9d Makefile.am:
Copy "disabled.def"
2005-10-10 00:21:10 +02:00
kent@mysql.com
095efe48a5 Makefile.am, configure.in:
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
kent@mysql.com
85ed1e8da7 Makefile.am:
Make dist copy of .imtest files not fail the make target, as there are no files yet
2005-08-31 02:25:28 +02:00
anozdrin@mysql.com
d30534c953 Implement WL#2789 "Instance Manager: test using mysql-test-run testing framework" 2005-08-29 22:28:42 +04:00
lenz@mysql.com
94310faa2e - reverted and optimized a merge 2005-07-08 21:13:14 +02:00
lenz@mysql.com
8ad778d9c0 Merge 2005-07-08 21:09:50 +02:00
lenz@mysql.com
611ae59245 - reverted adding mysql-test/t/*.def to the distribution (it is not supported in 4.1
at all)
2005-07-08 21:04:54 +02:00
lenz@mysql.com
79f43c864a - manual merge of the addition of including mysqlt-test/t/*.def 2005-07-08 11:27:08 +02:00
lenz@mysql.com
780d699b86 - added mysql-test/t/*.def to the source and binary distributions 2005-07-08 11:07:05 +02:00
kent@mysql.com
8e3b393d5c Merge 2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a Makefile.am:
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
kent@mysql.com
e58054ad16 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-19 20:09:28 +02:00
serg@serg.mylan
07513c001c BSD make compatibility. bug#9828 2005-06-18 18:14:28 +02:00
lenz@mysql.com
d11be61a51 Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0
2005-06-10 15:41:30 +02:00
lenz@mysql.com
a610a7749f - added missing files std_data/server-cert.pem and std_data/server-key.pem to make
the SSL tests pass
2005-06-10 15:30:16 +02:00
lenz@mysql.com
024010e562 - make sure to include mysql-test/t/*.sql files in the binary distributions and when
"make install" is called (mysql_delimiter.sql was missing)
2005-06-08 11:49:24 +02:00
lenz@mysql.com
852a57300d - include/config-win.h: removed double HAVE_CHARSET_cp932 #define
- mysql-test/Makefile.am: added a pattern match for t/*.sql 
  (t/mysql_delimiter.sql was missing from the source distribution)
2005-06-03 18:20:25 +02:00
jimw@mysql.com
3dcfc31e76 Remove references to result.es files 2005-04-12 18:04:32 -07:00
jani@ua141d10.elisa.omakaista.fi
18354f4570 A small fix to Makefile.am 2005-04-07 13:20:15 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
288eff45cb Added missing file to Makefile.am 2005-04-06 21:55:34 +03:00
kent@mysql.com
2aa8253f70 Merge 2005-04-06 18:19:05 +02:00
kent@mysql.com
57d8914287 Makefile.am:
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed
2005-04-06 12:20:55 +02:00
jimw@mysql.com
127afff8c8 Remove references to result.es files 2005-04-05 13:01:42 -07:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
tomas@poseidon.ndb.mysql.com
f5e9b79c28 mysql-test-run to default run with ndbcluster if compiled with that support 2005-03-07 13:42:01 +01:00
joerg@mysql.com
5c5ac0e3b1 Ensure that '*.disabled' files are truly optional, so that their non-existence
will not cause "make" to fail.
2005-03-03 16:01:39 +01:00
kent@mysql.com
87d6da972f make_binary_distribution.sh, Makefile.am:
Make .disabled files part of distribution
2005-02-17 20:07:52 +01:00
lenz@mysql.com
420d29159f Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-5.0
2005-02-09 17:52:31 +01:00
lenz@mysql.com
a0089319d2 - make sure to include the embedded test results in the source distribution 2005-02-09 17:49:43 +01:00
joreland@mysql.com
93bbde704a mysql-test/Makefile.am
Install varchar.frm
    Otherwise type_varchar fails when running mysql-test-run on installed system
mysql-test/mysql-test-run.sh
    Use correct path to clist_tests in on installed system
2005-01-04 08:15:33 +01:00
wax@kishkin.ru
e81d48fdd9 corrected mysqltest.dsp
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script
2004-12-14 18:46:55 +05:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
tomas@poseidon.ndb.mysql.com
3f38389905 Makefile.am:
added so that it is possible to make mysql_test_run_new
  but not done for target all do:
   make mysql_test_run_new
2004-11-08 10:53:48 +00:00
tomas@poseidon.ndb.mysql.com
f3cd21dbb3 Makefile.am:
remove mysql_test_run_new for now, it breaks the make
2004-11-08 10:41:59 +00:00
joerg@mysql.com
16b280b11d Ensure that even the (relatively new) "mysql-test/Makefile.am" gets into the source tar-ball. 2004-11-05 15:50:53 +01:00
wax@kishkin.ru
ff32313dd5 autocommit and changed name mysql_test_run_new 2004-11-04 21:25:51 +05:00
dlenev@mysql.com
fa21feda93 Fix for bug #6387 "Queried timestamp values do not match the inserted
value if server runs in time zone with leap seconds".

Now in my_gmt_sec() function we take into account difference between
our target and estimation in seconds part.
2004-11-03 17:59:03 +00:00
wax@mysql.com
d6dadac46c Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
2004-09-16 00:50:05 +06:00
wax@kishkin.ru
eb7515366b WL#964
porting mysql_test_run on Linux and Windows
2004-09-16 00:47:45 +06:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
guilhem@mysql.com
4a96a8a64f Fix for BUG#5050 "mysql-test-run fails on rpl_trunc_binlog after 'make install'":
The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.
2004-08-14 15:24:40 +02:00
konstantin@mysql.com
172ab0ab8b Fix for 'make dist' 'make distclean' goals work even if ./configure
called without NDB enabled.
2004-06-25 23:21:14 +04:00
serg@serg.mylan
c03addab79 merged 2004-06-23 12:36:07 +02:00
serg@serg.mylan
3f1c4ba745 handler interface cleanups:
more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing
2004-06-23 12:29:05 +02:00
serg@serg.mylan
308eb6f559 after merge fix 2004-06-11 22:00:08 +02:00
serg@serg.mylan
a0464b8563 one more ndb-isolating fix 2004-06-05 13:16:29 +02:00
tomas@poseidon.(none)
9d762e369a ndb in mysql-test fix 2004-05-27 08:05:10 +00:00
monty@mysql.com
cf535556c6 Cleanups (comments and compiler warnings)
dded init of variable to fix core dump on startup errors
2003-11-02 14:00:25 +02:00
dlenev@dlenev.mshome
2486222cd2 Implemented replication over SSL
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file
2003-09-01 15:16:20 +04:00
lenz@mysql.com
a95c024067 - typo fix (replaced blanks with a tab) 2003-03-05 08:13:37 +01:00
lenz@mysql.com
26f9bee733 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 22:24:00 +01:00
lenz@mysql.com
905ce89dc5 - added missing file mysql-test/std_data/des_key_file to source and binary
distribution to fix a test failure in test "func_encrypt"
2003-03-04 18:18:05 +01:00
monty@narttu.mysql.fi
050543bdfc Merge with 3.23 -> 4.0 2003-02-28 13:29:48 +02:00
monty@narttu.mysql.fi
41e2309259 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-02-28 12:33:10 +02:00
monty@narttu.mysql.fi
9286552567 Added copying of *.slave-mi mysql-test files 2003-02-28 12:32:37 +02:00
nick@mysql.com
4b7897fc76 Changed binlog name padding from binlog.001 to binlog.000001 2002-10-29 15:11:13 -07:00
monty@mashka.mysql.fi
bae4af8a4f Fixed missing table_list->name -> table_list->alias convert 2002-10-08 17:58:43 +03:00
Sinisa@sinisa.nasamreza.org
ff48c85c8f small fix from bugs@.. list 2002-10-07 16:30:39 +03:00
sasha@mysql.sashanet.com
ea2e911892 support for eval_result and let $var = query syntax in mysql-test
fixes for rpl_log test to make it config-independent
2001-06-30 13:08:35 -06:00
monty@donna.mysql.fi
1e3df575b9 Fixed probelm with count(*) and normal functions when no matchin rows.
Changed 'lib' to 'master-data'
Fix for slow slaves
2001-04-21 17:12:59 +03:00
sasha@mysql.sashanet.com
34b209db7a distribution did not include *.sh files in mysql-test/t 2001-04-18 18:01:56 -06:00
tim@threads.polyesthetic.msg
bcd6abea6d Use INSTALL_DATA instead of cp.
mysql.server is a script, not data.
2001-02-01 20:49:04 -05:00
tim@threads.polyesthetic.msg
faeb9896bd Use $(INSTALL_DATA) instead of cp -p in mysql-test and sql-bench.
Clean up $(INSTALL_DATA) use in sql/share.
2001-01-31 15:01:16 -05:00
monty@donna.mysql.com
1b72f32c30 Remove removed files from Makefile.am 2001-01-21 17:29:59 +02:00
monty@donna.mysql.com
62771338ca Changes for --with-server-suffix
Fixed mutex bug in logging (crash on windows when doing SET PASSWORD=)
Changed MERGE  tables to not use FILE
2001-01-21 16:30:16 +02:00
tim@cane.mysql.fi
08d36171a9 Add --with-server-suffix (MYSQL_SERVER_SUFFIX). 2001-01-19 02:46:13 +02:00
monty@donna.mysql.com
dad095b480 Added missing .require files 2001-01-02 15:17:11 +02:00