Commit graph

478 commits

Author SHA1 Message Date
unknown
64d48cd6d1 SET NAMES has been extended to support optional collation:
SET NAMES <charset name> [COLLATE <collation name>]
2003-03-05 12:37:39 +04:00
unknown
92754ae2db SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
2003-03-04 19:53:53 +04:00
unknown
08387526d4 sql_yacc.yy:
Produce an error when a field collation and charset are not compatible


sql/sql_yacc.yy:
  Produce an error when a field collation and charset are not compatible
2003-03-02 14:47:56 +04:00
unknown
77f8757a5e Added GeometryFromText, MultiPointFromText aliases.
Added GeometryCollection type.
2003-02-28 21:17:08 +04:00
unknown
882aed0d0b sql_yacc.yy:
_charset cast changes coercibility to implicit
item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT


sql/item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT
sql/sql_yacc.yy:
  _charset cast changes coercibility to implicit
2003-02-28 20:20:24 +04:00
unknown
1a2c7c18a1 Many files:
Coercibility, initial stage
item_func.h:
  Coercibility, initial stage


sql/item_func.h:
  Coercibility, initial stage
sql/item.cc:
   Coercibility, initial stage
sql/item_create.cc:
   Coercibility, initial stage
sql/item_create.h:
   Coercibility, initial stage
sql/item.h:
   Coercibility, initial stage
sql/item_func.cc:
   Coercibility, initial stage
sql/lex.h:
   Coercibility, initial stage
sql/sql_yacc.yy:
   Coercibility, initial stage
2003-02-28 19:22:20 +04:00
unknown
c00be6a648 sql_yacc.yy:
set names binary  didn't work
  ,


sql/sql_yacc.yy:
  set names binary  didn't work
  ,
2003-02-27 17:45:40 +04:00
unknown
f047e28068 sql_yacc.yy, item_strfunc.cc:
Two separate functions charset() and collatio()
item_strfunc.h:
  Two separate functions charset() and collation()


sql/item_strfunc.cc:
  Two separate functions charset() and collatio()
sql/item_strfunc.h:
  Two separate functions charset() and collation()
sql/sql_yacc.yy:
  Two separate functions charset() and collatio()
2003-02-27 16:53:10 +04:00
unknown
e0100ed886 sql_yacc.yy, lex.h:
SET NAMES is now working


sql/lex.h:
  SET NAMES is now working
sql/sql_yacc.yy:
  SET NAMES is now working
2003-02-26 17:02:36 +04:00
unknown
a7e3ba1df5 Merge with 4.0.11
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/FINISH.sh:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_pthread.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/handler.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/innodb_handler.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.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/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/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
sql/table.h:
  Auto merged
2003-02-26 01:03:47 +02:00
unknown
2842e601e0 Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/wax/mysql-4n


sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-02-24 23:54:58 +05:00
unknown
17a76b00c6 merge fix
client/mysql.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-02-22 17:14:50 +02:00
unknown
eec10a01cb do not allow COLUMN and AFTER/FIRST in
ALTER TABLE ... ADD KEY
2003-02-22 01:07:17 +01:00
unknown
0bf753ab74 DATABASE character set is never blank anymore 2003-02-21 18:24:41 +04:00
unknown
20e237e5eb Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM
strings/strto.c:
  Windows won't compile for a wrong argument passing, expects a charset pointer
sql/filesort.cc:
  Remove unused variable
sql/lex.h:
  Change POINT->POINT_SYM due to redefination error from windef.h
sql/mysqld.cc:
  Fix Embedded Server related code
sql/protocol.cc:
  Remove unused variables from Embedded Server
sql/sql_class.h:
  Remove silly usage
sql/sql_derived.cc:
  Windows won't let you compile for this kind of assignments
sql/sql_help.cc:
  Need a cast to make it compile
sql/sql_parse.cc:
  Remove unused variables from Embedded server
