Commit graph

913 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
1f20cf3b42 removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)
fixed some possible bugs
2002-10-30 13:18:52 +02:00
vva@genie.(none)
2196aae6b4 correct English in last message
delete ugly comma
2002-10-29 12:52:34 +04:00
vva@genie.(none)
9adf688be6 add help command on server side 2002-10-28 17:44:19 +04:00
bell@sanja.is.com.ua
7777d2b819 fixed union rexecution bug 2002-10-27 21:29:40 +02:00
bell@sanja.is.com.ua
c3127c7eb8 code cleanup
fixed subselect error handling bug
fixed subselect UNION ALL bug
fixed thd->lex.select restoring
explain UNION subselect bug
2002-10-26 20:18:37 +03:00
Sinisa@sinisa.nasamreza.org
6561faa10e 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
2002-10-16 21:17:57 +03:00
Sinisa@sinisa.nasamreza.org
0f663d346f Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-16 16:57:42 +03:00
Sinisa@sinisa.nasamreza.org
cd5ff6301e some fixes for SELECT INTO @vars .. 2002-10-16 16:55:08 +03:00
Sinisa@sinisa.nasamreza.org
96078b5fc5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-14 17:50:44 +03:00
monty@narttu.mysql.fi
3c7f6a9835 merge 2002-10-14 12:07:16 +03:00
bell@sanja.is.com.ua
d9f998164d fixed bug of multi-level EXPLAIN 2002-10-13 14:25:16 +03:00
Sinisa@sinisa.nasamreza.org
97990887cb SCRUM task 2002-10-11 21:49:10 +03:00
monty@narttu.mysql.fi
da2abaf887 Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03:00
bell@sanja.is.com.ua
199f667c19 merging 2002-10-04 14:15:59 +03:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
d69250a969 Fixes and code cleanups after merge with 4.0.3
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
bell@sanja.is.com.ua
46a22a5be7 new EXPLAIN
fixed bug in mysql-test/create-test-result
fixed bug in union-subselect engine
2002-09-26 23:08:22 +03:00
monty@mashka.mysql.fi
0281a6b160 Fixed searching after ssl directories.
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE
2002-09-05 16:17:08 +03:00
bell@sanja.is.com.ua
d9989c635e merged 2002-09-03 10:06:10 +03:00
bell@sanja.is.com.ua
b07aaeb295 subselect with union
new error handling
Item_ref bug fixed
2002-09-03 09:50:36 +03:00
monty@narttu.mysql.fi
7134ffec21 Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
monty@mashka.mysql.fi
bc035c71f1 Merge with 3.23.51
Fixed wrong usage of sprintf() in ha_innodb.cc
2002-07-25 22:46:28 +03:00
monty@mashka.mysql.fi
c702a1f8fd Removed wrong implementation of CUBE/ROLLUP
Fixed bugfix of INSERT ... SET db_name.table_name.column_name
Changed locking to external-locking
Fix client hangup for some invalid SQL queries.
2002-07-24 19:55:08 +03:00
monty@mashka.mysql.fi
fc7f7a2110 Small fixes after merge 2002-07-23 22:08:37 +03:00
monty@mashka.mysql.fi
4233d3a3d4 merge 2002-07-23 20:39:36 +03:00
monty@mashka.mysql.fi
dddc20d9d1 New SET syntax & system variables.
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
2002-07-23 18:31:22 +03:00
Sinisa@sinisa.nasamreza.org
ff2608099d Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-07-16 22:45:59 +03:00
Sinisa@sinisa.nasamreza.org
c5738005c4 Just making commit in order to stop getting erors.
Will do a push when it starts working ..
2002-07-16 22:42:53 +03:00
heikki@hundin.mysql.fi
7390d81f43 Many files:
Merge InnoDB-3.23.52b
2002-07-08 19:34:49 +03:00
bell@sanja.is.com.ua
984c84c234 cleanup 2002-07-05 08:15:57 +03:00
bar@gw.udmsearch.izhnet.ru
189d1dd630 SHOW CREATE DATABASE name;
Small fixes in database default charset code
2002-07-02 14:31:54 +05:00
bell@sanja.is.com.ua
ba30e55d4b typo fixed 2002-07-01 19:13:14 +03:00
bell@sanja.is.com.ua
0c6cb114e2 subselect clean up
fix after automerge
2002-07-01 19:06:24 +03:00
bell@sanja.is.com.ua
1a88542102 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-having-4.1
2002-07-01 14:17:59 +03:00
bell@sanja.is.com.ua
2cf620004e subselect in having clause
fixed bug in sum function in subselect
2002-07-01 14:14:51 +03:00
jani@rhols221.adsl.netsonic.fi
7cad1f9313 Added interface for first set of dynamic variables. 2002-06-28 19:30:09 +03:00
bar@gw.udmsearch.izhnet.ru
0dce493b69 ALTER DATABASE DEFAULT CHARACTER SET latin1; 2002-06-27 14:41:02 +05:00
venu@myvenu.com
5a33842a16 sql_error.cc, sql_prepare.cc:
new file

  Client-server protocol 4.1 changes - Server side:

 * Enhanced metadata information:
    - SHOW [COUNT(*)] ERRORS [LIMIT [offset,] rows]
    - SHOW [COUNT(*)] WARNING [LIMIT [offset,] rows]
    - SHOW TABLE TYPES
    - SHOW PRIVILEGES
    - SHOW COLUMN TYPES (Not fully implemented)

 * Prepared execution
 * Long data handling in pieces
 * And other misc changes
