mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15131 commits 2784 branches 343 tags 1.6 GiB
Commit graph

175 commits

Author SHA1 Message Date
serg@serg.mylan
6e17f4f20d fixes to Bitmap class 2003-10-24 22:44:48 +02:00
serg@serg.mylan
8cc3951c8f key_map with more that 64 bits width 2003-10-11 13:06:55 +02:00
monty@mashka.mysql.fi
45aa92c574 After merge fixes. 
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
 2003-09-11 19:06:23 +03:00
vva@eagle.mysql.r18.ru
40757beb81 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
 2003-08-27 19:15:27 -04:00
vva@eagle.mysql.r18.ru
cde2b50514 fixed bug #910 (right type of ifnull function) 2003-08-27 19:11:54 -04:00
bar@bar.mysql.r18.ru
786af34146 Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a 
The above query created a field of koi8r charset, not cp1251

Change:
CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
Length now means character length, not byte length.
The above creates a field that guarantees can store a multibyte value
1 character long. For utf8 the above creates a field that can store
3 bytes.
 2003-08-11 18:18:34 +05:00
serg@serg.mylan
7336f9cdd2 bugs #701 and #783 - old .frm files were read in incorrectly in 4.1 (each field was assigned a charset, BLOBs were converted to TEXT) 2003-07-28 16:58:52 +02:00
wax@kishkin.ru
492813d966 Merge kishkin.ru:/home/wax/mysql-4.1 into kishkin.ru:/home/wax/mysql-4g 2003-06-26 05:06:49 +06:00
hf@deer.(none)
3007290f83 Another bugfix for #615 
Looks a bit nicer than previous one
 2003-06-24 10:53:21 +05:00
serg@serg.mylan
002d842012 bug #251 - destroyed object reused - fixed 2003-06-13 23:00:04 +02:00
serg@serg.mylan
8b38d261a3 protect deleted objects from reusal with safemalloc technique 2003-06-11 13:32:50 +02:00
wax@kishkin.ru
61f7821323 Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4g 2003-06-03 17:07:46 +06:00
wax@kishkin.ru
a2e9bbf2eb URGENT 
SCRUM
BUG
correct wrong code in group_concat
 2003-05-31 15:44:19 +06:00
monty@narttu.mysql.fi
5da35e0488 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-05-26 20:59:40 +03:00
monty@narttu.mysql.fi
999cb4e07c Portability fix 2003-05-26 20:59:09 +03:00
monty@mashka.mysql.fi
bd4b9522e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1-narttu
 2003-05-26 19:03:25 +03:00
monty@mashka.mysql.fi
68a159b1fa New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set 2003-05-26 19:01:20 +03:00
bar@bar.mysql.r18.ru
8192d169a2 CHARSET_INFO structure reorganization for easier maintainance 2003-05-23 17:45:52 +05:00
bar@bar.mysql.r18.ru
a238efaa63 SHOW FIELDS changes, more SQL99 INFORMATION_SCHEMA.COLUMNS compatibility: 
Character set is not displayed in "Type" column anymore
In "Collation" column NULL instead of BINARY is now displayd for for non-character data types
 2003-05-23 13:10:25 +05:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
