Commit graph

52 commits

Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
4ed4546004 Changes for the BitKeeper resolve.
One more notice:

limiting number of queries per hour for different users has been done
on 4.0.1 , but I can port it to 3.23.* 

This will require only certain changes, like number of columns in user
table.

I will also make a test case for it, after it is approved by Monty, 
as result file will depend on the error message text.
2001-12-26 17:42:06 +02:00
Sinisa@sinisa.nasamreza.org
038db406c1 This is a large push. Included are :
* multi-table updates
* new paid feature for limiting number of queries per hour for users
* optional syntax for multi-table deletes
* optimization for SQL_CALC_FOUND_ROWS
* a small addition for CREATE .. SELECT that will be of future use

I know that all this will require many additions to documentation, 
which I have not done, but I am at Arjen's disposal to help him document
all this.
2001-12-26 16:49:10 +02:00
monty@hundin.mysql.fi
cb754eb5aa Fix after merge 2001-12-17 23:24:51 +02:00
monty@hundin.mysql.fi
c298f03570 merge with 3.23.47 (DO statement) 2001-12-17 20:47:20 +02:00
monty@hundin.mysql.fi
f049543416 Added DO command 2001-12-17 19:59:20 +02:00
monty@hundin.mysql.fi
0c0a170fa7 Fix that SHOW STATUS works with SSL.
Add 4.0 commands to SHOW STATUS.
2001-12-13 22:03:09 +02:00
monty@hundin.mysql.fi
6aeb40bd3f merge 2001-12-13 20:54:20 +02:00
monty@hundin.mysql.fi
bdc5a62104 Added status variables for all MySQL commands. 2001-12-13 20:06:44 +02:00
monty@hundin.mysql.fi
12058c2996 Fixed bug in GROUP BY ... DESC 2001-12-10 17:51:07 +02:00
monty@hundin.mysql.fi
b658662ae4 Update copyright
Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
2001-12-06 14:10:51 +02:00
Sinisa@sinisa.nasamreza.org
376638b15b Unchecked changes, so that I could run mysql-test.
If I ruined anything, write your complaints to sasha@mysql.com
2001-10-19 17:43:30 +03:00
monty@hundin.mysql.fi
06e719b7cc Remved Gemini code. 2001-10-10 02:50:28 +03:00
monty@hundin.mysql.fi
2f603156ed Cleanup after last merge 2001-10-08 07:24:04 +03:00
monty@work.mysql.com
0c81c7ea07 Merge 2001-10-07 13:31:12 +02:00
monty@hundin.mysql.fi
88e5ee0184 Fix for 'mysqladmin -w1 unknown-command'
Manual Changelog update
2001-10-07 14:18:09 +03:00
tonu@volk.internalnet
a16796c8ac Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0
2001-09-30 10:47:32 +08:00
tonu@volk.internalnet
5658ff8237 SSL compiles and works as far as can see. Continue testing.. 2001-09-30 10:46:20 +08:00
monty@tik.mysql.fi
e05bf277d6 Final fixes for INSERT into MERGE tables.
Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors
2001-09-27 21:45:48 +03:00
tonu@volk.internalnet
d6fb40171b SSL parser changes to allow SSL specific GRANT commands 2001-09-22 22:32:43 +08:00
monty@hundin.mysql.fi
59e7c97dab Remove warnings and portability fixes
New global read lock code
Fixed bug in DATETIME with WHERE optimization
Made UNION code more general.
2001-08-14 20:33:49 +03:00
Sinisa@sinisa.nasamreza.org
2252f945d0 Changes so that CREATE and INSERT work from UNION's 2001-08-12 16:01:32 +03:00
monty@tik.mysql.fi
b13d453d50 Fix UNION
New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION
2001-08-02 06:29:50 +03:00
Sinisa@sinisa.nasamreza.org
f0a6416b07 UNIONs : further work 2001-07-22 13:25:56 +03:00
monty@tik.mysql.fi
ca771c46bb merge 2001-07-08 06:24:03 +03:00
sasha@mysql.sashanet.com
c01d4e1ef7 SHOW NEW MASTER FOR SLAVE WITH ... 2001-07-04 17:14:31 -06:00
monty@tik.mysql.fi
0559758630 Added support for ANSI SQL X'hex-string' format.
Fixed mysqldump to use -- instead of # as comment characters.
Removed support for the 3.20 protocol format
2001-07-04 09:39:58 +03:00
monty@hundin.mysql.fi
897b37b506 Changed safe_mysqld -> mysqld_safe
Added some alias to SHOW commands
Prepare for dynamic changing of MySQL variables
2001-06-28 10:49:16 +03:00
sasha@mysql.sashanet.com
992f889878 added SHOW BINLOG EVENTS
fixed log sequence bugs
fixed bugs in handling Slave event
added test case with SHOW BINLOG EVENTS
have not fixed all the bugs - found some that are also in 3.23,
will fix them there first, then do pull and cleanup

