mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-06 03:03:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
13017 commits 2861 branches 349 tags 1.7 GiB
Commit graph

6521 commits

Author SHA1 Message Date
monty@mysql.com
a4b0ec1ede Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
sergefp@mysql.com
8e2ff7d135 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/dbdata/psergey/mysql-4.0-root
 2004-05-19 23:20:42 +04:00
bell@sanja.is.com.ua
192eb65e26 after merge fix 2004-05-19 18:13:21 +03:00
bell@sanja.is.com.ua
bd010b1ec3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
 2004-05-19 17:09:40 +03:00
bell@sanja.is.com.ua
d42d709171 after review changes 2004-05-19 17:07:28 +03:00
monty@mysql.com
b6188818b1 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-05-19 16:51:03 +03:00
monty@mysql.com
86a966256b Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
 2004-05-19 16:38:12 +03:00
guilhem@mysql.com
e9c6be0e9d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-05-19 15:04:01 +02:00
guilhem@mysql.com
319f83ef9b Fix for BUG#3829 "Setting server_id on fly doesn't allow replication to start" 
(fix by our Harrison Fisk): when one does SET GLOBAL SERVER_ID=x, we must set
server_id_supplied to 1.
 2004-05-19 15:03:32 +02:00
pem@mysql.comhem.se
ba749627ae Fixed BUG#3709: SELECT INTO 1 FROM DUAL not parsed as expected 
Made the combination of INTO and FROM DUAL work, e.g.
SELECT 1 INTO @x FROM DUAL.
As a consequence, DUAL is made a reserved word. It would work to not have
it reserved, but it was deemed to be confusing as a user defined table by
the same name then must be qualified with a db (schema).
 2004-05-19 14:51:41 +02:00
konstantin@mysql.com
e13e9288c9 Fix for Bug#3754 "SET GLOBAL myisam_max_sort_file_size doesn't 
work as expected": precision-losing conversion removed from 
sys_var_thd_ulonglong.
 2004-05-19 16:42:29 +04:00
hf@deer.(none)
af39bd4125 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.ps
 2004-05-19 10:28:24 +05:00
monty@mysql.com
332f124bc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-19 05:09:41 +03:00
monty@mysql.com
21f1bca789 Portability fixes 
Fixed wrong number of warnings/duplicates for machines with high-byte-first
 2004-05-19 05:09:10 +03:00
sergefp@mysql.com
8becc50685 Fix for BUG33649: Post-review fixes 2004-05-19 02:18:54 +04:00
sergefp@mysql.com
482058befa Fix and test case for BUG#3649. 2004-05-18 22:59:43 +04:00
brian@brian-akers-computer.local
fdaf6d4221 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-05-18 09:56:41 -07:00
brian@brian-akers-computer.local
bab1dc82c7 Updating range_in_rows for the include file for ha_example (the main .cc file has already been updated). 2004-05-18 09:54:36 -07:00
hf@deer.(none)
3a7e3f0612 embedded library: fix for sending of parameters to stored procedure. 
using of methods like sint2korr() doesn't work on Bigendian machines
 2004-05-18 19:13:21 +05:00
ram@gw.mysql.r18.ru
fdc0f0e781 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3756
 2004-05-18 13:56:40 +05:00
serg@serg.mylan
d9a6ff1125 don't try to purge closed logs 2004-05-18 10:29:20 +02:00
ram@gw.mysql.r18.ru
0f3ab4174e A fix (Bug : Missing warning in 4.1). 2004-05-18 12:16:00 +05:00
serg@serg.mylan
7961968ada current_thd is 0 if ha_resolve_by_name() is called when parsing command-line options 2004-05-17 18:45:59 +02:00
hf@deer.(none)
bbfe390afd Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.ps
 2004-05-17 18:45:50 +05:00
Sinisa@sinisa.nasamreza.org
8eadb1809d Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-05-17 13:47:51 +03:00
serg@serg.mylan
eb93657507 typo fixed 2004-05-17 11:10:22 +02:00
serg@serg.mylan
b269d4ad21 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-05-17 11:05:19 +02:00
serg@serg.mylan
bc71d98a03 bug#3681 - order by, distinct, refer to aliased field by name 
check for field_name (not only for name) in find_item_in_list, to be compatible with item->eq() that is done later
 2004-05-17 11:04:12 +02:00
monty@mysql.com
3f5ce7bd25 After merge fixes 2004-05-17 11:22:30 +03:00
magnus@neptunus.(none)
1f1b01e028 Merge 2004-05-17 09:57:02 +02:00
magnus@neptunus.(none)
43708207ba Fixes made after running with sql-bench 2004-05-17 09:51:02 +02:00
ram@gw.mysql.r18.ru
e166036894 A fix (bug : ISNULL(QUOTE()) returns 1 for every row after 1st NULL) 2004-05-17 12:47:16 +05:00
magnus@neptunus.(none)
ab78e4f4bc flags should be sent as second arg to my_error 2004-05-17 09:43:51 +02:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
monty@mishka.local
a79a3f5724 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mishka.local:/home/my/mysql-4.1
 2004-05-16 14:49:32 +03:00
monty@mishka.local
314a8bf114 key_cmp -> key_cmp_if_same 
New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys
 2004-05-16 14:48:32 +03:00
Sinisa@sinisa.nasamreza.org
2d656181dc Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-05-15 18:30:04 +03:00
Sinisa@sinisa.nasamreza.org
0806214620 Optimising UNION ALL (WL 1687) 2004-05-15 16:13:08 +03:00
hf@deer.(none)
e18cd2ea9f Fixes for , , , , 2004-05-15 17:07:44 +05:00
serg@serg.mylan
0dc8aacf7d merged 2004-05-15 11:26:58 +02:00
serg@serg.mylan
da63a927f2 bad old merge fixed 2004-05-15 11:20:42 +02:00
monty@mysql.com
9f171e7794 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-15 11:58:08 +03:00
monty@mysql.com
e0a4b51215 Better fix for bug (bug in deleting automatic generated foreign keys) 2004-05-15 11:57:40 +03:00
monty@mysql.com
1e860400f3 Extra safety fixes (probably not needed, but can't hurt) 2004-05-15 09:08:03 +03:00
sergefp@mysql.com
3711c98b2a Trivial manual merge 2004-05-15 00:06:16 +04:00
serg@serg.mylan
6a594c07c5 get rid of remaining strtolls - irix64 compatibility 2004-05-14 19:12:09 +02:00
bell@sanja.is.com.ua
712d379b5e check of item name presence in find_item_in_list (Bug ) 2004-05-14 18:55:24 +03:00
bell@sanja.is.com.ua
38d0d362c5 SELECT options print fixed 2004-05-14 16:56:47 +03:00
heikki@hundin.mysql.fi
02f51ccf2d Many files: 
Fix remaining cases of Bug : fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
 2004-05-14 16:48:56 +03:00
bell@sanja.is.com.ua
bb34b56bfd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
 2004-05-14 15:29:23 +03:00