1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
a320421abc fixed bug in processing transaction in query cache (inserted lost lines) 2003-04-20 22:18:32 +03:00
unknown
1b23ce2d35 Three bug fixes and one fix being undone.
mysql-test/r/innodb_handler.result:
  change of test case after Heikki's fix
sql/sql_db.cc:
  Adding suport for backquotes in change_db()
sql/sql_update.cc:
  Undoing a fix
strings/ctype-tis620.c:
  Fixing a crashing bug
2003-04-19 23:18:35 +03:00
unknown
b09b7a1f19 ha_innodb.cc:
Prevent crash if MySQL calls rnd_end WITOUT calling rnd_init first: only restore active_index if it the old value was pushed in rnd_init
  Initialize active_index to a sensible value: prevent crash if we restore it to the original value after an table scan


sql/ha_innodb.cc:
  Prevent crash if MySQL calls rnd_end WITOUT calling rnd_init first: only restore active_index if it the old value was pushed in rnd_init
2003-04-18 22:06:10 +03:00
unknown
4643820397 ha_innodb.h, ha_innodb.cc:
Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables
log0recv.c:
  Use fflush to make sure report of a corrupt log record is printed to .err log before mysqld crashes


innobase/log/log0recv.c:
  Use fflush to make sure report of a corrupt log record is printed to .err log before mysqld crashes
sql/ha_innodb.cc:
  Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables
sql/ha_innodb.h:
  Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables
2003-04-18 18:42:43 +03:00
unknown
d8e0604b27 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-04-17 15:48:54 +03:00
unknown
4ed94fcd8e Check the number of args to SPs.
Fixes bug #280.


include/mysqld_error.h:
  Check the number of args to SPs.
mysql-test/r/sp-error.result:
  Check the number of args to SPs.
mysql-test/t/sp-error.test:
  Check the number of args to SPs.
sql/share/czech/errmsg.txt:
  Check the number of args to SPs.
sql/share/danish/errmsg.txt:
  Check the number of args to SPs.
sql/share/dutch/errmsg.txt:
  Check the number of args to SPs.
sql/share/english/errmsg.txt:
  Check the number of args to SPs.
sql/share/estonian/errmsg.txt:
  Check the number of args to SPs.
sql/share/french/errmsg.txt:
  Check the number of args to SPs.
sql/share/german/errmsg.txt:
  Check the number of args to SPs.
sql/share/greek/errmsg.txt:
  Check the number of args to SPs.
sql/share/hungarian/errmsg.txt:
  Check the number of args to SPs.
sql/share/italian/errmsg.txt:
  Check the number of args to SPs.
sql/share/japanese/errmsg.txt:
  Check the number of args to SPs.
sql/share/korean/errmsg.txt:
  Check the number of args to SPs.
sql/share/norwegian-ny/errmsg.txt:
  Check the number of args to SPs.
sql/share/norwegian/errmsg.txt:
  Check the number of args to SPs.
sql/share/polish/errmsg.txt:
  Check the number of args to SPs.
sql/share/portuguese/errmsg.txt:
  Check the number of args to SPs.
sql/share/romanian/errmsg.txt:
  Check the number of args to SPs.
sql/share/russian/errmsg.txt:
  Check the number of args to SPs.
sql/share/serbian/errmsg.txt:
  Check the number of args to SPs.
sql/share/slovak/errmsg.txt:
  Check the number of args to SPs.
sql/share/spanish/errmsg.txt:
  Check the number of args to SPs.
sql/share/swedish/errmsg.txt:
  Check the number of args to SPs.
sql/share/ukrainian/errmsg.txt:
  Check the number of args to SPs.
sql/sp_head.cc:
  Check the number of args to SPs.
2003-04-17 13:20:02 +02:00
unknown
fa741bbc03 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2003-04-17 13:47:37 +03:00
unknown
6760aeb1c0 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/ha_innodb.cc:
  Auto merged
2003-04-17 13:44:26 +03:00
unknown
390597cf9a Fix to have a reserved OK byte (prepare result)
sql/sql_prepare.cc:
  FFix to send a reserved OK byte on a prepared call
2003-04-16 16:47:01 -07:00
unknown
01545bd472 ha_innodb.cc, row0sel.c, row0mysql.c, row0mysql.h:
Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key


innobase/include/row0mysql.h:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
innobase/row/row0mysql.c:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
innobase/row/row0sel.c:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
sql/ha_innodb.cc:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
2003-04-17 02:28:40 +03:00
unknown
8f47d237ce Post post-merge fix.
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2003-04-17 00:34:15 +02:00
unknown
36752387c1 Merged 4.1 into 5.0.
client/mysql.cc:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-04-16 23:23:23 +02:00
unknown
923c638e89 undoing a fix 2003-04-16 22:24:58 +03:00
unknown
a358ec28b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/sql_yacc.yy:
  Auto merged
2003-04-16 12:11:32 -07:00
unknown
259cc315a5 Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files



