mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15716 commits 2784 branches 343 tags 1.6 GiB
Commit graph

329 commits

Author SHA1 Message Date
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
hf@deer.mysql.r18.ru
c59bff7c96 SCRUM 
embedded library trimming
 2003-01-15 12:11:44 +04:00
bar@bar.mysql.r18.ru
09eac4793b bin chatset now handles strnncoll itself so we don't have to check 
if charset is binary anymore
 2003-01-14 18:28:50 +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
bar@bar.mysql.r18.ru
a89df5a096 Separating CHARSET and COLLATION terms 2003-01-09 15:37:59 +04:00
monty@mashka.mysql.fi
f9772317ee merge 2003-01-04 15:40:55 +02:00
venu@myvenu.com
33cfbc7894 Merge work.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/bk/src-4.1
 2003-01-03 23:44:24 -08:00
venu@myvenu.com
fc7a1bfacf Fix date,time,timestamp,year - binary protocol 2003-01-03 23:37:16 -08:00
Sinisa@sinisa.nasamreza.org
164ab11b29 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-01-03 15:08:40 +02:00
venu@myvenu.com
881c9808a4 Merge myvenu.com:/home/venu/bk/src-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-01-03 03:54:18 -08:00
venu@myvenu.com
5c4b7a2e96 Binary protocol changes (to monty) 2003-01-03 03:52:53 -08:00
monty@mashka.mysql.fi
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02:00
Sinisa@sinisa.nasamreza.org
885d9d9037 A fix for a charset bug in the select_export (select into 
outfile) class.
 2002-12-31 18:01:53 +02:00
Sinisa@sinisa.nasamreza.org
a4a80302b8 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2002-12-30 19:42:03 +02:00
miguel@hegel.br
f43ebb83db Fix compiler warnings removing unreferenced variables 2002-12-29 21:50:52 -02:00
Sinisa@sinisa.nasamreza.org
1e2bec8009 aliases with multi-table updates / deletes 
fix for a bug with derived tables and query cache
ix for a charset bug in timestamp
 2002-12-28 21:34:17 +02: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
fbad8dc364 less use of system_charset_info 2002-12-19 09:38:30 +04:00
bar@bar.mysql.r18.ru
1bba969b1e removed several cases of default_charset_info use 
a bit more ucs2 compatibility
 2002-12-19 09:38:29 +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
bb67600df4 Merging 2002-12-17 19:57:23 +04:00
bar@bar.mysql.r18.ru
e56fb1962f sql_type() is now ucs2 compatible 2002-12-17 19:57:22 +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
hf@deer.mysql.r18.ru
dcb5293576 Some fixes 2002-12-12 12:16:34 +04:00
monty@mashka.mysql.fi
e7164aba7e Add CHARSET keyword (missing from last push) 2002-12-11 21:22:57 +02: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
bar@bar.mysql.r18.ru
40f828d5f1 Some system_charset_info and default_charset_info were replaced by my_charset_latin1 2002-12-11 17:12:55 +04:00
bar@bar.mysql.r18.ru
34033b9389 Use of charset dependant num->string conversion routines 2002-12-11 16:04:46 +04:00
bar@bar.mysql.r18.ru
e870df661d Use of new num->str functions 
fix in ucs2 charset
 2002-12-11 15:29:23 +04:00
monty@mashka.mysql.fi
a241d9a0f7 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-12-11 09:18:43 +02: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
bar@bar.mysql.r18.ru
857d447e23 More new style str->num 2002-12-10 12:43:17 +04:00
bar@bar.mysql.r18.ru
632dff01d1 More use of new str->num functions 2002-12-09 15:45:05 +04:00
bar@bar.mysql.r18.ru
241f4143e8 More use of new string->number conversion routines 2002-12-09 14:31:11 +04:00
bar@bar.mysql.r18.ru
072abca49b Use of new string->number conversion routines 2002-12-09 14:08:42 +04:00
monty@mashka.mysql.fi
35ff08c2af After merge fixes 
Added THD to add_to_xxx_list() functions for faster parsing.
 2002-12-06 21:11:27 +02:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
monty@mashka.mysql.fi
fc06433a69 Removed copying of parameters as this leads to memory leaks in embedded server. 
Fixed 'not initialized' memory error.
 2002-12-05 03:40:33 +02:00
hf@genie.(none)
5e8b27c0d3 Pull conflicts resolutions 2002-11-29 12:35:48 +04:00
bar@bar.mysql.r18.ru
d2e5a5ddd2 More use of new string->number conversion functions 2002-11-28 11:33:04 +04:00
bar@bar.mysql.r18.ru
95930f129e new string-to-number functions 2002-11-27 18:08:31 +04:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
monty@butch.
890b39bb68 merge 2002-11-07 12:49:01 +02:00
hf@genie.(none)
25bd1e9a37 Merged by hands 2002-11-07 12:20:08 +04:00
monty@hundin.mysql.fi
db6cbba239 Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0 2002-11-07 04:03:44 +02: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
monty@butch.
a2bdf9265f Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +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
9a9e7ce0f4 Item->thd_charset() - returns a default charset which should be used 
to compose strings appeared without charset context, for example,
in convertion from numer into string type.
 2002-11-06 15:49:53 +04:00