will not push this changeset
2001-06-21 13:19:24 -06:00
Sinisa@sinisa.nasamreza.org
0d0ca68e48 Second phase of UNIONS (please do not test it yet) and some other
changes. This is mostly a merge between my repository and central 
one, so that I can take a test for multi table delete and fix it.
2001-06-13 13:36:53 +03:00
Sinisa@sinisa.nasamreza.org
b37a556889 bk resolve work 2001-06-07 14:25:45 +03:00
Sinisa@sinisa.nasamreza.org
338b51b5a7 These are actually two changesets. One for splitting LEX in two and
the other for multi-table delete
2001-06-03 17:07:26 +03:00
sasha@mysql.sashanet.com
a817bd3862 A slave now can optionally register with the master providing the
info on how to connect to the slave for the clients that connect to
the master, but would like to know where the slaves are
2001-05-30 18:50:56 -06:00
sasha@mysql.sashanet.com
8f6b34f950 updates for LOAD DATA FROM MASTER + some cleanup of replication code 2001-05-28 19:18:23 -06:00
serg@serg.mysql.com
8b2a9517a6 ALTER TABLE ... DISABLE KEYS / ALTER TABLE ... ENABLE KEYS 2001-05-11 22:26:12 +02:00
serg@serg.mysql.com
a6ebe74e3c Preliminary commit of HANDLER syntax (w/o LIMIT or column-list) 2001-04-07 00:18:33 +02:00
mikef@nslinux.bedford.progress.com
d145a6b97e Add support for Gemini table handler, Monty has checked and approved
Fix bug when read return error
2001-03-21 15:34:16 -05:00
monty@tik.mysql.fi
6f9a73a1ba Added isolation levels
Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE
2001-03-21 01:02:22 +02:00
tim@cane.mysql.fi
5fdf032769 Added SHOW OPEN TABLES. Thanks to Antony T Curtis <antony@abacus.co.uk>
for the code.
2000-12-18 23:22:20 +02:00
tim@cane.mysql.fi
7bff1dd4db Add SHOW LOGS command. 2000-12-15 13:18:52 +02:00
monty@narttu.mysql.fi
b689a1a752 merge 2000-11-16 00:24:11 +02:00
monty@tik.mysql.com
7a013339f8 Bug fixes, TRUNCATE, safer passwords on command line and connect timeout 2000-11-13 23:55:10 +02:00
sasha@mysql.sashanet.com
75cd25a579 fixed --skip-slave-thread bug
added PURGE MASTER LOGS TO and SHOW MASTER LOGS
fixed the output of SHOW MASTER STATUS
updated docs
2000-10-26 22:11:55 -06:00
monty@donna.mysql.com
00625e0f8f Added RESET command 2000-10-14 11:16:17 +03:00
sasha@mysql.sashanet.com
a08be4f963 fixed resolve problems 2000-09-16 20:04:06 -06:00
sasha@mysql.sashanet.com
037516b7a2 resolved conflicts 2000-09-16 18:31:30 -06:00
sasha@mysql.sashanet.com
af9e034dac Docs/manual.texi
Updates for BACKUP TABLE/RESTORE TABLE
    Added Replication FAQ
    Cleaned up TODO list removing a duplicate and features already implemented
    Updated changelog for 3.23.25
sql/sql_lex.h
    Re-added backup_dir to Lex which dispappeared while resovling conflicts
2000-09-16 18:23:30 -06:00
monty@donna.mysql.com
f2f515e5c2 Fix that REPAIR/ALTER TABLE use myisam_tempdir 2000-09-16 19:06:21 +03:00
sasha@mysql.sashanet.com
44bc3f9b0e merge of conflicts 2000-09-15 11:00:35 -06:00
sasha@mysql.sashanet.com
44455063e5 BACKUP TABLE TO 'directory'
RESTORE TABLE FROM 'directory'
log on slave when it connects to the master
2000-09-14 16:34:50 -06:00
monty@donna.mysql.com
b581f17be2 Fixes for MERGE TABLES and HEAP tables 2000-09-14 02:39:07 +03:00