sql/sql_yacc.yy:
  Change POINT->POINT_SYM due to redefination error from windef.h
mysys/mf_keycache.c:
  Add a correct cast and remove the unused variables
libmysqld/lib_sql.cc:
  Remove unused variable
libmysqld/libmysqld.c:
  Port the netware change to remove mysql_once_init to libmysqld
2003-02-20 14:14:37 -08:00
unknown
bcd22f2a28 add option default-week-format and variable default_week_format
(SCRUM)


mysql-test/r/func_time.result:
  result of test default_week_format
mysql-test/t/func_time.test:
  test of default_week_format
sql/mysqld.cc:
  add option default-week-format
sql/set_var.cc:
  add system variable default_week_format
sql/sql_class.h:
  add default_week_format into structure system_variables
sql/sql_yacc.yy:
  change lex of week() with one parameter
2003-02-19 17:05:35 +05:00
unknown
33f0239397 fix a bug in derived tables
UNION's bug fixes and code clean-up


mysql-test/r/subselect.result:
  An insignificant consequent of my UNION"s clean-up
sql/sql_derived.cc:
  Fix a bug that our CTO reported
sql/sql_lex.h:
  Fixing some bugs in UNION's with code clean-up
sql/sql_union.cc:
  Fixing some bugs in UNION's with code clean-up
sql/sql_yacc.yy:
  Fixing some bugs in UNION's with code clean-up
2003-02-13 17:56:01 +02:00
unknown
e1173be0e2 sql_yacc.yy:
Compilation failure fix


sql/sql_yacc.yy:
  Compilation failure fix
2003-02-13 10:14:35 +04:00
unknown
86ec3c8f08 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
libmysql/libmysql.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-02-12 23:18:00 +02:00
unknown
0a10f78f12 Updated configure script to handle 1 digit numbers in MySQL version
Fixed a few typos from last patch


configure.in:
  Updated script to handle 1 digit numbers in MySQL version
libmysqld/libmysqld.c:
  Added mysql_get_server_version
sql/sql_parse.cc:
  Fixed typo in last patch
sql/sql_yacc.yy:
  Fixed typo in last patch
2003-02-12 23:17:22 +02:00
unknown
fcb61f5917 Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.



BitKeeper/etc/ignore:
  added scripts/fill_help_tables.sql
client/mysql.cc:
  Some fixes when using 'help'
cmd-line-utils/libedit/compat.h:
  Portability fix
cmd-line-utils/libedit/fgetln.c:
  Portability fix
include/mysql.h:
  Added new client function: mysql_get_server_version()
libmysql/libmysql.c:
  Added new client function: mysql_get_server_version()
libmysqld/libmysqld.c:
  Fixed prototype
mysql-test/install_test_db.sh:
  Added creation of help tables
mysql-test/r/connect.result:
  Added help tables
mysql-test/r/myisam.result:
  Test of RTREE index
mysql-test/r/type_ranges.result:
  updated results
mysql-test/t/myisam.test:
  Test of RTREE index
mysql-test/t/type_ranges.test:
  Updated test
mysys/charset.c:
  Indentation change
mysys/my_symlink.c:
  Removed compiler warning
scripts/fill_help_tables.sh:
  Update for new help tables
sql/field.cc:
  Indentation changes
sql/filesort.cc:
  Optimized character set usage
sql/item_cmpfunc.cc:
  Fix wrong usage of binary()
sql/item_cmpfunc.h:
  Fix wrong usage of binary()
sql/item_func.cc:
  Fix wrong usage of binary()
sql/item_func.h:
  Fix wrong usage of binary()
sql/item_strfunc.cc:
  Fix wrong usage of binary()
sql/item_sum.cc:
  Fix wrong usage of binary()
sql/item_sum.h:
  Fix wrong usage of binary()
sql/key.cc:
  Indentation change
sql/lex.h:
  HELP -> HELP_SYM
sql/mysql_priv.h:
  Make get_field() more general
