Commit graph

5944 commits

Author SHA1 Message Date
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
82c83c4b4b 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-27 15:53:01 +02: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
unknown
6217be221a Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/vva/work/new_readline/4.1
2002-11-27 16:24:34 +04:00
unknown
d3969da2f9 correction for compiling under FreeBSD 2002-11-27 16:14:55 +04:00
unknown
3892b734b7 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-update-4.1
2002-11-27 14:00:09 +02:00
unknown
4b021e6ea9 Preparing to use better string-to-number functions to avoid c_ptr() call,
wich is slower and is not ucs2 compatible
2002-11-27 15:47:39 +04:00
unknown
645dec80e0 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-update-4.1


sql/sql_parse.cc:
  Auto merged
2002-11-27 13:30:45 +02:00
unknown
d71bdbef67 Merge work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1


sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-27 11:23:36 +01:00
unknown
e9f96cf92a Merge myvenu.com:/home/venu/bk/src-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2002-11-26 18:54:17 -08:00
unknown
4826ed0091 select_test.c, insert_test.c:
Added my_global.h to compile after my_list.h is added to mysql.h
sql_prepare.cc:
  Handle close stmt from client
  Minor fixups to make SET variable=? to work
sql_parse.cc:
  Added missed COM_CLOSE_STMT
mysql_priv.h:
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
libmysql.c:
  Clean all open stmts during mysql_close() implicitly


libmysql/libmysql.c:
  Clean all open stmts during mysql_close() implicitly
sql/mysql_priv.h:
  Handle close_stmt from client
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
sql/sql_parse.cc:
  Added missed COM_CLOSE_STMT
sql/sql_prepare.cc:
  Handle close stmt from client
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
  Minor fixups to make SET variable=? to work
client/insert_test.c:
  Added my_global.h to compile after my_list.h is added to mysql.h
client/select_test.c:
  Added my_global.h to compile after my_list.h is added to mysql.h
2002-11-26 18:51:38 -08:00
unknown
96ca7b8126 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-27 01:15:47 +02:00
unknown
a554151951 reverse order in global select list allow to avoid recursion in derived tables
sql/sql_delete.cc:
  new order in global select list
sql/sql_derived.cc:
  removed recursion from derived tables
sql/sql_insert.cc:
  new order in global select list
sql/sql_lex.h:
  pointer to global select list
sql/sql_select.cc:
  new order in global select list
sql/sql_update.cc:
  new order in global select list
2002-11-27 01:12:16 +02:00
unknown
4adb15f3fa add new tests, new functions
sql-bench/crash-me.sh:
  Add tests:
  
  - If double double quotes are allowed in identifiers. 
  - Rollback rolls back meta data
  - NULL sort and NULL sort perserve. 
  - remove one check of "serial".   
  - (Column,Table,Named constraints) new test to crash me if the check syntax is 
    only supported by the parser, but not done for real.
  - For all ..USER tests, (like current_user), add an extra test if
    ...USER() is supported.                                   
  - Add tests for constants TRUE and FALSE                     
  - Add test of LIMIT # OFFSET (PostgreSQL syntax) 
  - tests of a lot of new functions
2002-11-27 03:49:35 +05:00
unknown
9ee2cee69a multi-delete with subselects (SCRUM)
mysql-test/r/subselect.result:
  Multi-delete with subselect test
mysql-test/t/subselect.test:
  Multi-delete with subselect test
sql/sql_parse.cc:
  multi-delete with subselects
