Commit graph

17930 commits

Author SHA1 Message Date
monty@mysql.com
174c15aee1 Small fixes done while reviewing pushed code 2005-04-06 16:52:41 +03:00
monty@mysql.com
b9fdb65b18 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-04-06 15:53:32 +03:00
monty@mysql.com
6483a71e82 Fixed that create_time is set properly for cached threads 2005-04-06 15:52:32 +03:00
kent@mysql.com
34284d9354 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-04-06 13:45:14 +02:00
kent@mysql.com
57d8914287 Makefile.am:
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed
2005-04-06 12:20:55 +02:00
gluh@mysql.com
85bf400612 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 15:19:02 +05:00
bar@mysql.com
1c46a02069 Minor clean-ups for the previous commit. 2005-04-06 15:12:44 +05:00
gluh@mysql.com
decfc86fbb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables 2005-04-06 14:13:06 +05:00
heikki@hundin.mysql.fi
0c2caeb4d8 row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h:
Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
2005-04-06 10:27:40 +03:00
bar@mysql.com
0134a2b286 Adding a new parameter for well_formed_length to
return error. We'll use it for better warnign reporting.
2005-04-06 11:53:15 +05:00
serg@serg.mylan
014c8829cb Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-05 20:04:31 +02:00
serg@serg.mylan
4962ba7f8a merged 2005-04-05 19:44:39 +02:00
serg@serg.mylan
3c3defaa0a add changeset key to the bk commit mail 2005-04-05 15:16:15 +02:00
pekka@mysql.com
114b421c8b ndb - csc#4847 release scan op early to save memory 2005-04-05 13:14:03 +02:00
joerg@mysql.com
45ba58ab20 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-05 11:25:42 +02:00
heikki@hundin.mysql.fi
9db3965924 dict0dict.c:
Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints
2005-04-05 11:35:03 +03:00
joerg@mysql.com
cc06b6c12c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-05 09:06:57 +02:00
jimw@mysql.com
247f2ac563 Merge new tests 2005-04-04 18:29:18 -07:00
jimw@mysql.com
59b1a1f62f Merge mysql.com:/home/jimw/my/mysql-4.1-9472b
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:27:27 -07:00
jimw@mysql.com
1f1c44779a Merge mysql.com:/home/jimw/my/mysql-4.1-8866
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:26:39 -07:00
jimw@mysql.com
fc3c7d5f74 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 12:46:43 -07:00
joerg@mysql.com
36a034d36a Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-04 19:00:40 +02:00
heikki@hundin.mysql.fi
73a8d1bcad ha_innodb.cc:
Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables
2005-04-04 19:41:52 +03:00
heikki@hundin.mysql.fi
63aa88638a ha_innodb.cc:
Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string
2005-04-04 19:27:28 +03:00
jimw@mysql.com
0f007e5c73 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 08:42:30 -07:00
bar@mysql.com
d9f8b501db ctype_uca.result:
fixing test results accordingly.
ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.
2005-04-04 17:55:12 +05:00
dlenev@mysql.com
da53d7bc88 Manual merge of fix for bug #8894 "TIMESTAMP values scrambled/misaligned
when using --new" into 4.1 tree.
2005-04-03 10:05:01 +04:00
dlenev@mysql.com
a663889569 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg8894
2005-04-03 09:48:09 +04:00
serg@serg.mylan
ddee2fa7fb Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-02 21:45:02 +02:00
serg@serg.mylan
4a0e73c63a results updated 2005-04-02 21:36:50 +02:00
serg@serg.mylan
7ba99ee324 merged 2005-04-02 20:28:58 +02:00
serg@serg.mylan
3098b93ef8 bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)
2005-04-02 20:13:19 +02:00
jimw@mysql.com
623a5d5a57 Clean up merge of fix for Bug #9468. 2005-04-01 19:00:14 -08:00
jimw@mysql.com
16efc3e333 Merge embedded-server testing changes. 2005-04-01 16:43:35 -08:00
jimw@mysql.com
9e16f12145 Fix handling of max_allowed_packet and net_buffer_length in
embedded server when a size suffix (K, M, G) is added. (Bug #9472)
2005-04-01 16:09:20 -08:00
mskold@mysql.com
f2deb39f06 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-01 20:52:55 +02:00
joerg@mysql.com
2bdabb1ebb Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-01 20:17:24 +02:00
jimw@mysql.com
1ebcd90364 Fix the new ps_grant test to clean itself up properly. 2005-04-01 09:13:20 -08:00
joerg@mysql.com
e2dbb850b8 Merge changesets constituting 4.1.10a back into main tree, including release label. 2005-04-01 18:56:45 +02:00
joerg@mysql.com
7f52a616f4 Last minor things to finish MySQL 4.1.10a:
- some wordings,
- RPM packaging improvements.
2005-04-01 18:38:19 +02:00
mskold@mysql.com
5adfa12df2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-01 18:02:51 +02:00
mskold@mysql.com
cf7c0e43cb Fix for bug#9435: TIMESTAMP columns don't update 2005-04-01 17:59:46 +02:00
reggie@mdk10.(none)
0eaafddfdd Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-01 08:18:49 -06:00
msvensson@neptunus.(none)
09b3d3e224 Manual merge 2005-04-01 12:35:49 +02:00
msvensson@neptunus.(none)
fe5384dad8 BUG#6554 Problem Building MySql on Fedora Core 3
- Remove the local static var
2005-04-01 12:32:47 +02:00
sergefp@mysql.com
7ace3f1362 Better comment 2005-04-01 11:05:17 +04:00
joerg@mysql.com
e2a3d0da36 Fix for a build bug.
Added a missing comma.

Originally contained in 2005/03/04 09:30:22+01:00 ingo@mysql.com;
contained in MySQL 4.1.10a;
re-committed for archival purposes.
2005-03-31 22:02:05 +02:00
joerg@mysql.com
ccd6fe786a after merge fixes
Originally contained in 2005/03/03 23:57:48+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.
2005-03-31 21:57:46 +02:00
joerg@mysql.com
9db41fb08e typos fixed
Originally contained in 2005/03/03 23:10:23+01:00 serg@serg.mylan;
contained in MySQL 4.1.10a;
re-committed for archival purposes.
2005-03-31 21:47:18 +02:00