Commit graph

2257 commits

Author SHA1 Message Date
unknown
1c810278bd merge 2004-02-09 12:35:01 +01:00
unknown
35b1f54450 Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned



client/client_priv.h:
  cleanup & added OPT_COMPACT
client/mysqldump.c:
  Added option --compact to get a compact readable dump.
  Ensure that SET CHARACTER_SET_CLIENT is not done if we have not remembered the old character set
  Print optimization comments even if --skip-comments are given as these are not true comments. (Before these where only printed at end, which was a bug)
mysql-test/r/cast.result:
  More cast tests
mysql-test/r/derived.result:
  Removed warnings
mysql-test/r/mysqldump.result:
  Update results after fixing mysqlbinlog
mysql-test/r/query_cache.result:
  Make test usable with --extern
  more tests
mysql-test/r/rpl_until.result:
  Make test repeatable under valgrind
mysql-test/r/sql_mode.result:
  Fix test result
mysql-test/r/subselect.result:
  Make test smaller. Update wrong results
mysql-test/t/cast.test:
  More cast tests
mysql-test/t/derived.test:
  Removed warnings
mysql-test/t/query_cache.test:
  Make test usable with --extern
  more tests
mysql-test/t/rpl_until.test:
  fix for valgrind.  Becasue of unknown reason one got 'Slave_SQL_Running=yes' in this setup
mysql-test/t/subselect.test:
  Make test case smaller
sql/field.cc:
  Updated need_conversion() to use new arguments
sql/ha_heap.cc:
  Moved initialization of ref_length to right place. This fixed problem that we had a ref_length of 8 for heap tables, which was not efficent.
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Fixed bug in null_handling for cast to signed/unsigned
sql/item_strfunc.cc:
  Optimized/cleaned up Item_func_conv_charset3
sql/item_sum.cc:
  Cleanup.
  Ensure that some flag variables are cleared in cleanup()
sql/item_sum.h:
  Fixed references to uninitialized memory
sql/opt_range.cc:
  Fixed spelling error
sql/sql_class.cc:
  Fixed wrong return code, which could case protocol problems
sql/sql_class.h:
  After merge fix
sql/sql_prepare.cc:
  Added comments
sql/sql_show.cc:
  Cleanup
sql/sql_string.cc:
  Optimzed usage of need_conversion().
  - Removed not used argument
  - Save diff lenght in 'offset' to not have to recalculate length several times.
  Cleaned up comment
  Optimized copy_aligned() based on the knowledge that it's only called when you have wrong data
sql/sql_string.h:
  Updated need_conversion() and copy_aligned() to use new arguments
sql/sql_update.cc:
  Fixed error handling with non-updateable tables
sql/sql_yacc.yy:
  Ensure that lex->lock_options are set correctly (to get rid of warnings from valgrind)
  Ensure that cast_type sets lex->charset and lex->length. Without these CONVERT() didn't work properly
2004-02-09 12:31:03 +01:00
unknown
faa8a41b1d Problem fix:
http://bugs.mysql.com/bug.php?id=2366
Wrong utf8 behaviour when data is trancated
2004-02-06 16:59:25 +04:00
unknown
44289ba658 merge
mysql-test/r/subselect.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2004-02-05 18:14:48 +01:00
unknown
7b0ee22df4 Bug#2634
Emit "TYPE=" for 4.0 and 3.23 compatible modes


mysql-test/r/mysqldump.result:
  Bug#2634
    New test case
mysql-test/t/mysqldump.test:
  Bug#2634
    New test case
2004-02-05 02:30:28 +00:00
unknown
03f098d57e http://bugs.mysql.com/bug.php?id=2619
Bug #2619  	ucs2 LIKE comparison fails in some cases
Fixes
2004-02-04 18:16:28 +04:00
unknown
7f6f30284e Client character set is now not set from the server value. 2004-02-04 12:49:54 +04:00
unknown
786a5b6bc3 Bug #2619 ucs2 LIKE comparison fails in some cases 2004-02-03 18:14:23 +04:00
unknown
f85e469eed Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2419


sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-02-02 19:33:45 +04:00
unknown
65534b77a1 Indexes can be used for optimization if the operation
collation is the same with the index collation.
2004-02-02 17:50:14 +04:00
unknown
c91c1470c8 preload.result, key_cache.result, preload.test, key_cache.test, sql_yacc.yy:
Fixed bug #2602 in CACHE INDEX, LOAD INDEX


sql/sql_yacc.yy:
  Fixed bug #2602 in CACHE INDEX, LOAD INDEX
mysql-test/t/key_cache.test:
  Fixed bug #2602 in CACHE INDEX, LOAD INDEX