venu@myvenu.com
39cbb547d4 Resolve merge colflict 2003-05-21 00:12:09 -07:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
monty@narttu.mysql.fi
13530887cb Fix for UNION and LEFT JOIN (Bug #386) 
Fixed wrong logging of Access denied error (Bug #398)
 2003-05-13 18:58:26 +03:00
serg@serg.mylan
784fb81426 INSERT ... UPDATE ... VALUES() 2003-05-03 01:16:56 +02: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
wax@kishkin.ru
74e32241c4 Auto merged 2003-04-02 18:15:16 +06:00
bar@bar.mysql.r18.ru
0989db3e90 More OpenGIS compatibility: 
Point, MultiLine, Poligom, etc, are now not aliases
for Geometry, but separate field types.
 2003-03-27 13:09:09 +04:00
monty@narttu.mysql.fi
9f200ede0d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-03-20 02:06:08 +02:00
ram@mysql.r18.ru
031ac2a7b2 SRID support. 
GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.
 2003-03-18 15:30:32 +04:00
wax@kishkin.ru
12f1cb55b5 This is full commit of group_concat with support subselects 2003-03-18 04:07:40 +05:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
monty@mashka.mysql.fi
fef194fcb8 Fix for --new option (Timestamp in YYYY-MM-DD HH:MM:SS format) 2003-03-12 14:34:54 +02:00
monty@mashka.mysql.fi
d56e2acf50 Merge to get fix for LOCK TABLES + DROP TABLE in another thread 2003-03-07 01:20:56 +02:00
serg@serg.mysql.com
80c34b2aef fixed Field::eq() to work with CHAR(0) fields 2003-03-04 18:02:56 +01:00
bar@bar.mysql.r18.ru
6cbbbd6948 Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause 
for binary collations
 2003-03-04 12:33:52 +04:00
monty@mashka.mysql.fi
303c3e30ab Added charset number to result header 2003-02-04 03:19:19 +02:00
bar@bar.mysql.r18.ru
735399a850 Move latin1 into a separarte file 2003-01-29 17:31:20 +04:00
hf@deer.mysql.r18.ru
cff4a43711 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-default
 2003-01-28 15:06:23 +04:00
bar@bar.mysql.r18.ru
a292d4f632 New "fill" function in charset_info_st structure 2003-01-28 14:58:06 +04:00
hf@deer.mysql.r18.ru
87681bb85e Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-default
 2003-01-21 20:24:22 +04:00
hf@deer.mysql.r18.ru
9fb261e384 SCRUM 
Default in UPDATE & SELECT
 2003-01-21 20:20:46 +04:00
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04: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
7e9b27eaf5 Updates for multi-byte character sets 
(Note: test 'union' fails, but Sanja promised to fix this)
 2003-01-14 14:28:36 +02:00
hf@deer.mysql.r18.ru
445d426203 Conflicts resolving 2003-01-05 14:12:03 +04:00
hf@deer.mysql.r18.ru
f6e8e1f985 SCRUM 
DEFAULT in UPDATE and SELECT
 2003-01-05 14:07:24 +04:00
venu@myvenu.com
5c4b7a2e96 Binary protocol changes (to monty) 2003-01-03 03:52:53 -08:00
bar@bar.mysql.r18.ru
e5103ce714 Less "default_charset_info" 2002-12-19 15:27:46 +04:00
hf@deer.mysql.r18.ru
8a205e4ba3 Merge 2002-12-19 14:57:24 +04:00
bar@bar.mysql.r18.ru
c3053148f4 BINARY_FLAG has been restored. 
It's needed by ODBC code.
 2002-12-19 14:36:05 +04:00
hf@deer.mysql.r18.ru
bb67600df4 Merging 2002-12-17 19:57:23 +04:00
bar@bar.mysql.r18.ru
0ce4ae35e5 Some fixes to get closer to UCS2 compatible SHOW FIELDS 2002-12-17 14:35:19 +04:00
bar@bar.mysql.r18.ru
4f2a57c511 Move all sql_type() to the same file 2002-12-17 11:25:27 +04:00
hf@deer.mysql.r18.ru
c1e69d2cca Merging 2002-12-16 18:58:55 +04:00
monty@mashka.mysql.fi
d783e18436 merge 2002-12-14 17:49:01 +02:00
monty@mashka.mysql.fi
d49167bae5 Fixes for binary protocol (complement to last push) 
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run
 2002-12-14 17:43:01 +02:00
hf@deer.mysql.r18.ru
3517febe97 Resolving merge conflicts 2002-12-12 12:49:56 +04:00
bar@bar.mysql.r18.ru
b4fcdaa276 Preparation to charset dependant test_if_int and test_if_real 2002-12-11 17:42:48 +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
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
monty@hundin.mysql.fi
8830eb4aa9 Change of internal key_field=NULL handling to avoid error messages. 
Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable
 2002-12-03 13:08:25 +02:00
hf@genie.(none)
5e8b27c0d3 Pull conflicts resolutions 2002-11-29 12:35:48 +04:00
bell@sanja.is.com.ua
c74c93ffc3 supported possiblity of item substitute (fixed bug) in setup_fields 
more efficient reference creation
fixed table_name of Field in temporary table
 2002-11-25 01:38:56 +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
bar@bar.mysql.r18.ru
2434be61f8 String->copy() now has a charset arg 2002-11-06 17:43:22 +04:00
bar@bar.mysql.r18.ru
86b633379c Some charset code clean-ups 2002-11-06 17:01:12 +04:00
monty@hundin.mysql.fi
5333cfb429 Removed wrong patch to fix DATE BETWEEN TIMESTAMP1 AND TIMESTAMP2 
Some simple optimizations
 2002-11-05 22:45:42 +02:00
monty@hundin.mysql.fi
537f1c2f1e Removed wrong bug fix for problem with timestamp and BETWEEN. 
Will be properly fixed in 4.1 and 5.0
 2002-11-05 00:24:59 +02:00
lenz@mysql.com
be932e7345 - Applied fix made in 4.0 tree to fix a bug when comparing a datetime 
column with timestamp values with BETWEEN clause
 2002-10-30 21:55:56 +01:00
Sinisa@sinisa.nasamreza.org
fbe9577516 A fix for bug when comparing a datetime column with timestamp 
values with BETWEEN clause
 2002-10-30 22:08:34 +02:00
bar@bar.mysql.r18.ru
03e7fc3180 date and time fields now have charset arg in constructor 
my_charset_latin1
 2002-10-30 17:09:37 +04:00
bar@bar.mysql.r18.ru
440db4c1dc ENUM/SET fields now have charset too 2002-10-25 15:08:47 +05:00
bar@bar.mysql.r18.ru
95aef91521 BINARY charset is now used instead of binary_flag 2002-10-25 13:58:32 +05: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
monty@hundin.mysql.fi
fbf6ab4465 merge with 4.0.5 2002-10-16 19:30:24 +03:00
monty@hundin.mysql.fi
67d3cd643b Merge with 3.23.54 2002-10-16 13:11:25 +03:00
monty@hundin.mysql.fi
b4343ba939 Fixed bug in LEFT JOIN ... WHERE not_null_key_column=NULL; 2002-10-16 10:32:45 +03:00
hf@genie.(none)
55866b0615 Huge pull 2002-10-07 15:38:07 +05:00
hf@genie.(none)
71d0f48f1f Geometry field type implementation 2002-10-04 12:48:32 +05: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
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
Sinisa@sinisa.nasamreza.org
22bcce253e Adding a necessary functionality to ::store and ::save_in_field 
that will take place properly after pull from 4.0, in order to 
handle conversions from quoted constants to bigint's.
 2002-08-24 14:49:04 +03:00
monty@hundin.mysql.fi
b9d7fcd279 Fixed bug in SAFEMALLOC for systems that requires longlong data to be aligned on 8 byte boundaries (like sparc) 
Removed thread marking of safemalloc blocks (becasue of alignment problems)
Temporary fix for bigint comparison.
 2002-08-17 05:18:06 +03:00
monty@mashka.mysql.fi
1bb7665a9c merge 2002-08-08 03:29:36 +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
salle@geopard.online.bg
193c383e8b Reverting facist C++ comment cleanup 2002-08-02 15:05:10 +03:00
monty@mashka.mysql.fi
e701333bbf INSERT ... VALUES(DEFAULT) 2002-07-25 01:00:56 +03:00
salle@geopard.online.bg
b472f401b1 Some 
C++ comments cleanup
 2002-07-17 15:17:20 +03:00
bar@gw.udmsearch.izhnet.ru
337d46966c Several problems were fixed (mostly BLOB+charset related) 
Fixed that MyISAM were not working properly with non-8bit charsets in some cases
CONVERT() function now works properly
 2002-06-26 16:00:43 +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@hundin.mysql.fi
ee6bd84880 Changes for new binary .frm format 
Fixes after last merge from 4.0.
(Code not yet complete, need anoter merge from 4.0)
 2002-06-04 08:23:57 +03:00
monty@hundin.mysql.fi
6e54cc492c Extension of .frm file (not yet ready for push) 2002-06-02 21:22:20 +03:00
bar@gw.udmsearch.izhnet.ru
196aa19cf6 Now string values are created and filled with charset field 
SELECT func(charset2) FROM t ORDER BY 1 works in correct charset
 2002-05-17 16:29:52 +05:00
bar@gw.udmsearch.izhnet.ru
7fce07d52d Now several character sets can live in the same table, 
However some hacks were used while waiting for new FRM file
 2002-05-14 20:58:38 +05:00
monty@hundin.mysql.fi
b5a145d872 merge 2002-04-13 15:34:39 +03:00
monty@tik.mysql.fi
056175a1ce Update for BTREE keys in HEAP tables 
Split handler->option_flag() to handler->table_flags() and handler->index_flags()
 2002-04-12 21:35:46 +03:00
bar@gw.udmsearch.izhnet.ru
d8a4d6a8a3 remove default_charset_info 2002-03-14 23:03:15 +04:00