mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23066 commits 2791 branches 343 tags 1.7 GiB
Commit graph

23066 commits

This branch
This branch
All branches
Author SHA1 Message Date
serg@serg.mylan
bdd3452115 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-16 15:28:58 +02:00
monty@mysql.com
5641664de7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-05-16 15:26:40 +03:00
monty@mysql.com
d06bb6fa39 After merge fixes 2005-05-16 15:21:35 +03:00
monty@mysql.com
bacc512193 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/my/mysql-5.0
 2005-05-16 13:36:17 +03:00
monty@mysql.com
7d70579917 Fixed failing tests for not 32 bit intel machines 
Fixed bug in mysql_stmt_fetch() when retrieving rows to return
 2005-05-16 13:34:23 +03:00
serg@serg.mylan
c28accc9a9 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-16 12:05:42 +02:00
msvensson@neptunus.(none)
d54c1ecf39 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-16 11:25:38 +02:00
msvensson@neptunus.(none)
ffd6f926ca Build fixes 2005-05-16 11:24:41 +02:00
bell@book.sanja.is.com.ua
1ff9f55920 relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020) 2005-05-16 12:19:10 +03:00
ramil@mysql.com
09168e0474 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10655
 2005-05-16 13:45:13 +05:00
ramil@mysql.com
0b90c8bfd6 a fix (bug #10655: mysys/default.c compilation problem). 2005-05-16 13:40:57 +05:00
mskold@mysql.com
d6d9a7f45c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
 2005-05-16 08:12:35 +02:00
joreland@mysql.com
c4c582320c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-16 07:37:51 +02:00
kent@mysql.com
63fcb5de6f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-05-16 02:55:51 +02:00
kent@mysql.com
27c4182e6a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-05-16 02:03:18 +02:00
kent@mysql.com
24b34fa9fe Merge 2005-05-16 01:25:14 +02:00
kent@mysql.com
b076cdb208 mysqltest.c: 
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
 2005-05-16 01:08:42 +02:00
petr@mysql.com
834c47f336 Merge 2005-05-16 03:01:05 +04:00
petr@mysql.com
180d0ed620 post-review fixes 2005-05-16 01:54:02 +04:00
kent@mysql.com
0d73975517 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-05-15 20:53:19 +02:00
kent@mysql.com
6374bfeb61 mysqltest.c: 
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory
 2005-05-15 20:38:54 +02:00
pekka@mysql.com
3131434dcf ndb - wl-2451 update schemafile format change to 5.0.6 2005-05-15 18:10:30 +02:00
pekka@mysql.com
143ad5081a ndb - testScan -n ScanRead488O fix 2005-05-15 17:56:39 +02:00
kent@mysql.com
7858004c51 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-05-15 17:36:36 +02:00
kent@mysql.com
81b36addc9 mtr_report.pl, mtr_process.pl, mysql-test-run.pl: 
Added option --vardir=<directory> for feature bug#10096
 2005-05-15 17:22:54 +02:00
kent@mysql.com
e2d7efb238 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-05-15 07:38:42 +02:00
kent@mysql.com
f37bdbe059 mysql-test-run.pl: 
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
  Initial db updates
 2005-05-15 07:34:09 +02:00
kent@mysql.com
bd70ce726b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-05-15 07:06:47 +02:00
kent@mysql.com
221b1ccae8 mysqltest.c, mysql-test-run.sh: 
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
  Use Purify suppress file
 2005-05-15 06:59:34 +02:00
kent@mysql.com
a628878bbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
 2005-05-14 23:48:15 +02:00
monty@mishka.local
567712b9e7 Portability fix (for 64 bit intel) 2005-05-15 00:30:23 +03:00
serg@serg.mylan
40ce1e174d merged 2005-05-14 19:28:29 +02:00
monty@mishka.local
fdb7a69936 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-14 19:32:28 +03:00
monty@mishka.local
600010e583 Don't enable binlogs by default as this gives too many warnings 2005-05-14 19:31:34 +03:00
monty@mysql.com
9db45adb60 Merge with 4.1 2005-05-14 18:31:22 +03:00
monty@mysql.com
6588997eb8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-05-14 16:28:52 +03:00
monty@mysql.com
beb5867dfb After merge fixes 2005-05-14 16:24:36 +03:00
konstantin@mysql.com
6b90352eac More post-merge fixes. 2005-05-14 14:42:25 +04:00
konstantin@mysql.com
aa57e40df6 A post-merge fix. 2005-05-14 13:26:01 +04:00
konstantin@mysql.com
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +04:00
konstantin@mysql.com
6c981c0b80 Fix a valgrind warning: memcpy does not allow its arguments to overlap. 2005-05-14 02:31:26 +04:00
konstantin@mysql.com
6adfd9436e Fix wrong format specifier in error messages. 
Not to be pushed into 5.0 as there it's fixed differently (in the new
format of error messages)
 2005-05-14 02:28:10 +04:00
sergefp@mysql.com
480957e7e6 Fix for BUG#9622: Make index statistics collection in MyISAM behave the same 
way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert:
now statistics collection always assumes NULLs are inequal.
 2005-05-14 00:21:53 +02:00
monty@mysql.com
b4e92e6360 Merge with 4.0 2005-05-14 00:01:40 +03:00
serg@serg.mylan
63eaf44c5c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-05-13 22:55:08 +02:00
serg@serg.mylan
7cb3e5924c Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-13 22:49:49 +02:00
monty@mysql.com
59cce60151 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-05-13 23:12:22 +03:00
monty@mysql.com
9b39f8304e Fixed wrong buffer usage for auto-increment key with blob part that caused CHECK TABLE to report that the table was wrong. (Bug #10045) 2005-05-13 23:08:29 +03:00
serg@serg.mylan
c4c76c5fdb sql/ha_blackhole.cc 
bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks"
sql/sql_base.cc
    libmysqld/examples/mysql.cc linking problem
 2005-05-13 21:43:26 +02:00
monty@mishka.local
3ff39b3704 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-13 22:20:07 +03:00