mysql-test/t/preload.test:
  Fixed bug #2602 in CACHE INDEX, LOAD INDEX
mysql-test/r/key_cache.result:
  Fixed bug #2602 in CACHE INDEX, LOAD INDEX
mysql-test/r/preload.result:
  Fixed bug #2602 in CACHE INDEX, LOAD INDEX
2004-02-02 00:19:51 -08:00
unknown
abc17f8f3c fix for the bug #2419: order by ignores rows.
null_ref_key moved to TABLE_REF.
new null range created if necessary.


mysql-test/r/order_by.result:
  fix for the bug #2419: order by ignores rows
mysql-test/t/order_by.test:
  fix for the bug #2419: order by ignores rows
sql/item_subselect.cc:
  fix for the bug #2419: order by ignores rows
sql/opt_range.cc:
  fix for the bug #2419: order by ignores rows
sql/sql_select.cc:
  fix for the bug #2419: order by ignores rows
sql/sql_select.h:
  fix for the bug #2419: order by ignores rows
2004-01-31 10:04:16 +04:00
unknown
150c99dffe cleanup 2004-01-30 08:56:32 +01:00
unknown
cfc362dbc5 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-01-30 06:41:37 +01:00
unknown
735eab8a07 Fixed Bug#2479, "dependant subquery with limit crash".
The problem was that memory was free'd, but it was referenced
later. This free was unneccessary anyway, because join_free() /
JOIN::cleanup takes care of this later on.

Added test case into t/subselect.test for it.

Regards,
Jani


mysql-test/r/subselect.result:
  Added a test case for Bug#2479.
mysql-test/t/subselect.test:
  Added a test case for Bug#2479.
sql/sql_select.cc:
  Fixed Bug#2479, "dependant subquery with limit crash".
  The problem was that memory was free'd, but it was referenced
  later. This free was unneccessary anyway, because join_free() /
  JOIN::cleanup takes care of this later on.
2004-01-29 01:16:24 +02:00
unknown
832ea1206d better fix BUG#2361: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key 2004-01-28 18:35:52 +01:00
unknown
96abffd4a4 Fixed a bug in GREATES() and LEAST() function, that caused a core
dump when result was NULL.


mysql-test/r/func_test.result:
  Added a test for GREATEST() and LEAST() core dump bug.
mysql-test/t/func_test.test:
  Added a test for GREATEST() and LEAST() core dump bug.
2004-01-28 19:02:58 +02:00
unknown
557bb526d7 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2004-01-24 15:57:48 +02:00
unknown
acf9821b16 patch reverted - USE_RAID is defined in my_config.h
mysql-test/r/derived.result:
  result updated
2004-01-23 11:56:37 +01:00
unknown
989cb2f29b Fix for a bug #2422, where CONVERT(expr, cast) was masked by
CONVERT(expr, expr, expr);


mysql-test/t/mysqldump.test:
  fix for my previous result fix of Jani's changes.
2004-01-22 22:13:24 +02:00
unknown
cf240e4ee8 Further fixes for 2390: ucs2 alignment 2004-01-21 14:15:19 +04:00
unknown
c3cf3d2820 Merge
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/derived.result:
  SCCS merged
mysql-test/t/derived.test:
  e
  merge
2004-01-20 19:23:28 +02:00
unknown
7a1a5cd2d8 for multy-delete command used same algorithm of table reference (alias)
mysql-test/t/multi_update.test:
  new results of changed multi-delete
mysql-test/t/update.test:
  new results of changed multi-delete
mysql-test/r/multi_update.result:
  new results of changed multi-delete
mysql-test/r/update.result:
  new results of changed multi-delete
2004-01-20 19:16:18 +02:00
unknown
e44a7da25f merge
myisam/mi_write.c:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-01-20 00:15:01 +01:00
unknown
43abc597b8 Code cleanup
Fixed bug in optimizer where it didn't choose right table order in some cases


myisam/mi_delete.c:
  Remove not needed include errno.h
myisam/mi_delete_table.c:
  Remove not needed include errno.h
myisam/mi_extra.c:
  Remove not needed include errno.h
myisam/mi_locking.c:
  Remove not needed include errno.h
myisam/mi_log.c:
  Remove not needed include errno.h
myisam/mi_page.c:
  Remove not needed include errno.h
myisam/mi_rename.c:
  Remove not needed include errno.h
myisam/mi_update.c:
  Remove not needed include errno.h
myisam/mi_write.c:
  Remove not needed include errno.h
mysql-test/r/subselect.result:
  Update of test after optimzier fix
mysys/charset.c:
  Code cleanup
sql/item_cmpfunc.cc:
  Removed not needed comment
  Indentation cleanup
sql/item_cmpfunc.h:
  Indentation cleanup