sql/password.c:
  Indentation change + variable initialisation moved
sql/sql_acl.cc:
  Make get_field() more general
sql/sql_base.cc:
  Added comments + assertion for double call to mysql_lock_tables
sql/sql_cache.cc:
  Indentation changes
sql/sql_class.h:
  Added need_strxnfrm to SORT_FIELD to be able to optimise character set handling in filesort
sql/sql_derived.cc:
  Renamed variables
sql/sql_help.cc:
  New help functions (from Victor Vagin)
sql/sql_lex.cc:
  Removed variables that doesn't have to be initialized for each query
sql/sql_lex.h:
  Removed not used variable (olap)
sql/sql_parse.cc:
  Fixed (not fatal) access of unitialized memory
  Indentation / code cleanup
sql/sql_prepare.cc:
  Indentaion cleanup
sql/sql_table.cc:
  Disabled RTREE until 5.0
sql/sql_udf.cc:
  Make get_field() more general
sql/sql_yacc.yy:
  Removed access to uninitialized memory
  Always set offset_limit and select_limit when using LIMIT (removed warnings)
  Allow usage of 'help week'
sql/table.cc:
  Make get_field() more general
  More comments
sql/table.h:
  Fixded type of TABLE_LIST->derived
sql/time.cc:
  Stricter date / datetime handling (to be able to handle timestamps with days and microseconds)
strings/ctype-bin.c:
  Added cha
2003-02-12 21:55:37 +02:00
unknown
10b7dea846 For more OpenGIS compatibility, these symbols are now synomims to GEOMETRY type:
POINT, LINESTRING, POLYGON, MULTIPOINT, MULTIPOLYGON, MULTILINESTRING
2003-02-11 15:39:14 +04:00
unknown
e751d29836 Merge with 4.0 to get fix for MIN/MAX
BitKeeper/etc/ignore:
  added support-files/MacOSX/Info.plist
Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
configure.in:
  Use local version
mysql-test/r/func_group.result:
  merge
mysql-test/r/order_by.result:
  merge
mysql-test/r/show_check.result:
  merge
mysql-test/t/func_group.test:
  merge
mysql-test/t/join.test:
  merge
sql/mysql_priv.h:
  Use local version
sql/sql_yacc.yy:
  merge
sql/table.cc:
  USe local
2003-02-07 16:38:37 +02:00
unknown
dacf7f8fe5 Added START TRANSACTION syntax
Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)


include/my_global.h:
  Moved LL from mysql_priv (as this is also in config-win.h)
mysql-test/r/distinct.result:
  Updated results
mysql-test/r/func_group.result:
  Updated results
mysql-test/r/innodb.result:
  Updated results
mysql-test/r/join.result:
  Updated results
mysql-test/r/order_by.result:
  Updated results
mysql-test/t/func_group.test:
  Added test for SUM(ALL ...)
mysql-test/t/innodb.test:
  Added test for START TRANSACTION
mysql-test/t/join.test:
  Test different join syntaxes
mysql-test/t/order_by.test:
  Added new test of NULL ordering.
sql/filesort.cc:
  Sort NULL last if DESC is used
sql/lex.h:
  Added OLD_PASSWORD() as synonym for PASSWORD.
sql/mysql_priv.h:
  Removed LL()
sql/opt_range.cc:
  Sort NULL last if DESC is used
sql/opt_range.h:
  Sort NULL last if DESC is used
sql/slave.cc:
  Indentation changes
sql/sql_parse.cc:
  After merge fix
sql/sql_select.cc:
  Added comment
sql/sql_yacc.yy:
  Added START TRANSACTION syntax
  Added ALL as parameter option for all group functions.
  Make join handling uniform.
2003-02-06 16:55:59 +02:00
unknown
2ff82a7b15 Merge with 4.0.11
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
bdb/os/os_handle.c:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
myisam/ft_static.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_test3.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/handler.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/count_distinct.test:
  Auto merged