VC++Files/libmysql/libmysql.dsp:
  Fix the broken file
2003-04-16 11:49:52 -07:00
unknown
dad32c9310 Fix for a bug with InnoDB SQL handler, when previous query failed
and an attempt is made to read previous / next value.
2003-04-16 21:10:45 +03:00
unknown
48935d0536 merging
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
2003-04-16 20:35:29 +03:00
unknown
fecbc44eb6 Fix for #126
sql/ha_myisam.cc:
  Flag added to turn on check sum recounting
2003-04-16 21:37:22 +05:00
unknown
781133546c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-04-16 18:24:53 +03:00
unknown
0d898379a7 fix for bug #212
sql/sql_list.h:
  We should reset list::last here
2003-04-16 19:48:58 +05:00
unknown
674d512da0 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_show.cc:
  Auto merged
2003-04-16 17:07:20 +03:00
unknown
33ac47279b Many files:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works


innobase/buf/buf0flu.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0crea.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0dict.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0load.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/ibuf/ibuf0ibuf.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/db0err.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/dict0dict.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/row0ins.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/lock/lock0lock.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/os/os0file.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0ins.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0mysql.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0sel.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0upd.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/srv/srv0srv.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/ut/ut0ut.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
sql/ha_innodb.cc:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
2003-04-16 16:45:01 +03:00
unknown
07c29cc91a Memory leak fixed. 2003-04-16 17:47:36 +05:00
unknown
a3274c2222 fix for a bug with two natural joins. 2003-04-16 13:39:39 +03:00
unknown
3cb207ec4b Fix bug: Crash server when grant ssl options are used and ssl handshake is not set 2003-04-16 15:05:47 +05:00
unknown
70a2f3c268 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1


sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-04-16 09:26:24 +03:00
unknown
e5c62e3280 Add mysys specific error messages
Make RELAY_THREAD and alias for IO_THREAD
Added new interface for string -> (unsigned) long long.


include/my_sys.h:
  Add mysys specific error messages
sql/lex.h:
  Make RELAY_THREAD an alias for IO_THREAD
sql/sql_yacc.yy:
  Make RELAY_THREAD an alias for IO_THREAD
2003-04-16 09:25:43 +03:00
unknown
7690ab2fb9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
2003-04-16 11:09:06 +05:00
unknown
ed7a263728 Fix for bug #212
sql/sql_list.h:
  Here we should reset item::last sometimes
2003-04-16 11:08:21 +05:00
unknown
35459cb7f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-04-15 22:10:49 +03:00
unknown
3ac05ea481 Fixed bug in SUM() with NULL:s
Added logging of warnings for failed connections with ssl.
Fixed bug in symbolic link handling on Windows


include/my_global.h:
  Added replication flags from 4.1
mysql-test/r/func_group.result:
  Added test for SUM(NULL)
mysql-test/t/func_group.test:
  Added test for SUM(NULL)
sql/item_sum.cc:
  Fixed bug in SUM() with NULL:s
sql/item_sum.h:
  Fixed bug in SUM() with NULL:s
sql/mysqld.cc:
  Added option --symbolic-links
  Fixed bug in symbolic link handling on Windows
sql/net_serv.cc:
  Code cleanup
sql/sql_acl.cc:
  Added logging of warnings for failed connections with ssl.
sql/sql_show.cc:
  Changed to use HAVE_REPLICATION instead of EMBEDDED_LIBRARY
2003-04-15 22:04:16 +03:00
unknown
b03a00ebf6 replace default separator in group_concat, correct a bug
mysql-test/r/func_gconcat.result:
  replace default separator
sql/item_sum.h:
  add fix_length_and_dec() and copy_or_same()
sql/sql_yacc.yy:
  replace default separator
2003-04-16 00:22:43 +06:00
unknown
24aba046bf Fix for a NAN problem in FORMAT(...) string function .. 2003-04-14 21:46:24 +03:00
unknown
930ded12ca Back porting a fix from 4.0 at customer's request 2003-04-14 20:58:41 +03:00
unknown
e357610ba3 A fix for a bug with uncached database privileges. 2003-04-14 19:45:09 +03:00
unknown
0a1d7ccd0a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
2003-04-14 14:51:52 +03:00
unknown
2fb2e0352f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-04-12 20:07:52 -07:00
unknown
3e335144be Two bug fixes
mysql-test/r/innodb.result:
  Fix for a bug that caused queries with ORDER BY field_in_select_list
  to be returned entirely unsorted.
mysql-test/t/innodb.test:
  Fix for a bug that caused queries with ORDER BY field_in_select_list
  to be returned entirely unsorted.
sql/sql_select.cc:
  Fix for a bug that caused queries with ORDER BY field_in_select_list
  to be returned entirely unsorted.
sql/sql_update.cc:
  Fix for a glitch that caused too many tables to be locked.
