1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-07 17:42:39 +03:00
Commit Graph

4447 Commits

Author SHA1 Message Date
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
unknown
b388eb004d Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86


BitKeeper/etc/ignore:
  added libmysqld/sql_state.c
client/mysql.cc:
  Added SQLSTATE to error messages
  Added new function put_error() to be able to clean up some old code.
client/mysqltest.c:
  Write ERROR SQLSTATE for all errors
dbug/dbug.c:
  Portability fixes
include/m_string.h:
  Rename bmove_allign as bmove_align
include/mysql.h:
  Added SQLSTATE (for embedded version)
include/mysql_com.h:
  Send correct SQLSTATE for the error to the client
libmysql/libmysql.c:
  Changed default error state to HY000
  Applied code cleanup patch
libmysqld/Makefile.am:
  Added sql_state.cc
libmysqld/libmysqld.c:
  Added sqlstate
mysql-test/r/analyse.result:
  Updated results
mysql-test/r/ansi.result:
  Updated results
mysql-test/r/auto_increment.result:
  Updated results
mysql-test/r/bdb-deadlock.result:
  Updated results
mysql-test/r/bdb.result:
  Updated results
mysql-test/r/comments.result:
  Updated results
mysql-test/r/create.result:
  Updated results
mysql-test/r/ctype_collate.result:
  Updated results
mysql-test/r/delayed.result:
  Updated results
mysql-test/r/delete.result:
  Updated results
mysql-test/r/derived.result:
  Updated results
mysql-test/r/distinct.result:
  Updated results
mysql-test/r/drop.result:
  Updated results
mysql-test/r/err000001.result:
  Updated results
mysql-test/r/explain.result:
  Updated results
mysql-test/r/flush.result:
  Updated results
mysql-test/r/fulltext.result:
  Updated results
mysql-test/r/func_gconcat.result:
  Updated results
mysql-test/r/func_system.result:
  Updated results
mysql-test/r/grant_cache.result:
  Updated results
mysql-test/r/group_by.result:
  Updated results
mysql-test/r/handler.result:
  Updated results
mysql-test/r/heap.result:
  Updated results
mysql-test/r/heap_btree.result:
  Updated results
mysql-test/r/heap_hash.result:
  Updated results
mysql-test/r/innodb.result:
  Updated results
mysql-test/r/innodb_handler.result:
  Updated results
mysql-test/r/insert_select.result:
  Updated results
mysql-test/r/insert_update.result:
  Updated results
mysql-test/r/join.result:
  Updated results
mysql-test/r/join_outer.result:
  Updated results
mysql-test/r/key.result:
  Updated results
mysql-test/r/lock.result:
  Updated results
mysql-test/r/lock_multi.result:
  Updated results
mysql-test/r/merge.result:
  Updated results
mysql-test/r/multi_update.result:
  Updated results
mysql-test/r/myisam.result:
  Updated results
mysql-test/r/null.result:
  Updated results
mysql-test/r/olap.result:
  Updated results
mysql-test/r/order_by.result:
  Updated results
mysql-test/r/packet.result:
  Updated results
mysql-test/r/query_cache.result:
  Updated results
mysql-test/r/row.result:
  Updated results
mysql-test/r/rpl000001.result:
  Updated results
mysql-test/r/rpl000009.result:
  Updated results
mysql-test/r/rpl_empty_master_crash.result:
  Updated results
mysql-test/r/rpl_log.result:
  Updated results
mysql-test/r/rpl_replicate_do.result:
  Updated results
mysql-test/r/rpl_rotate_logs.result:
  Updated results
mysql-test/r/select.result:
  Updated results
mysql-test/r/select_safe.result:
  Updated results
mysql-test/r/show_check.result:
  Updated results
mysql-test/r/sql_mode.result:
  Updated results
mysql-test/r/subselect.result:
  Updated results
mysql-test/r/temp_table.result:
  Updated results
mysql-test/r/truncate.result:
  Updated results
mysql-test/r/type_blob.result:
  Updated results
