1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00
Commit Graph

2502 Commits

Author SHA1 Message Date
unknown
0da49160c6 Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-01 15:05:35 +02:00
unknown
9b045452c9 Fixed that one can use in identifiers: CREATE TABLE fo`a ...
Added BOOLEAN as synonym for tinyint


sql/sql_lex.cc:
  Fixed that one can use ` in identifiers:  CREATE TABLE `fo``a` ...
sql/sql_yacc.yy:
  Added BOOLEAN as synonym for tinyint
2002-12-01 14:59:06 +02:00
unknown
9fcbfc0d12 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-12-01 00:17:33 +02:00
unknown
1941d9b597 fix of error handling
mysql-test/r/subselect.result:
  test of error handling with subselect
mysql-test/t/subselect.test:
  test of error handling with subselect
2002-12-01 00:11:22 +02:00
unknown
0b36bbdf25 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-30 19:54:52 +02:00
unknown
b790bc24d8 some bug fixes and tests for those.
I am pushing now, because :

* I have a fix for crashing bug
* Sanja will destroy my changes in sub-select test ... ;)


mysql-test/r/derived.result:
  tests for recent bugs
mysql-test/r/subselect.result:
  tests for recent bugs
mysql-test/t/derived.test:
  tests for recent bugs
mysql-test/t/subselect.test:
  tests for recent bugs
sql/sql_derived.cc:
  Luckily, we have `make test` so that my last changes could be re-checked
2002-11-30 19:53:31 +02:00
unknown
0b270eb461 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-30 19:33:30 +02:00
unknown
64a3827b24 check of using same table for changing and select
mysql-test/r/subselect.result:
  test of using same table for changing and select
mysql-test/t/subselect.test:
  test of using same table for changing and select
sql/mysql_priv.h:
  new function
sql/sql_base.cc:
  new function
2002-11-30 19:26:18 +02:00
unknown
b496692663 many bug fixes
mysql-test/t/subselect.test:
  fixing problems with aliases being forced on derived tables
sql/item_func.cc:
  Fixing a bug that caused MySQL to crash on SELECT ...GROUP BY func(feilds)
sql/item_sum.cc:
  Making us compatible with ISO C++ paragrah 7.1.9.4
sql/item_sum.h:
  Making us compatible with ISO C++ paragrah 7.1.9.4
sql/sql_derived.cc:
  Fixing two more bugs in derived tables.
  
  One in EXPLAIN and another causing wrong result in opt_sum_query()
sql/sql_yacc.yy:
  Making possible INSERT from SELECT list_of_constants
2002-11-30 18:46:24 +02:00
unknown
0bc73be2ae Pass thd as an argument to yylex().
sql/sql_lex.cc:
  Pass thd as an argument to yylex(), avoiding the use of current_lex
  (and thus current_thd).
2002-11-30 16:43:53 +01:00
unknown
3706418d61 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-29 19:48:38 +02:00
unknown
1d418357ed let's leave "INSERT ... SELECT ... UPDATE" for the future 2002-11-29 16:17:52 +01:00
unknown
614a610ad3 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-11-29 17:06:26 +02:00
unknown
8e02b39abd Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2002-11-29 14:26:25 +01:00
unknown
66e3b9d7e6 many, many changes
mysql-test/r/subselect.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
include/mysqld_error.h:
  Merging changes ...
mysql-test/t/subselect.test:
  Merging changes ...
sql/share/czech/errmsg.txt:
  Merging changes ...
sql/share/danish/errmsg.txt:
  Merging changes ...
sql/share/dutch/errmsg.txt:
  Merging changes ...
sql/share/english/errmsg.txt:
  Merging changes ...
sql/share/estonian/errmsg.txt:
  Merging changes ...
sql/share/french/errmsg.txt:
  Merging changes ...
sql/share/german/errmsg.txt:
  Merging changes ...
sql/share/greek/errmsg.txt:
  Merging changes ...
sql/share/hungarian/errmsg.txt:
  Merging changes ...
sql/share/italian/errmsg.txt:
  Merging changes ...
sql/share/japanese/errmsg.txt:
  Merging changes ...
sql/share/korean/errmsg.txt:
  Merging changes ...
sql/share/norwegian-ny/errmsg.txt:
  Merging changes ...
sql/share/norwegian/errmsg.txt:
  Merging changes ...
sql/share/polish/errmsg.txt:
  Merging changes ...
sql/share/portuguese/errmsg.txt:
  Merging changes ...
sql/share/romanian/errmsg.txt:
  Merging changes ...
sql/share/russian/errmsg.txt:
  Merging changes ...
sql/share/serbian/errmsg.txt:
  Merging changes ...
sql/share/slovak/errmsg.txt:
  Merging changes ...
sql/share/spanish/errmsg.txt:
  Merging changes ...
sql/share/swedish/errmsg.txt:
  Merging changes ...
sql/share/ukrainian/errmsg.txt:
  Merging changes ...
