summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-04-063-0/+11
|\ | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/j/mysql-4.0
| * Merge hundin.mysql.fi:/home/marko/j/mysql-4.0unknown2004-04-053-0/+11
| |\ | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/i/mysql-4.0
| | * InnoDB: Backport fil_path_to_mysql_datadir from MySQL 4.1.xunknown2004-04-053-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/fil/fil0fil.c: Backport fil_path_to_mysql_datadir from 4.1 innobase/include/fil0fil.h: Backport fil_path_to_mysql_datadir from 4.1 sql/ha_innodb.cc: Backport fil_path_to_mysql_datadir from 4.1
* | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2004-04-063-6/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_3361/mysql-4.0
| * | | fixed Bug #3361 "mysqldump quotes DECIMAL values"unknown2004-04-053-6/+48
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | client/mysqldump.c: changed quotation mark around DECIMAL field values from " to ' as fix of BUG #3361 "mysqldump quotes DECIMAL values" mysql-test/r/mysqldump.result: added test for Bug #3361 "mysqldump quotes DECIMAL values" mysql-test/t/mysqldump.test: added test for Bug #3361 "mysqldump quotes DECIMAL values"
* | | - added ncurses-devel to the build prerequisites (BUG#3377)unknown2004-04-051-0/+5
| |/ |/|
* | Merge bk-internal:/home/bk/mysql-4.0/unknown2004-04-052-6/+27
|\ \ | |/ |/| | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * made fulltext search aware of concurrent insertsunknown2004-04-052-6/+27
| |
* | InnoDB: ignore intra-database foreign key references between tablesunknown2004-04-027-19/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when dropping database (Bug #3058) innobase/dict/dict0crea.c: Add a parameter to row_drop_table_for_mysql() innobase/dict/dict0dict.c: Make dict_tables_have_same_db() a global function innobase/include/dict0dict.h: Make dict_tables_have_same_db() a global function innobase/include/row0mysql.h: Add a parameter to row_drop_table_for_mysql() innobase/row/row0mysql.c: Add a parameter "drop_db" to row_drop_table_for_mysql() to skip foreign constraint checks on tables in same database innobase/trx/trx0roll.c: Add a parameter to row_drop_table_for_mysql() sql/ha_innodb.cc: Add a parameter "drop_db" to row_drop_table_for_mysql() innobase_drop_database(): allocate namebuf dynamically
* | Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-04-025-503/+563
|\ \ | |/ |/| | | | | | | | | into hundin.mysql.fi:/home/marko/j/mysql-4.0
| * InnoDB: Handle quotes properly in the InnoDB SQL parserunknown2004-04-025-503/+563
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/include/pars0pars.h: Remove dummy yywrap() function (use %noyywrap in pars0lex.l) innobase/pars/lexyy.c: New version corresponding to pars0lex.l innobase/pars/pars0lex.l: Add %option statements Add string_append() Allow quotes within quotes Simplify the patterns for matching comments innobase/pars/pars0pars.c: Remove dummy yywrap() function (use %noyywrap in pars0lex.l) innobase/pars/pars0sym.c: Remove quote handling from sym_tab_add_str_lit()
* | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-04-013-1/+14
|\ \ | |/ |/| | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_3200/mysql-4.0
| * Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2004-04-013-1/+14
| |\ | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_3200/mysql-4.0
| | * fixed bug #3200 "cannot compile with pstack"unknown2004-03-193-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | as downgrade of patch for bug #1661 "Compiling --with-pstack fails with binutils 2.13.90"
* | | Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-04-014-25/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/j/mysql-4.0 innobase/fil/fil0fil.c: Auto merged innobase/srv/srv0srv.c: Auto merged
| * | | fil0fil.c, os0file.c, srv0srv.h, srv0srv.c:unknown2004-04-014-34/+43
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char* innobase/srv/srv0srv.c: Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char* innobase/include/srv0srv.h: Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char* innobase/os/os0file.c: Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char* innobase/fil/fil0fil.c: Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char*
| * | fil0fil.c:unknown2004-03-312-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add assertions to check that we do not go out of bounds of io thread status array os0file.c: Fix memory corruption (assertion failure on line 244 of sync0sync.c) reported by Miguel in a Windows build of MySQL-4.1.2. The bug is present in all InnoDB versions in Windows, but it depends on how the linker places a static array in srv0srv.c, whether the bug shows itself. 4 bytes were overwritten with a pointer to a statically allocated string: 'get windows aio return value'. innobase/os/os0file.c: Fix memory corruption (assertion failure on line 244 of sync0sync.c) reported by Miguel in a Windows build of MySQL-4.1.2. The bug is present in all InnoDB versions in Windows, but it depends on how the linker places a static array in srv0srv.c, whether the bug shows itself. 4 bytes were overwritten with a pointer to a statically allocated string: 'get windows aio return value'. innobase/fil/fil0fil.c: Add assertions to check that we do not go out of bounds of io thread status array
* | | InnoDB cleanup: fixing buffer overflows and quoting of quotesunknown2004-04-0143-1142/+1144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/dict/dict0crea.c: Remove unneeded prototypes for static functions Remove unused parameters from some functions Replace some assertions with compile-time checks dict_create_add_foreigns_to_dictionary(): allocate space dynamically for the SQL, and quote quotes innobase/dict/dict0dict.c: Remove unnecessary prototypes for static functions dict_tables_have_same_db(): Remove length limitation dict_remove_db_name(): Use strchr() dict_get_db_name_len(): Use strchr() Replace mem_heap_alloc()+strlen()+memcpy() with mem_heap_strdup() Remove unnecessary strlen() calls Allocate space dynamically for generated strings dict_scan_id(): allow quotes within quoted strings innobase/dict/dict0load.c: Remove unnecessary strlen() calls Replace mem_heap_alloc()+strlen()+memcpy() with mem_heap_strdup() innobase/dict/dict0mem.c: Replace mem_heap_alloc()+strlen()+memcpy() with mem_heap_strdup() innobase/eval/eval0eval.c: Make TO_CHAR() work with any machine word width innobase/fil/fil0fil.c: Replace mem_alloc()+strlen()+strcpy() with mem_strdup() innobase/ibuf/ibuf0ibuf.c: Make some global variables static Add #ifdef UNIV_IBUF_DEBUG around debug statements innobase/include/data0data.h: Add #ifdef UNIV_DEBUG around dtuple_validate() innobase/include/data0data.ic: Replace = with == in ut_ad(tuple->magic_n == DATA_TUPLE_MAGIC_N) innobase/include/dict0dict.h: Add const qualifiers innobase/include/lock0lock.h: Add UL suffixes to unsigned long masks innobase/include/log0log.h: Remove unused parameter "type" of log_group_write_buf() innobase/include/mem0mem.h: Add mem_strdup(), mem_strdupl(), mem_strdupq(), mem_heap_strdup(), and mem_heap_strdupl() innobase/include/mem0mem.ic: Add mem_strdup(), mem_strdupl(), mem_strdupq(), mem_heap_strdup(), and mem_heap_strdupl() innobase/include/row0uins.h: Remove unused parameter "thr" of row_undo_ins() innobase/include/row0undo.h: Remvoe unused parameter "thr" of row_undo_search_clust_to_pcur() innobase/include/ut0byte.h: Add const qualifier to ut_cpy_in_lower_case() Remove parameter "len" of ut_cmp_in_lower_case() innobase/include/ut0mem.h: Add ut_strlenq(), ut_strcpyq() and ut_memcpyq() innobase/include/ut0mem.ic: Add ut_strlenq() innobase/include/ut0ut.h: Declare ut_sprintf() as a printf-style function innobase/lock/lock0lock.c: lock_clust_rec_modify_check_and_lock(): Remove unused variable "trx" innobase/log/log0log.c: Remove unused parameters innobase/log/log0recv.c: Remove parameter "type" from log_group_write_buf() innobase/mem/mem0mem.c: Simplify the initialization of block->init_block innobase/mtr/mtr0log.c: Add a debug assertion to mlog_parse_initial_log_record() innobase/page/page0cur.c: Add debug assertion to page_cur_insert_rec_write_log() Remove hard-coded buffer size in page_cur_parse_insert_rec() innobase/page/page0page.c: Remove unneeded variable rec innobase/pars/pars0opt.c: Correct a potential buffer overflow innobase/pars/pars0pars.c: Replace mem_heap_alloc()+strlen()+memcpy() with mem_heap_strdup() innobase/row/row0ins.c: Replace parameter "thr" with "trx" in row_ins_foreign_report_add_err() Remove unnecessary strlen() call Use strchr() innobase/row/row0mysql.c: Add row_mysql_is_recovered_tmp_table() Add row_mysql_is_system_table() Compare reserved table names with exact match Use strstr() and strchr() and mem_strdupl() Compute space needed for generated SQL, and allocate it dynamically innobase/row/row0purge.c: Remove unused parameters "thr" innobase/row/row0row.c: Simplify row_get_clust_rec() innobase/row/row0uins.c: Remove unused parameters "thr" innobase/row/row0umod.c: Remove unused variable "index" row_undo_mod_del_unmark_sec_and_undo_update(): Remove parameter "node" and variable "rec" Remove unused parameters "thr" innobase/row/row0undo.c: Remove unused parameters "thr" innobase/srv/srv0srv.c: Replace UT_NOT_USED() with __attribute__((unused)) innobase/srv/srv0start.c: Remove unnecessary strlen() calls Remove unused parameter "create_new_db" of open_or_create_log_file() innobase/trx/trx0roll.c: Replace mem_alloc()+strlen()+memcpy() with mem_strdup() innobase/trx/trx0sys.c: Remove unnecessary strlen() call innobase/ut/ut0byte.c: Add const qualifier to ut_cpy_in_lower_case() Remove parameter "len" of ut_cmp_in_lower_case() innobase/ut/ut0mem.c: Add ut_strlenq() and ut_memcpyq() sql/ha_innodb.cc: Remove parameter "len" of ut_cmp_in_lower_case()
* | | Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-03-311-14/+18
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/j/mysql-4.0
| * | InnoDB: cleanup of B-tree cursor operationsunknown2004-03-311-14/+18
| | | | | | | | | | | | | | | | | | innobase/btr/btr0cur.c: Remove unused parameter of btr_cur_latch_leaves() Simplify logic and add debug assertion in btr_cur_search_to_nth_level()
* | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-311-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0
| * | Fix bug #3181: insert_test client test missing mysql_initunknown2004-03-291-0/+1
| | |
* | | InnoDB: Remove ut_str_contains() and replace it with strchr()unknown2004-03-314-36/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/dict/dict0dict.c: Replace ut_str_contains() with strchr() innobase/include/ut0mem.h: Remove ut_str_contains(), a reinvented strchr() innobase/row/row0mysql.c: Replace ut_str_contains() with strchr() innobase/ut/ut0mem.c: Remove ut_str_contains(), a reinvented strchr()
* | | InnoDB: Remove unused hash table code and parametersunknown2004-03-312-69/+5
| | | | | | | | | | | | | | | | | | | | | | | | innobase/ha/ha0ha.c: Remove unused first parameter of ha_chain_get_next() innobase/include/ha0ha.ic: Remove unused first parameter of ha_chain_get_next() Remove unused function ha_next()
* | | InnoDB: Remove unnecessary code, mostly related to stored proceduresunknown2004-03-3110-315/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/data/data0data.c: Remove unused global variables innobase/dict/dict0dict.c: Remove unused code innobase/dict/dict0mem.c: Remove unnecessary function dict_mem_procedure_create() innobase/include/dict0dict.h: Remove unused code related to stored procedures innobase/include/dict0dict.ic: Remove unnecessary function dict_procedure_get() innobase/include/dict0mem.h: Remove unnecessary code related to stored procedures innobase/include/dict0types.h: Remove dict_proc_t, as procedures are not stored into database innobase/include/pars0pars.h: Remove call_node_struct and references to dict_proc_t, as procedures are not stored into database or called by name innobase/include/pars0sym.h: Remove procedure_def, as procedures are not stored into database innobase/include/pars0types.h: Remove call_node_t, as procedures are not called by name
* | | InnoDB: parse CONSTRAINT FOREIGN KEY correctly (Bug #3332)unknown2004-03-301-2/+9
| | | | | | | | | | | | | | | innobase/dict/dict0dict.c: dict_create_foreign_constraints_low(): parse CONSTRAINT FOREIGN KEY correctly
* | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-301-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| * | | A fix for the error message when database can not be dropped due tounknown2004-03-301-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the extra files being present.
* | | | Fix test results when you are in daylight saving timeunknown2004-03-301-0/+2
| | | | | | | | | | | | | | | | | | | | mysql-test/t/timezone.test: Fix results when you are in daylight saving time
* | | | Fixed wrong assert (Got failure in ctype_tis620)unknown2004-03-291-1/+1
| | | |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-299-4/+106
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.0
| * | | some cleanup of last patch for BUG #2342unknown2004-03-272-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/bdb-crash.test: added newline sql/ha_berkeley.cc: added a commet
| * | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-275-0/+64
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2342/mysql-4.0
| | * | fixed bug #2342 unknown2004-03-275-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Running ANALYZE TABLE on bdb table inside a transaction hangs server thread" 1. added new status HA_ADMIN_REJECT and processing of it in mysql_admin_table 2. got ha_berkley::analyze to return HA_ADMIN_REJECT if there are any transactions with the table.. mysql-test/r/bdb-crash.result: added test for bug #2342 "Running ANALYZE TABLE on bdb table inside a transaction hangs server thread" mysql-test/t/bdb-crash.test: added test for bug #2342 "Running ANALYZE TABLE on bdb table inside a transaction hangs server thread" sql/ha_berkeley.cc: fixed bug #2342 "Running ANALYZE TABLE on bdb table inside a transaction hangs server thread" we have to return new status "HA_ADMIN_REJECT" for ha_berkley::analyze if there are any transaction for this table so as bdb documentation says: "The DB->stat method cannot be transaction protected" sql/handler.h: added new status of table info "HA_ADMIN_REJECT" We have to return this status for bdb tables which have any active transactions so as bdb-documentation says: "The DB->stat method cannot be transaction-protected" sql/sql_table.cc: added processing of the new status HA_ADMIN_REJECT in mysql_admin_table (reason to add this status is explained in comment for commit on sql/handler.h)
| * | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-261-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| | * \ \ Merge heikki@build.mysql.com:/home/bk/mysql-4.0unknown2004-03-261-1/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.0
| | | * | mem0dbg.c:unknown2004-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport from 4.1: make mem_current_allocated_memory global variable innobase/mem/mem0dbg.c: Backport from 4.1: make mem_current_allocated_memory global variable
| * | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-263-3/+32
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| | * | | order_by.result:unknown2004-03-263-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | result of the test case for FORCE INDEX on ORDER BY order_by.test: test case for FORCE INDEX on ORDER BY sql_select.cc: Changing behaviour that MySQL server takes FORCE INDEX clause into account when optimising ORDER BY clause sql/sql_select.cc: Changing behaviour that MySQL server takes FORCE INDEX clause into account when optimising ORDER BY clause mysql-test/t/order_by.test: test case for FORCE INDEX on ORDER BY mysql-test/r/order_by.result: result of the test case for FORCE INDEX on ORDER BY
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-263-1/+43
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.0
| * | | | Allow keys with 0 segements in MyISAMunknown2004-03-263-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixed a bug in SELECT DISTINCT when all selected parts where constants. (Bug #3203) myisam/mi_create.c: Allow keys with 0 segements. mysql-test/r/myisam.result: Test for problem with SELECT DISTINCT mysql-test/t/myisam.test: Test for problem with SELECT DISTINCT
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0unknown2004-03-263-6/+65
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
| * | | | fixed BUG in query cahe statistic countingunknown2004-03-213-6/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/grant_cache.result: right results in query cache mysql-test/t/grant_cache.test: proving new results sql/sql_cache.cc: fixed statistic calculating in query cahe
* | | | | Updated tests after mergeunknown2004-03-252-33/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/alter_table.result: Updated tests mysql-test/t/alter_table.test: Updated tests
* | | | | merge with 3.23unknown2004-03-254-31/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union scripts/mysqlbug.sh: Auto merged sql/sql_parse.cc: Auto merged mysql-test/t/alter_table.test: Merge code with 3.23 sql/nt_servc.cc: use original code
| * | | | | Improved test caseunknown2004-03-253-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service backport from 4.0 mysql-test/t/alter_table.test: Improved test case sql/nt_servc.cc: service backport from 4.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-3.23unknown2004-03-251-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-alter-3.23
| | * | | | | protection against "ln -s /etc/passwd /tmp/failed-mysql-bugreport"unknown2004-03-241-2/+2
| | | | | | |
| * | | | | | used right table for grants check (BUG#3270)unknown2004-03-232-1/+20
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/alter_table.test: test for BUG#3270 added
* | | | | | bugs-aware post-commit triggerunknown2004-03-251-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup (VERSION variable)