diff options
| author | unknown <kostja@bodhi.local> | 2006-07-13 22:09:36 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-13 22:09:36 +0400 |
| commit | 3c3f9d9022800193c26caa599e85fc3685a4d1ff (patch) | |
| tree | 42abdb25b1b2f8d856888f75545406d835075a65 /mysys | |
| parent | 5e643e312d5be3c83ac23ba607a279f9cd8458b6 (diff) | |
| parent | 0bbc6fbeb7cb60d263510ce1f4c116a69ec77f95 (diff) | |
| download | mariadb-git-3c3f9d9022800193c26caa599e85fc3685a4d1ff.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/key.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysys/my_handler.c:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/heap/hp_test1.c:
Auto merged
storage/heap/hp_test2.c:
Auto merged
strings/ctype-mb.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
sql/table.cc:
Use local (manual merge)
mysql-test/mysql-test-run.sh:
Manual merge.
sql/ha_ndbcluster.cc:
Manual merge.
sql/item.cc:
Manual merge.
tests/mysql_client_test.c:
Manual merge.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_handler.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_handler.c b/mysys/my_handler.c index bfec44d57a4..46144c0dff2 100644 --- a/mysys/my_handler.c +++ b/mysys/my_handler.c @@ -15,6 +15,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include <my_global.h> #include "my_handler.h" int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length, |