Commit graph

462 commits

Author SHA1 Message Date
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
e2f4a07b4f after merging fix 2002-11-05 11:59:18 +02:00
unknown
1b0b26dae5 IN subselect erged with current 4.1 (pointer conversion)
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_lex.cc:
  Merged
sql/sql_lex.h:
  Merged
2002-11-05 11:21:40 +02:00
unknown
1b26dbbda0 move similar code to inline function 2002-11-05 01:10:05 +02:00
unknown
53a386ca87 moved similar code to function
onversion with check


sql/item.cc:
  removed similar code
sql/item_sum.cc:
  conversion with check
sql/sql_delete.cc:
  conversion with check
sql/sql_derived.cc:
  style fix
sql/sql_lex.cc:
  conversion with check
  moved similar code to function
sql/sql_lex.h:
  conversion with check
  moved similar code to function
sql/sql_parse.cc:
  conversion with check
sql/sql_update.cc:
  conversion with check
sql/sql_yacc.yy:
  conversion with check
2002-11-04 22:12:45 +02: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
a6a8ce2842 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2002-10-31 13:02:29 +03:00
unknown
ec952f21f8 Merge
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  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_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
Docs/manual.texi:
  SCCS merged
2002-10-31 10:44:20 +02:00
unknown
3cc1e1e6d7 Merge mysql.com:/home/nick/mysql/repository/mysql-4.1
into mysql.com:/home/nick/mysql/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
sql/sql_yacc.yy:
  Auto merged
2002-10-30 23:58:52 -07:00
unknown
a273b1dc8f fix commit thinko 2002-10-30 23:48:04 -07: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
5bb0ca0a1f Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1


sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-30 16:09:06 +02:00
unknown
1de7b50274 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/vva/work/mysql-4.1.help/mysql-4.1.help_res


sql/sql_yacc.yy:
  Auto merged
2002-10-30 17:40:26 +04:00
unknown
8dbfebc728 addition correction for 'help' command
include/mysqld_error.h:
  change count of error messages
libmysqld/Makefile.am:
  add sql_help.cc
sql/sql_help.cc:
  eliminate warnings
sql/sql_yacc.yy:
  add ';' to end of 'help' command
2002-10-30 17:38:07 +04:00
unknown
03437238ee Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2002-10-30 14:47:05 +03: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
e086000f19 Preparation to thread specific default charset 2002-10-30 13:05:27 +04:00
unknown
ea3ffb9b3e Added back old LARGEFILE handling
Fixed reference to freed memory in acl_init()/grant_init()
Fixed possible memory leak. (Could only happen in very strange circumstances)
Fixed bug in ALTER TABLE with BDB tables
Updated mysql-test for valgrind


Docs/manual.texi:
  ChangeLog
