Commit graph

6327 commits

Author SHA1 Message Date
unknown
4514f0b0fa Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2002-11-29 19:05:05 +05: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
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
469e0b321c improvement crash-me
BitKeeper/etc/ignore:
  Added core.2430 to the ignore list
sql-bench/crash-me.sh:
  1) restore #!@PERL@ that I (accidentally) deleted  last time
  2) comment order_by_remember_desc section
  3) rectify WEEK test. Now it returns "EURO" ,"USA", "error" (if it returns 
  wrong week number), or "no" (if this function isn't supported)
  4) merge 2 tests for noround() (func_extra_noround and ignoring_noround). 
   Now it returns yes/no/"syntax only"
  5) merge 2 tests for foreign key (foreign_key and foreign_key_syntax). Now it
   returns yes/no/"syntax only"
  6) correct misprint in crash-me help ( --db-start-cmd instead of --start-cmd)
sql-bench/server-cfg.sh:
  Misprint correction (db_Sapdb ->db_sapdb)
2002-11-29 18:07:02 +05: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
7989f285aa ha_innodb.cc:
Make copies of all string-type start/up options in case C-sharp moves them around; remove the need to specify innodb_log_arch_dir in my.cnf, since it has no relevance anyway


sql/ha_innodb.cc:
  Make copies of all string-type start/up options in case C-sharp moves them around; remove the need to specify innodb_log_arch_dir in my.cnf, since it has no relevance anyway
2002-11-29 13:05:37 +02: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
931437252f Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
sql/mysqld.cc:
  Auto merged
2002-11-28 19:38:22 +01:00
unknown
522d022e1d chroot() need chdir("/") afterwards to work 2002-11-28 19:38:01 +01: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
e725026a57 Merge work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2002-11-28 19:00:27 +01:00
unknown
1e68711a02 Added 29 {} at the end of clauses in sql_yacc.yy to make it work with bison 1.75.
sql/sql_yacc.yy:
  Added 29 {} at the end of clauses to make it work with bison 1.75.
  Otherwise we get errors of the type 
  "sql_yacc.yy:666.7-672.21: type clash (`NONE' `') on default action".
2002-11-28 18:57:56 +01: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
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
1cbef54cd6 Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2002-11-28 20:03:51 +05:00
unknown
5fe76b2069 Merge constraint tests with "ignoring constarint tests"
for column,table and named constarints. Now constraint test produces
exactly one line in report, with "yes","no" or syntax only".

add /odbc to server-version if benchmark/crash-me works over odbc


sql-bench/crash-me.sh:
  merge constraint tests with "ignoring constarint tests"
  for column,table and named constarints. Now constraint test produces
  exactly one line in report, with "yes","no" or syntax only".
sql-bench/server-cfg.sh:
  add /odbc to server-version if benchmark/crash-me works over odbc
2002-11-28 20:01:17 +05:00
unknown
7dc2b70f49 Better fix for 64 bit CPU .. 2002-11-28 16:37:58 +02:00
unknown
fa56d0bf29 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-28 16:27:42 +02:00
unknown
fac5864d88 A better way to get the ChangeSet revision for the Subject: line. 2002-11-28 12:45:01 +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