2002-11-29 15:22:47 +02:00
unknown
dcae697998 added missing Com_xxx status variables
moved SQLCOM_END to the end of the list
bad copy-paste in sql_yacc.yy fixed


sql/mysqld.cc:
  added missing Com_xxx status variables
sql/sql_lex.h:
  moved SQLCOM_END to the end. Comments added.
sql/sql_yacc.yy:
  bad copy-paste fixed :)
2002-11-29 14:20:25 +01:00
unknown
1b921a995e many bug fixes
mysql-test/r/derived.result:
  test for a bug fix which caused a deadlock !
  Also test for a bug fix with using() on derived tables
mysql-test/r/subselect.result:
  correcting previous changes caused by a bug ..
mysql-test/t/derived.test:
  test for a bug fix which caused a deadlock !
  Also test for a bug fix with using() on derived tables
mysql-test/t/subselect.test:
  corrections of previous changes caused by a bug ..
sql/sql_base.cc:
  A for for a bug which caused a deadlock !
  Also fix for a bug with using() on derived tables
sql/sql_derived.cc:
  code cleanup
sql/sql_lex.cc:
  fix for deadlock
2002-11-29 14:49:07 +02:00
unknown
5234e49baf make multi updates statistics visible in SHOW STATUS as Com_update_multi 2002-11-29 13:17:54 +01:00
unknown
76a634b763 s/SQLCOM_MULTI_UPDATE/SQLCOM_UPDATE_MULTI/ to be in line with SQLCOM_DELETE_MULTI 2002-11-29 12:29:27 +01:00
unknown
042c34d86d checking columns of top items
mysql-test/r/row_test.result:
  changed error message (report requestet columns number)
  new tests
mysql-test/t/row_test.test:
  new tests
sql/item.h:
  checking columns of wrapper items
2002-11-29 12:30:04 +02:00
unknown
5b62dfcdf5 fixed error handling bug
fixed naming bug
fixed bug of subselect excluding


mysql-test/r/subselect.result:
  test of error handling bug
  test of naming bug
  test bug of subselect excluding
mysql-test/t/subselect.test:
  test of error handling bug
  test of naming bug
  test bug of subselect excluding
sql/item_subselect.cc:
  fixed naming bug
  fixed error handling bug
sql/sql_lex.cc:
  fixed subselect excluding bug
2002-11-29 10:44:30 +02:00
unknown
781a5bc81a Fixesd that wrong charset were used 2002-11-29 11:15:15 +04:00
unknown
4078d0deff fixed bug IN subselect with ORDER
mysql-test/r/subselect.result:
  test of IN subselect with ORDER
mysql-test/t/subselect.test:
  test of IN subselect with ORDER
2002-11-28 22:59:35 +02:00
unknown
c58b8afa49 after review fix(CRUM)
after merge fix


sql/item.cc:
  after merge fix
sql/item_cmpfunc.cc:
  after review fix
sql/item_cmpfunc.h:
  after review fix
2002-11-28 20:58:23 +02:00
unknown
5fe662e290 merging
include/mysqld_error.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/item_subselect.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_base.cc:
  Auto merged
sql/sql_lex.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
2002-11-28 20:12:14 +02:00
unknown
9e3552174b Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-28 20:04:09 +02:00
unknown
b9daa52c4b Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-28 20:01:22 +02:00
unknown
12b7086c5a Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


sql/sql_yacc.yy:
  Auto merged
2002-11-28 19:31:06 +02:00
unknown
6f80b71169 fixed * without tables in IN bug
fixed sunction-test select in IN bug
fixed unions in subselect bug


include/mysqld_error.h:
  new warning
mysql-test/r/subselect.result:
  test of * without tables in IN
  test of sunction-test select in IN
  test of unions in subselect
mysql-test/t/subselect.test:
  test of * without tables in IN
  test of sunction-test select in IN
  test of unions in subselect
sql/item.cc:
  fixed * substitution without tables
sql/item_subselect.cc:
  fixed subselect rewriting with function-test subselect
sql/item_subselect.h:
  mechanism for subselect removing
sql/share/czech/errmsg.txt:
  new warning
sql/share/danish/errmsg.txt:
  new warning
sql/share/dutch/errmsg.txt:
  new warning
sql/share/english/errmsg.txt:
  new warning
sql/share/estonian/errmsg.txt:
  new warning
sql/share/french/errmsg.txt:
  new warning
sql/share/german/errmsg.txt:
  new warning
sql/share/greek/errmsg.txt:
  new warning
sql/share/hungarian/errmsg.txt:
  new warning
sql/share/italian/errmsg.txt:
  new warning
sql/share/japanese/errmsg.txt:
  new warning
sql/share/korean/errmsg.txt:
  new warning
sql/share/norwegian-ny/errmsg.txt:
  new warning
sql/share/norwegian/errmsg.txt:
  new warning
sql/share/polish/errmsg.txt:
  new warning
sql/share/portuguese/errmsg.txt:
  new warning
