Commit graph

698 commits

Author SHA1 Message Date
unknown
fdb093fc47 Copy arguments given to mysql_server_init()
Made keybuff_size longlong (To make show variables work similar on 32
and 64 bit systems)
Fixed some 'not initalized variable errors' in multi-table-update.
Fixed memory leak in multi-table-update.
Now all tests works under valgrind without any errors.


libmysqld/lib_sql.cc:
  Copy arguments given to mysql_server_init()
mysql-test/r/temp_table.result:
  Update test results (after merge form 3.23)
sql/handler.cc:
  Made keybuff_size longlong
sql/mysql_priv.h:
  Made keybuff_size longlong
sql/mysqld.cc:
  Made keybuff_size longlong
sql/set_var.cc:
  Made keybuff_size longlong
sql/set_var.h:
  Made keybuff_size longlong
sql/sql_select.cc:
  Simple cleanup
sql/sql_select.h:
  Make TMP_TABLE_PARAM to be allocated through Sql_alloc
sql/sql_update.cc:
  Fixed some 'not initalized variable errors' in multi-table-update.
  Fixed memory leak in multi-table-update
2002-12-05 16:38:49 +02:00
unknown
591b058518 Removed copying of parameters as this leads to memory leaks in embedded server.
Fixed 'not initialized' memory error.


mysql-test/mysql-test-run.sh:
  Updates to be able to more easily use --valgrind
mysql-test/r/alter_table.result:
  Added missing drop table
mysql-test/t/alter_table.test:
  Added missing drop table
sql/field.cc:
  Simple optimizations
sql/ha_innodb.cc:
  Remove copying of parameters as this leads to memory leaks in MySQL.
  Should be instead fixed by, in embedded server, make a temporary copy of
  all parameters and free them on server-end
sql/log.cc:
  Simple optimization
sql/mysql_priv.h:
  Move external reference to struct to include file
sql/mysqld.cc:
  Added safety asserts
sql/sql_class.cc:
  Fixed non fatal 'not initialized memory reference error' in thread init
sql/sql_udf.cc:
  Clear current_thd for global thread
strings/strto.c:
  Simple optimization
2002-12-05 03:40:33 +02:00
unknown
5c377fc092 SCRAM Remove spaces from most changed files.
This alters not only my code so it looks like I'm not only one adding the spaces.



client/mysqladmin.c:
  cut spaces
include/mysql_com.h:
  cut soaces
sql/item_strfunc.cc:
  cut spaces
sql/mini_client.cc:
  cut spaces
sql/mysql_priv.h:
  cut spaces
sql/mysqld.cc:
  cut spaces
sql/password.c:
  cut spaces
sql/sql_parse.cc:
  cut spaces
sql/sql_yacc.yy:
  cut spaces
2002-12-05 01:14:51 +03:00
unknown
577cb3238b Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-04 16:26:29 +03:00
unknown
07f797a9bf Return a warning for DROP DATABASE/TABLE IF EXISTS <non_existing_db/table(s)> 2002-12-04 03:19:08 -08:00
unknown
694c7334b3 merged
sql/mysql_priv.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-02 20:41:34 +01:00
unknown
0029b4e794 INSERT ... ON DUPLICATE KEY UPDATE ... 2002-12-02 20:38:00 +01:00
unknown
526ff493bc Megrge new changes in...
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_parse.cc:
  Manual Merge
2002-12-01 11:18:19 +03:00
unknown
64a3827b24 check of using same table for changing and select
mysql-test/r/subselect.result:
  test of using same table for changing and select
mysql-test/t/subselect.test:
  test of using same table for changing and select
sql/mysql_priv.h:
  new function
sql/sql_base.cc:
  new function
2002-11-30 19:26:18 +02:00
unknown
14754ce141 Merging....
BitKeeper/etc/logging_ok:
  auto-union
client/insert_test.c:
  Auto merged
client/select_test.c:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_parse.cc:
  Manual merge
2002-11-29 22:03:14 +03:00
unknown
c1403e17a8 Correct bug which exposed itself in rpl000017
Commit for merge 


client/connect_test.c:
  Roll back wrong change
include/mysql_com.h:
  Correct prototypes not to have need to include my_global.h
sql/mysql_priv.h:
  Add expected hash lenght for old paswords.
sql/password.c:
  Change prototypes
sql/sql_acl.cc:
  Minor bug correction
2002-11-29 21:34:13 +03:00
unknown
4653621909 New multi-table-update code
New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1  (We should use TRUE and FALSE)


heap/_check.c:
  Added checking of rows
heap/hp_delete.c:
  Extra debugging
heap/hp_scan.c:
  Extra debugging
heap/hp_update.c:
  Extra debugging
heap/hp_write.c:
  Extra debugging