acinclude.m4:
  Added back old LARGEFILE handling.
  (Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
configure.in:
  Added back old LARGEFILE handling.
  (Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x)
libmysqld/lib_sql.cc:
  Fixed reference to freed memory
mysql-test/mysql-test-run.sh:
  Added option --valgrind
mysys/Makefile.am:
  Removed warning when doing make
sql/mysqld.cc:
  Free regexp memory on shutdown.
  read 'des' key files from data directory
  Fixed reference to freed memory in grant_init()
sql/slave.cc:
  Fixed wrong printf() argument
sql/sql_acl.cc:
  Fixed reference to freed memory
sql/sql_acl.h:
  Fixed reference to freed memory
sql/sql_base.cc:
  Fixed possible memory leak. (Could only happen in very strange circumstances)
sql/sql_parse.cc:
  Updated arguments to grant_reload()
sql/sql_table.cc:
  Fixed bug in ALTER TABLE with BDB tables
sql/sql_yacc.yy:
  memset -> bzero
2002-10-29 21:59:03 +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
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
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
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
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
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
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
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
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
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
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
unknown
867de11ef8 sql_yacc.yy:
character set binary didn't work


sql/sql_yacc.yy:
  character set binary didn't work
2002-10-23 16:00:48 +05: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
61122db525 Some small accelerations ...
I intend to do some more accelerations in mysql_execute_command and
in SQLCOM_SELECT part for which I need to fix EXPLAIN with derived
tables plus few additional items. If this proves to be much I wil
just make it a new SCRUM task


sql/sql_lex.h:
  Some small accelerations ...
sql/sql_parse.cc:
  Some small accelerations ...
sql/sql_yacc.yy:
  Some small accelerations ...
2002-10-16 21:17:57 +03:00
unknown
b3cb7b7f77 merge with 4.0.5
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
2002-10-16 19:30:24 +03:00
unknown
3de4f87503 some fixes for SELECT INTO @vars ..
sql/sql_parse.cc:
  Simplification of code
2002-10-16 16:55:08 +03:00
unknown
53a0e2992a SCRUM Task 430: Allowing braces in joins by simply removing them.
Fixed the remaining join variations, (left, right, natural, etc).
(Previous fix only solved "," and "[cross] join".)


mysql-test/r/select.result:
  Added more test case results for more braced join fixes.
mysql-test/t/select.test:
  Added more tests for braced join fixes.
sql/sql_yacc.yy:
  Changed the remaining join_table_list cases to handle braces.
  Also added some precedence declaration to silence shift/reduce conflicts
  warnings that turned up after these fixes.
2002-10-15 16:33:06 +02:00
unknown
9bca9fb751 Task 430: Allowing braces in joins by simply removing them.
This is a simple fix, allowing a join_table_list in the right reduction of a
normal_join sequence, instead of just a join_table. This makes things like
"t1, (t2 left join t3)" work, but it also allows "join" and "cross join" instead
of ",".

This should fix the bug reported as:
  Subject: ODBC SQL syntax issue 
  From: Ivan Vazharov 
  Date: Mon, 30 Sep 2002 12:02:42 +0200 


mysql-test/r/select.result:
  Results from new test cases for removing braces in joins.
mysql-test/t/select.test:
  New test cases for removing braces in joins.
sql/sql_yacc.yy:
  Allow (and remove) braces in all parts of a normal_join list, not just the
  first one.
  Also added three missing ';'.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-12 11:07:54 +02:00
unknown
e6403485ed SCRUM task
mysql-test/r/select.result:
  SELECT ... INTO user_variables
mysql-test/t/select.test:
  SELECT ... INTO user_variables
sql/sql_class.cc:
  SELECT ... INTO user_variables
sql/sql_class.h:
  SELECT ... INTO user_variables
sql/sql_lex.h:
  SELECT ... INTO user_variables
sql/sql_parse.cc:
  SELECT ... INTO user_variables
sql/sql_yacc.yy:
  SELECT ... INTO user_variables
2002-10-11 21:49:10 +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
8640cd3544 One more commit to do the merge of new 4.1 tree
client/mysqladmin.c:
  Handle new password.c prototypes
include/mysql_com.h:
  New prototypes
libmysql/Makefile.shared:
  Client need sha1 compiled in now
libmysql/password.c:
  Replace copy with symlink
mysql-test/r/func_crypt.result:
  Fix test results to handle new password function
mysql-test/t/func_crypt.test:
  New tests for new password function
sql/item_create.cc:
  add old_password() function
sql/item_create.h:
  add old_password() function
sql/item_strfunc.cc:
  add old_password() function
  changes to new password.c functions prototypes
sql/item_strfunc.h:
  add old_password function
  handle new prototypes
sql/lex.h:
  add OLD_PASSWORD function
sql/password.c:
  Continue to work on new password handling
sql/sql_acl.cc:
  Handle new passwords
sql/sql_yacc.yy:
  Changes for new prototypes
2002-10-06 13:42:16 +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
unknown
be565cfbf7 Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-10-03 16:56:09 +03:00