mysql-test/t/func_crypt.test:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/table.cc:
  Auto merged
Docs/manual.texi:
  Use remote version
client/mysql.cc:
  Merge
configure.in:
  Merge
libmysql/libmysql.c:
  Merge
libmysqld/lib_sql.cc:
  Merge
myisam/ft_stopwords.c:
  Merge
myisam/myisamchk.c:
  Merge
mysql-test/r/bigint.result:
  Merge
mysql-test/r/group_by.result:
  Merge
mysql-test/r/rpl000009.result:
  Merge
mysql-test/t/group_by.test:
  Merge
mysql-test/t/rpl000009.test:
  Merge
mysql-test/t/rpl_rotate_logs.test:
  Merge
mysys/Makefile.am:
  Merge
mysys/charset.c:
  Merge
sql/item.h:
  Merge
sql/item_cmpfunc.cc:
  Merge
sql/item_cmpfunc.h:
  Merge
sql/item_create.cc:
  Merge
sql/item_func.cc:
  Merge
sql/item_strfunc.h:
  Merge
sql/log.cc:
  Merge
sql/mysql_priv.h:
  Merge
sql/mysqld.cc:
  Merge
sql/protocol.cc:
  Merge
sql/slave.cc:
  Merge
sql/sql_class.h:
  Merge
sql/sql_db.cc:
  Merge
sql/sql_handler.cc:
  Merge
sql/sql_parse.cc:
  Merge
sql/sql_select.cc:
  Merge
sql/sql_yacc.yy:
  Merge
2003-02-04 21:52:14 +02:00
unknown
d6ca74d272 Fixed bug in ulonglong parsing for constructs that only takes unsigned longlong as parameter.
mysql-test/r/bigint.result:
  Test if big LONG_NUM
mysql-test/t/bigint.test:
  Test if big LONG_NUM
2003-02-04 01:05:39 +02:00
unknown
e1134143e8 after-review changes (577 SCRUM)
sql/item.cc:
  typo fix
sql/item.h:
  typo fix
sql/item_cmpfunc.cc:
  comment
sql/item_func.cc:
  new interface
sql/item_subselect.cc:
  comment inserted
sql/item_sum.cc:
  layout fixed
  comment inserted
sql/mysql_priv.h:
  names changed
sql/sql_base.cc:
  some optimization
sql/sql_delete.cc:
  name changed
sql/sql_insert.cc:
  name changed
sql/sql_lex.h:
  name changed
sql/sql_prepare.cc:
  layout fixed
sql/sql_select.cc:
  layout fixed
  names changed
  comments inserted
  debugging code removed
sql/sql_select.h:
  name changed
sql/sql_union.cc:
  name changed
  layout fixed
sql/sql_update.cc:
  name changed
sql/sql_yacc.yy:
  typo fixed
2003-02-02 23:30:01 +02:00
unknown
9822623333 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1


sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-02-02 17:39:27 +02:00
unknown
bde6addd4b Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-30 21:23:58 +05:00
unknown
12af2c277d Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-30 21:15:21 +05:00
unknown
b627e2dbb2 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1


sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.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
2003-01-29 19:46:11 +02:00
unknown
307ed01440 Move latin1 into a separarte file 2003-01-29 17:31:20 +04:00
unknown
d7db6beec7 Merge
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.h:
  SCCS merged
2003-01-28 15:34:59 +02:00
unknown
ca0d06d599 fixed bugs in temporary tables in subselect implementation (SCRUM)
merging with switching on static tables optimization (SCRUM)
fixed subselects with uncacheable results
added test for fixed bugs from bugreports


mysql-test/r/subselect.result:
  changes in subselect test after switching on static tables optimization
  fixed bug test added
  uncacheable subselects
mysql-test/t/subselect.test:
  changes in subselect test after switching on static tables optimization
  fixed bug test added
  uncacheable subselects
