Commit graph

1656 commits

Author SHA1 Message Date
pem@mysql.comhem.se
3eca4bf22e Fixed BUG#9937: Crash on call to stored procedure.
This only showed up on two known platforms, both ia64 (one HP-UX and one Linux wich icc).
For some reason, they only get half the stack size they are supposed to have, which
makes deep SP recursion overrun the stack before check_stack_overrun() is triggered.
Also made som minor fixes in the check_stack_overrun() definition, supporting variable
margins.
No test case added, but the reason for the bug report was a failed existing test case
on these machines, which now works.
2005-05-26 20:36:14 +02:00
msvensson@neptunus.(none)
8401cd5d79 BUG#9993 2 unexpected warnings when dropping a routine and --skip-grant-tables
- Dont perform automatic privilege handling for stored procedures when server is started --skip-grant-tables
 - Renamed view_skip_grants to skip_grants and added test cases for this
2005-05-26 16:44:46 +02:00
monty@mysql.com
6d5d6c9257 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-05-25 12:57:29 +03:00
monty@mysql.com
fb90aaa7b5 Cleanup during code review
Faster detection of wrong table names (like PRN) on windows
2005-05-25 12:56:47 +03:00
acurtis@xiphis.org
4a77febaab Merge 2005-05-24 15:52:48 +01:00
acurtis@xiphis.org
72f9abbf76 Add comments 2005-05-24 13:38:46 +01:00
acurtis@xiphis.org
a6a589ef76 Bug#7241 - Invalid response when DELETE .. USING and LOCK TABLES used.
Only acquire necessary write lock for multi-delete
2005-05-24 11:44:34 +01:00
monty@mysql.com
0b75f6e37b compatibility issues
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00
ramil@mysql.com
86538b338b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0.b6267
2005-05-18 12:41:36 +05:00
acurtis@xiphis.org
8df5887ad5 Bug#10246 - Parser: bad syntax for GRANT EXECUTE
Rename some functions
  more fine-grained sp privileges
  make grant/revoke sp grammar less ambigious
