Commit graph

10774 commits

Author SHA1 Message Date
unknown
04675623d6 code and comments cleanup 2004-02-05 18:58:10 +04: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
f0a715f3ad cleanup: #ifdef DELETE_ITEMS removed
sql/item.cc:
  #ifdef DELETE_ITEMS removed
sql/item_cmpfunc.cc:
  #ifdef DELETE_ITEMS removed
sql/sql_parse.cc:
  #ifdef DELETE_ITEMS removed
sql/sql_select.cc:
  #ifdef DELETE_ITEMS removed
2004-02-03 23:34:31 +03:00
unknown
786a5b6bc3 Bug #2619 ucs2 LIKE comparison fails in some cases 2004-02-03 18:14:23 +04:00
unknown
453a32e927 Code cleanup:
we don't need opt_range.h and opt_range.cc files at all.


BitKeeper/deleted/.del-opt_ft.cc~2048ffa561f9c59:
  Delete: sql/opt_ft.cc
BitKeeper/deleted/.del-opt_ft.h~24aac1d29304599a:
  Delete: sql/opt_ft.h
2004-02-03 14:35:24 +04:00
unknown
715e7a63a6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2419
2004-02-03 12:47:34 +04:00
unknown
0058d24da4 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2438/mysql-4.1
2004-02-03 01:19:04 +04:00
unknown
bfadd733ac Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2438/mysql-4.1
2004-02-03 01:16:08 +04:00
unknown
bbdba29229 changed allocation of st_table::insert_values
from table->mem_root to thd->mem_root 
(fixed bug #2438 "Runaway memory consumption")
2004-02-03 01:07:43 +04:00
unknown
f1bfba29d4 just tried to find all 'skipp' and replace it with 'skip'.
client/sql_string.cc:
  skipp -> skip
dbug/dbug.c:
  skipp -> skip
myisam/mi_create.c:
  skipp -> skip
myisam/mi_dynrec.c:
  skipp -> skip
myisam/mi_packrec.c:
  skipp -> skip
myisam/mi_rrnd.c:
  skipp -> skip
myisam/mi_test1.c:
  skipp -> skip
myisam/myisampack.c:
  skipp -> skip
myisam/rt_test.c:
  skipp -> skip
myisam/sp_test.c:
  skipp -> skip
mysys/default.c:
  skipp -> skip
mysys/mf_iocache.c:
  skipp -> skip
mysys/mf_pack.c:
  skipp -> skip
mysys/mf_wcomp.c:
  skipp -> skip
mysys/typelib.c:
  skipp -> skip
sql/filesort.cc:
  skipp -> skip
sql/item_strfunc.cc:
  skipp -> skip
sql/mysqld.cc:
  skipp -> skip
sql/opt_range.h:
  skipp -> skip
sql/sql_delete.cc:
  skipp -> skip
sql/sql_select.cc:
  skipp -> skip
sql/sql_string.cc:
  skipp -> skip
sql/sql_update.cc:
  skipp -> skip
strings/ctype-bin.c:
  skipp -> skip
strings/ctype-simple.c:
  skipp -> skip
strings/r_strinstr.c:
  skipp -> skip
strings/strinstr.c:
  skipp -> skip
strings/strstr.c:
  skipp -> skip
2004-02-02 20:25:39 +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
8131ccaf80 Added a comment for NULL range creation. 2004-02-02 19:32:49 +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
7bdc4c4faf incorrect fix undone, as it causes memory leaks (e.g. in key.test) 2004-01-30 08:40:01 +01:00
unknown
14ede384fe catch accesses to deleted objects
double delete bug fixed


sql/sql_list.h:
  catch accesses to deleted objects
sql/sql_union.cc:
  double delete fixed
2004-01-30 08:09:42 +01:00
unknown
a2d67665d5 SHOW CREATE DATABASE moved to sql_show.cc where it belongs
db name is printed with append_identifier for a proper quoting
2004-01-30 07:32:35 +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
e7a336d869 Unused variable removed (cleanup spotted in bug #2214) 2004-01-29 18:27:52 +03:00
unknown
86351fe428 ibuf0ibuf.c:
Correct the comment about the ibuf record format in >= 4.1.1


innobase/ibuf/ibuf0ibuf.c:
  Correct the comment about the ibuf record format in >= 4.1.1
2004-01-29 15:08:22 +02: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
d01e810128 Fix for #2210 (SHOW TABLE STATUS fails when .frm is corrupted)
We signed error instead of returning the result


sql/sql_show.cc:
  we need this assignement in libmysqld to not to issue error
2004-01-28 12:38:17 +04:00
unknown
2746e7de02 Fix for #2209
mysql->server_status wasn't set after the query


libmysqld/lib_sql.cc:
  Server status assignement added
2004-01-27 16:51:11 +04:00
unknown
c6ca96ade9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.1224
2004-01-27 13:48:20 +04:00
unknown
58e442caf3 bugfix to #1224
code slightly modified with Monty's suggestions


libmysqld/lib_sql.cc:
  copying of pointers replaced with my_strdup()-s
sql/sql_class.cc:
  this code should work anyway now
2004-01-27 13:46:47 +04:00
unknown
36ab3e0dfe code cleanup (unnecessary line in libmysqld/Makefile.am)
libmysqld/Makefile.am:
  superfluous line deleted
2004-01-27 11:25:07 +04:00
unknown
a5af8f1f80 warning comment 2004-01-26 20:16:37 +01:00
unknown
01d42f79e6 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2004-01-26 19:39:46 +01:00
unknown
9a1d21f0d1 fix for BUG#2516: "SLAVE START may crash mysqld"
sql/sql_yacc.yy:
  Enable UNTIL in SLAVE START; bzero() fixes the bug.
2004-01-26 19:39:00 +01:00
unknown
b4ba28470b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.1.long
2004-01-26 20:32:14 +04:00
unknown
0a3ca2f640 Fix for bug#2505: MySQL reports "out of memory"
when DROP USER if --skip-grant-tables
2004-01-26 20:31:38 +04:00
unknown
0314c772b5 Fixed a bug in slave-compressed-protocol. Using this option
from command line did not work.
2004-01-26 15:12:52 +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
8cfd6d0c1d mysqld.cc:
Fixed a typo bug.


sql/mysqld.cc:
  Fixed a typo bug.
2004-01-23 21:26:13 -08:00
unknown
15ed4347b2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2004-01-23 20:08:02 -08:00
unknown
7580623ec7 define name fixed
sql/lex.h:
  Wrong define name
2004-01-23 20:52:35 +04:00
unknown
2e5dfc5ec4 Error message added 2004-01-23 20:03:42 +04:00
unknown
a6132c6f0a Conflicts resolved
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
include/mysqld_error.h:
  merging
sql/share/english/errmsg.txt:
  merging
2004-01-23 20:00:10 +04:00
unknown
87b3ca5fe0 SCRUM
WL#1163 (Make spatial code separable)
fixes before the push


include/my_global.h:
  Temporary place for these defines
include/mysqld_error.h:
  ER_FEATURE_DISABLED definition
sql/item_geofunc.cc:
  #ifdef HAVE_SPATIAL moved to the better place
sql/share/english/errmsg.txt:
  Message for ER_FEATURE_DISABLED
2004-01-23 19:54:22 +04:00
unknown
2320323a34 Reverted an addition to be able to use ';' as a comment
starting character elsewhere than in the beginning of a line,
because it affected some innodb options that had ';'
in them.
2004-01-23 15:31:16 +02:00
unknown
214c178f17 SCRUM
wl #1163 (Make spatial code optional)
Patch I cleaned with Serg & Monty's suggestions


sql/gen_lex_hash.cc:
  mysql_priv.h was included for SYM_GROUP declaration
sql/lex.h:
  sym_group_xxx made global so we can use texts from them
  throughout the code
sql/lex_symbol.h:
  SYM_GROUP declaration moved to mysql_priv.h
sql/mysql_priv.h:
  declarations about SYM_GROUP
sql/sql_table.cc:
  sym_group_xxx objects used instead of text constants
  a couple of HAVE_SPATIAL removed
sql/sql_yacc.yy:
  sym_group_xxx used instead of text constants
  some duplicated code restructured
  MYF(0) parameters removed from net_printf calls
2004-01-23 16:02:57 +04: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
fcb0c7f5ee Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-01-22 22:44:05 +02: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
2880b07f75 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
2004-01-22 14:46:54 +01:00