mysql-test/r/type_decimal.result:
  Updated results
mysql-test/r/type_float.result:
  Updated results
mysql-test/r/type_ranges.result:
  Updated results
mysql-test/r/union.result:
  Updated results
mysql-test/r/update.result:
  Updated results
mysql-test/r/user_var.result:
  Updated results
mysql-test/r/varbinary.result:
  Updated results
mysql-test/r/variables.result:
  Updated results
mysql-test/t/ansi.test:
  Test of sql_mode
mysql-test/t/derived.test:
  Updated results
mysql-test/t/func_system.test:
  Make this independen of the MySQL server name
mysql-test/t/lowercase_table.test:
  Cleanup
mysql-test/t/olap.test:
  A lot of new tests
mysql-test/t/sql_mode.test:
  More test for sql_mode
mysql-test/t/subselect.test:
  Added a few new tests (to find a bug in the item_ref code)
scripts/Makefile.am:
  Added mysql_fix_privilege_tables.sql
scripts/mysql_fix_privilege_tables.sh:
  Totally new script.  This bascily just pipes mysql_fix_privilege_tables.sql through 'mysql' to 'mysqld'
sql/Makefile.am:
  Added sql_state.cc
sql/item.cc:
  Extended Item_field::eq() to be able to better match GROUP BY fields on the command line.
  Needed for ROLLUP
sql/item.h:
  Added function to be able to avoid calling current_thd() when doing new Item.
sql/item_sum.cc:
  Moved copy_or_same() and some reset() functions from item_sum.h
  Needed to be able to access thd->mem_root.
sql/item_sum.h:
  Moved some functions to item_sum.cc
  Added make_unique() for ROLLUP
sql/item_uniq.h:
  Fixed return value
sql/mysql_priv.h:
  Updated MODE flags
sql/mysqld.cc:
  Added ANSI as it's own mode
  Moved charset_info variables here
  Cleaned up handler_count handling (for NT)
  Added table_alias_charset, for easier --lower-case-table-name handling
sql/net_serv.cc:
  New comment
sql/protocol.cc:
  Send SQLSTATE to client
sql/set_var.cc:
  Better SQL_MODE handling (Setting complex options also sets sub options)
sql/set_var.h:
  Better SQL_MODE handling
sql/sql_base.cc:
  Make alias depend on --lower-case-table-names
  Make find_item_in_list also check database name
sql/sql_cache.cc:
  Indentation cleanup
sql/sql_list.h:
  Added safety assert
  Addes support of alloc without current_thd()
sql/sql_prepare.cc:
  Update after prototype change
sql/sql_select.cc:
  Added ROLLUP
sql/sql_select.h:
  structures for rollup
sql/sql_show.cc:
  Easier SQL_MODE handling
sql/sql_string.cc:
  Move CHARSET_INFO to mysqld (to be together with all other global variables)
sql/sql_string.h:
  Added function to be able to avoid calling current_thd() when doing new Item.
sql/sql_table.cc:
  Simpler --lower-case-table-name handling
sql/sql_union.cc:
  Update after prototype change
sql/sql_yacc.yy:
  ROLLUP
sql/unireg.h:
  bmove_allign ->bmove_align
strings/Makefile.am:
  Fix to be able to compile str_test.c
strings/ctype.c:
  Removed empty lines
strings/str_test.c:
  Added test of bmove_align
strings/strings-x86.s:
  Faster bmove_align, bmove_upp and strmake
strings/strings.asm:
  move_allg
2003-06-04 18:28:51 +03:00
monty@narttu.mysql.fi
23145cfed7 Added SQLSTATE to client/server protocol
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
unknown
40f41ee1fc 'Expand the mysql.proc table to include (almost) all fields' task(851)
Fix after review
2003-06-02 14:25:01 +05:00
gluh@gluh.mysql.r18.ru
7c6522a74e 'Expand the mysql.proc table to include (almost) all fields' task(851)
Fix after review
2003-06-02 14:25:01 +05:00
unknown
69e084af1e new version of help 2003-05-29 17:47:31 -04:00
vva@eagle.mysql.r18.ru
b4014b903b new version of help 2003-05-29 17:47:31 -04:00
unknown
c560a02dcd rlyon-5.0.0-alpha.patch
client/mysql.cc:
  Import patch rlyon-5.0.0-alpha.patch