sql/share/romanian/errmsg.txt:
  new warning
sql/share/russian/errmsg.txt:
  new warning
sql/share/serbian/errmsg.txt:
  new warning
sql/share/slovak/errmsg.txt:
  new warning
sql/share/spanish/errmsg.txt:
  new warning
sql/share/swedish/errmsg.txt:
  new warning
sql/share/ukrainian/errmsg.txt:
  new warning
sql/sql_base.cc:
  fixed case on no name field in UNION subselect
sql/sql_lex.cc:
  mechanisp of removing single subselect for optimisation purposes
sql/sql_lex.h:
  mechanisp of removing single subselect for optimisation purposes
sql/sql_parse.cc:
  error handling
sql/sql_union.cc:
  fixed unions in subselect
sql/sql_yacc.yy:
  fixed Lex->describe flag appearence
2002-11-28 19:29:26 +02:00
unknown
802705f957 adding mandatory aliases for derived tables as per SQL-99
doing it in sql_yacc.yy does not work
this commit contains fixes for other tests
there are fixes in subselect test which will have to be changed
once fix_fields is fixed to work with aliased derived tables
2002-11-28 19:19:21 +02:00
unknown
37a9917243 INSERT ... UPDATE syntax (syntax only)
sql_yacc.yy and sql_parse.cc cleanup


sql/lex.h:
  INSERT ... UPDATE syntax
sql/sql_parse.cc:
  merged SQLCOM_REPLACE and SQLCOM_INSERT the same way their _SELECT counterparts were merged long time ago - just to remove duplicate code and be consistent :)
  now nobody needs SQLCOM_REPLACE* at all :))
sql/sql_yacc.yy:
  INSERT ... UPDATE syntax
  cleanup
2002-11-28 17:25:41 +01:00
unknown
b01993fd4e Fixed the reduce/reduce conflicts introduced by subselects.
sql/sql_yacc.yy:
  Fixed the reduce/reduce conflicts introduced by subselects by
  breaking select_init apart.
2002-11-28 16:10:29 +01:00
unknown
09fc04ad5f ::index_read_last() method has been added 2002-11-28 15:19:42 +04:00
unknown
5a1b9e1d05 More use of new string->number conversion functions 2002-11-28 11:33:04 +04:00
unknown
fb4dc27cf7 Item_func_equal made uniform
mysql-test/r/row_test.result:
  Equal test
mysql-test/t/row_test.test:
  Equal test
2002-11-28 09:11:35 +02:00
unknown
e761be558d New functions 2002-11-28 11:04:26 +04:00
unknown
bebac6db39 changed compare engine in basic row items (SCRUM)
fixed layout


sql/item_cmpfunc.cc:
  changed compare engine in basic row items
BitKeeper/etc/ignore:
  Added libmysqld/item_row.cc to the ignore list
sql/item_cmpfunc.h:
  changed compare engine in basic row items
sql/item_func.h:
  changed compare engine in basic row items
  fixed layout
sql/sql_select.cc:
  changed compare engine in basic row items
2002-11-28 01:00:09 +02:00
unknown
8b2be4e459 after-merge fix 2002-11-27 22:35:23 +02:00
unknown
6339053d9d merging
include/mysql_com.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  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/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
2002-11-27 19:31:11 +02:00
unknown
e3114057d4 layout fix 2002-11-27 19:16:06 +02:00
unknown
48a64b5703 fixed current_thread 2002-11-27 18:03:10 +02:00
unknown
da8a66aa15 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-all_any-4.1
2002-11-27 17:44:01 +02:00
unknown
a598cff2bc typo fixed 2002-11-27 17:42:15 +02:00
unknown
8c603386d2 support for HA_READ_BEFORE_KEY and HA_READ_PREFIX_LAST_OR_PREV 2002-11-27 19:32:47 +04:00
unknown
dbeb6fa206 merging
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-11-27 17:10:21 +02:00
unknown
943522556d after review changes in IN/ALL/ANY/SOME (SCRUM)
sql/item.cc:
  after review changes
sql/item.h:
  after review changes
sql/item_subselect.cc:
  after review changes
sql/mysql_priv.h:
  after review changes
sql/sql_base.cc:
  after review changes
2002-11-27 17:04:43 +02:00
unknown
dd7e533b38 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-27 18:24:02 +04:00
unknown
080b5c6057 new string-to-number functions
include/m_ctype.h:
  Typo fix
sql/field.cc:
  Use new string-to-number functions
strings/ctype-bin.c:
  Use new string-to-number functions
strings/ctype-simple.c:
  Use new string-to-number functions
strings/ctype-utf8.c:
  Use new string-to-number functions
2002-11-27 18:08:31 +04:00
unknown
1ef8067465 after merging fix 2002-11-27 15:52:32 +02:00
unknown
2e9eb31663 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


sql/sql_parse.cc:
  Auto merged
2002-11-27 14:31:39 +02:00