diff options
| author | unknown <monty@mishka.local> | 2005-08-25 06:55:48 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-08-25 06:55:48 +0300 |
| commit | 173e5df37fb315099f9e89ce7d686528e24de5c5 (patch) | |
| tree | 7dfaa1b1889d948f6f78eb4f70bcf87091e7f02d /sql/examples | |
| parent | b11953834d8e9521fd3a2dfc4e2bffd26f865eb8 (diff) | |
| parent | e0f9b8a807fb09df27b016d0ad3852e3320f72dd (diff) | |
| download | mariadb-git-173e5df37fb315099f9e89ce7d686528e24de5c5.tar.gz | |
Merge mishka.local:/home/my/mysql-4.1
into mishka.local:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
BitKeeper/deleted/.del-have_lowercase0.inc:
Delete: mysql-test/include/have_lowercase0.inc
VC++Files/mysql-test/mysql_test_run_new.dsp:
Auto merged
configure.in:
Auto merged
mysql-test/include/ps_conv.inc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_example.cc:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
VC++Files/client/mysqltest.dsp:
manual merge
VC++Files/sql/mysqld.dsp:
manual merge
mysql-test/r/grant2.result:
patch merge
mysql-test/r/subselect2.result:
manual merge
mysql-test/t/grant2.test:
patch merge
mysys/charset.c:
Remove already deleted function
sql/examples/ha_archive.h:
Manual merge
sql/sql_acl.cc:
manual merge
sql/sql_db.cc:
merge (no differences)
sql/sql_select.cc:
manual merge
sql/table.h:
merge (no differences)
tests/mysql_client_test.c:
patch merge
Diffstat (limited to 'sql/examples')
| -rw-r--r-- | sql/examples/ha_example.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/examples/ha_example.cc b/sql/examples/ha_example.cc index a7e193b9730..dfc2fa7a260 100644 --- a/sql/examples/ha_example.cc +++ b/sql/examples/ha_example.cc @@ -67,7 +67,7 @@ #pragma implementation // gcc: Class implementation #endif -#include <mysql_priv.h> +#include "../mysql_priv.h" #ifdef HAVE_EXAMPLE_DB #include "ha_example.h" |