Commit graph

261 commits

Author SHA1 Message Date
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
a72ebebf5d after merge fix of 577 task (SCRUM, pre commit to be able to merge with static tables optimization fix)
fixed derived tables with subselect inside


mysql-test/r/derived.result:
  test of subselects inside derived tables
mysql-test/t/derived.test:
  test of subselects inside derived tables
mysql-test/t/subselect.test:
  subselect test (not finished)
sql/item.cc:
  after merge fix
sql/item.h:
  after merge fix
sql/item_cmpfunc.h:
  after merge fix
sql/item_subselect.cc:
  after merge fix
sql/item_sum.h:
  after merge fix
sql/mysql_priv.h:
  fixed derived tables with subselect inside
sql/sql_class.h:
  after merge fix
sql/sql_derived.cc:
  fixed derived tables with subselect inside
sql/sql_lex.cc:
  fixed derived tables with subselect inside
sql/sql_lex.h:
  fixed derived tables with subselect inside
sql/sql_parse.cc:
  fixed derived tables with subselect inside
  after merge fix
sql/sql_prepare.cc:
  after merge fix
sql/sql_select.cc:
  after merge fix
  fixed derived tables with subselect inside
2003-01-26 21:30:35 +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
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
b3f58a1b1b Initial multi query execution support 2003-01-18 11:53:38 -08:00
unknown
0ee64eb3d2 merge
sql/sql_yacc.yy:
  Auto merged
2003-01-17 21:41:38 +02:00
unknown
4655f1d4b4 Changed my_strntoxxx functions to clear error number on start
Allow one to change ANSI_QUOTES mode per thread and on the fly


sql/field.cc:
  Use new my_strntoxxx functions where function clears errno.
  Change variable names to 'not_used' for variables that is not used in function
sql/sql_base.cc:
  comment
sql/sql_lex.cc:
  Allow one to change ANSI_QUOTES mode per thread and on the fly
sql/sql_lex.h:
  Allow one to change ANSI_QUOTES mode per thread and on the fly
strings/ctype-simple.c:
  Changed my_strntoxxx functions to clear error number on start
  Changed my_strtod() to correctly set return error number
strings/ctype-utf8.c:
  Changed my_strntoxxx functions to clear error number on start
  Changed my_strtod() to correctly set return error number
2003-01-17 16:33:54 +02:00
unknown
d08e02ebe1 Added support sql_mode, which can be used to produce various outputs
of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
be compatible with various databases, including earlier versions of
MySQL
.


sql/field.cc:
  Added support for sql_mode.
  
  Changed find_set() to be aware of possible error. If the argument
  contains a value that is not legal in the set, err_pos and err_len
  are set.
sql/field.h:
  Added support for sql_mode.
  
  Changed find_set() to be aware of possible error. If the argument
  contains a value that is not legal in the set, err_pos and err_len
  are set.
sql/item_func.cc:
  Added support for sql_mode.
sql/mysql_priv.h:
  Some new sql modes.
sql/mysqld.cc:
  Added support for sql mode, including some new modes.
sql/set_var.cc:
  Added support for sql_mode.
  
  Added function that can be used to check values in a set.
sql/set_var.h:
  Added support for sql_mode.
  
  Added function that can be used to check values in a set.
sql/sql_class.cc:
  Removed previous usage of opt_sql_mode.
sql/sql_class.h:
  Removed previous usage of opt_sql_mode.
sql/sql_lex.cc:
  Changed previous version of sql_mode to the new noe.
sql/sql_parse.cc:
  Changed previous version of sql_mode to the new noe.
sql/sql_select.cc:
  Changed previous version of sql_mode to the new noe.
sql/sql_show.cc:
  Added support for various sql_modes for printing CREATE TABLE.
sql/sql_yacc.yy:
  Changed previous version of sql_mode to the new noe.
2003-01-16 02:04:50 +02:00
unknown
742de8f5ff after merging fixing
include/m_string.h:
  added include to va_list bicame known
mysql-test/r/union.result:
  some changing in error message
