1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
b8798d25ab correct English message 2002-10-29 13:42:31 +04:00
unknown
81f500c5c4 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-29 12:33:27 +03:00
unknown
509529dcbf Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-10-29 12:30:22 +03:00
unknown
33e81799f5 correct English in last message
delete ugly comma


sql/share/czech/errmsg.txt:
  correct English
sql/share/danish/errmsg.txt:
  correct English
sql/share/dutch/errmsg.txt:
  correct English
sql/share/english/errmsg.txt:
  correct English
sql/share/estonian/errmsg.txt:
  correct English
sql/share/french/errmsg.txt:
  correct English
sql/share/german/errmsg.txt:
  correct English
sql/share/greek/errmsg.txt:
  correct English
sql/share/hungarian/errmsg.txt:
  correct English
sql/share/italian/errmsg.txt:
  correct English
sql/share/japanese/errmsg.txt:
  correct English
sql/share/korean/errmsg.txt:
  correct English
sql/share/norwegian-ny/errmsg.txt:
  correct English
sql/share/norwegian/errmsg.txt:
  correct English
sql/share/polish/errmsg.txt:
  correct English
sql/share/portuguese/errmsg.txt:
  correct English
sql/share/romanian/errmsg.txt:
  correct English
sql/share/russian/errmsg.txt:
  correct English
sql/share/serbian/errmsg.txt:
  correct English
sql/share/slovak/errmsg.txt:
  correct English
sql/share/spanish/errmsg.txt:
  correct English
sql/share/swedish/errmsg.txt:
  correct English
sql/share/ukrainian/errmsg.txt:
  correct English
sql/sql_lex.h:
  delete ugly comma
2002-10-29 12:52:34 +04: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
7a8b483d5f finally pushing what I could not due to BK problems 2002-10-28 17:04:18 +02: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
4c6e578b0e Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-28 10:48:51 +03:00
unknown
ffb367ac50 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
2002-10-27 23:27:57 +02:00
unknown
0241d64b64 IN subselect
mysql-test/r/subselect.result:
  IN subselect test
mysql-test/t/subselect.test:
  IN subselect test
sql/item.cc:
  Item wrappers for IN subselect
sql/item.h:
  Item wrappers for IN subselect
2002-10-27 23:27:00 +02:00
unknown
d2c7f44ff6 fixed union rexecution bug
mysql-test/r/subselect.result:
  test for union rexecution bug
mysql-test/t/subselect.test:
  test for union rexecution bug
2002-10-27 21:29:40 +02:00
unknown
5a3fe219fb add absent message that exist in english version 2002-10-27 20:49:45 +04:00
unknown
6e1cd06b9b Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-27 19:38:17 +03:00
unknown
60131d02af fixed bug in HAVING error handling
small Item_ref optimization
2002-10-27 16:22:58 +00:00
unknown
68168ee5ff 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
include/mysql_com.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-27 13:13:31 +03:00
unknown
fc08d48c9c sql_yacc.yy:
cleanup


sql/sql_yacc.yy:
  cleanup
2002-10-26 18:28:19 +00:00
unknown
7cbe573473 Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-10-26 22:27:22 +04:00
unknown
c37bbf06bb code cleanup
fixed subselect error handling bug
fixed subselect UNION ALL bug
fixed thd->lex.select restoring
explain UNION subselect bug


mysql-test/r/subselect.result:
  test for:
    subselect UNION ALL bug
    subselect error handling bug
    explain UNION subselect bug
mysql-test/t/subselect.test:
  test for:
    subselect UNION ALL bug
    subselect error handling bug
    explain UNION subselect bug
sql/sql_lex.cc:
  fixed subselect UNION ALL bug
sql/sql_lex.h:
  fixed subselect UNION ALL bug
sql/sql_parse.cc:
  fixed subselect UNION ALL bug
sql/sql_select.cc:
  fixed subselect error handling bug
  fixed explain UNION subselect bug
sql/sql_union.cc:
  fixed thd->lex.select restoring
  code cleanup
  fixed subselect error handling bug
  fixed subselect UNION ALL bug
sql/sql_yacc.yy:
  fixed subselect UNION ALL bug