include/my_base.h:
  Added option to disable row cache when using updates
isam/extra.c:
  Added option to disable row cache when using updates
myisam/mi_check.c:
  Comment cleanup
myisam/mi_extra.c:
  Added option to disable row cache when using updates
myisam/sort.c:
  Indentaion cleanups
myisammrg/myrg_extra.c:
  Added option to disable row cache when using updates
mysql-test/r/multi_update.result:
  Updated results
mysql-test/t/multi_update.test:
  Cleanup up to only use table names t1, t2,...
mysys/mf_iocache.c:
  Safety fix
sql/item_cmpfunc.cc:
  change true-> 1 and false -> 0
sql/mysql_priv.h:
  Cleaned up SQL_LIST handling
sql/sql_base.cc:
  Fixed grant checking if SELECT tablename.*
sql/sql_class.h:
  Cleaned up multi-table-update
sql/sql_delete.cc:
  Fixed OPTION_SAFE_UPDATE checking in multi-table-delete.
  Fixed query-cache invalidation in multi-table-delete
sql/sql_insert.cc:
  cleaned up timestamp handling
sql/sql_olap.cc:
  false -> 0
sql/sql_parse.cc:
  Optimized some list handling.
  Moved multi-table-update to sql_update.cc
sql/sql_select.cc:
  More comments
  Fixed create_tmp_table for multi-table-update
sql/sql_select.h:
  New prototypes
sql/sql_union.cc:
  false -> 0
  Cleaned up timestamp handling
sql/sql_update.cc:
  New multi-update-table code
sql/sql_yacc.yy:
  false -> 0, true -> 1
  Optimized some list handling
sql/table.h:
  Added union for temporary values.
  Made shared int to be able to store counters.
sql/uniques.cc:
  Indentation cleanup
2002-11-29 16:40:18 +02:00
unknown
943522556d after review changes in IN/ALL/ANY/SOME (SCRUM)
sql/item.cc:
  after review changes
sql/item.h:
  after review changes
sql/item_subselect.cc:
  after review changes
sql/mysql_priv.h:
  after review changes
sql/sql_base.cc:
  after review changes
2002-11-27 17:04:43 +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
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
5f80c35306 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/mysql_priv.h:
  Auto merged
2002-11-25 13:34:52 +03:00
unknown
06e647472f Reference to field in outer subelect fixed
Fixed context in error mesages


mysql-test/r/subselect.result:
  tests of references and error message
mysql-test/t/subselect.test:
  tests of references and error message
sql/item.cc:
  Fixed layout
  Resolving field names of outer select
sql/item_subselect.cc:
  saving/restoring context for error messages
sql/mysql_priv.h:
  changed function interface to allow resolving field names inside Item_ref::fix_fields
sql/sql_base.cc:
  changed function interface to allow resolving field names inside Item_ref::fix_fields
sql/sql_lex.h:
  allow access to thd field
2002-11-24 21:10:52 +02:00
unknown
4b85d31b2d Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
2002-11-24 17:35:24 +03:00
unknown
5b1ced4580 Merge....
BitKeeper/etc/logging_ok:
  auto-union
client/mysqladmin.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
libmysql/password.c:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/mysqld.cc:
  Manual merge
2002-11-24 17:26:26 +03:00
unknown
bd6df955e3 protocol merge
libmysql/errmsg.c:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_error.cc:
  Auto merged
2002-11-22 10:20:14 -08:00
unknown
7eafe60b36 protocol fixups 2002-11-22 10:04:42 -08: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
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
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
548e59c685 Added some compatibility modes (for the future)
libmysql/libmysql.c:
  Removed ^M from source
libmysqld/libmysqld.c:
  Added handling of protocol options (to get source to compile)
sql/lex.h:
  Added compabitlity keywords
sql/mysql_priv.h:
  Added compatibility modes
sql/mysqld.cc:
  Added compatibility modes
sql/sql_delete.cc:
  Cleaned up SAFE_UPDATES handling
sql/sql_yacc.yy:
  Added compatibility modes
2002-11-20 21:44:32 +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
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
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
6987b41456 ALL/ANY/SOME
decreasing number of rules in sql_yacc.yy to satisfy bison limitation
fixed subselect Items initializer methods


mysql-test/r/subselect.result:
  tests of ALL/ANY/SOME
mysql-test/t/subselect.test:
  tests of ALL/ANY/SOME
sql/item_cmpfunc.cc:
  ALL/ANY/SOME
sql/item_cmpfunc.h:
  ALL/ANY/SOME
sql/item_subselect.cc:
  ALL/ANY/SOME
  fixed subselect Items initializer methods
sql/item_subselect.h:
  ALL/ANY/SOME
  fixed subselect Items initializer methods
sql/lex.h:
  ALL/ANY/SOME