sql/sql_base.cc:
  error detection moved
sql/sql_lex.cc:
  new flag to detect table name error
sql/sql_lex.h:
  new flag to detect table name error
sql/sql_yacc.yy:
  check possibility of using table name added
2003-01-14 18:00:34 +02:00
unknown
91f18f0a26 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
innobase/mem/mem0pool.c:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-09 22:43:23 +02:00
unknown
f7ff1cca14 Post merge fix
Allow empty key list in USE|IGNORE|FORCE INDEX()


mysql-test/r/myisam.result:
  New explain format
mysql-test/t/myisam.test:
  test of index()
mysys/my_handler.c:
  Updated ha_key_cmp() to be as latest _mi_key_cmp() in 4.0
sql/sql_lex.cc:
  Post merge fix
sql/sql_lex.h:
  Post merge fix
sql/sql_parse.cc:
  Post merge fix
sql/sql_yacc.yy:
  Post merge fix for FORCE INDEX ()
  Allow empty key list in USE|IGNORE|FORCE INDEX()
2003-01-09 22:42:31 +02:00
unknown
0adfa1eef9 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
2003-01-09 16:11:03 +02:00
unknown
6383a27b53 Separating CHARSET and COLLATION terms
mysql-test/r/alter_table.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/create.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/innodb.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/isam.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/select.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/show_check.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_blob.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_float.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
mysql-test/r/type_ranges.result:
  SHOW FIELDS and SHOW CREATE TABLE now displays collation
sql/field.cc:
  In field type charset rather than collation name is displayed
sql/sql_db.cc:
  COLLATE clause has been added into SHOW CREATE DATABASE
sql/sql_lex.cc:
  Detect charset names rather than collation names
sql/sql_show.cc:
  COLLATION field has been added into SHOW FIELDS
sql/sql_yacc.yy:
  COLLATE syntax has been added in CREATE TABLE/DATABASE
2003-01-09 15:37:59 +04:00
unknown
c05c3d50c8 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
2003-01-05 23:39:33 +02:00
unknown
53894481bf merging
mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2002-12-31 12:55:03 +02:00
unknown
af3f9524f1 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
2002-12-30 01:59:08 +04:00
unknown
8dceb7c051 processing thread specific queries
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-30 01:46:48 +04:00
unknown
3ab0ddc294 postreview fix (SCRUM)
fixed layout


sql/filesort.cc:
  fixed layout
sql/gstream.cc:
  fixed layout
sql/item.cc:
  postreview fix
sql/item.h:
  postreview fix
sql/item_cmpfunc.cc:
  postreview fix
sql/item_cmpfunc.h:
  fixed layout
sql/item_func.h:
  fixed layout
sql/item_row.h:
  fixed layout
sql/item_strfunc.cc:
  fixed layout
sql/item_subselect.cc:
  postreview fix
sql/item_subselect.h:
  postreview fix
sql/nt_servc.cc:
  fixed layout
sql/opt_range.cc:
  fixed layout
sql/password.c:
  fixed layout
sql/spatial.cc:
  fixed layout
sql/sql_help.cc:
  fixed layout
sql/sql_lex.cc:
  fixed layout
sql/sql_olap.cc:
  fixed layout
sql/sql_select.cc:
  fixed layout
sql/sql_show.cc:
  fixed layout
sql/sql_string.cc:
  fixed layout
sql/sql_table.cc:
  fixed layout
sql/stacktrace.c:
  fixed layout
2002-12-28 01:01:05 +02:00
unknown
b861d68321 thd_charset copy in lex 2002-12-24 14:06:52 +04:00
unknown
fce29f66fb moved links initialization
mysql-test/r/delete.result:
  test of delete error
mysql-test/t/delete.test:
  test of delete error
2002-12-15 22:01:09 +02:00
unknown
657b311206 derived tables with UNION's ...
Scrum task !!!!!


mysql-test/r/analyse.result:
  reverting a fix
mysql-test/r/derived.result:
  derived tables with UNION's ...
mysql-test/t/analyse.test:
  reverting a fix