2002-10-26 20:18:37 +03:00
unknown
3ae890edfe bad auto-merge fixed 2002-10-25 23:30:15 +00:00
unknown
7962de4cf3 merged
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~888e38cf95239a33:
  'Auto converge rename'
Docs/manual.texi:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2002-10-25 22:07:04 +00:00
unknown
26121e00d9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2002-10-25 21:31:16 +00:00
unknown
f5563ddad4 merged
BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
  Delete: BitKeeper/etc/skipkeys
BitKeeper/etc/skipkeys:
  Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
Build-tools/Do-compile:
  Auto merged
Docs/manual.texi:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/pars/pars0grm.c:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/nt_servc.cc:
  Auto merged
sql/nt_servc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/bdb-crash.test:
  Auto merged
2002-10-25 21:15:52 +00:00
unknown
d51b72cac3 typo fixed 2002-10-25 14:21:55 +00:00
unknown
a46e0cbb89 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-10-25 14:18:30 +00:00
unknown
14e6526a0b support for HA_READ_PREFIX_LAST_OR_PREV in headres
full support for HA_READ_PREFIX_LAST_OR_PREV in MyISAM
protected by #if NOT_IMPLEMENTED_YET in opt_range.cc as not all table handlers support it


BitKeeper/etc/ignore:
  Added configure.lineno innobase/configure.lineno innobase/stamp-h1 myisam/rt_test.MYD myisam/rt_test.MYI stamp-h1 to the ignore list
include/my_base.h:
  support for HA_READ_PREFIX_LAST_OR_PREV
myisam/mi_search.c:
  full support of HA_READ_PREFIX_LAST_OR_PREV in MyISAM
myisam/mi_static.c:
  full support of HA_READ_PREFIX_LAST_OR_PREV in MyISAM
sql/opt_range.cc:
  support for HA_READ_PREFIX_LAST_OR_PREV
  protected by #if NOT_IMPLEMENTED_YET, not all table handlers support it
sql/sql_handler.cc:
  support for HA_READ_PREFIX_LAST_OR_PREV
2002-10-25 14:09:47 +00:00
unknown
235068a164 ENUM/SET fields now have charset too 2002-10-25 15:08:47 +05:00
unknown
0525cf47cb Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk


sql/item_func.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-25 13:59:08 +05:00
unknown
e823751548 BINARY charset is now used instead of binary_flag 2002-10-25 13:58:32 +05:00
unknown
347e9de041 cp1251.conf:
unicode mapping


sql/share/charsets/cp1251.conf:
  unicode mapping
2002-10-25 12:10:39 +05:00
unknown
cbb466e1b6 Added missing case for Rand_log_event to Log_event::get_type_str() 2002-10-24 20:20:37 -06:00
unknown
eb67ad313b Merge nleippe@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/nick/mysql/repository/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2002-10-24 18:42:34 -06:00
unknown
f5f15255be Merge nleippe@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/nick/mysql/repository/mysql-4.0
2002-10-24 18:40:15 -06:00
unknown
d172cc9aa0 changed syntax from SHOW MASTER LOGS to SHOW BINARY LOGS 2002-10-24 18:32:42 -06:00
unknown
458ced9f34 altered syntax from SLAVE START|STOP to START|STOP SLAVE
mysql-test/mysql-test-run.sh:
  Added --rpl option which tests all t/rpl*.test tests.
2002-10-24 17:46:14 -06:00
unknown
27d11e85b2 Added Rand_log_event 2002-10-24 16:48:34 -06:00
unknown
d39f52780e fixed prev. commit (was commited in disabled state) 2002-10-24 16:04:38 -06:00
unknown
9bb3936f37 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2002-10-25 01:50:12 +05:00
unknown
80450104f5 Index:
removed "depriciated" as requested by salle


sql/share/charsets/Index:
  removed "depriciated" as requested by salle
2002-10-25 01:49:34 +05:00
unknown
171ac60fe1 Moved rand initialization from mysqld.cc to sql_class.cc:THD::THD() 2002-10-24 14:33:24 -06:00
unknown
c813006913 fixed update with subselect (FOR REVIEW)
mysql-test/r/subselect.result:
  update with subselect test
mysql-test/t/subselect.test:
  update with subselect test
