mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19439 commits 2784 branches 343 tags 1.7 GiB
Commit graph

19439 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
monty@mysql.com
12bf600d18 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-02 22:41:18 +02:00
monty@mysql.com
209190d3df Review fixed 2005-02-02 22:39:21 +02:00
monty@mysql.com
e7450d9781 Use -DUNIV_DEBUG (extra debugging for InnoDB) when configuring with --debug=full 2005-02-02 22:35:36 +02:00
monty@mysql.com
8907374947 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-02 22:28:22 +02:00
monty@mysql.com
e791e86444 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-02 20:30:57 +02:00
monty@mysql.com
3936edd7fa Fixed during review of new pulled code 2005-02-02 20:28:01 +02:00
lenz@mysql.com
7213ca46ad Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-02-02 19:25:43 +01:00
lenz@mysql.com
164b2ddf39 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-02-02 19:24:13 +01:00
lenz@mysql.com
e24d97ae58 - typo fix... 2005-02-02 19:23:24 +01:00
jimw@mysql.com
bcac063558 Fix merge of func_str tests (accidently duplicated a test). 2005-02-02 09:05:52 -08:00
jimw@mysql.com
5f0c4ff140 Merge fixes for #8248, #5569. 2005-02-02 08:21:11 -08:00
jimw@mysql.com
4104f160cb Merge mysql.com:/home/jimw/my/mysql-4.1-8207 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-02 07:51:55 -08:00
jimw@mysql.com
2ab66e644a Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-02 07:49:30 -08:00
monty@mysql.com
b131520f9d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-02 16:50:35 +02:00
lenz@mysql.com
7cb5afc052 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-02-02 13:45:32 +01:00
lenz@mysql.com
70b8360323 Small Do-compile improvements: 
- added Option "--comment" to be able to override the default compilation comment
- improved the abort subroutine to not rely on an external "tail" command (the
  default /usr/bin/tail on Solaris does not understand the "-n" notation).
  Get rid of a "useless use of cat" case in the process.
 2005-02-02 13:40:17 +01:00
serg@serg.mylan
33fc4b10b6 configure.in 
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
    hide from the user options that do nothing
sql/sql_update.cc
    better fix for uninitialized used_index
 2005-02-02 12:08:20 +01:00
igor@rurik.mysql.com
9a779d6441 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-01 23:54:39 -08:00
igor@rurik.mysql.com
0fb0dab4ca func_str.result, func_str.test: 
Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
 2005-02-01 23:34:31 -08:00
sergefp@mysql.com
9eca8dced6 Adjust test results for BUG#7634: The result of EXPLAIN is different if OS doesn't support file sizes > 2G 2005-02-02 07:51:43 +03:00
pekka@mysql.com
ea5c1f324c ndb - backup fix, found on powermacg4 2005-02-02 03:58:43 +01:00
jimw@mysql.com
2caee2b3f2 Merge mysql.com:/home/jimw/my/mysql-4.0-clean 
into mysql.com:/home/jimw/my/mysql-4.0-8248
 2005-02-01 18:34:28 -08:00
jimw@mysql.com
d9e128d78f Merge bk-internal:/home/bk/mysql-4.0 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-02-01 18:34:16 -08:00
jimw@mysql.com
e86457cef0 Fix QUOTE() to not reuse the input field for output, which resulted in 
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248)
 2005-02-01 18:29:10 -08:00
heikki@hundin.mysql.fi
7fb3a79794 Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-02-02 01:47:46 +02:00
heikki@hundin.mysql.fi
b75bfa828d eval0eval.ic: 
Remove wrong assertion that fails on 64 bits
 2005-02-02 01:43:25 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
a90d28eb6e Fix compile problem - line missing. 2005-02-01 23:43:09 +00:00
jimw@mysql.com
76ff72d73f Merge mysql.com:/home/jimw/my/mysql-4.0-5569 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-02-01 15:38:27 -08:00
heikki@hundin.mysql.fi
b0a343dd06 Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-02-02 00:41:25 +02:00
heikki@hundin.mysql.fi
e5479c3f90 rem0rec.ic: 
Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed
 2005-02-02 00:31:06 +02:00
heikki@hundin.mysql.fi
11c0260147 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-02-02 00:22:19 +02:00
marko@hundin.mysql.fi
679f4fe66b Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0
 2005-02-01 23:57:05 +02:00
marko@hundin.mysql.fi
1075c406f4 InnoDB: Fix debug compile error on Tru64 (Bug #8244) 2005-02-01 23:55:41 +02:00
jimw@mysql.com
a8039e1ac8 Make sure mysql_client_test and embedded test clients get added to 
binary distribution on all platforms.
 2005-02-01 11:59:44 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
9cfe250419 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967
 2005-02-01 19:57:42 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc WL#1967 
Support for COMMIT/ROLLBACK optional arguments
 2005-02-01 19:48:05 +00:00
reggie@bob.(none)
b018755ea6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bob.(none):/home/reggie/bk/mysql41
 2005-02-01 08:46:56 -06:00
monty@mysql.com
b87e0c52a7 Proper fix for comparision with ' ' 
(Bug #7788 "Table is full" occurs during a multitable update")
 2005-02-01 16:27:08 +02:00
reggie@bob.(none)
f2639d3852 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into bob.(none):/home/reggie/bk/mysql5.0
 2005-02-01 08:19:57 -06:00
reggie@bob.(none)
3066e117b0 Merge bob.(none):/home/reggie/bk/mysql41 
into bob.(none):/home/reggie/bk/mysql5.0
 2005-02-01 08:16:45 -06:00
monty@mysql.com
4e92f2afb1 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2005-02-01 15:38:48 +02:00
monty@mysql.com
0751cb8ff1 Remove #if 0 as this only confuses the code withing adding anything 2005-02-01 15:36:48 +02:00
ram@gw.mysql.r18.ru
26dcd87ee6 merging 2005-02-01 17:20:32 +04:00
ram@gw.mysql.r18.ru
40daecb8b4 after merge fix up: 
we should use REPLACE for $hostaname queries to avoid problems when $hostname=localhost.
 2005-02-01 17:13:44 +04:00
lenz@mysql.com
c02d97b5e2 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/space/my/mysql-4.0
 2005-02-01 13:30:16 +01:00
lenz@mysql.com
2aa2ae5af2 Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-02-01 13:19:21 +01:00
bell@sanja.is.com.ua
85f62aa67c Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2005-02-01 13:55:40 +02:00
bar@mysql.com
b9054c5e4a Skip cp932 and eucjpms tests when the character sets are not compiled. 2005-02-01 14:37:51 +04:00
bell@sanja.is.com.ua
48da18cd45 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-02-01 11:05:29 +02:00