Commit graph

2629 commits

Author SHA1 Message Date
unknown
63a49b7886 Just making commit in order to stop getting erors.
Will do a push when it starts working ..
2002-07-16 22:42:53 +03:00
unknown
f95ed60934 Found bugs fixed
libmysqld/lib_sql.cc:
  This would be more correct
sql/item.cc:
  This error not to be exposed
sql/item_strfunc.cc:
  We don't want login/password stuff in Embedded Library
sql/sql_select.cc:
  This error not to be exposed
sql/sql_table.cc:
  Usual changes here
2002-07-11 13:43:21 +05:00
unknown
2da868d45c Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bisonxp.(none):/home/hf/work/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2002-07-09 10:42:24 +05:00
unknown
615c1e4fcf Minor fixes
libmysqld/lib_sql.cc:
  Working when LIMIT is on
sql/sql_handler.cc:
  Usual fix to handle embedded case properly
sql/sql_select.cc:
  Usual fix to handle embedded case properly
sql/sql_table.cc:
  Usual fix to handle embedded case properly
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-07-09 10:39:22 +05:00
unknown
5d2927e4a6 subselect clean up
fix after automerge


sql/item_strfunc.cc:
  fix after automerge
sql/sql_lex.h:
  subselect clean up
sql/sql_select.cc:
  subselect clean up
2002-07-01 19:06:24 +03:00
unknown
fd8c758692 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-having-4.1


sql/item_strfunc.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-07-01 14:17:59 +03:00
unknown
e5b5f45319 subselect in having clause
fixed bug in sum function in subselect


mysql-test/r/subselect.result:
  subselect in having clause
mysql-test/t/subselect.test:
  subselect in having clause
sql/item.cc:
  subselect in having clause
sql/item.h:
  subselect in having clause
sql/item_cmpfunc.cc:
  subselect in having clause
sql/item_cmpfunc.h:
  subselect in having clause
sql/item_func.cc:
  subselect in having clause
sql/item_func.h:
  subselect in having clause
sql/item_strfunc.h:
  subselect in having clause
sql/item_subselect.cc:
  subselect in having clause
sql/item_subselect.h:
  subselect in having clause
sql/item_uniq.h:
  subselect in having clause
sql/sql_base.cc:
  subselect in having clause
sql/sql_class.cc:
  subselect in having clause
sql/sql_class.h:
  subselect in having clause
sql/sql_handler.cc:
  subselect in having clause
sql/sql_lex.cc:
  subselect in having clause
sql/sql_lex.h:
  subselect in having clause
sql/sql_prepare.cc:
  subselect in having clause
sql/sql_yacc.yy:
  subselect in having clause
2002-07-01 14:14:51 +03:00
unknown
baa8486e52 Merge work:/home/bk/mysql-4.0/
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0-new


mysys/my_getopt.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-07-01 10:14:55 +03:00
unknown
a86390f01a Update for running gcc 3.x (mainly on HPUX)
Portability fixes for HPUX
Rename of CHECK_LOCK to IS_FREE_LOCK
Apply lower_case_table_names also to databases
Cleanup of describe code
Don't allow \ in database names


Build-tools/Do-compile:
  Added option --make-options
Docs/manual.texi:
  Changelog
  Added XOR, ^ and IS_FREE_LOCK() descriptions
acinclude.m4:
  Update for running gcc 3.x on HPUX
client/mysql.cc:
  Portability fix
client/mysqlbinlog.cc:
  Fix for using gcc 3.1
configure.in:
  Fix for using gcc 3.1
include/my_global.h:
  Fix for using gcc 3.1
include/my_pthread.h:
  Removed warning on HPUX
innobase/configure.in:
  Portability fix (for gcc 3.1 on HPUX)
innobase/ut/ut0ut.c:
  Portability fix (for gcc 3.1 on HPUX)
mysql-test/r/func_test.result:
  Test of new functions
mysql-test/r/rpl_get_lock.result:
  Test of new functions
mysql-test/t/func_test.test:
  Test of new functions
mysql-test/t/rpl_get_lock.test:
  Test of new functions
mysys/my_tempnam.c:
  Portability fix