peter@mysql.com
5968a5ea25 Final decimal bug fix changeset (hope) 2002-11-06 12:35:16 +03:00
peter@mysql.com
043ea441d7 Decimal field fix overflow 2002-10-30 19:39:52 +03: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
b43876b9dd All String->set() now have charset argument 2002-10-30 16:19:43 +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
peter@mysql.com
79978dcb0e Fix exponent overflow handling for decimal type. Overflow lead to crash 2002-10-13 21:11:01 +04:00
bar@bar.mysql.r18.ru
50c391538a my_sortcmp -> my_strnncoll 2002-10-09 16:33:35 +05:00
bar@bar.mysql.r18.ru
954a47b95a Simple charsets now have strncoll() field too 2002-10-09 15:40:57 +05: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
peter@mysql.com
a1443a7e2c Allow storing "+456" then decimal declared unsigned 2002-07-30 19:52:51 +04: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
monty@hundin.mysql.fi
578a9d9901 Updated windows files (VC++ files and winmysqladmin). 
Portability fixes.
Removed compiler warnings.
 2002-06-28 17:26:11 +03:00
monty@hundin.mysql.fi
ade20c5b19 Indentation cleanup & new comments 2002-06-28 09:18:23 +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
peter@linux.local
e773a26e6e Adding handling of numbers with exponent to decimal type. 2002-06-24 21:30:54 +04: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
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
bar@gw.udmsearch.izhnet.ru
1a91646854 Charset of any string field now can be specified during CREATE TABLE 2002-06-07 17:23:33 +05:00
monty@hundin.mysql.fi
e4130b11c9 removed init_count from IO_CACHE. 
Added missing mutex_unlock to slave replication code.
 2002-06-05 23:04:38 +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
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
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
monty@hundin.mysql.fi
f5ed8784a2 merge with 3.23.51 2002-05-16 18:20:49 +03:00
monty@hundin.mysql.fi
e90c6b481d Fixed problems with DECIMAL() type on overflow. 2002-05-02 18:04:21 +03: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
monty@hundin.mysql.fi
ce541b292a support for unsigned FLOAT/DOUBLE 2002-03-27 00:50:54 +02:00
bar@gw.udmsearch.izhnet.ru
b37ce8e769 New ctype functions/macros to support many charsets at a time 2002-03-12 21:37:58 +04:00
bar@gw.udmsearch.izhnet.ru
735b27d578 Added GIS extension 2002-02-22 15:24:42 +04: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
monty@hundin.mysql.fi
1de4fff5ba Update of query cache code. 
Changed some sql_alloc() -> thd->alloc()
Removed a lot of compiler warnings on Linux Alpha (64 bit)
Fixed some core dumps on 64 bit systems (wrong type for packet_len)
 2001-12-05 13:03:00 +02:00
monty@hundin.mysql.fi
4c60b41954 Portability fix 
Cleanup typos (like SKIPP -> SKIP)
 2001-11-07 00:13:29 +02:00
monty@hundin.mysql.fi
fd0780493d merge with 3.23.44 2001-11-04 16:14:09 +02:00
monty@hundin.mysql.fi
8cd4c2358d Fix that mysqladmin shutdown can be interrupted with ^C 
Fixed bug with BLOB keys in BDB tables
Fixed problem with MERGE tables on OS with 32 bit files
Fixed that TIME_TO_SEC() works with negative times
 2001-11-03 15:18:09 +02:00
monty@hundin.mysql.fi
d89690e606 Portability fixes 
Fix for consistent 0000-00-00 date handling
Close + open binary logs on flush tables
Fix for AVG() in HAVING.
 2001-10-31 18:27:49 +02:00
monty@hundin.mysql.fi
0bfec316ce Don't do signal() on windows (Causes instability problems) 
Safer, a bit faster filesort.
Code changes to avoid calls to current_thd() (faster code).
Removed all compiler warnings from readline.
 2001-10-17 19:39:39 +03:00
monty@hundin.mysql.fi
06e719b7cc Remved Gemini code. 2001-10-10 02:50:28 +03:00
monty@hundin.mysql.fi
c55ac34fef Some fixes for Gemini 2001-09-20 20:22:43 +03:00
monty@hundin.mysql.fi
733f865f54 Fixes for OS2. 
Fix bug in isamlog
Add argument types to function declarations.
 2001-08-22 01:45:07 +03:00
