Commit graph

267 commits

Author SHA1 Message Date
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
monty@mashka.mysql.fi
c9ae785bc3 Delete duplicate error message names 2003-11-18 17:28:00 +02:00
monty@mashka.mysql.fi
e5d75fb984 merge 2003-11-18 13:51:48 +02:00
monty@mashka.mysql.fi
cab1dc628c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
2003-11-18 13:47:27 +02:00
serg@serg.mylan
6d350964dc word substitution in error messages removed - can create problems for i18n 2003-11-18 10:23:49 +01: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
serg@serg.mylan
c752d2cad0 removed one more hack that - as usual - almost always worked
(but broke permission handling for *some* IP's after we started to compare in utf8)
Bug #1636
2003-10-24 23:27:21 +02:00
pem@mysql.com
337238b78a Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
monty@narttu.mysql.fi
d37a5c4dd7 Indentation cleanups
Remove wait_if_global_read_lock on commit as this can cause deadlocks
2003-10-08 21:50:05 +03:00
heikki@hundin.mysql.fi
6112853cda Many files:
Multiple tablespaces for InnoDB
sql_table.cc:
  Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql_update.cc, sql_select.cc, my_base.h:
  More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
2003-10-07 17:28:59 +03:00
hf@deer.(none)
9612ca5f58 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-29 12:27:39 +05:00
guilhem@gbichot2
30c55ea464 A fix of the fix for BUG#1209 (was: SELECT DATABASE() still shows dropped database).
Don't free the client's selected db (thd->db) when it has been DROPped,
if this is a slave thread; the x_free() was causing a lot
of various bugs in rpl_loaddata_rule_m (garbage characters, segfault, hangs in
other threads).
A small post-merge fix (rli->inside_transaction exists in 4.0 only).
2003-09-26 22:56:13 +02:00
hf@deer.(none)
ba8fa76fa2 SCRUM:
WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server
2003-09-26 15:33:13 +05:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
bar@bar.mysql.r18.ru
1d20c09ce9 New SQL variables "collation_server" and "collation_database" 2003-09-15 16:31:04 +05:00
ram@mysql.r18.ru
d0acda900c Fix for the fix for the bug #1209: SELECT DATABASE(). 2003-09-10 11:19:01 +05:00
ram@mysql.r18.ru
44d6102f81 Fix for the bug #1209: SELECT DATABASE(). 2003-09-08 17:30:53 +05:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
bar@bar.mysql.r18.ru
c2a7768b56 A new separate error message: Unknown collation 'blablabla' 2003-07-29 17:12:14 +05:00
serg@serg.mylan
2cac8f0768 now GRANT db.* ... compares patterns correctly to prevent privilege escalation 2003-07-22 22:21:23 +02:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02: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
6aa8929cf3 After merge fixes
Added initialization of all important global variables
2003-05-21 21:39:58 +03:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
jani@hynda.(none)
447bebfd77 Fixed a bug in DROP DATABASE when database had a RAID type table.
Bug ID 381.
2003-05-13 22:28:34 +03: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
pem@mysql.com
386b0b91b2 Merged 4.1 into 5.0. 2003-04-16 23:23:23 +02:00
bar@bar.mysql.r18.ru
2cdc21d24a SET NAMES doesn't start recoding
SET CHARACTER SET does
2003-04-08 11:33:54 +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
guilhem@mysql.com
654410a3d3 Deprecated the update log (Sprint task #792). Now --log-update
just turns on --log-bin and prints a warning. SQL_LOG_UPDATE
is handled in two ways (see mysqld.cc for comments).
2003-04-02 00:15:20 +02:00
bar@bar.mysql.r18.ru
8103c4c537 CONVERT class was removed 2003-03-18 17:01:32 +04:00
bar@bar.mysql.r18.ru
caf31a0790 Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
bar@bar.mysql.r18.ru
59f6e35cf6 sql_parse.cc, sql_db.cc:
less system_charset_info
2003-03-15 17:24:21 +04:00
bar@bar.mysql.r18.ru
7f21fb31b2 DATABASE character set is never blank anymore 2003-02-21 18:24:41 +04:00
monty@mashka.mysql.fi
25de9c19b2 After merge fixes & remove compiler warnings
Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files
2003-02-07 15:47:24 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
9e3fd09305 merge with 3.23.56 to get patches for --lower-case-table-names and
proper handling of SUM() in some functions.
2003-01-29 19:22:22 +02:00
monty@mashka.mysql.fi
d88eb71f34 Fixed handling of lower_case_table_names in SHOW TABLE STATUS, mysql_list_fields() and mysql_table_dump().
This fixes some Errcode 13 errors on Windows when deleting tables.
2003-01-29 18:56:34 +02:00
monty@mashka.mysql.fi
183df2da7f Fixes cases where thd->query was not protected.
This fixes a problem with SHOW PROCESSLIST
2003-01-19 02:00:26 +02:00
monty@mashka.mysql.fi
fb4572a498 Merge with 3.23 to get bug fix for SHOW PROCESSLIST + running thread 2003-01-19 01:31:43 +02:00
monty@mashka.mysql.fi
dd4d4cc8b5 Only set thd->query to 0 if LOCK_thread_count is hold
This fixes a possible core dump problem in SHOW PROCESSLIST
2003-01-18 23:38:55 +02:00
bar@bar.mysql.r18.ru
88e9a0bf2b do not call get_charset_by_name() with string "DEFAULT" 2003-01-09 16:38:23 +04:00
bar@bar.mysql.r18.ru
a89df5a096 Separating CHARSET and COLLATION terms 2003-01-09 15:37:59 +04:00
monty@mashka.mysql.fi
1f6ecc0cd3 Changed mysql-test to print warnings for not existing table to DROP TABLE
Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print()
2003-01-06 01:48:59 +02:00
monty@mashka.mysql.fi
6d6f051178 Added support for DROP TEMPORARY TABLE
Removed mysql_warnings() API function.
Post merge fixes.
2003-01-04 15:37:20 +02:00
monty@mashka.mysql.fi
446b9c0768 Moved lower_case_table_name check to right place. 2002-12-21 10:57:53 +02:00
monty@mashka.mysql.fi
f03bbd3fe2 Merge with 3.23:
Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE
2002-12-21 10:56:40 +02:00
bar@bar.mysql.r18.ru
6ac401b550 thd_charset has been moved to variables structure 2002-12-19 09:38:28 +04:00
Sinisa@sinisa.nasamreza.org
8ebc983442 fix for a bug in CASE ...WHEN ... 2002-12-16 22:16:57 +02:00
Sinisa@sinisa.nasamreza.org
c2f3ff6630 Fix for a bug with mysql_select_db() on manually created
database and lower case table names.
2002-12-14 15:32:36 +02:00