Commit graph

483 commits

Author SHA1 Message Date
igor@rurik.mysql.com
15e70c5480 sql_delete.cc, sql_update.cc, sql_class.h:
Simplification of the previous fix for multi-update/delete.
2003-12-12 13:14:59 -08:00
igor@rurik.mysql.com
54628879fc Many files:
Fixed a bug causing a crash for multi-update/multi-delete
  with impossible where (bug #1860).
2003-12-11 14:55:48 -08:00
konstantin@oak.local
a942f55716 unused variable max_prep_stmt_count removed 2003-12-05 01:55:57 +03:00
guilhem@mysql.com
dd2303ce07 - Fix for BUG#1858 "SQL-Thread stops working when using optimize table":
we change THD::system_thread from a 'bool' to a bitmap to be able to
distinguish between delayed-insert threads and slave threads.
- Fix for BUG#1701 "Update from multiple tables" (one line in sql_parse.cc,
plus a new test rpl_multi_update.test). That's just adding an initialization.
2003-12-04 22:42:18 +01:00
konstantin@oak.local
bab592c3c0 comment to user-level lock added 2003-12-04 19:12:01 +03:00
monty@mysql.com
ede8169d24 Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
konstantin@oak.local
7c2d0eea45 fix for bug #1946:
"You can always mysql_real_query a query with placeholders 
after mysql_prepare()"
2003-11-25 17:41:12 +03:00
bell@sanja.is.com.ua
7191ea0ae3 Fixed UNION fields type/length detecting 2003-11-23 02:01:15 +02:00
serg@serg.mylan
4be8179135 do not log certain commans in the slow log 2003-11-14 13:50:19 +01:00
monty@narttu.mysql.fi
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02:00
monty@narttu.mysql.fi
6b79cd5c23 Merge 2003-11-03 22:48:03 +02:00
monty@narttu.mysql.fi
a444a3449f Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
2003-11-03 14:01:59 +02:00
konstantin@oak.local
d4cc4a3ca1 old_total_warn_count is not used
and was removed from THD
2003-10-31 15:15:13 +03:00
konstantin@mysql.com
ca34cf30bd comments about designation of thd->where and
thd->proc_info added
2003-10-30 21:30:20 +03:00
gluh@gluh.mysql.r18.ru
4bed4abb62 Merge commit 2003-10-20 13:45:28 +05:00
gluh@gluh.mysql.r18.ru
62b0b8b800 Scrum task 835 - text-to-datetime conversion function 2003-10-20 13:24:18 +05:00
monty@mashka.mysql.fi
e87c9f5ff8 merge with 4.0 2003-10-16 03:08:40 +03:00
monty@mashka.mysql.fi
0d34e50f39 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-10-15 22:52:31 +03:00
monty@mashka.mysql.fi
84d9d98078 Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
2003-10-15 21:41:13 +03:00
monty@mashka.mysql.fi
35c09b8082 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-10-15 16:23:01 +03:00
monty@mashka.mysql.fi
461d1627b3 merge with 4.0 for more memory allocation variables. 2003-10-13 15:50:30 +03:00
heikki@hundin.mysql.fi
5ec87f2449 Many files:
ALTER TABLE ... DISCARD/IMPORT TABLESPACE
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
2003-10-13 11:20:19 +03:00
monty@mashka.mysql.fi
c60a75e9ba Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL) 2003-10-11 23:26:39 +03:00
monty@mashka.mysql.fi
c95d142f8f Add new user variables for tuning memory usage:
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
2003-10-11 22:00:24 +03:00
monty@narttu.mysql.fi
9e57c12b5a Fixed bug in error handling of CREATE ... SELECT
More tests cases
After merge fixes
2003-10-08 18:53:31 +03:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
serg@serg.mylan
b58098c3b9 bug #1434 (and related issues) 2003-10-06 20:02:27 +02:00
bell@laptop.sanja.is.com.ua
e1b53fdd42 Merge 2003-10-06 20:55:06 +03:00
hf@deer.(none)
a5f9c695df Fix for #1487 2003-10-06 16:32:38 +05:00
monty@mishka.mysql.fi
989ca397b2 Optimized code for setting user variables with := and fixed some bugs in old code (Bug #1194)
Use forced close of socket to make mysqld shutdown faster when used under valgrind
2003-10-03 00:40:27 +03:00
hf@deer.(none)
ddbca4176d SCRUM:
prepared statements in embedded library
2003-09-17 20:48:53 +05:00
hf@deer.(none)
6dd77126b4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-16 16:07:00 +05:00
hf@deer.(none)
bf017a2eb0 SCRUM
Prepared statements in embedded server
Several changes in library code with two goals:
to make mysql_prepare_stmt working in embedded server
to get rid of #define mysql_interface_func mysql->methods->interface_func
in user's interface
2003-09-16 16:06:25 +05:00
bar@bar.mysql.r18.ru
1d20c09ce9 New SQL variables "collation_server" and "collation_database" 2003-09-15 16:31:04 +05:00
monty@narttu.mysql.fi
4b3b4b9250 merge 2003-09-03 19:53:08 +03:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were
lost.
2003-09-03 14:12:10 +04:00
kostja@oak.local
dc6366035d comment left after merge was moved to correct
place
2003-08-29 17:14:10 +04:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
27e331c30a Revert change of lower-case-table handling as this breaks how alias works.
Changes like this should be done to 4.1, not to a stable release
2003-08-29 04:17:30 +03:00
monty@narttu.mysql.fi
a2a1e97226 Portability fixes 2003-08-28 22:18:02 +03:00
guilhem@mysql.com
6c9cff9534 Clearer states in SHOW PROCESSLIST for replication threads.
For example the Binlog_dump thread (on the master) sometimes showed "Slave:".
And there were confusing messages where "binlog" was employed instead
of "relay log".
2003-08-25 14:13:58 +02:00
bell@laptop.sanja.is.com.ua
f77f46d8eb Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-08-23 13:33:02 +03:00
Sinisa@sinisa.nasamreza.org
ced195f8a9 After merge fixes 2003-08-22 18:43:46 +03:00
guilhem@mysql.com
759a3c1e3c 2 minor edits, plus
fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning"
and
fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog".
Now we don't always write the non-trans update immediately to the binlog;
if there is something in the binlog cache we write it to the binlog cache
(because the non-trans update could depend on a trans table which was modified
earlier in the transaction); then in case of ROLLBACK, we write the binlog
cache to the binlog, wrapped with BEGIN/ROLLBACK.
This guarantees that the slave does the same updates.
For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it
to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated,
we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction
terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog
(because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO
SAVEPOINT in the binlog.

Apart from this rare case of updates of mixed table types in transaction, the
usual way is still clear the binlog cache at ROLLBACK, or chop it at
ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which
is fine).
Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".
2003-08-22 15:39:24 +02:00
bell@laptop.sanja.is.com.ua
811ed77e5f quick fix for found row counter
code cleunup
2003-08-20 21:57:37 +03:00
dlenev@mysql.com
bb96092202 Fix for BUG#1086. Now we don't preserve event's log_pos through
log-slave-updates since this causes unexpected values in 
Exec_master_log_pos in A->B->C replication setup, synchronization
 problems in master_pos_wait()... 
Still this brokes some functionality in sql/repl_failsafe.cc 
(but this file is not used now)
2003-08-20 03:38:31 +04:00
monty@mashka.mysql.fi
4f7512160b After merge fixes
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
bell@sanja.is.com.ua
6ac8e9b93c optimisation of independent ALL/ANY with aggregate function (WL#1115) (SCRUM) 2003-08-12 12:38:03 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
bell@sanja.is.com.ua
ddd3ee8b27 rewritten test using loop (BUG#930)
removed unused field (now it is in variables)
2003-08-08 23:27:22 +03:00
Sinisa@sinisa.nasamreza.org
e08a00bd02 Fuller implementation of lower case table names.
Bug record #828
2003-07-23 17:36:56 +03:00
kostja@oak.local
715f8747d4 few compile-time bugs fixed 2003-07-18 18:57:21 +04:00
kostja@oak.local
09e53b0169 Style fixes, comments for 4.1.1 authorization
Now special 1-byte packet is used for request of old password
Fixed bug with --skip-grant-tables and acl_getroot
2003-07-18 18:25:54 +04:00
monty@narttu.mysql.fi
df7c1e8165 Better fix for bug #791: At binlog rotation, INSERTs may not find their way into the binlog 2003-07-14 14:59:26 +03:00
monty@mashka.mysql.fi
e1aa90a9bf Safety and speedup fixes:
Changed is_open() to work as before.
Added back inited argument to LOG
2003-07-14 10:12:05 +03:00
guilhem@mysql.com
b7e1fe5ad1 Member no_rotate in MYSQL_LOG was always 0, I delete it. 2003-07-12 15:48:26 +02:00
guilhem@mysql.com
34c8918915 removed 2 small useless if(). 2003-07-12 15:06:40 +02:00
guilhem@mysql.com
fbebac9a48 Fix for BUG#791:
a safer way of initing the mutexes in MYSQL_LOG.
is_open() is now always thread-safe.
See each file for details.
2003-07-11 14:26:44 +02:00
kostja@oak.local
0f28677af6 Merge oak.local:/home/kostja/mysql/mysql-4.1-root
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-08 12:03:46 +04:00
kostja@oak.local
a232225b69 Preliminary support for options --secure-auth,
--old-passwords
Support for option --old-protocol was removed.
Some test performed.
Tests for SSL and replication are pending.
More strict following to specification for --old-passwords
is in the TODO.
2003-07-08 02:36:14 +04:00
guilhem@mysql.com
9c73d91d54 WL#912 (more user control on relay logs):
FLUSH LOGS now rotates relay logs,
and a new variable max_relay_log_size.
Plus a very small bit of code cleaning.
2003-07-06 17:59:54 +02:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1)
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
2003-07-01 23:40:59 +04:00
monty@mashka.mysql.fi
baf9baba2a merge 2003-07-01 15:57:45 +03:00
monty@mashka.mysql.fi
6bc7b3a6be LAST_INSERT_ID() should not be set if we couldn't generate an auto_increment id. 2003-06-30 13:28:36 +03:00
monty@mashka.mysql.fi
34919a03c4 Added thread variable max_seeks_for_key
Change optimizer to prefer key lookups before table scan
Change table scans to be done after tables with constrains on scanned table
2003-06-27 03:04:54 +03:00
bell@sanja.is.com.ua
2d120d32fa cond_count moved to SELECT_LEX_NODE
fixed BUG #726
2003-06-26 11:09:11 +03:00
monty@mashka.mysql.fi
5f556f11e0 Fixed memory allocation in Unique to not allocate too much memory 2003-06-26 07:56:55 +03:00
bar@bar.mysql.r18.ru
7371150f2d New class DTCollation (SQL:2003 calls it "declared type collation")
It's a combination of collation and its derivation (precedence order)
2003-06-24 15:11:07 +05:00
gluh@gluh.mysql.r18.ru
289d375f50 SCRUM
Task ID 894:
Backport default_week_format variable to 4.0
2003-06-19 14:02:19 +05:00
igor@rurik.mysql.com
a0f3dcc3c8 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-06-12 06:22:35 -07:00
igor@rurik.mysql.com
f547f2769f Many files:
New feature: preload indexes into key cache.
mi_preload.c:
  new file
Many files:
  Added preload statement.
2003-06-12 04:29:02 -07:00
bar@bar.mysql.r18.ru
81f0fb6e18 character_set_server is now updatable
character_set_database was added
Code optimization: reuse more code for all character sets variables
2003-05-30 13:03:56 +05:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
bar@bar.mysql.r18.ru
8d52377a5c Some SHOW VARIABLES have been renamed:
collation_client  -> character_set_client
collation_results -> character_set_results
character_set     -> character_set_server

SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
2003-05-21 17:44:12 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
serg@serg.mylan
12e53eb9e1 parallel-repair available in mysqld 2003-05-04 18:43:37 +02:00
monty@narttu.mysql.fi
9e4f394e59 Fix reference to not initialized memory
Changed handing of priv_host to fix bug in FLUSH PRIVILEGES
2003-04-30 10:15:09 +03:00
venu@myvenu.com
eb137c063c Support of warnings for all DML statements (Insert, Update and Alter)
Fix LOAD DATA INFILE warnings to have a better meanigful messages
Fix to make the mysql command line to automatically show the warnings count for all basic commands
2003-04-30 00:02:28 -07:00
serg@serg.mylan
d13e4fc532 CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is) 2003-04-29 00:15:18 +02:00
Sinisa@sinisa.nasamreza.org
5dc8dbea5f merge fix 2003-04-26 15:26:28 +03:00
Sinisa@sinisa.nasamreza.org
3ca1a152eb Making a better fix for double released pointers and safe
TMP_TABLE_PARAM.
This involved moving things around in include files.
All tests, including the ones with Valgrind passed.
2003-04-26 15:12:14 +03:00
guilhem@mysql.com
66e97ba570 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-04-24 17:42:07 +02:00
igor@hundin.mysql.fi
517a287ec9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/igor/dev/mysql-4.1
2003-04-24 18:42:06 +03:00
guilhem@mysql.com
b03ec0d7db Replication: new code to not modify in-memory log positions until the COMMIT
is executed, even if the transaction spans on >=2 relay logs (bug #53).
New variable relay_log_purge =0|1
New test to verify bug #53
2003-04-24 15:29:25 +02:00
igor@hundin.mysql.fi
80615fade2 Many files:
Added the MAX_LENGTH_FOR_SORT_DATA option
filesort.cc:
  Added the MAX_LENGTH_FOR_SORT_DATA option
2003-04-24 14:33:33 +03:00
bar@bar.mysql.r18.ru
6d5f527afd Variable names have been renamed:
client_collation -> collation_client
  result_collation -> collation_results
  connection_collation -> collation_connection
2003-04-23 18:19:22 +05:00
bar@bar.mysql.r18.ru
a3d08eaaf9 I renamed system variable literal_collation into connection_collation 2003-04-22 12:27:35 +05:00
venu@myvenu.com
24d5cd37d2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-04-12 20:07:52 -07:00
bar@bar.mysql.r18.ru
8cf9ada977 Use of CHARSWT_INFO *result_collation
instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests
2003-04-08 14:38:17 +05:00
bar@bar.mysql.r18.ru
e165845d39 sys_var_collation is now abstract class
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
2003-04-07 16:10:27 +05:00
bar@bar.mysql.r18.ru
e0caf3f225 New methods to store strings with "convert to" argimument 2003-04-07 13:52:48 +05:00
venu@myvenu.com
06f075888e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-04-04 13:25:53 -05:00
venu@myvenu.com
8eeecd9c86 Fix to support update + bianry logs with prepared statements (Dynamic query) 2003-04-04 12:33:17 -05:00
monty@narttu.mysql.fi
4a4838059f Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT) 2003-04-03 21:19:14 +03:00
wax@kishkin.ru
8c0de640e3 resolve new updates group_concat 2003-04-02 19:16:19 +06:00
wax@kishkin.ru
77eb790ec5 SCRUM
correct sql_alloc, ORDER BY and NULL value in group_concat
add comments
move test msg_arg
add test on NULL
2003-04-02 17:55:53 +06:00
wax@kishkin.ru
12f1cb55b5 This is full commit of group_concat with support subselects 2003-03-18 04:07:40 +05:00
Sinisa@sinisa.nasamreza.org
77eb6e5063 Better fix for "Halloween" effect ... 2003-03-12 17:11:48 +02:00
Sinisa@sinisa.nasamreza.org
40c744a3ac A bug fix for multi-table updates with InnoDB storage engine 2003-03-11 19:40:49 +02:00
serg@serg.mysql.com
6897b00216 --new option and local variable to optionally turn on
"very new functions" - for now 4.1-compatible TIMESTAMT format
2003-03-05 18:43:56 +01:00
bell@sanja.is.com.ua
47b16dae7a posreview changing (SCRUM)
increased compatibility
postmerge changing
2003-02-27 20:31:54 +02:00
bell@sanja.is.com.ua
352a338147 client port number added to SHOW PROCESSLIST (SCRUM?) 2003-02-17 22:07:26 +02:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
2003-02-12 21:55:37 +02:00
monty@mashka.mysql.fi
48558055ed Move tmp_table_used to THD
Optimize depending sub querys
Remove valgrind warnings
2003-02-10 17:59:16 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
bell@sanja.is.com.ua
291f8a225a Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
2003-02-02 17:39:27 +02:00
gluh@gluh.mysql.r18.ru
8d3c43880d conflicts resolving 2003-01-31 09:43:53 +04:00
bell@sanja.is.com.ua
e294751c41 fixed bug in determinating uncacheable queries
new fatal_error interface to assign is_fatal_error and ne.report_error
commant about Item_row
2003-01-30 22:15:44 +02:00
gluh@gluh.mysql.r18.ru
57a805de6c 'Replicate user variables' task 2003-01-30 21:39:54 +04:00
bell@sanja.is.com.ua
2f04313db5 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
2003-01-30 18:19:28 +02:00
bell@sanja.is.com.ua
5ed5dac01b cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation 2003-01-30 14:35:07 +02:00
venu@myvenu.com
7e09f1db4b Fix 'n' concurrent prepared executions 2003-01-30 00:38:11 -08:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +02:00
bell@sanja.is.com.ua
760e22f0bb after merge fix of 577 task (SCRUM, pre commit to be able to merge with static tables optimization fix)
fixed derived tables with subselect inside
2003-01-26 21:30:35 +02:00
bell@sanja.is.com.ua
44d8a8cdab merging 2003-01-25 13:19:46 +02:00
bell@sanja.is.com.ua
d56e23f64e fixed subselects with temporary tables (SCRUM)
fixed memory leacks
2003-01-25 02:25:52 +02:00
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00
hf@deer.mysql.r18.ru
1f6b615677 SCRUM
embedded-related changes
2003-01-20 18:47:25 +04:00
monty@mashka.mysql.fi
8acc22296c Change client_flag to unsigned long (16 -> 32 bits) to handle more options.
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows
2003-01-18 16:39:21 +02:00
jani@rhols221.adsl.netsonic.fi
94cc7d751e Added support sql_mode, which can be used to produce various outputs
of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
be compatible with various databases, including earlier versions of
MySQL
.
2003-01-16 02:04:50 +02:00
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
monty@mashka.mysql.fi
22aaac013b Fixed that derived tables are properly droped 2003-01-07 11:45:06 +02:00
monty@mashka.mysql.fi
803dff1002 Merge with 4.0.8 2003-01-06 02:04:52 +02:00
monty@mashka.mysql.fi
f9772317ee merge 2003-01-04 15:40:55 +02:00
monty@mashka.mysql.fi
6d5ad61a11 Added support for max_allowed_packet in option files read by mysql_option()
Extended max_allowed_packet for clients to 1G
Fixed bug in sending compressed rows >= 16M
Fix bug in skiping too long packets from clients.
Added checking of wrong command number sent by client.
2003-01-04 15:17:16 +02:00
monty@mashka.mysql.fi
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02:00
bell@sanja.is.com.ua
2c6fca2755 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-12-31 12:48:00 +02:00
vva@eagle.mysql.r18.ru
6ab60981e8 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1
2002-12-30 01:59:08 +04:00
vva@eagle.mysql.r18.ru
1dcca480e8 processing thread specific queries 2002-12-30 01:46:48 +04:00
monty@mashka.mysql.fi
b5aa9ae0c7 Changed thd variables max_join_size and select_limit to type ha_rows.
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
2002-12-20 14:58:27 +02:00
bell@sanja.is.com.ua
b63f230346 row IN subselects (SCRUM) 2002-12-19 21:15:09 +02:00
hf@deer.mysql.r18.ru
8a205e4ba3 Merge 2002-12-19 14:57:24 +04:00
bar@bar.mysql.r18.ru
6ac401b550 thd_charset has been moved to variables structure 2002-12-19 09:38:28 +04:00
hf@deer.mysql.r18.ru
c1e69d2cca Merging 2002-12-16 18:58:55 +04:00
hf@deer.mysql.r18.ru
e3b3b68307 Big purge about embedded library (scrum) 2002-12-16 17:33:29 +04:00
hf@deer.mysql.r18.ru
3517febe97 Resolving merge conflicts 2002-12-12 12:49:56 +04:00
monty@mashka.mysql.fi
d3eb993a27 rename of net_pkg.cc to protocol.cc
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
2002-12-11 09:17:51 +02:00
venu@myvenu.com
9100688c17 item.cc:
Fix for save_in_field to take extra bool argumnet (4.0 merge compatibility)
2002-12-06 23:39:11 -08:00
monty@mashka.mysql.fi
f1d35b29bc merge fix 2002-12-06 21:15:05 +02:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
peter@mysql.com
5fa02daa69 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-12-04 16:26:29 +03:00
serg@serg.mysql.com
2320923a7b INSERT ... ON DUPLICATE KEY UPDATE ... 2002-12-02 20:38:00 +01:00
peter@mysql.com
a24258375a SCRUM: Montymise code
fix mysql_change_user() for old clients
2002-11-30 20:58:53 +03:00
peter@mysql.com
08f51eaedd Merging.... 2002-11-29 22:03:14 +03:00
monty@mashka.mysql.fi
6603d75213 New multi-table-update code
New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1  (We should use TRUE and FALSE)
2002-11-29 16:40:18 +02:00
hf@genie.(none)
5e8b27c0d3 Pull conflicts resolutions 2002-11-29 12:35:48 +04:00
pem@mysql.com
55a3bd911d Merge 2002-11-25 15:32:44 +01:00
peter@mysql.com
d2aa1fb8e7 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-11-24 17:35:24 +03:00
peter@mysql.com
925155cf5a Merge.... 2002-11-24 17:26:26 +03:00
peter@mysql.com
35ccfd0b42 SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit
done for merge with newer version of code.
2002-11-24 17:07:53 +03:00
venu@myvenu.com
a9aebd433d protocol merge 2002-11-22 10:20:14 -08:00
venu@myvenu.com
b74c43f475 protocol fixups 2002-11-22 10:04:42 -08:00
pem@mysql.com
ae2192ed53 Moved safe_to_cache_query from thd to lex.
This is required for prepared statements and stored procedures.
2002-11-22 14:50:53 +01:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
monty@mashka.mysql.fi
305d16a7cb Automatic conversion from CHAR(length) to BLOB when length > 255
New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0
2002-11-21 02:07:14 +02:00
monty@mashka.mysql.fi
1a96948e81 Small improvement to alloc_root
Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
2002-11-16 20:19:10 +02:00
bell@sanja.is.com.ua
979f27ee4a fixed bug in cyclic reference refinition 2002-11-14 09:43:24 +02:00
bell@sanja.is.com.ua
41d9311621 fixed cyclic reference bug 2002-11-14 00:26:18 +02:00
bell@sanja.is.com.ua
62e4aca91b fixed select_lex & max_join_size parameters with BIG_TABLES 2002-11-11 17:28:58 +02:00
hf@genie.(none)
25bd1e9a37 Merged by hands 2002-11-07 12:20:08 +04:00
monty@hundin.mysql.fi
65badfff1a Put temporary files in binlog cache when using BEGIN/COMMIT
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE
2002-11-07 04:02:37 +02:00
hf@genie.(none)
3a7c12b22a Libmysqld improvements 2002-11-06 14:42:44 +04:00
bell@sanja.is.com.ua
c94b39134f Fixed error handling bug 2002-11-04 00:56:25 +02:00
bar@bar.mysql.r18.ru
fef10d9bb1 Preparation to thread specific default charset 2002-10-30 13:05:27 +04:00
serg@serg.mysql.com
1a1cafce63 merged 2002-10-25 22:07:04 +00:00
nick@mysql.com
6c22ca4454 Added Rand_log_event 2002-10-24 16:48:34 -06:00
nick@mysql.com
d749b832b2 Added Rand_log_event 2002-10-22 15:17:17 -06:00
hf@genie.(none)
8a88791fb1 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
2002-10-18 15:55:21 +05:00
Sinisa@sinisa.nasamreza.org
cd5ff6301e some fixes for SELECT INTO @vars .. 2002-10-16 16:55:08 +03:00
Sinisa@sinisa.nasamreza.org
97990887cb SCRUM task 2002-10-11 21:49:10 +03:00
hf@genie.(none)
55866b0615 Huge pull 2002-10-07 15:38:07 +05: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
a748b35ddd merge with work 2002-10-02 13:45:16 +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
bar@bar.mysql.r18.ru
1af778c05b User variables didn't store charset, so this didn't work
as expected and returned default charset instead:
SET @x = _koi8_ru'test';
SELECT CHARSET(@x);
2002-10-01 17:23:28 +05: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
bell@sanja.is.com.ua
96ebe3816f new function for innodb
windows case insensitive tables name work around
2002-09-19 10:36:19 +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
monty@mashka.mysql.fi
a01a0840dc Some trivial optimzations
Check if AND/OR expression can be NULL; Fixed bug in GROUP BY and-or-expression where expression could be NULL
Bug fix for SHOW OPEN TABLES when user didn't have privilege to access all open tables.
Better fix for ALTER TABLE on BDB tables.
2002-09-03 15:44:25 +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
d49bf802ec Removed wrong mutex lock (hangup in kill on HPUX)
all free_defaults() on exit in mysql.cc;  Should fix problem with SSL
2002-08-24 02:08:10 +03:00
monty@hundin.mysql.fi
f36f9d00ff Fixed bug in wait_for_update() that I had introduced.
Changed option variables to my_bool (to avoid bugs in my_getopt())
Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early.
Changed usage of LOCK_thread_count -> LOCK_status for statistics variables
2002-08-22 16:50:58 +03:00
monty@hundin.mysql.fi
ae1ec6e16a Changed SQL variable delay_key_write to an enum
able delay_key_write as default (as it was in 4.0.2)
2002-08-13 02:18:39 +03:00
monty@hundin.mysql.fi
8832927d5c Added nety_retry_count as a changeable variable
Make safe_mysqld a symlink to mysqld_safe in binary distribution
Fixed problem with CTRL-C when using mysqld --bootstrap
2002-08-08 20:49:06 +03:00
monty@mashka.mysql.fi
2c4fa340cc Lots of code fixes to the replication code (especially the binary logging and index log file handling)
Fixed bugs in my last changeset that made MySQL hard to compile.
Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
Extended my_chsize() to allow one to specify a filler character.
Extend vio_blocking to return the old state (This made some usage of this function much simpler)
Added testing for some functions that they caller have got the required mutexes before calling the function.
Use setrlimit() to ensure that we can write core file if one specifies --core-file.
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
Added variables foreign_key_checks & unique_checks.
Less logging from replication code (if not started with --log-warnings)
Changed that SHOW INNODB STATUS requre the SUPER privilege
More DBUG statements and a lot of new code comments
2002-08-08 03:12:02 +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
hf@bisonxp.(none)
d8c94e942b Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bisonxp.(none):/home/hf/work/mysql-4.1
2002-07-09 10:42:24 +05: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
97d9936f5d Database default charset now works:
CREATE DATABASE dbname DEFAULT CHARACTERSET=latin1
2002-06-24 21:50:08 +05:00
bell@sanja.is.com.ua
0c808b431c merged 2002-06-19 17:55:51 +03:00
bell@sanja.is.com.ua
f974c735cf EXISTS type of subselect
more correct parameters in result creation script
2002-06-19 17:52:44 +03:00
hf@bison.(none)
cc6407f1a5 Resolving of conflicts from pull 2002-06-17 17:14:20 +05:00
hf@bison.(none)
ede6ba5621 Removing net emulation out of embedded library 2002-06-17 16:24:51 +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
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
bd7e31bc53 temporary preventing subselect in HAVING clause 2002-06-07 21:26:43 +03:00