2003-04-11 20:09:24 +03:00
unknown
c11f200890 A fix for a crashing bug in EXPLAIN on derived tables with a join. 2003-04-10 21:05:28 +03:00
unknown
a4f6f3ad74 Merge
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
include/mysqld_error.h:
  merge.
sql/share/czech/errmsg.txt:
  SCCS merged
sql/share/danish/errmsg.txt:
  merge.
sql/share/dutch/errmsg.txt:
  merge .
sql/share/english/errmsg.txt:
  merge.
sql/share/estonian/errmsg.txt:
  merge.
sql/share/french/errmsg.txt:
  merge.
sql/share/german/errmsg.txt:
  merge.
sql/share/greek/errmsg.txt:
  merge.
sql/share/hungarian/errmsg.txt:
  e
  merge.
sql/share/italian/errmsg.txt:
  merge.
sql/share/japanese/errmsg.txt:
  merge.
sql/share/korean/errmsg.txt:
  merge.
sql/share/norwegian/errmsg.txt:
  merge.
sql/share/norwegian-ny/errmsg.txt:
  merge.
sql/share/polish/errmsg.txt:
  merge.
sql/share/portuguese/errmsg.txt:
  merge.
sql/share/romanian/errmsg.txt:
  SCCS merged
sql/share/russian/errmsg.txt:
  merge.
sql/share/serbian/errmsg.txt:
  merge.
sql/share/slovak/errmsg.txt:
  merge.
sql/share/spanish/errmsg.txt:
  merge.
sql/share/swedish/errmsg.txt:
  merge.
sql/share/ukrainian/errmsg.txt:
  merge.
2003-04-10 10:25:21 -04:00
unknown
75bdeb1b21 added compress/uncompress function
sql/mysql_priv.h:
  added have_compress variable
sql/mysqld.cc:
  added have_compress variable
sql/set_var.cc:
  added have_compress variable
2003-04-09 20:50:30 -04:00
unknown
9a86ad60af Post - post merge fix. 2003-04-09 19:17:12 +03:00
unknown
ac94902633 merge fix 2003-04-09 18:52:33 +03:00
unknown
8b81ac649f A fix for DELETE with ORDER BY and LIMIT.
How come we do not have a test case for this ??
2003-04-09 18:22:17 +03:00
unknown
c0672fb860 fix for a :
SELECT USER();
2003-04-09 17:34:06 +03:00
unknown
3bcbdd7852 Merge bk-internal:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-04-09 07:31:29 -07:00
unknown
cc8de8eb7f Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-04-09 16:38:36 +03:00
unknown
8cad4f7090 fix for #254
(3.23 master, 4.0 slave. 
Slave loss temp tables everytime FLUSH LOGS on master). 
This fix is less bad than the bug, it will cause a problem only maybe
if the master dies the hard way (I say maybe because I could not
cause a problem, and I don't see how it could happen).


sql/log_event.cc:
  fix for #254
  (3.23 master, 4.0 slave. 
  Slave loss temp tables everytime FLUSH LOGS on master). 
  This fix is less bad than the bug, it will cause a problem only maybe
  if the master dies the hard way. (I say maybe because I could not
  cause a problem, and I don't see how it could happen).
2003-04-09 15:16:12 +02:00
unknown
7786126bef a fix for a crashing bug when attempting to create InnoDB table
with GEOMETRY field type.
2003-04-08 20:39:50 +03:00
unknown
bbcf5390d6 Merging
myisam/mi_check.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  error messages trimmed
sql/share/czech/errmsg.txt:
  error messages trimmed
sql/share/danish/errmsg.txt:
  error messages trimmed
sql/share/dutch/errmsg.txt:
  error messages trimmed
sql/share/english/errmsg.txt:
  error messages trimmed
sql/share/estonian/errmsg.txt:
  error messages trimmed
sql/share/french/errmsg.txt:
  error messages trimmed
sql/share/german/errmsg.txt:
  error messages trimmed
sql/share/greek/errmsg.txt:
  error messages trimmed
sql/share/hungarian/errmsg.txt:
  error messages trimmed
sql/share/italian/errmsg.txt:
  error messages trimmed
sql/share/japanese/errmsg.txt:
  error messages trimmed
sql/share/korean/errmsg.txt:
  error messages trimmed
sql/share/norwegian-ny/errmsg.txt:
  error messages trimmed
sql/share/norwegian/errmsg.txt:
  error messages trimmed
sql/share/polish/errmsg.txt:
  error messages trimmed
sql/share/portuguese/errmsg.txt:
  error messages trimmed
sql/share/romanian/errmsg.txt:
  error messages trimmed
sql/share/russian/errmsg.txt:
  error messages trimmed
sql/share/serbian/errmsg.txt:
  error messages trimmed
sql/share/slovak/errmsg.txt:
  error messages trimmed
sql/share/spanish/errmsg.txt:
  error messages trimmed
sql/share/swedish/errmsg.txt:
  error messages trimmed
sql/share/ukrainian/errmsg.txt:
  error messages trimmed
2003-04-08 19:43:24 +05:00