mysql-test/t/derived.test:
  derived tables with UNION's ...
sql/mysql_priv.h:
  derived tables with UNION's ...
sql/sql_analyse.cc:
  reverting a fix
sql/sql_derived.cc:
  derived tables with UNION's ...
sql/sql_lex.cc:
  derived tables with UNION's ...
sql/sql_select.cc:
  derived tables with UNION's ...
sql/sql_union.cc:
  derived tables with UNION's ...
2002-12-12 16:09:06 +02:00
unknown
ae4323e0d9 After merge fixes
Added THD to add_to_xxx_list() functions for faster parsing.


heap/_check.c:
  After merge fix
mysql-test/r/distinct.result:
  After merge fix
mysql-test/r/multi_update.result:
  Make timestamp test portable
mysql-test/t/multi_update.test:
  Make timestamp test portable
sql/field.cc:
  After merge fix
sql/item_sum.cc:
  After merge fix
sql/log_event.cc:
  Remove compiler warning
sql/mysql_priv.h:
  Added THD to add_to_list (Faster parsing)
sql/sql_derived.cc:
  Fixed parameters to create_tmp_table()
sql/sql_lex.cc:
  Added THD to add_to_list (Faster parsing)
sql/sql_lex.h:
  Added THD to add_to_list (Faster parsing)
sql/sql_parse.cc:
  Added THD to add_to_list (Faster parsing)
sql/sql_select.cc:
  After merge fixes
  Fixed return values from JOIN::optimize()
  Replaced test_function_query with '!tables_list'
  Optimized arguments to create_tmp_table()
sql/sql_select.h:
  Removed test_function_query variable
  Updated prototypes
sql/sql_union.cc:
  Updated argument lists.
sql/sql_update.cc:
  After merge fixes
sql/sql_yacc.yy:
  Added THD to all add_xxx_to_list() functions
sql/table.h:
  After merge fix
2002-12-06 21:11:27 +02:00
unknown
67c9ab3888 Merge work:/home/bk/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1
sql/sql_yacc.yy:
  Auto merged
sql/sql_lex.cc:
  Auto merged
2002-12-02 17:58:48 +02:00
unknown
59dec1bcd2 Fixed bug when creating keys in temporary HEAP tables.
(This caused the DISTINCT test to fail)
Removed one inline as this caused compiler problems


heap/hp_create.c:
  Comment
heap/hp_update.c:
  Indentation cleanup
heap/hp_write.c:
  Indentation cleanup
mysql-test/mysql-test-run.sh:
  Better options for valgrind
sql/item_sum.cc:
  Removed inline as this caused compiler problems with gcc 3.2
  (Was also non standard usage of inline)
sql/item_sum.h:
  Removed inline as this caused compiler problems with gcc 3.2
sql/sql_class.cc:
  Fixed reference to uninitialized value
sql/sql_lex.cc:
  Indentation cleanup
sql/sql_select.cc:
  Fixed bug when creating keys in temporary HEAP tables.
2002-12-02 17:52:22 +02:00
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
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
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
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
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
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
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
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
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
9767982aed merging
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-11-27 11:32:09 +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
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
b99dec07b0 after merging fix (update SCRUM?)
mysql-test/t/subselect.test:
  after merging fix
sql/sql_lex.cc:
  after merging fix
sql/sql_update.cc:
  after merging fix
sql/sql_yacc.yy:
  after merging fix
2002-11-23 20:40:16 +02:00
unknown
96b338f7df merging
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-23 19:20:04 +02:00
unknown
b7bcb96508 lock option in table list
sql/sql_lex.cc:
  note about methods location
2002-11-23 18:54:15 +02:00
unknown
0e9a75a4f7 Moved safe_to_cache_query from thd to lex.
This is required for prepared statements and stored procedures.


BitKeeper/etc/ignore:
  Added bkpull.log bkpull.log.2 bkpull.log.3 build.log sql/safe_to_cache_query.txt to the ignore list
sql/item_create.cc:
  Moved safe_to_cache_query from thd to lex.