sql/item_create.cc:
  fixed subselects with uncacheable results
sql/item_func.cc:
  fixed subselects with uncacheable results
sql/item_subselect.cc:
  fixed subselects with uncacheable results
  clean up
sql/item_subselect.h:
  fixed subselects with uncacheable results
sql/sql_lex.cc:
  fixed subselects with uncacheable results
sql/sql_lex.h:
  fixed subselects with uncacheable results
sql/sql_select.cc:
  fixed bugs in temporary tables in subselect implementation
  fixed subselects with uncacheable results
sql/sql_union.cc:
  fixed subselects with uncacheable results
sql/sql_yacc.yy:
  fixed subselects with uncacheable results
2003-01-28 14:48:12 +02:00
unknown
a831430e62 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-28 12:59:07 +04:00
unknown
ecb55f4307 sql_yacc.yy:
Semicolon has been added


sql/sql_yacc.yy:
  Semicolon has been added
2003-01-27 13:46:33 +04:00
unknown
dc87247df4 making the keyword ROW for row items optional 2003-01-26 20:01:45 +01:00
unknown
db47e4ca24 Added timeout for wait_for_master_pos
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.


mysql-test/r/rpl000009.result:
  Fixed replication test after fixing replication of DROP/CREATE DATABASE
mysql-test/t/rpl000009.test:
  Fixed replication test after fixing replication of DROP/CREATE DATABASE
sql/item_create.cc:
  Added timeout for wait_for_master_pos
sql/item_create.h:
  Added timeout for wait_for_master_pos
sql/item_func.cc:
  Added timeout for wait_for_master_pos
sql/item_func.h:
  Added timeout for wait_for_master_pos
sql/lex.h:
  Added timeout for wait_for_master_pos
sql/slave.h:
  Added timeout for wait_for_master_pos
  Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_parse.cc:
  Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_repl.cc:
  Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
2003-01-25 15:07:51 +02:00
unknown
fbd882fca6 merging
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-25 13:19:46 +02:00
unknown
b23541339c fixed subselects with temporary tables (SCRUM)
fixed memory leacks


mysql-test/r/subselect.result:
  some changes in subselect tests
mysql-test/t/subselect.test:
  some changes in subselect tests
sql/item.cc:
  some item made copyable
  methods for creating copy of item list
  tmp_table_field() splited
sql/item.h:
  some item made copyable
  methods for creating copy of item list
  tmp_table_field() splited
sql/item_cmpfunc.cc:
  changed references creation
sql/item_cmpfunc.h:
  changed references creation
sql/item_func.cc:
  some item made copyable
  methods for creating copy of item list
  changed references creation
sql/item_func.h:
  some item made copyable
  methods for creating copy of item list
  changed references creation
  tmp_table_field() splited
sql/item_subselect.cc:
  changed references creation
sql/item_sum.cc:
  some item made copyable
  methods for creating copy of item list
sql/item_sum.h:
  some item made copyable
  methods for creating copy of item list
sql/item_timefunc.h:
  tmp_table_field() splited
sql/item_uniq.h:
  some item made copyable
  methods for creating copy of item list
sql/mysql_priv.h:
  fixed subselects with temporary tables
sql/sql_base.cc:
  fixed subselects with temporary tables
sql/sql_class.h:
  fixed subselects with temporary tables
sql/sql_delete.cc:
  fixed subselects with temporary tables
sql/sql_derived.cc:
  fixed subselects with temporary tables
sql/sql_do.cc:
  fixed subselects with temporary tables
sql/sql_insert.cc:
  fixed subselects with temporary tables
sql/sql_lex.cc:
  fixed subselects with temporary tables
sql/sql_lex.h:
  fixed subselects with temporary tables
sql/sql_list.h:
  fixed subselects with temporary tables
sql/sql_load.cc:
  fixed subselects with temporary tables
sql/sql_olap.cc:
  fixed subselects with temporary tables