configure.in:
  Import patch rlyon-5.0.0-alpha.patch
include/config-netware.h:
  Import patch rlyon-5.0.0-alpha.patch
include/my_global.h:
  Import patch rlyon-5.0.0-alpha.patch
include/my_pthread.h:
  Import patch rlyon-5.0.0-alpha.patch
mysys/my_pthread.c:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-AUTOTOOLS:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-linux-tools:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-END:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-START:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-all:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-debug:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-standard:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/mwasmnlm:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/mwccnlm:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/mwenv:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/mwldnlm:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/nwbootstrap:
  Import patch rlyon-5.0.0-alpha.patch
netware/Makefile.am:
  Import patch rlyon-5.0.0-alpha.patch
netware/mysql_test_run.c:
  Import patch rlyon-5.0.0-alpha.patch
scripts/make_binary_distribution.sh:
  Import patch rlyon-5.0.0-alpha.patch
sql/mysqld.cc:
  Import patch rlyon-5.0.0-alpha.patch
sql/slave.cc:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/compile-netware-src:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/cron-build:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/crontab:
  Import patch rlyon-5.0.0-alpha.patch
netware/BUILD/knetware.imp:
  Import patch rlyon-5.0.0-alpha.patch
2003-05-29 14:28:02 -04:00
greg@mysql.com[greg]
ea46c24279 rlyon-5.0.0-alpha.patch 2003-05-29 14:28:02 -04:00
unknown
245c5086c1 fixed small merge bug
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-05-27 16:58:57 +05:00
vva@mysql.r18.ru
55d4e55f7c fixed small merge bug 2003-05-27 16:58:57 +05:00
unknown
99740ff53d merge
VC++Files/libmysql/libmysql.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.def:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ctype_latin1_de-master.opt:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/charset.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  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/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
2003-05-22 02:57:27 +03:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
unknown
a8e5dcb449 Resolve merge colflict
mysql-test/r/create.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
include/mysqld_error.h:
  Resolve merge colflict by changing the warning codes
2003-05-21 00:12:09 -07:00
venu@myvenu.com
39cbb547d4 Resolve merge colflict 2003-05-21 00:12:09 -07:00
unknown
daac922bc3 Merge with 4.0.13
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
  Auto merged
Makefile.am:
  Auto merged
acinclude.m4:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
Build-tools/Do-compile:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/violite.h:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/buf0lru.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_range.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/innodb_handler.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
mysql-test/t/select_safe.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/init.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/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/unireg.h:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/test-transactions.sh:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
tests/grant.res:
  Auto merged
sql/log_event.cc:
  Merge with 4.0.13
  Cleaned up comment syntax
2003-05-19 16:35:49 +03:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
unknown
10c790eff0 Safety fix to enable RAID in max binaries
Better fix for format('nan')
Fix for HAVING COUNT(DISTINCT...)


myisam/mi_check.c:
  Better error message
myisam/mi_dynrec.c:
  Simple code cleanup
myisam/myisamchk.c:
  Better error messages
mysql-test/r/func_misc.result:
  Added back test for format('nan')
mysql-test/r/having.result:
  New test
mysql-test/t/func_misc.test:
  Added back test for format('nan')
mysql-test/t/having.test:
  Added test for count(distinct) in having
mysys/raid.cc:
  Safety fix to enable RAID in max binaries
scripts/mysql_install_db.sh:
  Create data directories even if --in-rpm is used (for MaxOSX)
sql/item_strfunc.cc:
  Better fix for format('nan')
sql/mysqld.cc:
  Give stacktrace on assert()
sql/sql_yacc.yy:
  Fix for HAVING COUNT(DISTINCT...)
