diff options
| author | monty@tik.mysql.fi <> | 2001-09-27 21:45:48 +0300 |
|---|---|---|
| committer | monty@tik.mysql.fi <> | 2001-09-27 21:45:48 +0300 |
| commit | e05bf277d6529b61bf74cf0b8b3e6efd994869a0 (patch) | |
| tree | bacb3c051e2ae3debd9dedea9b0eb2efd094a961 /myisammrg | |
| parent | 5d9be4de24ab02436edbe2c75e96704a31c522b2 (diff) | |
| download | mariadb-git-e05bf277d6529b61bf74cf0b8b3e6efd994869a0.tar.gz | |
Final fixes for INSERT into MERGE tables.
Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors
Diffstat (limited to 'myisammrg')
| -rw-r--r-- | myisammrg/myrg_create.c | 2 | ||||
| -rw-r--r-- | myisammrg/myrg_static.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/myisammrg/myrg_create.c b/myisammrg/myrg_create.c index 5c6638b6ef2..d1ea018741d 100644 --- a/myisammrg/myrg_create.c +++ b/myisammrg/myrg_create.c @@ -54,7 +54,7 @@ int myrg_create(const char *name, const char **table_names, if (insert_method != MERGE_INSERT_DISABLED) { end=strxmov(buff,"#INSERT_METHOD=", - get_type(&merge_insert_method,insert_method),"\n",NullS); + get_type(&merge_insert_method,insert_method-1),"\n",NullS); if (my_write(file,buff,(uint) (end-buff),MYF(MY_WME | MY_NABP))) goto err; } diff --git a/myisammrg/myrg_static.c b/myisammrg/myrg_static.c index ad57ea847d5..d667c5a5475 100644 --- a/myisammrg/myrg_static.c +++ b/myisammrg/myrg_static.c @@ -26,5 +26,5 @@ LIST *myrg_open_list=0; static const char *merge_insert_methods[] = { "FIRST", "LAST", NullS }; -TYPELIB merge_insert_method= { array_elements(merge_insert_methods),"", +TYPELIB merge_insert_method= { array_elements(merge_insert_methods)-1,"", merge_insert_methods}; |