sql/item_func.cc:
  Moved safe_to_cache_query from thd to lex.
sql/sql_cache.cc:
  Moved safe_to_cache_query from thd to lex.
  Note: Query_cache::is_cacheable() has both a thd and lex argument.
  We assumed that it's the lex->safe_to_cache_query we should test.
sql/sql_class.cc:
  Moved safe_to_cache_query from thd to lex.
sql/sql_class.h:
  Moved safe_to_cache_query from thd to lex.
sql/sql_lex.cc:
  Moved safe_to_cache_query from thd to lex.
  We set it to 1 initially. It's then set to 0 in cases where
  it's know not to be safe. (Before this change, it was set to
  0 in thd, and then set to 1 before parsing.)
sql/sql_lex.h:
  Moved safe_to_cache_query from thd to lex.
sql/sql_parse.cc:
  Moved safe_to_cache_query from thd to lex.
  No point in setting it here now, it's set in lex_start() later.
sql/sql_prepare.cc:
  Moved safe_to_cache_query from thd to lex.
  Must set it after lex_start() has been called.
sql/sql_yacc.yy:
  Moved safe_to_cache_query from thd to lex.
2002-11-22 14:50:53 +01:00
unknown
c58d9d9a9d Fixes after merge with 4.0
mysql-test/r/heap_btree.result:
  Updated results
mysql-test/r/heap_hash.result:
  Updated results
mysql-test/r/merge.result:
  Updated results
mysql-test/r/rpl_log.result:
  Updated results
mysql-test/r/select.result:
  Updated results
mysql-test/r/subselect.result:
  Updated results
sql/item_cmpfunc.h:
  Fix after merge
sql/log_event.cc:
  Fix after merge
sql/mysql_priv.h:
  Fix after merge
sql/sql_acl.cc:
  Fix after merge
sql/sql_class.cc:
  Fix after merge
sql/sql_db.cc:
  Fix after merge
sql/sql_delete.cc:
  Fix after merge
sql/sql_lex.cc:
  Fix after merge
sql/sql_lex.h:
  Fix after merge
sql/sql_parse.cc:
  Fix after merge
sql/sql_update.cc:
  Fix after merge
sql/sql_yacc.yy:
  Fix after merge
2002-11-21 22:25:53 +02:00
unknown
2723dbdb5e Automatic conversion from CHAR(length) to BLOB when length > 255
New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0


include/mysqld_error.h:
  New warning message
mysql-test/r/func_system.result:
  Added testing of new functions
mysql-test/r/func_test.result:
  Added testing of new functions
mysql-test/r/type_blob.result:
  Added testing of new functions
mysql-test/t/func_system.test:
  Added testing of new functions
mysql-test/t/func_test.test:
  Added testing of new functions
mysql-test/t/type_blob.test:
  Added testing of new functions
sql/item_func.cc:
  Added function DIV
sql/item_func.h:
  Added function DIV
sql/lex.h:
  New keywords
sql/share/czech/errmsg.txt:
  New warning message
sql/share/danish/errmsg.txt:
  New warning message
sql/share/dutch/errmsg.txt:
  New warning message
sql/share/english/errmsg.txt:
  New warning message
sql/share/estonian/errmsg.txt:
  New warning message
sql/share/french/errmsg.txt:
  New warning message
sql/share/german/errmsg.txt:
  New warning message
sql/share/greek/errmsg.txt:
  New warning message
sql/share/hungarian/errmsg.txt:
  New warning message
sql/share/italian/errmsg.txt:
  New warning message
sql/share/japanese/errmsg.txt:
  New warning message
sql/share/korean/errmsg.txt:
  New warning message
sql/share/norwegian-ny/errmsg.txt:
  New warning message
sql/share/norwegian/errmsg.txt:
  New warning message
sql/share/polish/errmsg.txt:
  New warning message
sql/share/portuguese/errmsg.txt:
  New warning message
sql/share/romanian/errmsg.txt:
  New warning message
sql/share/russian/errmsg.txt:
  New warning message
