mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity
6,022 commits 3,589 branches 380 tags 1.7 GiB
Commit graph

610 commits

Author SHA1 Message Date
unknown
4c668ca7ef Pull conflicts resolutions 
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
include/mysql.h:
  Pull conflicts resolved
include/violite.h:
  Pull conflicts resolved
sql/item.cc:
  Pull conflicts resolved
sql/item.h:
  Pull conflicts recolved
sql/item_strfunc.cc:
  Pull conflicts resolved
sql/mysql_priv.h:
  Pull conflicts resolved
sql/sql_parse.cc:
  Pull conflicts resolved
 2002-11-29 12:35:48 +04:00
unknown
5996e68fe2 mysql.h: 
renamed arg name to avoid a warning that it shadows global variable


include/mysql.h:
  renamed arg name to avoid a warning that it shadows global variable
 2002-11-29 10:17:43 +04:00
unknown
0d2e0f4b2b Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi 2002-11-29 02:51:08 +05:00
unknown
53a81804e9 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
 2002-11-28 20:59:21 +02:00
unknown
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
5c7ce5202e Merge work.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/bk/src-4.1
 2002-11-28 10:02:01 -08:00
unknown
1c2d7aa880 Get rid of pbool from my_list.h; and avoid using the my_global.h for clients 2002-11-28 09:56:26 -08:00
unknown
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
22b0bfa288 Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi 
BitKeeper/etc/logging_ok:
  auto-union
include/myisam.h:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
 2002-11-28 15:24:55 +05:00
unknown
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
080b5c6057 new string-to-number functions 
include/m_ctype.h:
  Typo fix
sql/field.cc:
  Use new string-to-number functions
strings/ctype-bin.c:
  Use new string-to-number functions
strings/ctype-simple.c:
  Use new string-to-number functions
strings/ctype-utf8.c:
  Use new string-to-number functions
 2002-11-27 18:08:31 +04:00
unknown
4b021e6ea9 Preparing to use better string-to-number functions to avoid c_ptr() call, 
wich is slower and is not ucs2 compatible
 2002-11-27 15:47:39 +04:00
unknown
e9f96cf92a Merge myvenu.com:/home/venu/bk/src-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1


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


libmysql/libmysql.c:
  Clean all open stmts during mysql_close() implicitly
sql/mysql_priv.h:
  Handle close_stmt from client
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
sql/sql_parse.cc:
  Added missed COM_CLOSE_STMT
sql/sql_prepare.cc:
  Handle close stmt from client
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
  Minor fixups to make SET variable=? to work
client/insert_test.c:
  Added my_global.h to compile after my_list.h is added to mysql.h
client/select_test.c:
  Added my_global.h to compile after my_list.h is added to mysql.h
 2002-11-26 18:51:38 -08:00
unknown
a14db06bfc Merge work:/home/bk/mysql-4.1 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2002-11-25 22:22:13 +01:00
unknown
4ea2f42e33 myisammrg::index_next_same 
myisammrg/Makefile.am:
  myrg_rnext_same.c added
 2002-11-25 22:18:44 +01:00
unknown
e392821fbe Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


mysql-test/r/subselect.result:
  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/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/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
 2002-11-23 20:32:02 +02:00
unknown
671ed6ac8b Missed include/ files 2002-11-22 11:58:20 -08:00
unknown
32658672d6 after merging fix 2002-11-21 16:04:59 +02:00
unknown
33fc0d53b5 Merge with 4.0 
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Auto merged
BitKeeper/etc/config:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
include/myisam.h:
  Auto merged
include/violite.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/tree.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hash_filo.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.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/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/errmsg.txt:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/share/norwegian-ny/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/ha_myisam.cc:
  Merge with 4.0
  Removed some commented code
sql/sql_db.cc:
  Merge with 4.0
  Optimized the logging of the drop db call a bit
sql/sql_update.cc:
  Added comment
 2002-11-21 15:56:48 +02:00
unknown
ee88c36af6 merging 
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
 2002-11-21 12:05:52 +02:00
unknown
2da4d13569 prevent using references on sum function (except HAVING clouse of current select) and forward references 
include/mysqld_error.h:
  new error message
mysql-test/r/subselect.result:
  new error message
mysql-test/t/subselect.test:
  new error message
sql/item.cc:
  fix_fields indicator
  test on incorrect references
sql/item.h:
  fix_fields indicator
sql/item_cmpfunc.cc:
  fix_fields indicator
sql/item_func.cc:
  fix_fields indicator
sql/item_func.h:
  fix_fields indicator
sql/item_strfunc.cc:
  fix_fields indicator
sql/item_subselect.cc:
  fix_fields indicator
sql/item_sum.cc:
  fix_fields indicator
sql/item_sum.h:
  fix_fields indicator