2005-05-17 19:54:20 +01:00
ramil@ram-book.(none)
d85e052d71 a fix (bug #6267: ENUM ... NOT NULL w/o default treated differently than other data types).
the behavior of enum changed to be consistent.
2005-05-13 16:44:14 +05:00
igor@rurik.mysql.com
3351233349 Manual merge 2005-05-10 16:41:47 -07:00
igor@rurik.mysql.com
9d4b228b61 Many files:
Fixed bug #8528.
  Representation for single-table views was made similar to
  representation for multi-table views.
view.test:
  Added test case for bug #8528.
view.result:
  Added test case for bug #8528. Fixed other test cases.
2005-05-10 16:31:13 -07:00
holyfoot@hf-ibm.(none)
5ddaf35c26 Fix for bug #9632 (strict.test fails in -embedded-server mode) 2005-05-09 16:26:06 +05:00
monty@mishka.local
015cd1cd21 merge 2005-05-06 13:51:58 +03:00
monty@mishka.local
a9f6aab4c9 Fixes while reviewing new code
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03:00
holyfoot@mysql.com
556504287b Merge 2005-05-05 20:10:50 +05:00
holyfoot@hf-ibm.(none)
2c8e9df232 A lot of fixes to Precision math
Mostly about precision/decimals of the results of the operations
2005-05-05 20:06:49 +05:00
gbichot@quadita2.mysql.com
b72ae4fe57 Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).
Approximative, because it's using our binlogging way (what we call "query"-level) and this is not as good as record-level binlog (5.1) would be. It imposes several
  limitations to routines, and has caveats (which I'll document, and for which the server will try to issue errors but that is not always possible).
  Reason I don't propagate caller info to the binlog as planned is that on master and slave
  users may be different; even with that some caveats would remain.
2005-05-05 14:20:53 +02:00
jimw@mysql.com
7bab94f36b Clean up merge from 4.1 2005-05-02 10:19:37 -07:00
sergefp@mysql.com
908c5d74d4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug9821
2005-04-29 02:52:20 +04:00
jimw@mysql.com
9c33716380 Clean up error message for connections-per-hour user limit
being exceeded. (Bug #9947)
2005-04-27 17:05:15 -07:00
pem@mysql.comhem.se
f769a7a8b0 Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW
(Review on irc by monty)
2005-04-27 16:35:49 +02:00
sergefp@mysql.com
ea347e5b06 Fix for BUG#8921: Make SHOW CREATE VIEW ignore temporary tables. 2005-04-25 04:00:35 +04:00
pem@mysql.comhem.se
057b8aa9a8 Fixed BUG#9004: Inconsistent behaviour of SP re. warnings 2005-04-22 12:53:48 +02:00
msvensson@neptunus.(none)
f1496eb6f7 BUG#9455 mysqladmin status crash the server
- Send error to client when mysql_change_db fails.
2005-04-14 11:56:13 +02:00
serg@serg.mylan
32221d9b9e Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-12 23:12:26 +02:00
serg@serg.mylan
d4a0becc8a FLUSH TABLES WITH READ LOCK should block writes to binlog too 2005-04-12 17:15:54 +02:00
pem@mysql.comhem.se
e0e281ecb8 Fixed BUG#6663: Stored Procedures code report non-selected DB
when CREATE but not when ALTER
2005-04-12 14:52:54 +02:00
monty@mysql.com
beb28b27e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f Fixed errors descovered by valgrind 2.4
Added suppression file for some valgrind warnings that are not real errors
2005-04-06 17:22:21 +03:00
jani@ua141d10.elisa.omakaista.fi
1dd12e9d04 Some of the argument place holders were not quite correct compared to
the argument type. Fixed also some float() casts to double() as query_id
is now actually longlong type. Related to Bug#9646.
2005-04-05 23:14:56 +03:00
serg@serg.mylan
c796ea598c Merge 2005-04-05 13:23:11 +02:00
jimw@mysql.com
c2cfa5e435 Merge 2005-04-04 08:54:36 -07:00
monty@mysql.com
04f8e164fb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-04 16:45:23 +03:00
serg@serg.mylan
52770e8682 XID SQL syntax
minor cleanups
XA tests
2005-04-04 00:50:05 +02:00
jimw@mysql.com
5865330a9e Merge embedded server testing changes from 4.1. 2005-04-01 19:17:15 -08:00
jimw@mysql.com
623a5d5a57 Clean up merge of fix for Bug #9468. 2005-04-01 19:00:14 -08:00
monty@mysql.com
9616c9a80d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-01 15:06:35 +03:00
monty@mysql.com
201ee3eb78 Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902)
CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912)
ALTER TABLE now fails in STRICT mode if it generates warnings.
Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933)
2005-04-01 15:04:50 +03:00
bell@sanja.is.com.ua
05c9defefa Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
2005-04-01 13:02:29 +03:00
bell@sanja.is.com.ua
45a79c9056 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0
2005-04-01 02:15:40 +03:00
bell@sanja.is.com.ua
05d4ed14e4 merge 4.1->5.0 2005-03-31 10:39:48 +03:00
bell@sanja.is.com.ua
c64efa6062 merge 2005-03-30 22:11:08 +03:00
pem@mysql.comhem.se
8df8afc270 Fixed BUG#6600: Stored procedure crash after repeated calls with check table.
Sedond attempt: Simply disallow CHECK in SPs, since it can't work.
2005-03-30 17:43:52 +02:00
ramil@mysql.com
e9dbf09dfc Merge 2005-03-30 17:07:40 +05:00
serg@serg.mylan
9db4daf111 merged 2005-03-30 10:52:28 +02:00
serg@serg.mylan
2a297353c6 don't strcmp db if it's a pattern 2005-03-30 10:43:24 +02:00
bell@sanja.is.com.ua
dcdda90a11 Merge 2005-03-30 10:27:36 +03:00
bell@sanja.is.com.ua
1659dacab1 fixed mechanism of detection selection from table wich we update
(BUG##9398, BUG#8703)
fixed wrong join view detection in multi-delete which lead to server crash
2005-03-28 15:13:31 +03:00
serg@serg.mylan
72c9ac844b fixes for "backport wild_compare fix from 4.1 - bug#3924" 2005-03-26 19:46:42 +01:00
msvensson@neptunus.(none)
bf2f6ff2d4 BUG#9303 blob field with specified length < 256 does not create tinyblob 2005-03-24 13:48:38 +01:00
serg@serg.mylan
d6bedfa8e0 merged 2005-03-23 09:42:24 +01:00
bell@sanja.is.com.ua
4554b1f263 fixed union types merging and table related metadata (BUG#8824) 2005-03-23 08:36:48 +02:00
mysqldev@mysql.com
ad26a667e6 sql_acl.cc, sql_acl.h, sql_parse.cc
New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
  new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
  results updated
2005-03-22 15:54:18 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
4ef20658d7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-03-18 19:04:09 +02:00
pem@mysql.comhem.se
8af9a0d782 Fixed BUG#6600: Stored procedure crash after repeated calls with check table 2005-03-18 16:52:41 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5537d21466 Added more tests to grant2. Fixed some previous tests.
Added new logic to ACL system:

1) If GRANT OPTION (not mysql db):
   Ok to update existing user, but not password.
   Not allowed to make a new user.

2) If UPDATE_ACL to mysql DB:
   Ok to update current user, but not make a new one.

3) If INSERT_ACL to mysql DB:
   Ok to add a new user, but not modify existing.

4) If GRANT OPTION to mysql DB:
   All modifications OK.
2005-03-18 13:32:28 +02:00
lenz@mysql.com
4ca5b3c73b - Added a missing pair of parenthesis. (already commited by Jani, ChangeSet@1.1819) 2005-03-17 18:49:48 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
130d1c0877 Added a missing pair of parenthesis. 2005-03-17 19:24:27 +02:00
serg@serg.mylan
41997cf263 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-17 08:46:48 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
1fbb61754b Fixed two bugs in MySQL ACL.
First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.

Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)