tests/big_record.pl:
  Extend test to abuse packed MyISAM tables
tests/table_types.pl:
  Fixed wrong merge
2003-05-13 10:54:07 +03:00
monty@mashka.mysql.fi
4bde719df7 Safety fix to enable RAID in max binaries
Better fix for format('nan')
Fix for HAVING COUNT(DISTINCT...)
2003-05-13 10:54:07 +03:00
unknown
fb5df27adf Expand the mysql.proc table 2003-05-06 21:09:20 +05:00
gluh@gluh.mysql.r18.ru
33cabdc3b1 Expand the mysql.proc table 2003-05-06 21:09:20 +05:00
unknown
d6e4b6a90e Varbinary should be string as default
scripts/make_win_src_distribution.sh:
  make sql_yacc.cpp portable
2003-05-06 06:20:16 +03:00
monty@mashka.mysql.fi
1e2f2ae037 Varbinary should be string as default 2003-05-06 06:20:16 +03:00
unknown
f58147225b - applied patch from Tim Bunce (new --addtodest option that adds copied
files into an already existing directory)
2003-05-03 16:16:52 +02:00
lenz@mysql.com
7179284df9 - applied patch from Tim Bunce (new --addtodest option that adds copied
files into an already existing directory)
2003-05-03 16:16:52 +02:00
unknown
cddecbb141 make_win_src_distribution.sh:
Fix for bdb/cxx as they contain .cpp files directly ( for 4.0 to go )


scripts/make_win_src_distribution.sh:
  Fix for bdb/cxx as they contain .cpp files directly ( for 4.0 to go )
2003-04-30 09:42:08 -07:00
venu@myvenu.com
55f2e01879 make_win_src_distribution.sh:
Fix for bdb/cxx as they contain .cpp files directly ( for 4.0 to go )
2003-04-30 09:42:08 -07:00
unknown
3f25329605 Merged 4.1 to 5.0.
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.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_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-04-29 12:06:04 +02:00
pem@mysql.com
35c82164f6 Merged 4.1 to 5.0. 2003-04-29 12:06:04 +02:00
unknown
30a9ca4f72 - Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz>
(General code cleanup, use the GRANT statement instead of updating
   the privilege tables directly, added option to revoke privileges)
2003-04-25 21:58:25 +02:00
lenz@mysql.com
093f661a80 - Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz>
(General code cleanup, use the GRANT statement instead of updating
   the privilege tables directly, added option to revoke privileges)
2003-04-25 21:58:25 +02:00
unknown
259cc315a5 Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files



VC++Files/libmysql/libmysql.dsp:
  Fix the broken file