sql/mysql_priv.h:
  decreasing number of rules in sql_yacc.yy to satisfy bison limitation
sql/sql_parse.cc:
  decreasing number of rules in sql_yacc.yy to satisfy bison limitation
sql/sql_yacc.yy:
  ALL/ANY/SOME
  decreasing number of rules in sql_yacc.yy to satisfy bison limitation
2002-11-07 23:45:19 +02:00
unknown
c88b910208 Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
client/mysqlbinlog.cc:
  Portability fix
configure.in:
  Added use of ASFLAGS (For Solaris with Forte 5.0)
include/my_global.h:
  Portability fix
include/myisam.h:
  Portability fix
include/queues.h:
  Portability fix
innobase/include/ut0ut.h:
  Portability fix
innobase/log/log0log.c:
  Portability fix
innobase/rem/rem0cmp.c:
  Portability fix
innobase/trx/trx0sys.c:
  Portability fix
isam/pack_isam.c:
  Portability fix
myisam/ft_boolean_search.c:
  Portability fix
myisam/mi_dynrec.c:
  Code change to go around bug in Forte 5.0
myisam/sort.c:
  Portability fix
mysys/my_aes.c:
  Portability fix
scripts/Makefile.am:
  Support for ASFLAGS
scripts/mysqlbug.sh:
  Support for ASFLAGS
sql/field.cc:
  Portability fix
sql/filesort.cc:
  Portability fix
sql/gen_lex_hash.cc:
  Portability fix
sql/ha_innodb.cc:
  Portability fix
  Changed SHOW INNODB STATUS to return error instead of writing message to log file.
sql/ha_isammrg.cc:
  Portability fix
sql/ha_myisam.cc:
  Portability fix
sql/ha_myisammrg.cc:
  Portability fix
sql/hash_filo.h:
  Portability fix
sql/hostname.cc:
  Portability fix
sql/item_cmpfunc.h:
  Indentation change
sql/item_func.cc:
  Portability fix
sql/item_func.h:
  Portability fix
sql/log.cc:
  Portability fix
sql/log_event.cc:
  Portability fix
sql/mysql_priv.h:
  Portability fix
sql/mysqld.cc:
  Portability fix
  Fixed bug with rpl_recovery_rank command line option on 64 bit systems
sql/opt_range.cc:
  Portability fix
sql/repl_failsafe.cc:
  Portability fix
sql/slave.cc:
  Portability fix
sql/slave.h:
  Portability fix
sql/sql_acl.cc:
  Portability fix
sql/sql_base.cc:
  Portability fix
sql/sql_cache.cc:
  Portability fix
sql/sql_cache.h:
  Portability fix
sql/sql_class.cc:
  Portability fix
sql/sql_delete.cc:
  Portability fix
sql/sql_insert.cc:
  Portability fix
sql/sql_manager.cc:
  Portability fix
sql/sql_parse.cc:
  Portability fix
BUILD/compile-solaris-sparc-forte:
  C
sql/sql_udf.cc:
  Portability fix
sql/sql_update.cc:
  Portability fix
strings/Makefile.am:
  Portability fix
strings/bmove_upp-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/str_test.c:
  Cleanup
strings/strappend-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strend-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strmake-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strmov-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strnmov-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strstr-sparc.s:
  Fix so that this works on 32 and 64 bit sparcs
strings/strxmov-sparc.s:
  Fixes to make this more portable, but it's still not usable on 64 bit systems :(
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-11-07 03:54:00 +02:00
unknown
cf2a927174 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-06 12:51:07 +03:00
unknown
1e63509dfc Extensions to support this:
SHOW CREATE DATABASE [IF NOT EXISTS] dbname

Version dependant parts are displayed in appropriative comments:
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `ucs` /*!40100 DEFAULT CHARACTER SET ucs2*/


client/mysqldump.c:
  SHOW CREATE DATABASE IF NOT EXISTS
sql/mysql_priv.h:
  SHOW CREATE DATABASE IF NOT EXISTS
sql/sql_db.cc:
  SHOW CREATE DATABASE IF NOT EXISTS
sql/sql_parse.cc:
  SHOW CREATE DATABASE IF NOT EXISTS
sql/sql_yacc.yy:
  SHOW CREATE DATABASE IF NOT EXISTS
2002-11-06 12:01:38 +04:00
unknown
52f423d5cf Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-05 21:31:03 +03:00
unknown
07573b03af Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1


sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-11-04 15:45:54 +02:00
unknown
77abf6d4b2 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-30 18:03:09 +03:00
unknown
85f35cbf57 All String->set() now have charset argument 2002-10-30 16:19:43 +04:00
unknown
0bb1e716bc removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)
fixed some possible bugs


sql/item.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/item_subselect.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/item_sum.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/mysql_priv.h:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_base.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_cache.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_delete.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_lex.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_lex.h:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
  fixed some possible bugs