Fixed tests grant.pl and grant2, which were wrong.
2005-03-17 08:16:56 +02:00
monty@mysql.com
aa6ab3b49c Move handler dependent tests to the specific handler (myisam, bdb, innodb)
Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP
2005-03-17 01:22:12 +02:00
monty@mysql.com
f42941073d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-16 22:59:06 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
4e0b462612 Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.2
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
2005-03-16 16:27:07 +00:00
monty@mysql.com
594ef41b2d Cleanup during reviews
Removed some optional arguments
Fixed portability problem in federated tests
2005-03-16 16:11:01 +02:00
dlenev@brandersnatch.localdomain
3da06a5500 Fixed behavior of LOAD DATA with subqueries in SET clause.
The idea is to use TABLE_LIST::lock_type for passing type of lock for
target table to mysql_load() instead of using LEX::lock_option 
(which were rewritten by first subselect in SET clause).

This should also fix potential problem with LOAD DATA in SP
(it is important for them to have right lock_type in the table
 list by the end of statement parsing).
2005-03-16 12:13:35 +03:00
serg@serg.mylan
4afb736576 sql/handler.cc
smarter xid-to-str routiine
    fixed assert crash in XA RECOVER
sql/sql_parse.cc
    XA COMMIT/ROLLBACK did not send_ok in some cases
