diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-08 09:50:56 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-08 10:19:55 +0200 |
| commit | c761b43451d54eeeecdf3c102906fcce88d4e9d9 (patch) | |
| tree | c00b07bf4b36108f1ecbfc3015b5594899e0e248 /include/my_global.h | |
| parent | 07e4853c232726a639b30d4718bef9914ea42d24 (diff) | |
| parent | bac2ec3a5b28ed590826b20a4cf27fd788903bbd (diff) | |
| download | mariadb-git-c761b43451d54eeeecdf3c102906fcce88d4e9d9.tar.gz | |
Merge 10.3 into 10.4mariadb-10.4.0
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index d620d4e790b..ea438e7171f 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -981,7 +981,6 @@ typedef unsigned long my_off_t; TODO Convert these to use Bitmap class. */ typedef ulonglong table_map; /* Used for table bits in join */ -typedef ulong nesting_map; /* Used for flags of nesting constructs */ /* often used type names - opaque declarations */ typedef const struct charset_info_st CHARSET_INFO; |