sql/mysql_priv.h:
  fixed update with subselect
sql/sql_base.cc:
  fixed update with subselect
sql/sql_lex.cc:
  fixed update with subselect
sql/sql_select.cc:
  fixed update with subselect
sql/sql_update.cc:
  fixed update with subselect
sql/sql_yacc.yy:
  fixed update with subselect
2002-10-24 22:59:29 +03:00
unknown
6f043c359c - replaced all occurences of HPUX with HPUX10 (to be prepared for eventual
differences in HPUX11)


acconfig.h:
   - fixed typo
configure.in:
   - replaced HPUX -> HPUX10
   - added -DHPUX11 (not being used yet) to hpux11 workarounds
include/my_global.h:
   - replaced HPUX -> HPUX10
include/my_net.h:
   - replaced HPUX -> HPUX10
include/my_pthread.h:
   - replaced HPUX -> HPUX10
libmysql/libmysql.c:
   - replaced HPUX -> HPUX10
mysys/my_append.c:
   - replaced HPUX -> HPUX10
mysys/my_copy.c:
   - replaced HPUX -> HPUX10
mysys/my_pthread.c:
   - replaced HPUX -> HPUX10
mysys/my_redel.c:
   - replaced HPUX -> HPUX10
mysys/thr_alarm.c:
   - replaced HPUX -> HPUX10
sql/mini_client.cc:
   - replaced HPUX -> HPUX10
sql/mysqld.cc:
   - replaced HPUX -> HPUX10
strings/do_ctype.c:
   - replaced HPUX -> HPUX10
2002-10-24 14:30:25 +02:00
unknown
47ffb583ca added new syntax:
STOP|START SLAVE
rather than SLAVE STOP|START, which is now deprecated and should be deleted in 4.1
2002-10-24 03:52:51 -06:00
unknown
372b26e778 In database/table charset the keyword DEFAULT is now optional,
and CHARSET is now the same with CHARACTER SET:

CREATE DATABASE name 
  [DEFAULT] {CHAR SET | CHARACTER SET | CHARSET} csname


CREATE TABLE (...)  [DEFAULT] {CHARSET | CHARACTER SET | CHAR SET} [=] csname

To Paul and Arjen:
However this should be recommended in db option to conform SQL99:
CREATE DATABASE dbname DEFAULT CHARACTER SET csname
In table option there is no SQL99 recommended syntax as far as
table charset is MySQL extension.
2002-10-24 14:22:42 +05:00
unknown
7a8e330f3b Fixed problem with BDB tables and ALTER TABLE
Docs/manual.texi:
  ChangeLog
mysql-test/t/bdb-crash.test:
  Don't run test if BDB is not configured
sql/sql_base.cc:
  Added free on error
2002-10-24 01:29:29 +03:00
unknown
f4a3b1d903 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1
2002-10-23 23:40:17 +03:00
unknown
4aef286296 fixed DISTINCT in subselect bug
small Item_ref fix


mysql-test/r/subselect.result:
  DISTINCT in subselect test
mysql-test/t/subselect.test:
  DISTINCT in subselect test
sql/sql_class.cc:
  fixed DISTINCT in subselect bug
2002-10-23 23:36:11 +03:00
unknown
8962d3f66d Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


libmysql/Makefile.shared:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-23 23:28:36 +04:00
unknown
d8661f9eab Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0
2002-10-23 23:25:28 +04:00
unknown
020e3bd713 All these syntaxes now work:
CREATE TABLE a (...) TYPE isam  CHARSET latin1  MAX_ROWS 1000;
CREATE TABLE a (...) TYPE=isam  CHARSET=latin1  MAX_ROWS=1000;
CREATE TABLE a (...) TYPE isam, CHARSET latin1, MAX_ROWS 1000;
CREATE TABLE a (...) TYPE=isam, CHARSET=latin1, MAX_ROWS=1000;
2002-10-23 19:18:54 +05:00
unknown
636975db57 Both syntaxes are now working:
CREATE TABLE a (...) TYPE isam  CHARSET latin1  MAX_ROWS 1000;
CREATE TABLE a (...) TYPE=isam  CHARSET=latin1  MAX_ROWS=1000;
2002-10-23 18:43:59 +05:00