diff options
| author | unknown <guilhem@gbichot4.local> | 2008-02-18 23:35:17 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-02-18 23:35:17 +0100 |
| commit | 34fff04d033e042ee89f7ffcd326285e59495c6a (patch) | |
| tree | 02fdc79840b4f1bb2f1ceb90b37a47fc51a5aeed /storage/myisam/myisamdef.h | |
| parent | d37d49bc543e933def3e460b1d6c156b3ec309cd (diff) | |
| parent | 85213f6235aa344f7861cc2f9a151869e041cb9e (diff) | |
| download | mariadb-git-34fff04d033e042ee89f7ffcd326285e59495c6a.tar.gz | |
Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca
into gbichot4.local:/home/mysql_src/mysql-maria-monty
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/replace.c:
Auto merged
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisamlog.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
include/my_global.h:
merge
storage/myisam/myisamdef.h:
merge
Diffstat (limited to 'storage/myisam/myisamdef.h')
| -rw-r--r-- | storage/myisam/myisamdef.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h index 64c1a8214c3..b0b9226749d 100644 --- a/storage/myisam/myisamdef.h +++ b/storage/myisam/myisamdef.h @@ -432,7 +432,7 @@ typedef struct st_mi_s_param n_ref_length, n_length, totlength, part_of_prev_key, prev_length, pack_marker; uchar *key, *prev_key, *next_key_pos; - bool store_not_null; + my_bool store_not_null; } MI_KEY_PARAM; /* Prototypes for intern functions */ |