1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-17 14:41:26 +03:00

13691 Commits

Author SHA1 Message Date
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
d7edf9785b Post-merge fixes. 2003-04-17 00:18:29 +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
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
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
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
a3274c2222 fix for a bug with two natural joins. 2003-04-16 13:39:39 +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
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
fc6456b5c4 correct codes of warnings in result file 2003-04-12 04:26:55 +06: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
ac94902633 merge fix 2003-04-09 18:52:33 +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
f4216c526b Fix for a bug with empty item list in UNION's 2003-04-08 15:55:28 +03:00
unknown
8c95b51625 Use of CHARSWT_INFO *result_collation
instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests
2003-04-08 14:38:17 +05:00
unknown
f20835c7aa SET NAMES doesn't start recoding
SET CHARACTER SET does
2003-04-08 11:33:54 +05:00
unknown
da68e3d69f Changed innobase_flush_log_at_trx_commit to be 1 as default
Fixed problem with not freed thr_alarm() on slave connect


mysql-test/t/rpl_alter.test:
  Changed name of created test database
sql/ha_innobase.cc:
  Changed innobase_flush_log_at_trx_commit to be 1 as default
sql/mini_client.cc:
  Fixed problem with not freed thr_alarm()
sql/mysqld.cc:
  Allocate some extra thr_alarm slots just to be safe
sql/slave.cc:
  Simple code cleanup
2003-04-07 21:36:45 +03:00
unknown
ad9c7f040a merge fix
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
2003-04-07 14:32:25 +03:00
unknown
bfdaffb892 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.0
2003-04-06 12:26:04 +03:00
unknown
9a4258b4d4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


sql/sql_yacc.yy:
  Auto merged
2003-04-05 21:51:03 +03:00
unknown
0ee981674c Some optimization in SET NAMES
mysql-test/r/ctype_collate.result:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/r/variables.result:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/t/ctype_collate.test:
  SET NAMES charset COLLATE collation is new syntax
mysql-test/t/variables.test:
  SET NAMES charset COLLATE collation is new syntax
2003-04-05 18:56:15 +05:00
unknown
740adf718d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-04-05 09:29:58 +03:00
unknown
933e16a388 fixed st_select_lex initialization
fixed mustiupdate subselect compatibility

(bug 217)



mysql-test/r/subselect.result:
  test of multi-update & subselect
mysql-test/t/subselect.test:
  test of multi-update & subselect
sql/sql_update.cc:
  added subselect compatibility to query cache
sql/sql_yacc.yy:
  right st_select_lex initialization 
  layout fix
2003-04-05 09:29:28 +03:00
unknown
b2f51db6ac Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-04-05 09:06:45 +03:00
unknown
cfd69393e4 Post merge fixes.
mysql-test/r/sp.result:
  Enabled the cs test as it works now.
mysql-test/t/sp.test:
  Enabled the cs test as it works now.
2003-04-04 15:47:43 +02:00
unknown
b60e6bcf2d Merging 4.1 to 5.0.
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-04-04 13:45:35 +02:00
unknown
094d141b10 Updating subselect results after SUBSELECT was changed into SUBQUERY.
mysql-test/r/subselect.result:
  Updating results after SUBSELECT was changed into SUBQUERY.
2003-04-04 13:33:01 +02:00
unknown
c9d2e7759a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
2003-04-03 21:19:13 +03:00
unknown
6b8e2938f2 Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Auto merged
BitKeeper/deleted/.del-mysql.xdc:
  Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
sql/sql_parse.cc:
  Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
  Auto merged
2003-04-03 21:19:12 +03:00
unknown
41ce5aaa50 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 21:19:10 +03:00
unknown
5b67416a0b add test file for rpl_loaddata.test 2003-04-03 14:19:09 -04:00
unknown
00d9b06a7a test case for displaying and correct functioning of ALTER TABLE
ENABLE / DISABLE KEYS
2003-04-03 21:17:53 +03:00
unknown
89bb316550 One test case, one bug fix and one new feature
mysql-test/r/innodb.result:
  A test case for non-functional rollback after inserting a row into
  MyISAM table with binary log enabled.
mysql-test/t/innodb.test:
  A test case for non-functional rollback after inserting a row into
  MyISAM table with binary log enabled.
sql/sql_show.cc:
  Displaying disabled keys in SHOW KEYS
sql/sql_table.cc:
  Fix for a serious bug with ALTER TABLE ENABLE / DISABLE KEYS
2003-04-03 20:24:15 +03:00
unknown
5f5b6a7cea Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
2003-04-03 19:55:37 +03:00
unknown
4a1542d056 added test for replication load data into temporary table with additional options
sql/log_event.cc:
  fix bug #183 (Replication of temporary tables not working)
2003-04-03 12:54:08 -04:00
unknown
1834b6ff49 Updated results after merge 2003-04-03 13:21:39 +03:00
unknown
7835ff5083 AsWKB() function has been added. 2003-04-03 15:13:14 +05:00
unknown
f5feb33773 Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.


BitKeeper/etc/logging_ok:
  auto-union
sql/log.cc:
  Auto merged
client/client_priv.h:
  Merge with 3.23
client/mysqldump.c:
  Merge with 3.23
myisam/mi_dynrec.c:
  Merge with 3.23
mysql-test/t/myisam.test:
  Merge with 3.23
sql/log_event.cc:
  Merge with 3.23
sql/slave.cc:
  Merge with 3.23
sql/sql_delete.cc:
  Merge with 3.23
2003-04-03 12:33:13 +03:00
unknown
3a321d49e8 Updated result file. 2003-04-02 21:18:52 +02:00
unknown
2eebaf7bd3 Getting rid of lots of memory leaks (but not quite all of them yet,
some will go away when temporary code is replaced).


mysql-test/r/sp.result:
  Drop db before creating.
mysql-test/t/sp.test:
  Drop db before creating.
2003-04-02 20:42:28 +02:00
unknown
1e8cc909de correct code of warning of group_concat 2003-04-02 21:47:22 +06:00
unknown
bd4d87297d A fix for a bug in multi-table updates which was always caused
whenever a temporary MyISAM table had to be created from HEAP table.
2003-04-02 17:05:34 +03:00
unknown
aee0d02abd Auto merged
BitKeeper/etc/logging_ok:
  auto-union
2003-04-02 18:15:16 +06:00
unknown
6feda00ddb SCRUM
correct sql_alloc, ORDER BY and NULL value in group_concat
add comments
move test msg_arg
add test on NULL


mysql-test/r/func_gconcat.result:
  change work with NULL
mysql-test/t/func_gconcat.test:
  add test on NULL
sql/item_sum.cc:
  correct sql_alloc, ORDER BY and NULL value
  add comments
sql/sql_class.h:
  move test msg_arg
2003-04-02 17:55:53 +06:00