2003-04-16 11:49:52 -07:00
venu@myvenu.com
077d7e81c8 Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files
2003-04-16 11:49:52 -07:00
unknown
bf09c10a6e - added missing dashes to parameter "open-files-limit" in mysqld_safe
(bug #264)
2003-04-15 16:11:37 +02:00
lenz@mysql.com
7fbc28c074 - added missing dashes to parameter "open-files-limit" in mysqld_safe
(bug #264)
2003-04-15 16:11:37 +02:00
unknown
0606f5bb1b - applied patch from provided by Christian Hammers from Debian to be able
to run the script even if mysqld is not up and running on upgrade


scripts/mysql_fix_privilege_tables.sh:
   - applied Patch provided by Christian Hammers from Debian to be able to run
     this script on every upgrade without having to worry that the server
     is really running. Therefore "mysqld --bootstrap" is used to make the
     changes. For this to work all SQL statements are sent to stderr when
     "--sqlonly" is given and the echo's are piped to /dev/null.
     The echo_stderr that is used is just a "#!/bin/sh\necho "$*" >&2"
     script.
2003-04-09 21:19:53 +02:00
lenz@mysql.com
ef39d2a669 - applied patch from provided by Christian Hammers from Debian to be able
to run the script even if mysqld is not up and running on upgrade
2003-04-09 21:19:53 +02:00
unknown
b60e6bcf2d Merging 4.1 to 5.0.
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
sql/item.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/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-04-04 13:45:35 +02:00
pem@mysql.com
736e78251e Merging 4.1 to 5.0. 2003-04-04 13:45:35 +02:00
unknown
6b8e2938f2 Merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Auto merged
BitKeeper/deleted/.del-mysql.xdc:
  Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/backup.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_mutex.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
sql/sql_parse.cc:
  Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
  Auto merged
2003-04-03 21:19:12 +03:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
unknown
9c3d7df569 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches
client/mysql.cc:
  NetWare only: Remove pthread_yield on large screen results
client/mysqldump.c:
  NetWare only: Remove pthread_yield on large screen results
include/my_pthread.h:
  NetWare only: pthread_cond_timedwait now present in LibC
mysys/default.c:
  Add conditional for NetWare
mysys/my_init.c:
  Changes to netware_init
mysys/my_pthread.c:
  NetWare only: special my_pthread_cond_timedwait no longer needed
mysys/thr_mutex.c:
  NetWare: no need for pthread_mutex_lock calls
netware/BUILD/mwenv:
  Add zlib to environment variables
netware/Makefile.am:
  Add isam/isamchk.def to netware_build_files
scripts/make_binary_distribution.sh:
  Made bin directory files more flexible for alternate platforms, without unnecessary repetition
2003-03-28 14:24:32 -05:00
greg@mysql.com
080b73ee18 Manual merge of Novell's changes for NetWare platform from 4.0, 4.1 patches 2003-03-28 14:24:32 -05:00
unknown
420686dd8e Improve make_binary_distribution from Novell code at Monty's request
netware/BUILD/create-patch:
  Change mode to -rwxrwxr-x
scripts/make_binary_distribution.sh:
  Split BIN_FILES into more generic parts, with no repetition
2003-03-27 18:13:37 -05:00
greg@mysql.com
9aeb60210f Improve make_binary_distribution from Novell code at Monty's request 2003-03-27 18:13:37 -05:00
unknown
8db55dcf86 Merged 4.1 into 5.0.
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-03-27 12:09:11 +01:00
pem@mysql.com
c77699ca93 Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01:00
unknown
2ec4163759 Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC
client/mysql.cc:
  Remove unnecessary pthread_yield calls for NetWare
client/mysqldump.c:
  Remove unnecessary pthread_yield calls for NetWare
include/my_pthread.h:
  Special extern my_pthread_cond_timedwait no longer required for NetWare
mysql-test/t/backup.test:
  replace_result added so test passes correctly on NetWare
mysys/default.c:
  Add conditional to avoid non-applicable file checking on NetWare
mysys/my_init.c:
  Remove working directory change from netware_init()
mysys/my_pthread.c:
  Remove unnecessary NetWare version of my_pthread_cond_timedwait
mysys/thr_mutex.c:
  Remove unnecessary NetWare block
scripts/make_binary_distribution.sh:
  Changes to clear up extraneous EXTRA_BIN_FILES, NetWare sections
2003-03-21 16:45:39 -05:00
greg@mysql.com
67985efed5 Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC 2003-03-21 16:45:39 -05:00
unknown
e4ae47ff36 Fixes for fill_help_tables.sql
innobase/ha/ha0ha.c:
  Removed compiler warnings
mysql-test/t/innodb.test:
  Another fix for cardinality
scripts/Makefile.am:
  Install fill_help_tables.sql in prefix/share/mysql
  Don't install make_binary_distribution
scripts/fill_help_tables.sh:
  use INSERT IGNORE to avoid errors
scripts/make_binary_distribution.sh:
  Install and use fill_help_tables.sql
scripts/mysql_install_db.sh:
  Search for and use fill_help_tables.sql
sql/mysqld.cc:
  Don't write shutdown message when called from mysql_install_db
support-files/Makefile.am:
  Don't install binary-configure
support-files/binary-configure.sh:
  Don't use config files
2003-03-21 18:53:55 +02:00