monty@hundin.mysql.fi
063a1a6557 Portability fixes. 
Patches required by Gemini
Fix to properly detect if there is an active transaction in InnoDB
Fix to not lock thread structure when doing automatic rollback when thread ends
Allow -O lower_case_names=0 on UNIX
 2001-08-21 20:06:00 +03:00
monty@hundin.mysql.fi
72fb81e888 Fixed bug in mysqlcheck when using --fast 
Fixed problem when converting bigint to double.
Fixed bug in count(distinct null)
Fixed bug with empty BDB tables.
 2001-06-19 14:30:12 +03:00
mikef@nslinux.bedford.progress.com
ceac5f9227 Pushing all the Gemini changes above the table handler. 2001-05-29 09:29:08 -04:00
monty@donna.mysql.fi
1e80c3f3e1 Don't use ranges on HEAP tables with LIKE 
Don't reconnect client on close
 2001-04-17 03:55:25 +03:00
monty@donna.mysql.fi
1afbe4feba The environment variable PAGER is now used as the default pager 
Fixed bug with float columns
 2001-04-17 01:45:30 +03:00
monty@donna.mysql.fi
ac77076ff2 Fixed bug with HEAP tables when using LIKE 2001-04-16 14:05:55 +03:00
monty@donna.mysql.fi
3c82d4a2e1 Fixed bug with UPDATE/DELETE on UNIQUE key which could be NULL 2001-04-10 11:32:28 +03:00
serg@serg.mysql.com
555430819d mysql-test/r/order_by.result fixed for new test 
sql/field.cc    ORDER BY bug fixed
 2001-03-13 13:30:12 +01:00
monty@donna.mysql.fi
5ccbbd83f2 Fixes for innobase usage 
Fixed bug when using TEXT columns with BDB tables
Allow LOAD DATA INFILE to use numbers with ENUM and SET columns
 2001-03-03 03:03:12 +02:00
sasha@mysql.sashanet.com
bc52b4a280 text/blob fields in some cases were not handled properly 2001-03-01 11:49:06 -07:00
monty@donna.mysql.com
1b2c841864 Check that __FLOAT_WORD_ORDER is defined 2001-02-08 04:43:55 +02:00
monty@donna.mysql.com
d487e5a9b1 Use new bitmap interface 
Patches for Armstrong
Removed warnings when using REPAIR TABLE .. EXTENDED
 2001-02-07 17:42:20 +02:00
monty@donna.mysql.com
a7c5b9c211 Portability fixes for OPENBSD, OS2 and Windows 2001-01-27 01:20:56 +02:00
monty@donna.mysql.com
0732f7475e Fixed for bugs that was found when getting full code coverage of BDB 
Fixed bug with HEAP tables on windows
Fixed bug with HAVING on empty tables
 2001-01-17 03:15:20 +02:00
monty@donna.mysql.com
c1b5a5b00f Removed not used variable 'last_ref' 
Fixed problem with negative DECIMAL() keys
Fixed some bugs with NULL keys in BDB
More mysql-test tests
 2001-01-16 06:02:05 +02:00
monty@donna.mysql.com
fbb40da0aa Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql 2001-01-15 22:57:08 +02:00
monty@donna.mysql.com
12d0f179cd Fixes for mysqltest 2001-01-15 22:56:44 +02:00
tim@cane.mysql.fi
768457911c Fix get_time bug 2001-01-15 21:04:51 +02:00
monty@donna.mysql.com
adeed9168d Added bdb_lock_max and fixed bug in BDB tables when using key parts 2000-10-25 01:50:46 +03:00
monty@donna.mysql.com
117d8b7f64 Automatic repair of MyISAM tables + small bug fixes 2000-10-17 00:47:15 +03:00
monty@donna.mysql.com
7ac13c89e6 Fix of LEFT JOIN optimizer bug, problem with key cache on Windows and 
a lot of portability issues.
 2000-10-14 03:16:35 +03:00
monty@donna.mysql.com
4726593862 Fixes for FULLTEXT and TIME type 2000-09-13 01:08:34 +03:00
monty@donna.mysql.com
d564acf14e Fixes for Ia64 2000-08-23 15:02:27 +03:00
monty@donna.mysql.com
f85a25e9ea Fix typo 2000-08-22 01:35:50 +03:00
monty@donna.mysql.com
0fcdce7bc4 Fix for snprintf 2000-08-22 00:55:45 +03:00
monty@donna.mysql.com
f0952ce3e1 FLUSH TABLE table_list 
Fixes for RENAME TABLE
Portability fixes
 2000-08-22 00:18:32 +03:00
monty@donna.mysql.com
ea013c2152 Fixed for Ia64 + delayed key creation + a lot of small bug fixes 2000-08-15 20:09:37 +03:00
bk@work.mysql.com
f4c589ff6c Import changeset 2000-07-31 21:29:14 +02:00