diff options
| author | unknown <guilhem@gbichot3.local> | 2006-09-07 11:23:01 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-09-07 11:23:01 +0200 |
| commit | 0e9b2ad0165918ad7c4da840ecbb4cf7bf01380d (patch) | |
| tree | 743c2b5e98d550f5822d62a5574113f93e0fd5c8 /mysql-test/include | |
| parent | 04c78289dea881c78457ffc1aaae239d8fdf5463 (diff) | |
| parent | 0166d45cd6fed1248eaf4649318d5be19d8a967e (diff) | |
| download | mariadb-git-0e9b2ad0165918ad7c4da840ecbb4cf7bf01380d.tar.gz | |
Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria
into gbichot3.local:/home/mysql_src/mysql-maria
BitKeeper/etc/ignore:
auto-union
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/my_pread.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/myisam/ft_parser.c:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisam/mi_delete_all.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/sort.c:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
configure.in:
merge
sql/mysqld.cc:
merge
storage/myisam/Makefile.am:
merge
storage/myisam/myisamdef.h:
merge
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_maria.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/have_maria.inc b/mysql-test/include/have_maria.inc new file mode 100644 index 00000000000..955e2305ca5 --- /dev/null +++ b/mysql-test/include/have_maria.inc @@ -0,0 +1,4 @@ +-- require r/have_maria.require +disable_query_log; +show variables like "have_maria"; +enable_query_log; |