sql/mysqld.cc:
  Updated comment for expire_logs_days
sql/set_var.cc:
  Remved duplicate code
sql/sql_select.cc:
  Fixed bug in optimizer where it didn't choose right table order in some cases (Bug found and fixed by Igor)
2004-01-19 23:51:17 +01:00
unknown
3b98955a5c Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1
2004-01-20 00:34:38 +04:00
unknown
7db61ce021 Fixed bug #2310 "INET_ATON handles short-forms addresses incorrectly"
mysql-test/r/func_misc.result:
  added new test for inet_aton (short-forms addresses)
mysql-test/t/func_misc.test:
  added new test for inet_aton (short-forms addresses)
sql/item_func.cc:
  Change Item_func_inet_aton::val_int to parse short-forms addresses correctly
2004-01-20 00:32:25 +04:00
unknown
d2b5444181 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/item.h:
  Auto merged
2004-01-19 19:21:07 +04:00
unknown
162f1dc5e6 UCS-2 aligning 0xAA -> 0x00AA 2004-01-19 19:16:30 +04:00
unknown
9af09d1266 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-01-19 14:23:18 +01:00
unknown
06de76aec5 field length convertion (bytes->chars) should be done with rounding UP. 2004-01-19 14:22:38 +01:00
unknown
a66924353a Test case for the bug #2198: SELECT INTO OUTFILE (with Sub-Select) Problem. 2004-01-19 14:10:05 +04:00
unknown
2f7bf967fd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2182


client/mysqldump.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
2004-01-19 13:00:51 +04:00
unknown
cf2b6edaad Fix deprecation warning - database_engine => storage_engine
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-01-18 22:30:35 +00:00
unknown
aa35b8c1b1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-insert-4.1


sql/sql_derived.cc:
  Auto merged
2004-01-17 15:28:56 +02:00
unknown
d63d204c07 new test added
test fixed
2004-01-17 15:28:20 +02:00
unknown
fb006367e5 merge
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-01-17 13:13:48 +02:00
unknown
2de832dbf9 switched to new syntax (TYPE->ENGINE)
check of memory allocation operation was added


mysql-test/r/subselect_innodb.result:
  switched to new syntax
mysql-test/t/subselect_innodb.test:
  switched to new syntax
sql/sql_select.cc:
  check of memory allocation operation
2004-01-17 13:00:46 +02:00
unknown
dea4107141 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
2004-01-17 12:18:46 +02:00
unknown
12e7d6a39d mysqldump results fixed 2004-01-17 12:03:14 +02:00
unknown
adca234881 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1


mysql-test/r/subselect_innodb.result:
  Auto merged
mysql-test/t/subselect_innodb.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
2004-01-17 11:53:04 +02:00
unknown
e0bd7faf5b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_db.cc:
  Auto merged
2004-01-17 10:02:01 +02:00
unknown
306a903b37 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2004-01-15 22:05:24 +02:00
unknown
d372811cb2 I forgot to add the test in the previous commit :(
Blame me!
2004-01-15 16:10:44 +04:00
unknown
fd427c063d Fic for Bug 2367: INSERT() behaviour is different for different charsets. 2004-01-15 13:27:20 +04:00
unknown
6eaa5c3a66 assigned correct lex->current_select for derived tables (BUG#2349)
moved LIMIT initialialization, because it is need only for single select derived table


mysql-test/r/derived.result:
  test suite for BUG#2349
mysql-test/t/derived.test:
  test suite for BUG#2349
sql/sql_derived.cc:
  assigned correct lex->current_select (BUG#2349)
  moved LIMIT initialialization, because it is need only for single select
2004-01-14 15:15:42 +02:00
unknown
2f69de8e0e Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_show.cc:
  Auto merged
2004-01-14 14:08:56 +01:00
unknown
fd7d543adc show create tests 2004-01-14 12:29:30 +01:00
unknown
21e2c72bfb a fix (bug #2361: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key). 2004-01-13 16:18:37 +04:00
unknown
d84ee4d503 null.result, null.test:
Fix for a bug #2219, regarding a bad cast to integer from NULL
item_func.h:
  Fix for a bug #2219, regarding a bad cast to integer from NULL
sql_parse.cc:
  A fix for a bug #2207, with mysql server haning on option setting


sql/sql_parse.cc:
  A fix for a bug #2207, with mysql server haning on option setting
sql/item_func.h:
  Fix for a bug #2219, regarding a bad cast to integer from NULL
mysql-test/t/null.test:
   Fix for a bug #2219, regarding a bad cast to integer from NULL
mysql-test/r/null.result:
   Fix for a bug #2219, regarding a bad cast to integer from NULL
2004-01-09 22:28:29 +02:00