sql/item_uniq.h:
  fix_fields indicator
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/serbian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/share/ukrainian/errmsg.txt:
  new error message
 2002-11-21 11:01:33 +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
9b9546edbc Try to optimize the cache buffer size needed for bulk_insert 
Fix for shutdown on Mac OS X


include/my_tree.h:
  Try to optimize the cache buffer size needed for bulk_insert
myisam/mi_write.c:
  Try to optimize the cache buffer size needed for bulk_insert
mysql-test/r/bdb.result:
  Make test repeatable
mysql-test/t/bdb.test:
  Make test repeatable
mysys/tree.c:
  Try to optimize the cache buffer size needed for bulk_insert
sql/mysql_priv.h:
  Small optimization
sql/mysqld.cc:
  Fix for shutdown on Mac OS X
sql/sql_insert.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/sql_yacc.yy:
  Call thd->strmake() instead of sql_strmake()
sql/table.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/table.h:
  Try to optimize the cache buffer size needed for bulk_insert
 2002-11-20 22:56:57 +02:00
unknown
bcaa09771f Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2002-11-19 17:34:38 +02:00
unknown
b9a431c41c Move MI_SORT_PARAM and BUFFPEK to myisamdef.h, delete KEY_STORE, change functions 
of store keys to temp. file


include/myisam.h:
  move MI_SORT_PARAM to myisamdef.h
myisam/myisamdef.h:
  Move MI_SORT_PARAM and BUFFPEK. Change MI_SORT_PARAM
myisam/sort.c:
  Delete KEY_STORE, change functions of store keys to temp. file
 2002-11-17 05:41:42 +05:00
unknown
4b9c5888e9 Merge serg.mysql.com:/usr/home/serg/Abk/mysql 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


scripts/mysqlhotcopy.sh:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
 2002-11-17 00:36:28 +01:00
unknown
638d4619ad Delete: include/.my_sys.h.swp 2002-11-17 00:35:13 +01:00
unknown
849b9ed913 typelib.h is required by mysql.h and should be installed 
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Delete: include/.my_sys.h.swp
 2002-11-17 00:31:57 +01:00
unknown
7ddbc9e298 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


sql/item_cmpfunc.cc:
  Auto merged
 2002-11-16 23:30:14 +02:00
unknown
bd1c2d65c4 Small improvement to alloc_root 
Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE


BitKeeper/etc/ignore:
  added autom4te.cache/* bdb/dist/autom4te.cache/* innobase/autom4te.cache/*
include/my_alloc.h:
  Small improvement to alloc_root
libmysql/libmysql.c:
  Removed compiler warning
myisam/mi_page.c:
  Better DBUG message
mysql-test/r/multi_update.result:
  Added test with lock tables
mysql-test/r/rpl_replicate_do.result:
  Update results
mysql-test/r/rpl_rotate_logs.result:
  Make test independent of if t1 exists
mysql-test/t/multi_update.test:
  Added test with lock tables
mysql-test/t/rpl_rotate_logs.test:
  Make test independent of if t1 exists
mysys/my_alloc.c:
  Small imprevement to alloc_root
  (Don't free blocks less than ALLOC_MAX_BLOCK_ROOT (4K)
sql/ha_innodb.cc:
  More debug messages
sql/ha_myisam.cc:
  Safety change
sql/lex.h:
  Add support for LIMIT # OFFSET #
sql/lock.cc:
  Added assertion
sql/mysql_priv.h:
  Change of lock handling
sql/mysqld.cc:
  Added function clear_error_messages()
sql/sql_base.cc:
  Change lock handling by open_ltable() and open_and_lock_tables()
sql/sql_class.cc:
  Split THD::THD to two functions
  Move some code from cleanup() to ~THD:THD
  Add THD::change_user()
sql/sql_class.h:
  Prototype changes in class THD
sql/sql_delete.cc:
  Remove locking argument from mysql_delete()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
sql/sql_insert.cc:
  Remove locking argument from mysql_insert()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
  Don't use bulk insert if bulk_insert_buff_size is 0
sql/sql_parse.cc:
  Changes to make mysql_change_user() work as close+connect
  Changed command statistics to use statstics_increment to get more speed
  Update code to handle that locks is now stored in TABLE_LIST
sql/sql_update.cc:
  Remove locking argument from mysql_update()
  Locking type is now stored in TABLE_LIST
  Small code change to not call query_cache_invalidate() twice for transactional tables.
sql/sql_yacc.yy:
  Locking type is now stored in TABLE_LIST
  Added support for LIMIT # OFFSET # syntax
  Removed some wrong (never true) checks for SQLCOM_MULTI_UPDATE
mysql-test/t/rpl_replicate_do-slave.opt:
  Changed tables to use t1,t2,...
mysql-test/t/rpl_replicate_do.test:
  Changed tables to use t1,t2,...
 2002-11-16 20:19:10 +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
5a264eb9a7 move like_range into CHARSET_INFO structure 2002-11-15 11:44:23 +04:00
unknown
f3af93f88e Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4sm 2002-11-15 00:18:37 +05:00
unknown
64dd949c41 Add shared memory protocol and option --protocol 
client/client_priv.h:
  Add OPT_MYSQL_PROTOCOL and OPT_SHARED_MEMORY_BASE_NAME
include/config-win.h:
  Add shared memory protocol
include/errmsg.h:
  Add error codes of shared memory protocol
include/my_sys.h:
  Delete TYPELIB, moved to typelib.h
include/mysql.h:
  Add shared memory protocol
include/violite.h:
  Add shared memory protocol
libmysql/errmsg.c:
  Add texts of errors of shared memory protocol
sql/mysqld.cc:
  Add shared memory protocol and option --shared-memory, correct option --named-pipe
sql/set_var.cc:
  Add shared memory protocol variables
vio/vio.c:
  Add shared memory protocol
vio/viosocket.c:
  Add shared memory protocol
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2002-11-15 00:16:30 +05:00
unknown
5a8c6a33c2 removed unused function 
some bug fixes


include/m_ctype.h:
  Macros bug fix
mysys/charset.c:
  wildcmp was not initialized
sql/mysql_priv.h:
  removed unused functions
sql/slave.cc:
  removed unused function
sql/sql_string.cc:
  removed unused functions
 2002-11-14 16:47:48 +04:00
unknown
e7bbe3aa0b New wildcmp() function in CHARSET_INFO structure 2002-11-14 16:07:29 +04:00
unknown
3648eb7da8 Portability fix when using -DBIG_TABLES 
BitKeeper/etc/config:
  Changed Sasha to sys
client/mysqlbinlog.cc:
  Fixed that --position open works.
sql/item_timefunc.cc:
  Portability fix
sql/log_event.cc:
  Portability fix
sql/set_var.cc:
  Portability fix
 2002-11-14 12:21:36 +02:00
unknown
7642da10d4 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
 2002-11-14 00:26:40 +02:00
unknown
81a5afb925 fixed cyclic reference bug 
mysql-test/r/subselect.result:
  test of cyclic reference
mysql-test/t/subselect.test:
  test of cyclic reference
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/serbian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/share/ukrainian/errmsg.txt:
  new error message
 2002-11-14 00:26:18 +02:00
unknown
7721c7582a Some macros to make life easier 2002-11-13 17:58:07 +04:00
unknown
81d428bd5a Preparing to embed string to number conversion functions into charset structure 2002-11-13 17:13:29 +04:00
unknown
f779dba31c fixed 2 typo in BUG_TABLES using 
remuved 'unstable' variable from test


include/myisampack.h:
  fixed 2 typo
mysql-test/r/variables.result:
  remuved 'unstable' variable
mysql-test/t/variables.test:
  remuved 'unstable' variable
 2002-11-12 15:25:09 +02:00
unknown
42d5a9b8b6 include/mysisampack.h 
- fixed typo: mi_rowkorr(T,A) -> mi_rowkorr(T)


include/myisampack.h:
   - fixed typo: mi_rowkorr(T,A) -> mi_rowkorr(T)
 2002-11-12 13:28:26 +01:00
unknown
dd91b0a261 include/myisampack.h 
- fixed Typo: BIG_TABLE -> BIG_TABLES


include/myisampack.h:
   - fixed Typo: BIG_TABLE -> BIG_TABLES
 2002-11-12 13:21:44 +01:00
unknown
10ba987c5e fix for HEAP rb-tree indexes and BIG_TABLES problem (serg: thanks for discovery) 2002-11-11 13:34:47 +04:00
unknown
992075e209 New field snprintf() in CHARSET_INFO structure 2002-11-10 16:14:39 +04:00
unknown
212fe9d13e Portability fixes for HP compiler and HPUX11 
Docs/internals.texi:
  Added protocol information
  (needs to be converted to texi and merged with the old documentation)
configure.in:
  Updates for HP compiler (cc)
include/my_global.h:
  Add option to handle bugs in 'inline' for HP compiler
libmysql/password.c:
  Portability fix (for HP compiler)
mysys/hash.c:
  Portability fix (for HP compiler)
mysys/my_static.c:
  Portability fix (for HPUX11)
mysys/my_static.h:
  Portability fix (for HPUX11)
mysys/my_tempnam.c:
  Portability fix (for HPUX11)
sql/sql_analyse.cc:
  Fixed bug in decimal handling
 2002-11-09 13:26:46 +02:00
unknown
8d0d518ced merge 
configure.in:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
 2002-11-07 12:49:01 +02:00
unknown
36140ba7c5 Merged by hands 
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~207548ca813d5081:
  'Auto converge rename'
libmysqld/lib_sql.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  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_table.cc:
  Auto merged
 2002-11-07 12:20:08 +04:00