sql/sql_parse.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_prepare.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_repl.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_select.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_union.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_update.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_yacc.yy:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
2002-10-30 13:18:52 +02:00
unknown
cf707b4644 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-29 10:36:43 +03:00
unknown
fc4c9c01ee add help command on server side
include/mysqld_error.h:
  add error for corrupt help db
scripts/Makefile.am:
  add script for fill help db
scripts/mysql_install_db.sh:
  modify for add help db
sql/Makefile.am:
  modify for add sql_help.cc
sql/lex.h:
  add help command
sql/mysql_priv.h:
  add mysqld_help function declaration
sql/share/czech/errmsg.txt:
  add message for help-db error
sql/share/danish/errmsg.txt:
  add message for help-db error
sql/share/dutch/errmsg.txt:
  add message for help-db error
sql/share/english/errmsg.txt:
  add message for help-db error
sql/share/estonian/errmsg.txt:
  add message for help-db error
sql/share/french/errmsg.txt:
  add message for help-db error
sql/share/german/errmsg.txt:
  add message for help-db error
sql/share/greek/errmsg.txt:
  add message for help-db error
sql/share/hungarian/errmsg.txt:
  add message for help-db error
sql/share/italian/errmsg.txt:
  add message for help-db error
sql/share/japanese/errmsg.txt:
  add message for help-db error
sql/share/korean/errmsg.txt:
  add message for help-db error
sql/share/norwegian-ny/errmsg.txt:
  add message for help-db error
sql/share/norwegian/errmsg.txt:
  add message for help-db error
sql/share/polish/errmsg.txt:
  add message for help-db error
sql/share/portuguese/errmsg.txt:
  add message for help-db error
sql/share/romanian/errmsg.txt:
  add message for help-db error
sql/share/russian/errmsg.txt:
  add message for help-db error
sql/share/serbian/errmsg.txt:
  add message for help-db error
sql/share/slovak/errmsg.txt:
  add message for help-db error
sql/share/spanish/errmsg.txt:
  add message for help-db error
sql/share/swedish/errmsg.txt:
  add message for help-db error
sql/share/ukrainian/errmsg.txt:
  add message for help-db error
sql/sql_lex.h:
  add SQLCOM_END 
  and help_arg in Lex
sql/sql_parse.cc:
  add SQLCOM_HELP handler
sql/sql_yacc.yy:
  add help command
2002-10-28 17:44:19 +04:00
unknown
a456cfa135 Merge to update to recent tree version
BitKeeper/etc/logging_ok:
  auto-union
client/mysqladmin.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-20 00:09:11 +04:00
unknown
5d2e98ff5f merge
Docs/world.sql:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-10-17 11:39:11 +03:00
unknown
aee5ef8516 Added THD as parameter to filesort. Removed not used 'special' argument.
sql/mysql_priv.h:
  Fix for changed parameters to filesort
sql/sql_delete.cc:
  Fix for changed parameters to filesort
sql/sql_select.cc:
  Fix for changed parameters to filesort
sql/sql_table.cc:
  Fix for changed parameters to filesort
sql/sql_test.cc:
  Removed not used special parameter
sql/sql_update.cc:
  Fix for changed parameters to filesort
2002-10-16 17:21:47 +03:00
unknown
103330a3c0 fixed subselect explain bug
mysql-test/r/subselect.result:
  test for subselect explain bug
mysql-test/t/subselect.test:
  test for subselect explain bug
2002-10-16 00:42:59 +03:00
unknown
bbd0d085a1 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/mysql_priv.h:
  Auto merged
2002-10-09 10:10:15 +04:00
unknown
13da94b7a2 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
2002-10-08 14:17:38 +00:00
unknown
81a82f0d6e support for --tmpdir=dir1:dir2:... 2002-10-08 12:39:37 +00:00
unknown
e8e3f7728f fixed couple of bugs in field/reference name resolution
fixed error handling in subselect fix_field


mysql-test/r/subselect.result:
  test of name resolution
mysql-test/t/subselect.test:
  test of name resolution
sql/item.cc:
  fixed couple of bugs in field/reference name resolution.
sql/item_subselect.cc:
  fixed error handling
sql/mysql_priv.h:
  fixed couple of bugs in field/reference name resolution.
sql/sql_base.cc:
  fixed couple of bugs in field/reference name resolution.
sql/sql_select.cc:
  new find_item_in_list interface
2002-10-08 14:50:12 +03:00
unknown
fb3a8883c4 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


include/mysql_com.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-06 13:43:42 +04:00
unknown
05c5908a9e merging
include/mysql_com.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/key_primary.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/odbc.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/varbinary.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged
2002-10-04 14:15:59 +03:00