sql/sql_parse.cc:
  fixed subselects with temporary tables
sql/sql_prepare.cc:
  fixed subselects with temporary tables
sql/sql_select.cc:
  fixed subselects with temporary tables
sql/sql_select.h:
  fixed subselects with temporary tables
sql/sql_table.cc:
  fixed subselects with temporary tables
sql/sql_union.cc:
  fixed subselects with temporary tables
sql/sql_update.cc:
  fixed subselects with temporary tables
sql/sql_yacc.yy:
  fixed subselects with temporary tables
2003-01-25 02:25:52 +02:00
unknown
c95a77c24f Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default


sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-22 20:51:54 +04:00
unknown
8823fa22f1 Merge
client/mysql.cc:
  Auto merged
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mf_iocache.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/protocol.cc:
  SCCS merged
2003-01-21 21:28:51 +02:00
unknown
10e22c346a Portability fixes (for windows)
Some changes to the prepared statement protocol to make it easier to use and faster.


Makefile.am:
  Fix to make dist to work with cmd-line-utils
client/mysql.cc:
  Portability fixes
client/mysqlbinlog.cc:
  Portabiliy fixes and remove usafe of FILE
configure.in:
  Fix to make dist to work with cmd-line-utils
heap/_check.c:
  Portability fixes
include/config-win.h:
  Portability fixes
include/m_ctype.h:
  Indentation cleanup
include/my_list.h:
  Portability fixes
include/mysql.h:
  Cleanup of BIND structure
include/violite.h:
  Portability fixes
innobase/dict/dict0dict.c:
  Portability fixes
innobase/dict/dict0load.c:
  Portability fixes
innobase/include/os0proc.h:
  Portability fixes (Heikki, please check)
innobase/os/os0proc.c:
  Portability fixes (Heikki, please check)
innobase/ut/ut0ut.c:
  Portability fixes
isam/pack_isam.c:
  Portability fixes
libmysql/libmysql.c:
  Portability fixes
  Remove obscure usage of the length parameter for prepared statements.
libmysql/libmysql.def:
  Remove not existing functions
libmysqld/lib_sql.cc:
  Remove compiler warning
mysql-test/r/explain.result:
  Fix after merge
mysql-test/r/join.result:
  Fix after merge
mysys/my_once.c:
  Portability fix
mysys/tree.c:
  Portability fixes
sql/field.cc:
  Portability fixes
sql/filesort.cc:
  move assert.h to mysql_priv.h
sql/ha_berkeley.cc:
  move assert.h to mysql_priv.h
sql/ha_innodb.cc:
  move assert.h to mysql_priv.h
sql/item.cc:
  move assert.h to mysql_priv.h
  Fixed syntax error
sql/item_cmpfunc.cc:
  move assert.h to mysql_priv.h
sql/item_func.cc:
  move assert.h to mysql_priv.h
sql/item_row.cc:
  move assert.h to mysql_priv.h
sql/item_strfunc.cc:
  Portability fix
sql/item_subselect.cc:
  Portability fix
sql/item_sum.cc:
  move assert.h to mysql_priv.h
sql/lex.h:
  Portability fix
sql/lock.cc:
  move assert.h to mysql_priv.h
sql/log.cc:
  move assert.h to mysql_priv.h
sql/log_event.cc:
  Portability fix
sql/mf_iocache.cc:
  move assert.h to mysql_priv.h
sql/mysql_priv.h:
  move assert.h to mysql_priv.h
sql/mysqld.cc:
  move assert.h to mysql_priv.h
sql/opt_range.cc:
  move assert.h to mysql_priv.h
sql/password.c:
  Portability fix
sql/protocol.cc:
  move assert.h to mysql_priv.h
sql/set_var.cc:
  Portability fix
sql/slave.cc:
  move assert.h to mysql_priv.h
sql/spatial.cc:
  Portability fix
sql/sql_acl.cc:
  move assert.h to mysql_priv.h