2002-06-12 14:13:12 -07:00
monty@mashka.mysql.fi
b8421d34ec Added the following new privleges:
SHOW DATABASES
CREATE TEMPORARY TABLE
LOCK TABLES
REPLICATION SLAVE & REPLICATION CLIENT
SUPER
EXECUTE

All scripts & documentation is updated for this change.
Added better error messages for global privileges
2002-06-12 15:04:18 +03:00
bar@gw.udmsearch.izhnet.ru
e8571e68bb New command: SHOW CHARACTER SET [LIKE 'wild'] 2002-06-11 17:40:06 +05:00
monty@mashka.mysql.fi
2aecdd1a91 Big code cleanup/review before 4.0.2 release.
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
2002-06-11 11:20:31 +03:00
bell@sanja.is.com.ua
289ac250af merged 2002-06-05 21:32:22 +03:00
monty@hundin.mysql.fi
f0b28da6f9 merge with 4.0 2002-06-03 12:59:31 +03:00
monty@hundin.mysql.fi
6e54cc492c Extension of .frm file (not yet ready for push) 2002-06-02 21:22:20 +03:00
bell@sanja.is.com.ua
fb2cd68b5d new subselect tests
LIMIT fixed
AVG & STD with subselect fixed
join_free fixed to be depended queries compatible
sort_default removed from SELECT_LEX
2002-06-01 23:35:36 +03:00
bell@sanja.is.com.ua
ab36838e9b Hiding internal pointers of SELECT_LEX structures 2002-05-27 20:52:54 +03:00
bell@sanja.is.com.ua
59602212d2 merge 2002-05-26 22:57:08 +03:00
bell@sanja.is.com.ua
35faf872aa added depended subselect processing 2002-05-26 22:50:32 +03:00
bar@gw.udmsearch.izhnet.ru
2b0a5e1f65 Charset related synax changes, now these things work in parser:
CREATE DATABASE name DEFAULT CHARACTER SET charsetname;
CREATE DATABASE name (fieldname CHAR(n) CHARACTER SET charsetname);
Changes affect query parsing ONLY and do not have other effect yet.
2002-05-20 17:10:50 +05:00
Sinisa@sinisa.nasamreza.org
d65671f778 Features made for Schlund plus several bug fixes.
Read a manual for more detail
2002-05-15 13:50:38 +03:00
bell@sanja.is.com.ua
4cb3760b44 total table list managment is changed 2002-05-09 15:23:57 +03:00
bell@sanja.is.com.ua
494184ff5f new SELECT_LEX structure 2002-05-07 00:04:16 +03:00
monty@hundin.mysql.fi
b5a145d872 merge 2002-04-13 15:34:39 +03:00
Sinisa@sinisa.nasamreza.org
22d4f87e69 Derived tables ! 2002-03-26 15:06:05 +02:00
sasha@mysql.sashanet.com
2e6b48afd3 replication updates and bugfixes. Still not perfect - there is some strange
memory corruption I can only repeat on one system.
2002-03-15 18:44:44 -07:00
sasha@mysql.sashanet.com
d993a1c0c4 slave start <options> to be able to do
slave start io_thread 
 slave start sql_thread
same for stop
2002-03-09 21:48:06 -07:00
monty@hundin.mysql.fi
e070e9a01f merge with 3.23.49 2002-02-14 18:58:24 +02:00
monty@hundin.mysql.fi
b21f2d084f Don't give warnings for empty statements with comments 2002-02-14 15:04:14 +02:00
sasha@mysql.sashanet.com
684f13ef4c Ugly merge! But I am not done yet - there are a number of things I need to fix
before I can push
2002-01-19 22:46:25 -07:00
sasha@mysql.sashanet.com
56129ce634 Here comes a nasty patch, although I am not ready to push it yet. I will
first pull, merge,test, and get it to work.

The main change is the new replication code - now we have two slave threads
SQL thread and I/O thread. I have also re-written a lot of the code to 
prepare for multi-master implementation. 

I also documented IO_CACHE quite extensively and to some extend, THD class.
2002-01-19 19:16:52 -07:00
Sinisa@sinisa.nasamreza.org
17d94da96d Accomodating Monty's changes from MULTI_DELETE to DELETE_MULTI 2001-12-26 17:55:24 +02:00
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
monty@donna.mysql.com
aa3580924b RENAME TABLE table_name TO new_table_name ; Faster Alloc
Small bug fixes
2000-08-21 03:00:52 +03:00
bk@work.mysql.com
f4c589ff6c Import changeset 2000-07-31 21:29:14 +02:00