2005-03-16 08:42:06 +01:00
dlenev@brandersnatch.localdomain
f169114042 WL#874 "Extended LOAD DATA".
Now one can use user variables as target for data loaded from file
(besides table's columns). Also LOAD DATA got new SET-clause in which
one can specify values for table columns as expressions.

For example the following is possible:
LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;

This patch also implements new way of replicating LOAD DATA.
Now we do it similarly to other queries.
We store LOAD DATA query in new Execute_load_query event
(which is last in the sequence of events representing LOAD DATA).
When we are executing this event we simply rewrite part of query which
holds name of file (we use name of temporary file) and then execute it
as usual query. In the beggining of this sequence we use Begin_load_query
event which is almost identical to Append_file event
2005-03-16 04:32:47 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
1a64fe066d Bug#8670
Rework to resolve ambigious grammer: conflict in join expression
  handling of parentheses for nested joins and derived tables.
  Tests included of failing statements
Optimize item construction for AND/OR logical expressions
2005-03-16 00:13:23 +00:00
monty@mysql.com
05acaf060c Merge with global tree 2005-03-15 16:21:08 +02:00
monty@mysql.com
dd4db08438 Code cleanups during review of pushed code 2005-03-15 16:07:28 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9ec8d87328 Updated error message to be more informative. Previous error message
"Access denied to database mysql" was actually not just misleading, but
also wrong.

Bug#7905.
2005-03-14 16:59:09 +02:00
serg@serg.mylan
7b19170cf7 BUG#9101 - RELEASE/ROLLBACK TO SAVEPOINT did not forget savepoints correctly 2005-03-11 21:10:41 +01:00
serg@serg.mylan
e40bf3c40b sql/ha_ndbcluster.cc
after merge fix
sql/sql_parse.cc
    correct max_connections condition
2005-03-10 00:10:10 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
8d94824aa1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
2005-03-09 01:15:42 +00:00
acurtis@ltantony.rdg.cyberkinetica.homeunix.net
be3c863ba0 Merge in fix Bug#3788 2005-03-08 22:32:09 +00:00
Sinisa@sinisa.nasamreza.org
b2c77c1c9c post merge fixes 2005-03-08 22:59:21 +02:00
Sinisa@sinisa.nasamreza.org
a54b5ea52f Fixing bug #8850 in such a way that when TRUNCATE is called within
stored  procedure,  it  is converted  to DELETE.
2005-03-05 21:44:15 +02:00
dlenev@mysql.com
48d92d150d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-sp
2005-03-05 16:33:36 +03:00
dlenev@brandersnatch.localdomain
e6a506c397 Fix for yet another memleak caused by SP-locking patch.
Improved handling of situations when we encounter error during
CREATE PROCEDURE (FUNCTION/TRIGGER/...) and bail out of yyparse()
without restoring proper THD::lex.
2005-03-05 16:31:58 +03:00
gluh@gluh.mysql.r18.ru
df2b38913f WL2131: Access control for SHOW ... PROCEDURE|FUNCTION ... 2005-03-05 14:35:32 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
5e1d2ad68c Bug#3788
Crashes with stored procedure return non-string values
  Also fixes Bug#2773
2005-03-04 21:14:35 +00:00
dlenev@mysql.com
5b16dbf960 Manual merge SP-locking improvements patch with current tree. 2005-03-04 17:46:45 +03:00
dlenev@brandersnatch.localdomain
5a6c7027f0 Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.

- We don't have separate stage for calculation of list of tables
  to be prelocked and doing implicit LOCK/UNLOCK any more.
  Instead we calculate this list at open_tables() and do implicit
  LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
  Also now we support cases when same table (with same alias) is
  used several times in the same query in SP.

- Cleaned up execution of SP. Moved all common code which handles
  LEX and does preparations before statement execution or complex
  expression evaluation to auxilary sp_lex_keeper class. Now 
  all statements in SP (and corresponding instructions) that
  evaluate expression which can contain subquery have their
  own LEX.
2005-03-04 16:35:28 +03:00
mskold@mysql.com
b9aa67bc76 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-26 16:15:36 +01:00
monty@mysql.com
1ecb8c8fed Fixes while during review of last pull
Temporary patch to remove some warnings
2005-02-26 12:19:02 +02:00
monty@mysql.com
7e5f74f8f2 Merge with global tree 2005-02-25 17:12:06 +02:00
monty@mysql.com
0a6b7aedb2 Remove compiler warnings and remove not used variables
(Found during build process)
2005-02-25 16:53:22 +02:00
joreland@mysql.com
65daa271c1 Cset exclude: joreland@mysql.com|ChangeSet|20050224071025|18754 2005-02-25 09:35:09 +01:00
joreland@mysql.com
8253f54524 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-25 09:17:55 +01:00
mskold@mysql.com
c7c2eacfb8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-25 08:28:43 +01:00
monty@mysql.com
cd78e701a5 Show all generated warnings in SHOW ERROR
Previously we only stored the first given error (the error sent to the client)
2005-02-24 23:33:42 +02:00
joreland@mysql.com
1029db2b6d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-24 20:57:32 +01:00
ramil@mysql.com
05eb8af434 fixed compilation failure affects build without InnoDB 2005-02-24 20:55:20 +04:00
pem@mysql.comhem.se
2b1f0bf1f5 Fixed BUG#8638: Test 'sp' fails: Stored Procedure often sends warning 1329
The warning sent is by itself ok, the problem was rather why it wasn't
  sent on some other platforms...
  The real problem was that a total_warn_count which was inconsistent with warn_list
  was sent back with send_eof() during SP execution, which in turn cause a protocol
  error in mysqltest.
2005-02-24 13:56:09 +01:00
joreland@mysql.com
a0aac3e3f8 #ifdef innodb specific code, (old_innodb_table_locks) 2005-02-24 08:10:25 +01:00
bell@51.0.168.192.in-addr.arpa
5d6cc9de06 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-24 01:11:59 +02:00
serg@serg.mylan
383c6e312a don't log BEGIN in auto-commit mode
correct end_log_pos for Xid_log_event
2005-02-23 18:26:49 +01:00
bell@52.0.168.192.in-addr.arpa
25e87cd6f7 Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 19:22:52 +02:00
jimw@mysql.com
41043bb3f5 Merge 2005-02-22 16:39:21 -08:00
jimw@mysql.com
df3c8db4f3 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00
bell@51.0.168.192.in-addr.arpa
a9b40a8c0b Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-22 14:52:26 +02:00
bell@51.0.168.192.in-addr.arpa
04cffe4dfb postreview fix 2005-02-22 12:43:49 +02:00
serg@serg.mylan
178be07aa3 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-22 00:17:56 +01:00
serg@serg.mylan
b43029f4eb bug#8646 - deadlock if long transaction causes binlog rotate 2005-02-22 00:15:31 +01:00
konstantin@mysql.com
b902a66e27 Fix -ansi -pedantic compilation failure. 2005-02-21 17:27:36 +03:00
monty@mysql.com
cab35adf7e Review of new pushed code (XA & other)
Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command()
2005-02-21 14:47:57 +02:00
bell@51.0.168.192.in-addr.arpa
a11369b999 Merge 2005-02-20 18:49:27 +02:00
jimw@mysql.com
10800c1eb5 Merge mysql.com:/home/jimw/my/mysql-4.1-8475
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-18 15:40:17 -08:00
jimw@mysql.com
29d1d9a369 Clean up merge for fix for Bug #8350. 2005-02-18 15:23:17 -08:00
serg@serg.mylan
262dd182ef compilation fixes 2005-02-18 14:42:14 +01:00
serg@serg.mylan
c0dda01f76 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 12:02:46 +01:00
jimw@mysql.com
1c22de9032 Log each slow query in a multi-statement query to the slow query log.
(Bug #8475)
2005-02-17 11:48:44 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
10ab9e982f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1
2005-02-17 17:52:49 +00:00
serg@serg.mylan
530eecbd99 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
serg@serg.mylan
2b41b8fa01 post-review fixes. Now ROLLBACK is done in Format_description_log_event 2005-02-17 13:52:16 +01:00
jani@ua141d10.elisa.omakaista.fi
36998b7cb7 Fixed Bug#8042, "mysqld crashes on sighup". 2005-02-17 14:07:28 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
a1bf1c926e Bug#8147
Fix ambigious table error for INSERT..SELECT..UPDATE
2005-02-17 01:33:59 +00:00
guilhem@mysql.com
0987d81ae6 Merge 2005-02-16 21:03:58 +01:00
serg@serg.mylan
5ddb6354a5 after merge fixes 2005-02-16 17:34:02 +01:00
monty@mysql.com
38d1a42481 Merge with 4.1 2005-02-15 17:12:13 +02:00
guilhem@mysql.com
4f41de1cc5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 15:12:50 +01:00
monty@mysql.com
44ceb84cdc Merge with 4.0 2005-02-15 14:49:52 +02:00
monty@mysql.com
788a2658a3 Better bug fix for #5569: "Incorrect "Access Denied" error with SAME login DIFFERENT host"
This fixes also the reverse lookup bug introduced by the previous patch
2005-02-15 14:42:13 +02:00
guilhem@mysql.com
55fb16a7a6 1) undoing my fix for BUG#8055 "Trouble with replication from temporary tables and ignores"
and fixing it another way (per Monty; a simpler solution which does not increase the number
of binlog events is to always execute DROP TEMPORARY TABLE IF EXISTS on slave). A new test rpl_drop_temp.
2) fixing BUG#8436 "Multiple "stacked" SQL statements cause replication to stop" by setting
thd->query_length to the length of the query being executed, not counting the next queries
if this is a multi-query. Should also improve display of SHOW PROCESSLIST. A new test rpl_multi_query.
2005-02-14 23:47:17 +01:00
serg@serg.mylan
fd828e5b4d manually merged 2005-02-14 21:50:09 +01:00
bell@sanja.is.com.ua
6da6c5be0c fixed SP processing for mysql_list_fields() command (BUG#6814) 2005-02-13 21:47:00 +02:00
bell@sanja.is.com.ua
5040e7cdb4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0
2005-02-10 20:08:11 +02:00
bell@sanja.is.com.ua
9b1bf2da5a merge 2005-02-10 18:01:06 +02:00
konstantin@mysql.com
e9225b2588 Fix -ansi -pedantic compilation failure. 2005-02-10 17:46:27 +03:00
pem@mysql.comhem.se
51296b5399 Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc. 2005-02-10 11:40:54 +01:00
jimw@mysql.com
f391223f19 Fix per-hour user connection limits by making sure that the number of
connections is actually reset after an hour, and also fix (unlikely)
conditions under which the per-hour query and connection limits could be
exceeded. (Bug #8350)
2005-02-08 18:43:27 -08:00
hf@deer.(none)
96558f6ad3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 02:54:08 +04:00
hf@deer.(none)
b94a482ee9 Precision Math implementation 2005-02-09 02:50:45 +04:00
pem@mysql.comhem.se
2c26ebe359 WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
2005-02-08 20:52:50 +01:00
gluh@gluh.mysql.r18.ru
15273035ce Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-07 11:57:14 +03:00
monty@mysql.com
80b3e02462 Fixed bug detected by sp-tests
Cleanup during reviews of new pushed code
2005-02-05 16:05:46 +02:00
gluh@gluh.mysql.r18.ru
be5532d36a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-03 20:46:53 +03:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
gluh@gluh.mysql.r18.ru
cacb8d74b4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-03 11:12:01 +03:00
jimw@mysql.com
5f0c4ff140 Merge fixes for #8248, #5569. 2005-02-02 08:21:11 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a90d28eb6e Fix compile problem - line missing. 2005-02-01 23:43:09 +00:00
jimw@mysql.com
76ff72d73f Merge mysql.com:/home/jimw/my/mysql-4.0-5569
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-01 15:38:27 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc WL#1967
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
gluh@gluh.mysql.r18.ru
92f04aedf3 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-01 12:20:03 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
941b959cb4 Bug#7011
Fix for merge from 4.1
2005-01-31 20:49:37 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
adb91423ac Bug#7011
Merge from 4.1
2005-01-31 15:57:32 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04 Bug#7011
Merge from 4.0
2005-01-31 12:48:00 +00:00
bell@sanja.is.com.ua
25042ae70c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0
2005-01-31 09:36:23 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
500fbf5c0f Bug#7011
Fix replication for multi-update
  new test - rpl_multi_update2
2005-01-30 10:24:03 +00:00
serg@serg.mylan
3c5060981f query_id and my_xid -> ulonglong
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
gluh@gluh.mysql.r18.ru
6afbb3d627 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-27 20:01:37 +03:00
gluh@gluh.mysql.r18.ru
ac14d40dde A fix: information_schema test fails on Mac OSX 2005-01-27 13:16:51 +03:00
gluh@gluh.mysql.r18.ru
a6315a8ad9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-26 20:58:47 +03:00
jimw@mysql.com
94da57dc65 Always call vio_in_addr() so that thd->remote is
always initialized. (Bug #5569)
2005-01-25 12:06:55 -08:00
konstantin@mysql.com
6c3a4aee18 Fix two typos in comments. 2005-01-25 17:25:46 +03:00
gluh@gluh.mysql.r18.ru
849ef34156 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-25 11:42:50 +03:00
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
gluh@gluh.mysql.r18.ru
e492c1b44e Additional fix for WL#1629: SHOW with WHERE(discussed with PeterG)
- Do not allow a column list as part of SHOW WITH WHERE task.
 - The WHERE clause must accept field names which are
   valid in SHOW, not INFORMATION_SCHEMA names.
2005-01-24 18:44:54 +03:00
serg@serg.mylan
79240013b2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
timour@mysql.com
36f1e91b69 Merge of fix for BUG#4258 from 4.1.
Needs additional manual merge.
2005-01-21 17:38:36 +02:00
bell@sanja.is.com.ua
e9ad508542 Fixed problem of sending ERROR to client after OK or EOF (BUG#6804) 2005-01-20 10:41:37 +02:00
timour@mysql.com
7fb0de20f3 Final patch for BUG#4285.
This patch collects all previous patches into one.

The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
2005-01-19 12:55:54 +02:00
bell@sanja.is.com.ua
a7d0eaae7c added replication of VIEW DDL commands (BUG#4838) 2005-01-17 01:18:08 +02:00
serg@serg.mylan
1034677f94 XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00
monty@mysql.com
7c457a1bd7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-13 20:09:41 +02:00
konstantin@mysql.com
019ff4c577 Manual merge. 2005-01-13 02:19:35 +03:00
konstantin@mysql.com
30c4d10e1a Add logging of COM_EXECUTE in the general query log. 2005-01-13 02:13:19 +03:00
konstantin@mysql.com
f01f721672 manual merge 2005-01-12 21:51:04 +03:00
konstantin@mysql.com
2cc2844bbb Merge mysql.com:/home/kostja/work/mysql-4.0-6761
into mysql.com:/home/kostja/work/mysql-4.1-root
2005-01-12 19:00:04 +03:00
konstantin@mysql.com
6058edbe18 A fix for Bug#6761 "mysql_list_fields() does not work": test
case will be added to client_test in 4.1
2005-01-12 17:04:45 +03:00
monty@mysql.com
314cf993c6 Fixed memory reference errors found by valgrind 2005-01-12 03:38:53 +02:00
monty@mysql.com
56fb6f31ba Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-10 15:28:17 +02:00
brian@zim.(none)
75f282df27 Fix for compiling error in sql_parse 2005-01-06 16:31:18 -08:00
serg@sergbook.mysql.com
f472cec178 merged 2005-01-06 19:32:16 +02:00
bell@sanja.is.com.ua
421738e8ce removed unused label 2005-01-06 17:08:38 +02:00
monty@mysql.com
bda0a78184 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-01-06 13:31:31 +02:00
monty@mysql.com
d35140a851 First stage of table definition cache
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
2005-01-06 13:00:13 +02:00
jimw@mysql.com
652fc10467 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-04 19:00:22 +01:00
bell@sanja.is.com.ua
a8a5f3590c fixed bugs in view code with prepared statemnts 2005-01-04 18:04:16 +02:00
jimw@mysql.com
050e229162 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-04 02:47:48 +01:00
monty@mysql.com
309b1a2b6c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
monty@mysql.com
2299e1eca4 Better handling of ensuring that setup_tables() are not called twice
This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests
2005-01-03 21:04:33 +02:00
jimw@mysql.com
0e8d3f1ccd Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-03 19:56:20 +01:00
jimw@mysql.com
98d7964d2a Fix 'SHOW CREATE FUNCTION' to say 'FUNCTION' in its error message. (Bug #6338) 2005-01-03 19:53:54 +01:00
monty@mysql.com
ce456b6a20 Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases
(Old code failed for INSERT ... ON DUPLICATE with prepared statements) 
Instead, always reset table->insert_values on open.
2005-01-03 13:56:23 +02:00
monty@mysql.com
1bd22faa05 Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
2004-12-31 12:04:35 +02:00
dlenev@mysql.com
536cb92195 Manual merge. 2004-12-31 12:48:27 +03:00
vtkachenko@intelp4d.mysql.com
ae1b969c8f Merge bk-internal:/home/bk/mysql-5.0
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
2004-12-31 09:00:34 +01:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00
monty@mysql.com
d71c030587 After merge fixes 2004-12-31 00:44:00 +02:00
gluh@gluh.mysql.r18.ru
50266af38c wl#1629 SHOW with WHERE(final part, after review)
added syntax:
  'show variables where', 'show status where', 'show open tables where'
2004-12-30 15:20:40 +03:00
dlenev@mysql.com
a8deefa3dd Manual merge of patch implementing WL#1339 with main tree. 2004-12-29 22:35:16 +03:00
dlenev@brandersnatch.localdomain
ffa7393330 WL#1339 "Add per account max_user_connections limit (maximum number
of concurrent connections for the same account)"

Added support of account specific max_user_connections limit. Made all
user limits to be counted per account instead of the old behavior,
which was per user/host accounting. Added option which enables the old
behavior. Added testing of these to the test suite.

(After review version).
2004-12-29 20:30:37 +03:00
serg@serg.mylan
19e3c001f4 revert "LOCK TABLES ... WHERE ENGINE=INNODB" 2004-12-27 12:08:22 +01:00
vtkachenko@intelp4d.mysql.com
f1dfafe721 Many files:
tabs replaced
ha_innodb.cc:
  Comments removed
2004-12-24 13:31:21 +01:00
vtkachenko@intelp4d.mysql.com
78846b2923 logging_ok:
Logging to logging@openlogging.org accepted
sql_yacc.yy, sql_parse.cc, sql_lex.h, lex.h:
  Implements the SHOW MUTEX STATUS command
set_var.cc, mysqld.cc, mysql_priv.h:
  Added new GLOBAL variable timed_mutexes
ha_innodb.h:
  New function innodb_mutex_show_status
ha_innodb.cc:
  Added new innodb variables in SHOW STATUS
  Implements the SHOW MUTEX STATUS command
innodb.test, innodb.result:
  Added new row_lock_waits status variables tests.
variables.test, variables.result:
  test new variable timed_mutexes
ut0ut.c:
  New function ut_usectime.
sync0sync.c:
  Mutex counting.
sync0rw.c:
  New mutex parameters initialization.
srv0srv.c:
  Counting row lock waits
row0sel.c, row0mysql.c:
  Setting row_lock or table_lock state to thd.
que0que.c:
  Added default no_lock_state to thd.
univ.i:
  Added UNIV_SRV_PRINT_LATCH_WAITS debug define
sync0sync.ic:
  Count mutex using.
sync0sync.h:
  Added new parameters to mutex structure for counting.
sync0rw.h:
  Added new parameters to rw_create_func.
srv0srv.h:
  Added new innodb varuables to SHOW STATUS.
que0que.h:
  Added thread lock states.
2004-12-24 12:13:32 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
bf40ab8cb1 Fix for embedded 2004-12-23 11:42:57 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b1e30904d5 WL#925 - Privileges for stored routines
Implement fine-grained control over access to stored procedures
  Privileges are cached (same way as existing table/column privs)
2004-12-23 10:46:24 +00:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
dlenev@mysql.com
0ef4413f36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
2004-12-21 15:42:19 +03:00
jan@hundin.mysql.fi
198dc7a8ec Content merge. 2004-12-21 07:49:38 +02:00
dlenev@mysql.com
ca8373f49d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-tzbug
2004-12-19 11:32:21 +03:00
monty@mysql.com
2a215c17bb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-12-18 12:49:14 +02:00
gluh@gluh.mysql.r18.ru
bc7860c80c Fix for bug #7213: information_schema: redundant non-standard TABLE_NAMES table 2004-12-18 13:49:13 +03:00
gluh@gluh.mysql.r18.ru
bf0104045d Fix for bug #7210: information_schema: can't access when table-name = reserved word 2004-12-18 12:48:01 +03:00
monty@mysql.com
f37fd31ddc Merge with global tree 2004-12-18 06:05:16 +02:00
monty@mysql.com
3fb088a075 Add 0x before pointers (to help with debugging)
Add support for VARCHAR with 1 or 2 length bytes
Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
Give error if we got problems in temporary tables during a SELECT
Don't use new table generated by ALTER TABLE if index generation fails
Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
2004-12-18 05:19:21 +02:00
guilhem@mysql.com
884663662b Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7,
SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump
produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in
mysqldump (compatibility with old servers).
2004-12-17 23:37:43 +01:00
ram@gw.mysql.r18.ru
92f89369ae bit type 2004-12-17 18:06:05 +04:00
dlenev@brandersnatch.localdomain
c834a49b66 Fix for bug #6849 "Crash while preparing query containing const expr with
IN and CONVERT_TZ()" (with after review changes).

Now we add implicitly used time zone tables to global table list right
at the parsing stage instead of doing it later in mysql_execute_command()
or in check_prepared_statement().

No special test-case needed since this bug also manifests itself as
timezone2.test failure if one runs it with --ps-protocol option.
2004-12-17 15:34:48 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
9818cadd1b WL#2274 - INSERT..SELECT..UPDATE
UPDATE clause conflicts with SELECT for use of item_list field.
  Alter UPDATE clause to use new lex field update_list
  Tests included
2004-12-13 12:26:28 +00:00
dlenev@mysql.com
62a6d9749b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
2004-12-09 13:33:12 +03:00
dlenev@brandersnatch.localdomain
4b0882e0a6 Fix for bug #6765 "Implicit access to time zone description
tables requires privileges for them if some table or column level grants
present" (with after-review fixes).

We should set SELECT_ACL for implicitly opened tables in 
my_tz_check_n_skip_implicit_tables() to be able to bypass privilege
checking in check_grant(). Also we should exclude those tables from
privilege checking in multi-update.
2004-12-09 13:31:46 +03:00
jan@hundin.mysql.fi
49c0044a2f Content merge. 2004-12-09 11:20:50 +02:00
jan@hundin.mysql.fi
d6effde5d0 Added support for a LOCK TABLES...WHERE ENGINE = InnoDB query which sets
transactional table locks to tables mentioned in the query. These locks
are released at the end of the transaction automatically.
This is fix for bugs #5655, #5998 and issue #3762.
2004-12-09 11:10:45 +02:00
jani@ua141d10.elisa.omakaista.fi
aac5f57b4d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2004-12-07 21:58:26 +02:00
jani@ua141d10.elisa.omakaista.fi
e554642528 Fixed Bug#7043, "SHOW CREATE TABLE security hole". 2004-12-07 21:57:54 +02:00
bell@sanja.is.com.ua
b218560604 merge 2004-12-07 09:07:37 +02:00
monty@mysql.com
77207d19f2 Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
ram@gw.mysql.r18.ru
878dd8ba0a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5823
2004-12-06 20:45:31 +04:00
gluh@gluh.mysql.r18.ru
0282d03215 Syntax extention: 'ALTER DATABASE' without db name (after review) 2004-12-06 19:01:51 +03:00
monty@mysql.com
75d0958dc3 After merge fixes
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
2004-12-06 17:15:54 +02:00
ram@gw.mysql.r18.ru
bd247e3d56 A fix (bug #5823: mysql_install_db fails due to incorrect max_allowed_packet). 2004-12-06 18:45:41 +04:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
bell@sanja.is.com.ua
734ffb8452 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
2004-12-03 22:13:53 +02:00
mats@mysql.com
fe70f8c747 Merge mysql.com:/space/bkroot/mysql-4.1
into mysql.com:/space/bk/b6391-mysql-4.1
2004-12-03 12:15:31 +01:00
mats@mysql.com
2bbdf2403d Bug#6391 (binlog-do-db rules ignored)
CREATE DATABASE statement used the current database instead of the
  database created when checking conditions for replication.
  CREATE/DROP/ALTER DATABASE statements are now replicated based on
  the manipulated database.
2004-12-03 12:13:51 +01:00
guilhem@mysql.com
f3b577f591 Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish. Normally this step is not long but it's still nice to be killable
(especially in case of bug like BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever").
2004-12-02 23:02:38 +01:00
bar@mysql.com
a09a603d83 Bug #6379: ENUM values are incorrectly converted
- add_field_to_list() now uses <List>String
instead of TYPELIB to be able to distinguish
literals 'aaa' and hex literals 0xaabbcc.
- move some code from add_field_to_list() where
  we don't know column charset yet, to 
  mysql_prepare_table(), where we do.
2004-12-02 12:48:43 +04:00
bell@sanja.is.com.ua
4c017d18e2 Merge 2004-12-01 10:25:11 +02:00
bell@sanja.is.com.ua
f20e7a82b7 now we create temporary join for all queries with subqueries to make correct cleunup of tables and avoid too early unlock (BUG#6841) 2004-11-30 21:41:12 +02:00
serg@serg.mylan
f09429a4df protection: TRASH in delete
fixed a bug that it discovered
2004-11-28 15:53:17 +01:00
serg@serg.mylan
246cf0d682 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-27 12:37:03 +01:00
ingo@mysql.com
0eca0e0a68 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
2004-11-25 21:58:28 +01:00
ingo@mysql.com
cb53411b47 WL#2050 - CREATE USER and DROP USER and RENAME USER
Added new commands CREATE USER and RENAME USER.
Changed behaviour of DROP USER.
Changed an error messages for the new commands.
2004-11-25 21:55:49 +01:00
serg@serg.mylan
7dabb64176 merged 2004-11-25 17:36:43 +01:00
pem@mysql.comhem.se
a1e0e96e2d Fixed BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY
...and for PURGE BEFORE too. (Don't fix_fields in the parser!)
2004-11-25 16:13:06 +01:00
bell@sanja.is.com.ua
a1cac9687e spelling fixed/comments added (postreview fixes) 2004-11-25 09:28:32 +02:00
bell@sanja.is.com.ua
69ec6a4592 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0
2004-11-25 02:27:02 +02:00
bell@sanja.is.com.ua
1e3d8b0839 post-merge fix 2004-11-25 02:23:13 +02:00
serg@serg.mylan
bf173a85a9 send_warning removed 2004-11-24 17:22:29 +01:00
dlenev@brandersnatch.localdomain
d201074611 Fix for bug #5888 "Triggers with nonexistent columns cause packets
out of order". (final version)

Now instead of binding Item_trigger_field to TABLE objects during
trigger definition parsing at table open, we perform pass through
special list of all such objects in trigger. This allows easily check
all references to fields in old/new version of row in trigger during
execution of CREATE TRIGGER statement (this is more courtesy for users
since we can't check everything anyway).
We also report that such reference is bad by returning error from
Item_trigger_field::fix_fields() method (instead of setup_field())
This means that if trigger is broken we will bark during trigger
execution instead of trigger definition parsing at table open.
(i.e. now we allow to open tables with broken triggers).
2004-11-24 12:24:02 +03:00
pem@mysql.comhem.se
43aefd66fd Fix compiler warnings on some systems. (Unused variables)
Fixed bug in DROP FUNCTION for UDFs.
Note: It still doesn't work properly, but that bug is somewhere else.
2004-11-23 19:19:09 +01:00
bell@sanja.is.com.ua
072d38eb12 merge 2004-11-21 20:08:12 +02:00
bell@sanja.is.com.ua
21eb2e2eae post merge 2004-11-21 19:33:49 +02:00
bell@sanja.is.com.ua
f5e253dc2f reporting empty result added in case of max/min optimisation of ALL/ANY/SOME subqueries
fixed null processing in NOT operation used in ALL subquery (Bug #6247)
2004-11-18 18:10:07 +02:00