1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-19 01:41:20 +03:00

6466 Commits

Author SHA1 Message Date
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
4db4ffef27 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2298


myisam/mi_search.c:
  Auto merged
2004-01-22 20:35:36 +04:00
unknown
f9cf5bb263 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2290/mysql-4.0
2004-01-22 20:35:35 +04:00
unknown
76c7dac801 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2290/mysql-4.0
2004-01-22 20:28:17 +04:00
unknown
8b03b319f5 some ammendments (comments and code style)
mysql-test/t/func_str.test:
  add skipped new line
sql/item_strfunc.cc:
  rewrote some comments for Item_func_elt
2004-01-22 20:20:43 +04:00
unknown
79f6e16d5e a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
<monty> ramil, in MySQL/MyISAM we should only strip end space, not 'space-like' characters.
<monty> This is according to SQL;  When doing a comparision end space and only end space are ignored.



myisam/mi_key.c:
  a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
myisam/mi_search.c:
  a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
mysql-test/r/select.result:
  test case for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
mysql-test/t/select.test:
  test case for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
sql/sql_string.cc:
  a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
2004-01-22 18:05:47 +04:00
unknown
d0123ed5d2 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-22 14:18:12 +02:00
unknown
cdcf112af0 test moved to an appropriate file 2004-01-21 23:39:35 +01:00
unknown
0ef9acc9a9 two more bugfixes for "space stripping in MyISAM indexes" 2004-01-21 23:29:17 +01:00
unknown
2c3fdcf749 test case for MyISAM sort-repair bug 2004-01-21 21:43:41 +01:00
unknown
219f51b475 Fixed BUG#2227: Server crash with stored procedure call.
(Meaning "... with SELECT v", where v is a local variable.)


mysql-test/r/sp.result:
  Test case for BUG#2227
mysql-test/t/sp.test:
  Test case for BUG#2227
sql/item.h:
  Item_splocal::send() needed for "SELEC v", where "v" is a local variable.
  Also set the field name.
sql/sp_head.cc:
  Have to get decimals and max_length right for reals, when SELECT of local variables.
2004-01-21 14:28:35 +01:00
unknown
cf240e4ee8 Further fixes for 2390: ucs2 alignment 2004-01-21 14:15:19 +04:00
unknown
24ca1e1edb added test for bug #2290 "output truncated with ELT when using DISTINCT"
sql/item_strfunc.cc:
  fixed bug #2290 "output truncated with ELT when using DISTINCT"
2004-01-21 02:18:51 +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
862b062275 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-20 17:49:10 +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
0153488a02 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-01-19 23:10:18 +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
3991a1d0d1 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-19 14:15:40 +02: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
2d6ff22e94 merge fixes 2004-01-17 17:18:32 +02: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
19fe657f4e commit of forgoten test 2004-01-17 13:09:41 +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
1069e99eb1 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2004-01-17 02:25:56 -08: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
c217c4867b Two bug fixes
mysql-test/t/mysqldump.test:
  Fixing a test to encompass latest Jani's patch to mysqldump.c
sql/sql_union.cc:
  Fix for the unlock problem with a typo correction.
2004-01-16 20:05:08 +02:00
unknown
d894ca49bd Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-01-16 15:26:58 +02:00
unknown
130ae28cca Fixed table crash bug when updating row > 16M (Bug #2159)
myisam/mi_dynrec.c:
  Fixed table crash bug when updating row > 16M
2004-01-15 21:39:56 +01: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
ae4b94598c an obvious bug in _mi_key_cmp fixed (BUG#2295 - range on blobs) 2004-01-15 16:31:27 +01: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
95a34bd83f Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-01-14 18:20:49 +01:00