2002-11-26 22:33:33 +02:00
unknown
8079acf080 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-update-4.1
2002-11-26 18:17:37 +02:00
unknown
8546e9dc58 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-26 16:51:24 +02:00
unknown
ae729f9315 A fix for a bug with derived tables within subselect
within derived tables within ......
2002-11-26 16:49:55 +02:00
unknown
e0682e6b63 temporary fix to make mysql.cc to compile --with-readline
(thought it won't compile --without-readline)
preper fix is to follow...
2002-11-26 15:33:30 +01:00
unknown
cb746b6ce9 typo fixed 2002-11-26 14:19:39 +01:00
unknown
1144c5cfd8 Pass thd as an argument to yyparse(), getting rid of all current_thd in the parser.
BitKeeper/etc/ignore:
  Added bkpull.log.4 bkpull.log.5 bkpull.log.6 bkpush.log sql/sql_yacc.output to the ignore list
2002-11-26 14:18:16 +01:00
unknown
0c417889d9 mysql.cc has to support older readline to compile on FreeBSD :(( 2002-11-26 14:03:25 +01:00
unknown
c6ce7b3fbe removed redundant -I include-dirs 2002-11-26 14:01:08 +01:00
unknown
da538d2bb5 subselects in insert/replace (SCRUM)
mysql-test/r/subselect.result:
  test of insert/replace with subselects
mysql-test/t/subselect.test:
  test of insert/replace with subselects
sql/sql_insert.cc:
  subselects in insert/replace
sql/sql_yacc.yy:
  subselects in insert/replace
2002-11-26 01:00:05 +02:00
unknown
a14db06bfc Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-25 22:22:13 +01:00
unknown
4ea2f42e33 myisammrg::index_next_same
myisammrg/Makefile.am:
  myrg_rnext_same.c added
2002-11-25 22:18:44 +01:00
unknown
30d1b14361 subselet in delete (SCRUM)
mysql-test/r/subselect.result:
  subselects in delete test
mysql-test/t/subselect.test:
  subselects in delete test
sql/sql_delete.cc:
  subselet in delete
2002-11-25 21:27:14 +02:00
unknown
52f18046c4 merging tests
BitKeeper/deleted/.del-innodb-non-simple.test~380a6ef42b6e15d1:
  Delete: mysql-test/t/innodb-non-simple.test
BitKeeper/deleted/.del-innodb-non-simple.result~2f77d5b0aaf5aa90:
  Delete: mysql-test/r/innodb-non-simple.result
2002-11-25 18:34:24 +02:00
unknown
4383ef1377 Merge
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2002-11-25 17:53:03 +02:00
unknown
cfb331bf90 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-25 17:34:51 +02:00
unknown
1b9becc358 Fixed CAST( xxx as CHAR)
sql/item.h:
  Made some virtual functions non virtual (as they are not used virtually)
sql/item_strfunc.cc:
  Optimizations.
sql/item_strfunc.h:
  Fixed BINARY handling
sql/sql_string.h:
  Indentation cleanups
2002-11-25 17:33:51 +02:00
unknown
8da0fd29aa Merge
sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  SCCS merged
2002-11-25 15:32:44 +01:00
unknown
27f2c60553 removed limit for "FOR UPDATE" and "IN SHARE MODE" (now thay allowed for non-simple selects and applyed to current select)
fix for using subselects with update
test of locking for non-simple queries
(SCRUM?)


sql/sql_yacc.yy:
  removed limit for "FOR UPDATE" and "IN SHARE MODE" (now thay allowed for non-simple selects and applyed to current select)
  fix for using subselects with update
2002-11-25 13:44:47 +02:00
unknown
4842f59088 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/vva/work/new_readline/4.1
2002-11-25 14:32:44 +04:00
unknown
0985653c1f Merge with 4.0
configure.in:
  Auto merged
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item_func.h:
  Merge
2002-11-25 12:19:28 +02:00
unknown
895e3dbbf8 Faster parsing of identifiers
Compatibility syntax: SERIAL, [PRIMARY] KEY and VALUE



sql/sql_lex.cc:
  Faster handling of identifiers
sql/sql_lex.h:
  Faster handling of identifiers
sql/sql_yacc.yy:
  Added SERIAL (alias for bigint auto_increment)
  Make PRIMARY optional in field specification
  Make VALUE alias for VALUES
2002-11-25 12:11:16 +02:00
unknown
c06421ae06 Merge genie.(none):/home/vva/work/mysql.orig/clear/4.1
into genie.(none):/home/vva/work/new_readline/4.1
2002-11-25 13:45:00 +04:00
unknown
83b4c4d618 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1
2002-11-25 13:42:00 +04:00
unknown
c115d1cee0 fixed bug of subselect in derived tables
mysql-test/r/subselect.result:
  test of subselect in derived table
mysql-test/t/subselect.test:
  test of subselect in derived table
2002-11-25 10:58:49 +02:00
unknown
8276111fa1 add define of __attribute__ for readline 2002-11-25 12:54:55 +04:00
unknown
36f03b3988 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1


sql/opt_range.cc:
  Auto merged
2002-11-25 12:15:34 +04:00
unknown
b5b19a7877 supported possiblity of item substitute (fixed bug) in setup_fields
more efficient reference creation
fixed table_name of Field in temporary table


mysql-test/r/subselect.result:
  test of 2 references bugs
mysql-test/t/subselect.test:
  test of 2 references bugs
sql/field.h:
  fixed layout
  fixed table name of fields of temporary table (derived table)
sql/item.cc:
  more efficient reference creation
sql/sql_base.cc:
  fixed layout
  supported possiblity of item substitute (fixed bug)
2002-11-25 01:38:56 +02:00
unknown
be5d04e8fc Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/opt_range.cc:
  Auto merged
2002-11-24 21:44:25 +02:00
unknown
79cdd8773c Updated results after merge from 3.23 2002-11-24 21:39:22 +02:00
unknown
06e647472f Reference to field in outer subelect fixed
Fixed context in error mesages


mysql-test/r/subselect.result:
  tests of references and error message
mysql-test/t/subselect.test:
  tests of references and error message
sql/item.cc:
  Fixed layout
  Resolving field names of outer select
sql/item_subselect.cc:
  saving/restoring context for error messages
sql/mysql_priv.h:
  changed function interface to allow resolving field names inside Item_ref::fix_fields
sql/sql_base.cc:
  changed function interface to allow resolving field names inside Item_ref::fix_fields
sql/sql_lex.h:
  allow access to thd field
2002-11-24 21:10:52 +02:00
unknown
83e25bbc30 fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds
renamed tables to prevent droping real tables


mysql-test/r/group_by.result:
  test of error message
mysql-test/r/subselect.result:
  renamed tables to prevent droping real tables
mysql-test/t/group_by.test:
  test of error message
mysql-test/t/subselect.test:
  renamed tables to prevent droping real tables
sql/sql_base.cc:
  moved thd->allow_sum_func assignment to upper level
sql/sql_select.cc:
  fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds
2002-11-24 17:41:34 +02:00
unknown
18ca5c4dbc merge with 3.23 to get bugfixes for <=> NULL and --bind-address
Build-tools/Do-compile:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/mysql-test-run.sh:
  Ignore changes from 3.23
mysql-test/r/func_time.result:
  Update results
mysql-test/r/null_key.result:
  Update results
scripts/mysqld_safe.sh:
  Don't apply NICE handling change from 3.23
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
support-files/mysql.server.sh:
  Don't apply changes from 3.23
2002-11-24 16:37:41 +02:00
unknown
bb948c6355 Rewrote nice handling to make more portable 2002-11-24 16:20:41 +02:00