sql/share/serbian/errmsg.txt:
  New warning message
sql/share/slovak/errmsg.txt:
  New warning message
sql/share/spanish/errmsg.txt:
  New warning message
sql/share/swedish/errmsg.txt:
  New warning message
  Translated a lot of error messages
sql/share/ukrainian/errmsg.txt:
  New warning message
sql/sql_class.cc:
  Added support for warnings during parsing
sql/sql_class.h:
  Added support for warnings during parsing
sql/sql_error.cc:
  Added support for warnings during parsing
sql/sql_lex.cc:
  Fixed comment
sql/sql_parse.cc:
  Added automatic conversion from CHAR(length) to BLOB when length > 255
  Added support for BLOB(length)
sql/sql_yacc.yy:
  New operators MOD and DIV
  SELECT ... FROM DUAL
  TRUE = 1 and FALSE = 0
2002-11-21 02:07:14 +02:00
unknown
3f74283121 basic row Items (SCRUM)
include/mysql_com.h:
  basic row Items
include/mysqld_error.h:
  more wide error mening
libmysqld/Makefile.am:
  basic row Items
mysql-test/r/subselect.result:
  more wide error mening
sql/Makefile.am:
  basic row Items
sql/filesort.cc:
  basic row Items
sql/item.cc:
  basic row Items
sql/item.h:
  basic row Items
sql/item_cmpfunc.cc:
  basic row Items
sql/item_cmpfunc.h:
  basic row Items
sql/item_func.cc:
  basic row Items
sql/item_func.h:
  basic row Items
sql/item_strfunc.cc:
  basic row Items
sql/item_strfunc.h:
  basic row Items
sql/item_subselect.cc:
  basic row Items
sql/item_sum.cc:
  basic row Items
sql/share/czech/errmsg.txt:
  more wide error mening
sql/share/danish/errmsg.txt:
  more wide error mening
sql/share/dutch/errmsg.txt:
  more wide error mening
sql/share/english/errmsg.txt:
  more wide error mening
sql/share/estonian/errmsg.txt:
  more wide error mening
sql/share/french/errmsg.txt:
  more wide error mening
sql/share/german/errmsg.txt:
  more wide error mening
sql/share/greek/errmsg.txt:
  more wide error mening
sql/share/hungarian/errmsg.txt:
  more wide error mening
sql/share/italian/errmsg.txt:
  more wide error mening
sql/share/japanese/errmsg.txt:
  more wide error mening
sql/share/korean/errmsg.txt:
  more wide error mening
sql/share/norwegian-ny/errmsg.txt:
  more wide error mening
sql/share/norwegian/errmsg.txt:
  more wide error mening
sql/share/polish/errmsg.txt:
  more wide error mening
sql/share/portuguese/errmsg.txt:
  more wide error mening
sql/share/romanian/errmsg.txt:
  more wide error mening
sql/share/russian/errmsg.txt:
  more wide error mening
sql/share/serbian/errmsg.txt:
  more wide error mening
sql/share/slovak/errmsg.txt:
  more wide error mening
sql/share/spanish/errmsg.txt:
  more wide error mening
sql/share/swedish/errmsg.txt:
  more wide error mening
sql/share/ukrainian/errmsg.txt:
  more wide error mening
sql/sql_base.cc:
  fix_fields error handling
sql/sql_lex.cc:
  basic row Items
sql/sql_select.cc:
  basic row Items
sql/sql_yacc.yy:
  basic row Items
2002-11-15 20:32:09 +02:00
unknown
f980950bb3 Some code optimisations related to EXPLAIN of derived tables and the
resulting code cleanup in our main loop.
2002-11-09 15:40:46 +02:00
unknown
107015d3d7 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-06 22:35:17 +02:00
unknown
1448ba4ee9 test of join_free bug
sql/sql_lex.cc:
  possible bug fixed
sql/sql_select.cc:
  fixed join_free bug
2002-11-05 21:47:20 +02:00
unknown
8169483375 Fixed accidentally inverted assert condition 2002-11-05 11:24:44 +02:00