mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
6014 commits 2774 branches 343 tags 1.6 GiB
Commit graph

6014 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
1d418357ed let's leave "INSERT ... SELECT ... UPDATE" for the future 2002-11-29 16:17:52 +01: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
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
23342bad22 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-29 15:16:15 +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
b226e15a09 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
 2002-11-29 14:13:35 +04:00
unknown
641c7ff9dd UCS2 fixes 2002-11-29 14:04:36 +04:00
unknown
4b0a6e6bcd my_strntod_ucs2 and my_strntol_ucs2 fixes 2002-11-29 13:29:48 +04: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
5996e68fe2 mysql.h: 
renamed arg name to avoid a warning that it shadows global variable


include/mysql.h:
  renamed arg name to avoid a warning that it shadows global variable
 2002-11-29 10:17:43 +04:00
unknown
0d2e0f4b2b Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi 2002-11-29 02:51:08 +05:00
unknown
3ec9f7e1c4 test of changing subselects tree 2002-11-28 23:31:48 +02: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
53a81804e9 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
 2002-11-28 20:59:21 +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
5c7ce5202e Merge work.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/bk/src-4.1
 2002-11-28 10:02:01 -08: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
1c2d7aa880 Get rid of pbool from my_list.h; and avoid using the my_global.h for clients 2002-11-28 09:56:26 -08: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
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
3284c39a1f Makefile.am: 
libmysys.a is needed for my_errno


regex/Makefile.am:
  libmysys.a is needed for my_errno
 2002-11-28 15:28:23 +04:00
unknown
09fc04ad5f ::index_read_last() method has been added 2002-11-28 15:19:42 +04:00
unknown
22b0bfa288 Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi 
BitKeeper/etc/logging_ok:
  auto-union
include/myisam.h:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
 2002-11-28 15:24:55 +05:00
unknown
0c34966595 Correct view of sort.c and mi_too_big_key_for_sort() 
myisam/mi_check.c:
  Correct mi_too_big_key_for_sort()
myisam/sort.c:
  Correct view, according rules
 2002-11-28 15:16:56 +05:00
unknown
683d777ad8 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/ram/mysql-4.1
 2002-11-28 14:04:39 +04:00
unknown
57321e64cd support for HA_READ_PREFIX_LAST_OR_PREV, HA_READ_PREFIX_LAST and HA_READ_BEFORE_KEY 2002-11-28 13:31:35 +04:00
unknown
f1b3f48e49 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 
libmysql/libmysql.c:
  Auto merged
 2002-11-28 11:29:35 +02:00
unknown
da6e29a610 Fix wrong increment in prepared statements handling 
libmysql/libmysql.c:
  Fix wrong increment
 2002-11-28 11:28:49 +02: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