sql/sql_base.cc:
  move assert.h to mysql_priv.h
sql/sql_cache.cc:
  move assert.h to mysql_priv.h
sql/sql_class.cc:
  move assert.h to mysql_priv.h
sql/sql_handler.cc:
  move assert.h to mysql_priv.h
sql/sql_help.cc:
  Removed compiler warning
sql/sql_lex.cc:
  Portability fix
sql/sql_lex.h:
  Portability fix
sql/sql_parse.cc:
  move assert.h to mysql_priv.h
sql/sql_prepare.cc:
  move assert.h to mysql_priv.h
sql/sql_repl.cc:
  move assert.h to mysql_priv.h
sql/sql_select.cc:
  move assert.h to mysql_priv.h
sql/sql_string.cc:
  Portability fix
sql/sql_string.h:
  Portability fix
sql/sql_table.cc:
  move assert.h to mysql_priv.h
sql/sql_yacc.yy:
  Portability fix
  Remove not accessed code
strings/ctype-bin.c:
  Portability fix
strings/ctype-mb.c:
  Portability fix
strings/ctype.c:
  Portability fix
tests/client_test.c:
  A
2003-01-21 21:07:59 +02:00
unknown
96b86dcc9a Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-default


sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
2003-01-21 20:24:22 +04:00
unknown
dceabff131 SCRUM
Default in UPDATE & SELECT


sql/field.h:
  brackets was omitted
sql/item.cc:
  now only DEFAULT_ITEM
sql/item.h:
  Item_default class deletion
sql/sql_yacc.yy:
  changes in syntax for DEFAULT in UPDATE & SELECT
sql/table.cc:
  default_values member removed
sql/table.h:
  member changed with inline function
2003-01-21 20:20:46 +04:00
unknown
aec72f3315 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1


sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-21 15:31:04 +02:00
unknown
a5bdc2e561 resolve fix
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_derived.cc:
  resolve fix.
2003-01-21 14:57:33 +02:00
unknown
8a3d3a539f fixed test of cardinality
mysql-test/r/subselect.result:
  test of cardinality error
mysql-test/t/subselect.test:
  test of cardinality error
2003-01-21 13:55:26 +02:00
unknown
6dc8a385dc delete name_length and change an assign of udf.name (SCRUM)
sql/sql_yacc.yy:
  delete name_length and change assign of udf.name
2003-01-20 02:58:21 +05:00
unknown
61434bf8e8 Change client_flag to unsigned long (16 -> 32 bits) to handle more options.
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows


client/mysql.cc:
  Removed compiler warnings.
  Make quote handling simpler
include/config-win.h:
  Fix for myisam/rt_mbr.c
include/mysql.h:
  Change client_flag to unsigned long to handle more options.
libmysql/libmysql.c:
  Change client_flag to unsigned long to handle more options.
libmysqld/libmysqld.c:
  Change client_flag to unsigned long to handle more options.
myisam/rt_mbr.c:
  Portability fix for Windows
mysql-test/r/rpl_loaddata.result:
  Fix test case
sql/item_strfunc.cc:
  Don't use new password format if mysql.user has old format
sql/item_strfunc.h:
  Don't use new password format if mysql.user has old format
sql/mysql_priv.h:
  Don't use new password format if mysql.user has old format
sql/mysqld.cc:
  Don't use new password format if mysql.user has old format
sql/sql_acl.cc:
  Don't use new password format if mysql.user has old format.
  tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_class.h:
  Don't use new password format if mysql.user has old format
sql/sql_parse.cc:
  Change client_flag to unsigned long to handle more options.
sql/sql_yacc.yy:
  Don't use new password format if mysql.user has old format
strings/ctype-utf8.c:
  Remove compiler warnings
strings/ctype-win1250ch.c:
  Remove compiler warnings
tests/grant.res:
  Update results
2003-01-18 16:39:21 +02:00