sql/item_cmpfunc.cc:
  Added comments to Item_cond_xor.
  Fixed NULL handling for XOR
sql/item_create.cc:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_create.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/item_func.cc:
  Cleanup XOR handling
sql/item_func.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/lex.h:
  rename of CHECK_LOCK to IS_FREE_LOCK
sql/mysqld.cc:
  Moved chroot() to be exectued earlier.
sql/sql_db.cc:
  Apply lower_case_table_names also to databases
sql/sql_parse.cc:
  Apply lower_case_table_names also to databases
sql/sql_select.cc:
  Cleanup describe code (after Sinisa's patch for EXPLAIN + UNION)
sql/table.cc:
  Don't allow \ in database names
2002-06-30 18:57:21 +03:00
unknown
e0d8d62e39 Added interface for first set of dynamic variables. 2002-06-28 19:30:09 +03:00
unknown
1ff701ee0c Several problems were fixed (mostly BLOB+charset related)
Fixed that MyISAM were not working properly with non-8bit charsets in some cases
CONVERT() function now works properly


myisam/mi_unique.c:
  Fix for non-8bit charsets
sql/field.cc:
  Initialize blobs with charset
sql/field.h:
  Initialize blobs with charset
sql/field_conv.cc:
  Initialize blobs with charset
sql/item_strfunc.cc:
  CONVERT() function now has working fix_lenght_and_dec(), and it's own 
  fix_fields()
sql/item_strfunc.h:
  CONVERT() function now has working fix_lenght_and_dec(), and it's own 
  fix_fields()
sql/sql_select.cc:
  Fixes for BLOBs
  Fixed that wrong charset was used in some cases
2002-06-26 16:00:43 +05:00
unknown
2583ecd642 SELECT left(non_default_charset_field,n) GROUP BY 1
now works more correctly. Still needs fixes.
2002-06-20 22:52:56 +05:00
unknown
518787c299 Made keyread (key scanning) a key specific attribute.
This avoids using fulltext keys for table scanning.
This also reverts Sinisa's original fix for this problem.


Docs/manual.texi:
  Update of SQL_JOIN_MAX_SIZE information3602
client/mysqldump.c:
  comment cleanup
include/my_aes.h:
  General cleanup for new file
include/rijndael.h:
  General cleanup for new file
include/sha1.h:
  General cleanup for new file
mysys/my_aes.c:
  General cleanup for new file
mysys/rijndael.c:
  General cleanup for new file
mysys/sha1.c:
  General cleanup for new file
sql/ha_berkeley.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_innodb.cc:
  Merge with 3.23.x
sql/ha_innodb.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_isam.cc:
  Moved things to table_flags()
sql/ha_isam.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisam.cc:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisam.h:
  Made keyread (key scanning) a key specific attribute.
sql/ha_myisammrg.h:
  Made keyread (key scanning) a key specific attribute.
sql/handler.h:
  Made keyread (key scanning) a key specific attribute.
sql/item_strfunc.cc:
  Cleanup of AES_xxx code
sql/opt_range.cc:
  Made keyread (key scanning) a key specific attribute.
sql/sql_base.cc:
  Made keyread (key scanning) a key specific attribute.
sql/sql_cache.cc:
  Removed compiler warning
sql/sql_select.cc:
  Removed wrong patch to fulltext problem
sql/table.cc:
  Made keyread (key scanning) a key specific attribute.
sql/table.h:
  Made keyread (key scanning) a key specific attribute.
2002-06-19 00:22:30 +03:00
unknown
c47044f0ae Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-06-17 09:46:38 +03:00
unknown
8a8e4be22f Cleanup of checking of user resources
Added missing checking of no_keyread


Docs/manual.texi:
  Fixed wrong example
myisam/myisamchk.c:
  Removed not needed include file
mysys/my_pthread.c:
  Fix for HPUX
mysys/my_thr_init.c:
  Removed not needed warning
scripts/mysql_fix_privilege_tables.sh:
  Cleanup
sql/sql_lex.cc:
  Removed not needed initialization
sql/sql_parse.cc:
  Cleanup of checking of user resources
sql/sql_select.cc:
  Added checking of no_keyread
2002-06-16 17:06:12 +03:00
unknown
4a1b497899 Fixed a rare bug when fulltext index is present and no tables are used.
A better fix would be to have a map of tables that are not used at all, 
and to annul just fledls in that TABLE.
2002-06-14 15:06:01 +03:00
unknown
6cdebb33d7 sql_error.cc, sql_prepare.cc:
new file

  Client-server protocol 4.1 changes - Server side:

 * Enhanced metadata information:
    - SHOW [COUNT(*)] ERRORS [LIMIT [offset,] rows]
    - SHOW [COUNT(*)] WARNING [LIMIT [offset,] rows]
    - SHOW TABLE TYPES
    - SHOW PRIVILEGES
    - SHOW COLUMN TYPES (Not fully implemented)

 * Prepared execution
 * Long data handling in pieces
 * And other misc changes
2002-06-12 14:13:12 -07:00
unknown
70aa7424c4 Big code cleanup/review before 4.0.2 release.
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.


BUILD/SETUP.sh:
  Added -DPEDANTIC_SAFEMALLOC as standard debug option
Docs/manual.texi:
  Changes for new version.
client/mysql.cc:
  Fixed default value for rehash
  cleanup
client/mysqladmin.c:
  Cleanup
client/mysqlbinlog.cc:
  cleanup
client/mysqldump.c:
  Cleanup
client/mysqlmanager-pwgen.c:
  Cleanup
client/mysqlmanagerc.c:
  Cleanup
client/mysqltest.c:
  Cleanup
dbug/dbug.c:
  Cleanup
extra/resolve_stack_dump.c:
  Cleanup & Simple optimizations
include/ft_global.h:
  Cleanup
include/my_alloc.h:
  Cleanup
include/my_global.h:
  Cleanup
include/my_sys.h:
  Cleanup
include/myisam.h:
  Cleanup
libmysql/libmysql.c:
  Cleanup
libmysql/manager.c:
  Cleanup
myisam/ft_boolean_search.c:
  Cleanup
myisam/ft_dump.c:
  Change strcpy -> strmov
myisam/ft_eval.c:
  Cleanup
myisam/ft_nlq_search.c:
  Cleanup
myisam/ft_test1.c:
  strncpy -> strnmov
myisam/ft_update.c:
  Cleanup
myisam/mi_static.c:
  Cleanup
myisam/mi_test2.c:
  Cleanup
myisam/mi_write.c:
  Cleanup
mysys/mf_fn_ext.c:
  Cleanup
mysys/mf_iocache.c:
  Cleanup
mysys/mf_iocache2.c:
  Cleanup
mysys/my_getopt.c:
  Cleanup
mysys/my_read.c:
  Cleanup
mysys/my_thr_init.c:
  Cleanup
mysys/queues.c:
  Cleanup
mysys/safemalloc.c:
  Cleanup
sql/field.cc:
  Indentation cleanups
sql/ha_berkeley.cc:
  Indentation cleanups
sql/ha_myisam.cc:
  Cleanup
sql/item.h:
  Indentation cleanups
sql/item_cmpfunc.cc:
  Indentation cleanups
sql/item_create.cc:
  cleanup
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Indentation cleanups
sql/item_strfunc.cc:
  Indentation cleanups
sql/item_sum.cc:
  Indentation cleanups
sql/item_timefunc.cc:
  Indentation cleanups
sql/lock.cc:
  Indentation cleanups
sql/log.cc:
  Cleanup
  strnmov -> strmake
sql/log_event.cc:
  Cleanup + optimizations
  Fixed memory leak
  Added missing pthread_mutex_unlock()  (On error condition)
sql/log_event.h:
  Indentation and comment cleanup
  Merged #ifdef's into common blocks for better readability
sql/mini_client.cc:
  Indentation cleanup
sql/mysql_priv.h:
  Cleanup
  Changed int function to bool
sql/mysqld.cc:
  Indentation and comment cleanup
sql/net_pkg.cc:
  Indentation cleanup
sql/net_serv.cc:
  Changed int function -> bool
sql/nt_servc.cc:
  Cleanup
sql/opt_range.cc:
  Indentation cleanup
sql/repl_failsafe.cc:
  Cleanup + simple optimization
  strnmov -> strmake
sql/slave.cc:
  strnmov -> strmake
  Cleanups
sql/slave.h:
  Cleanup
sql/sql_acl.cc:
  Indentation and DBUG_PRINT cleanup
  Changed WITH MAX... to not use =
sql/sql_base.cc:
  Indentation cleanup
sql/sql_cache.cc:
  Indentation cleanup
sql/sql_class.cc:
  Indentation cleanup
sql/sql_class.h:
  Renamed some struct slots
sql/sql_delete.cc:
  Indentation cleanup
sql/sql_handler.cc:
  Indentation cleanup
sql/sql_insert.cc:
  Use new slot names.
sql/sql_lex.cc:
  Indentation cleanup
sql/sql_lex.h:
  Indentation cleanup
sql/sql_load.cc:
  Indentation cleanup
sql/sql_parse.cc:
  Indentation cleanup
  Removed not used check from LOCK TABLES
sql/sql_repl.cc:
  strnmov -> strmake
sql/sql_repl.h:
  Removed test if file is included (We want to know if it's included twice to avoid this)
sql/sql_select.cc:
  Indentation cleanup
sql/sql_show.cc:
  Indentation cleanup
sql/sql_string.cc:
  Indentation cleanup
sql/sql_table.cc:
  Indentation cleanup
sql/sql_union.cc:
  Use renamed struct slot
sql/sql_update.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Removed = after GRANT ... MAX_  to make the syntax uniform
sql/table.cc:
  Indentation cleanup
sql/table.h:
  Indentation cleanup
sql/time.cc:
  Indentation cleanup
sql/udf_example.cc:
  Indentation cleanup
sql/unireg.cc:
  strnmov -> strmake
tests/grant.pl:
  Added test for LOCK TABLES
tools/mysqlmanager.c:
  Cleanup
  fopen() -> my_fopen()
vio/viosocket.c:
  DBUG_PRINT cleanups
vio/viosslfactories.c:
  Indentation cleanup
  Checking of results from malloc()
  Fixed possible memory leak
BitKeeper/etc/ignore:
  Added scripts/mysql_secure_installation to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-06-11 11:20:31 +03:00
unknown
45e0cd6129 Fixed bug in SQL_CALC_FOUND_ROWS + LIMIT
Docs/manual.texi:
  Changelog
mysql-test/r/select_found.result:
  Test of FOUND_ROWS() bug fix
mysql-test/t/select_found.test:
  Test of FOUND_ROWS() bug fix
2002-06-10 13:33:25 +03:00
unknown
3a395a994a Bug fix for complicated GROUP BY ... ORDER BY query.
Fixed problem in access rights testing (from last patch)


mysql-test/r/group_by.result:
  Condenced GROUP test case
mysql-test/t/group_by.test:
  Condenced GROUP test case
sql/sql_parse.cc:
  Fixed problem in access rights testing (from last patch)
sql/sql_select.cc:
  Rollback Sinisa's GROUP BY patch and make a better one.
2002-06-09 15:41:19 +03:00
unknown
ec09d2e5a8 A bug fix and test case for a bug that appears in quereis where there
is a GROUP BY a column that is not NOT NULL and ORDER BY is done by
another column.

Even better fix would be to make a separate function for this.
2002-06-08 20:02:49 +03:00
unknown
b0c1e00467 temporary preventing subselect in HAVING clause 2002-06-07 21:26:43 +03:00
unknown
4a1dec3dfb post-merged fixing 2002-06-05 22:05:08 +03:00
unknown
954a0583f8 merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  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_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2002-06-05 21:32:22 +03:00
unknown
08526ba32d Changes for new binary .frm format
Fixes after last merge from 4.0.
(Code not yet complete, need anoter merge from 4.0)


heap/hp_write.c:
  cleanup
myisam/ft_boolean_search.c:
  Fixed tree handling to new format
mysql-test/r/alter_table.result:
  SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/r/func_math.result:
  Updated results
mysql-test/r/heap_btree.result:
  Portability fix
mysql-test/r/isam.result:
  SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/r/show_check.result:
  SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/t/heap_btree.test:
  Portability fix
mysql-test/t/show_check.test:
  SHOW FULL COLUMN FROM TABLE now returns comment
sql/field.cc:
  Fix for comment handling
sql/field.h:
  Added CHARSET_INFO to field structure
sql/item_cmpfunc.cc:
  Fixed like to use system charset (need to be updated)
sql/item_func.cc:
  Update to new charset handling
sql/mysql_priv.h:
  cleanup
sql/sql_base.cc:
  Added charset to HA_CREATE_INFO
sql/sql_delete.cc:
  Added charset to HA_CREATE_INFO
sql/sql_parse.cc:
  Added charset to HA_CREATE_INFO
sql/sql_select.cc:
  cleanup
sql/sql_show.cc:
  charset change
sql/sql_string.h:
  cleanup
sql/sql_table.cc:
  cleanup
sql/sql_yacc.yy:
  Go back to old code for ALTER table ... MODIFY
sql/table.cc:
  fixed comment handling
sql/unireg.cc:
  new field format
2002-06-04 08:23:57 +03:00
unknown
f0409fa920 merge with 4.0
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-pentium-debug:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/mysql_install.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/ft_dump.c:
  Auto merged
myisam/ft_test1.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
mysys/charset.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/hash.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.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_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.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/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/sql_update.cc:
  Auto merged
sql/structs.h:
  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
strings/Makefile.am:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
2002-06-03 12:59:31 +03:00
unknown
a532bfb2ea new subselect tests
LIMIT fixed
AVG & STD with subselect fixed
join_free fixed to be depended queries compatible
sort_default removed from SELECT_LEX


mysql-test/r/subselect.result:
  new subselect tests
mysql-test/t/subselect.test:
  new subselect tests
sql/item.cc:
  marking as depended _ALL_ subselects under select from wich depend
sql/item_subselect.cc:
  limit fixed
  TODO added
sql/sql_class.cc:
  AVG & STD function with subselects fixed
sql/sql_lex.h:
  sort_default removed
sql/sql_parse.cc:
  limit fixed
sql/sql_select.cc:
  fixed to be subselect compatible
sql/sql_yacc.yy:
  sort_default removed
2002-06-01 23:35:36 +03:00
unknown
807b50855c Hiding internal pointers of SELECT_LEX structures 2002-05-27 20:52:54 +03:00
unknown
e640e2e2c0 merge
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/item_strfunc.h:
  merge layout fixing
sql/sql_update.cc:
  merge layout fixing
2002-05-26 22:57:08 +03:00
unknown
02d8b9ba56 added depended subselect processing
mysql-test/r/subselect.result:
  depended subselect test
mysql-test/t/subselect.test:
  depended subselect test
sql/item.cc:
  resolving field names in depended queries
sql/item_subselect.cc:
  move optimization just before execution, because we can't optimize inner depended subselect if have not optimized outer subselect
sql/item_subselect.h:
  move optimization just before execution
sql/sql_lex.h:
  some inline methods to hide internal SELECT_LEX structures
sql/sql_select.cc:
  fixed error
2002-05-26 22:50:32 +03:00
unknown
af68d3de87 Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_select.cc:
  Auto merged
2002-05-26 12:59:02 +02:00
unknown
85bfbcd7ad quick fix for some optimizer glitch (it appears as ft+const bug, but it, probably, isn't)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-05-25 20:59:50 +02:00
unknown
72ea538b0b A fix for the very nusty bug with when there are 2 or more fields
in GROUP BY , which fields can be NULL ....
2002-05-22 15:11:35 +03:00
unknown
8bee96ab0a Now string values are created and filled with charset field
SELECT func(charset2) FROM t ORDER BY 1 works in correct charset
2002-05-17 16:29:52 +05:00
unknown
66f426c063 Fixed some compilation problems in last changeset
Docs/manual.texi:
  Small changes regarind user resources
client/mysqlbinlog.cc:
  Applied patch to support --database
mysql-test/r/func_isnull.result:
  New test results
mysql-test/r/join.result:
  New test results
mysql-test/r/show_check.result:
  New test results
mysql-test/r/type_datetime.result:
  New test results
mysql-test/r/type_decimal.result:
  New test results
mysql-test/r/type_float.result:
  New test results
mysys/my_gethostbyname.c:
  Fixed type on last push
mysys/my_pthread.c:
  Fixed type on last push
sql/sql_select.cc:
  Fixed bug in LIMIT handling
2002-05-16 23:35:09 +03:00
unknown
9ef4edccc2 Fix bug in SELECT SQL_CALC_FOUND_ROWS
Docs/manual.texi:
  Update of new GRANT options
libmysql/manager.c:
  Use new my_gethostbyname_r() functions
mysql-test/r/select_found.result:
  new test case
mysql-test/t/select_found.test:
  new test case
sql/mysqld.cc:
  Change names of some status variables
2002-05-16 16:06:57 +03:00
unknown
5a8763b3f8 resolve changes
sql/sql_parse.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-05-15 14:11:27 +03:00
unknown
c5bfcc9d7f Features made for Schlund plus several bug fixes.
Read a manual for more detail
2002-05-15 13:50:38 +03:00
unknown
716ed1168f Sergei's MyODBC fix 2002-05-12 23:01:45 -03:00
unknown
044cbe42ac simple subselects ported to new select_lex structures
include/mysqld_error.h:
  simple subselects
libmysqld/Makefile.am:
  simple subselects
sql/Makefile.am:
  simple subselects
sql/item.h:
  simple subselects
sql/item_strfunc.h:
  simple subselects
sql/share/czech/errmsg.txt:
  simple subselects
sql/share/danish/errmsg.txt:
  simple subselects
sql/share/dutch/errmsg.txt:
  simple subselects
sql/share/english/errmsg.txt:
  simple subselects
sql/share/estonian/errmsg.txt:
  simple subselects
sql/share/french/errmsg.txt:
  simple subselects
sql/share/german/errmsg.txt:
  simple subselects
sql/share/greek/errmsg.txt:
  simple subselects
sql/share/hungarian/errmsg.txt:
  simple subselects
sql/share/italian/errmsg.txt:
  simple subselects
sql/share/japanese/errmsg.txt:
  simple subselects
sql/share/korean/errmsg.txt:
  simple subselects
sql/share/norwegian-ny/errmsg.txt:
  simple subselects
sql/share/norwegian/errmsg.txt:
  simple subselects
sql/share/polish/errmsg.txt:
  simple subselects
sql/share/portuguese/errmsg.txt:
  simple subselects
sql/share/romanian/errmsg.txt:
  simple subselects
sql/share/russian/errmsg.txt:
  simple subselects
sql/share/slovak/errmsg.txt:
  simple subselects
sql/share/spanish/errmsg.txt:
  simple subselects
sql/share/swedish/errmsg.txt:
  simple subselects
sql/share/ukrainian/errmsg.txt:
  simple subselects
sql/sql_class.cc:
  simple subselects
sql/sql_class.h:
  simple subselects
sql/sql_lex.cc:
  simple subselects
sql/sql_select.cc:
  simple subselects
sql/sql_select.h:
  simple subselects
sql/sql_union.cc:
  simple subselects
sql/sql_yacc.yy:
  simple subselects
2002-05-12 23:46:42 +03:00
unknown
6ff06df233 new SELECT_LEX structures used for storing global ORDER BY, global LIMIT & limit counters
mysql-test/r/union.result:
  correct result of union explain command
2002-05-08 23:14:40 +03:00
unknown
7abf67c5e9 init_dynamic_array MyODBC compatibility fix 2002-04-28 21:22:37 +00:00
unknown
3adee5046d MI_KEYSEG -> HA_KEYSEG
_mi_key_cmp -> ha_key_cmp


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-04-25 15:10:29 +05:00
unknown
fdc446d0c6 merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-pentium-debug:
  Auto merged
acconfig.h:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
heap/hp_rfirst.c:
  Auto merged
heap/hp_rnext.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
mysys/mf_iocache2.c:
  Auto merged
mysys/my_vsnprintf.c:
  Auto merged
sql/convert.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
strings/Makefile.am:
  Auto merged
2002-04-13 15:34:39 +03:00
unknown
6326ec9944 Update for BTREE keys in HEAP tables
Split handler->option_flag() to handler->table_flags() and handler->index_flags()


Docs/manual.texi:
  Updated standard binary options
include/my_base.h:
  Update for BTREE keys in HEAP tables
libmysql/net.c:
  merge with net_serv.cc
mysql-test/r/func_misc.result:
  Update for new behaviour of inet_ntoa
sql/field.cc:
  Update for BTREE keys in HEAP tables
sql/field.h:
  Update for BTREE keys in HEAP tables
sql/filesort.cc:
  Update for BTREE keys in HEAP tables
sql/ha_berkeley.h:
  Update for BTREE keys in HEAP tables
sql/ha_heap.h:
  Update for BTREE keys in HEAP tables
sql/ha_innodb.h:
  Update for BTREE keys in HEAP tables
sql/ha_isam.cc:
  Update for BTREE keys in HEAP tables
sql/ha_isam.h:
  Update for BTREE keys in HEAP tables
sql/ha_isammrg.h:
  Update for BTREE keys in HEAP tables
sql/ha_myisam.cc:
  Update for BTREE keys in HEAP tables
sql/ha_myisam.h:
  Update for BTREE keys in HEAP tables
sql/ha_myisammrg.h:
  Update for BTREE keys in HEAP tables
sql/handler.cc:
  Update for BTREE keys in HEAP tables
sql/handler.h:
  Update for BTREE keys in HEAP tables
sql/log.cc:
  Update for BTREE keys in HEAP tables
sql/net_serv.cc:
  Update for BTREE keys in HEAP tables
sql/opt_range.cc:
  Update for BTREE keys in HEAP tables
sql/opt_sum.cc:
  Update for BTREE keys in HEAP tables
sql/records.cc:
  Update for BTREE keys in HEAP tables
sql/sql_class.h:
  Update for BTREE keys in HEAP tables
sql/sql_handler.cc:
  Update for BTREE keys in HEAP tables
sql/sql_insert.cc:
  Update for BTREE keys in HEAP tables
sql/sql_select.cc:
  Update for BTREE keys in HEAP tables
sql/sql_show.cc:
  Update for BTREE keys in HEAP tables
sql/sql_table.cc:
  Update for BTREE keys in HEAP tables
sql/structs.h:
  Update for BTREE keys in HEAP tables
sql/table.cc:
  Update for BTREE keys in HEAP tables
sql/unireg.cc:
  Update for BTREE keys in HEAP tables
2002-04-12 21:35:46 +03:00
unknown
5560713590 Merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
readline/Makefile.am:
  Auto merged
sql/convert.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
2002-04-02 19:46:26 +03:00
unknown
d2771b82a4 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-04-02 14:59:40 +00:00
unknown
8bf63614de fts+const_tables bug fixed 2002-04-02 14:56:40 +00:00
unknown
36b38aa503 merge with 3.23.50
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
configure.in:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/range.test:
  Auto merged
scripts/mysqldumpslow.sh:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/share/Makefile.am:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
Docs/manual.texi:
  merge
client/mysql.cc:
  merge
client/mysqldump.c:
  merge
innobase/buf/buf0buf.c:
  merge
innobase/os/os0file.c:
  merge
innobase/row/row0mysql.c:
  merge
mysql-test/r/range.result:
  merge
sql/ha_innodb.cc:
  merge
sql/log_event.h:
  merge
sql/mysqld.cc:
  merge
sql/sql_base.cc:
  merge
sql/sql_load.cc:
  merge
2002-03-27 01:56:10 +02:00
unknown
8f2f159750 Fix for bug in WHERE key='j' or key='J'
Docs/manual.texi:
  Changelog
myisam/myisampack.c:
  Delete tmp file on error.
mysql-test/r/range.result:
  Updated test case
mysql-test/t/range.test:
  Updated test case
2002-03-22 14:03:42 +02:00