mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20123 commits 2784 branches 343 tags 1.6 GiB
Commit graph

20123 commits

This branch
This branch
All branches
Author SHA1 Message Date
ingo@mysql.com
6bc4636b64 Merge mysql.com:/home/mydev/mysql-4.0-4000 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-15 18:09:40 +01:00
ingo@mysql.com
aa1f46a819 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
After merge fix.
 2005-11-15 18:01:30 +01:00
bell@sanja.is.com.ua
297639bdbe Test suite for BUG#13673 (the bug was fixed in the bugfix for BUG#14138) 2005-11-15 18:14:53 +02:00
ingo@mysql.com
1aa15c25c7 Merge mysql.com:/home/mydev/mysql-4.0-bug14397 
into  mysql.com:/home/mydev/mysql-4.0-4000
 2005-11-15 16:47:15 +01:00
ingo@mysql.com
8996fd40cf Merge mysql.com:/home/mydev/mysql-4.0-bug14616 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-15 16:07:05 +01:00
bar@mysql.com
8894bd8d55 Bug#14406 GRANTS ON objects with non-ascii names borked after FLUSH PRIVILEGES 
ps_grant.result:
  Fixing result order.
grant.result:
  Adding test case,
  fixing result order.
grant.test:
  Adding test case.
sql_acl.cc:
  Fixed that my_charset_latin1 was incorrectly used instead of system_charset_info.
  This problem was previously fixed by Ingo in 5.0.
  This patch is basically a backport of the same changes into 4.1.
 2005-11-14 16:36:06 +04:00
kent@mysql.com
ca415d9873 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-11-14 02:00:51 +02:00
kent@mysql.com
61438b0218 mysql-test-run.pl: 
Corrected search for 'mysqlimport' executable
 2005-11-14 01:59:15 +02:00
svoj@mysql.com
5d8cefe0b4 Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8 2005-11-12 11:25:14 +04:00
jimw@mysql.com
2ffc7ff2a2 Update out-of-date URLs in 'help' text of mysql client. (Bug #14801) 2005-11-11 15:23:04 -08:00
jimw@mysql.com
56a56a789a Merge mysql.com:/home/jimw/my/mysql-4.1-14469 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-10 11:23:52 -08:00
guilhem@mysql.com
27a6670747 Merge mysql.com:/home/mysql_src/mysql-4.1-gca 
into  mysql.com:/home/mysql_src/mysql-4.1
 2005-11-10 15:14:17 +01:00
guilhem@mysql.com
2df7d97281 Declaring some class members public for BUG#12377: 
"Item_date_add_interval needs to have the int_type member as Public".
As explained in the bug report, this change is is to help http://search.cpan.org/~philips/DBIx-MyParse-0.20/
So please keep those members public.
 2005-11-10 15:12:22 +01:00
sergefp@mysql.com
f12212f74e BUG#14480: post-fix: use the default field value from CREATE list too. 2005-11-09 09:34:46 +03:00
sasha@asksasha.com
637c800191 changed select release_lock() to do release_lock() to avoid having to compare the 
non-deterministic result in the test case for BUG#7947
the bug fix for BUG#7947 now fixed the result of mix_innodb_myisam_binlog test, which
in the past was missing DO RELEASE_LOCK() in the output of SHOW BINLOG EVENTS
 2005-11-07 20:51:30 -07:00
sergefp@mysql.com
41bc233699 Merge mysql.com:/home/psergey/mysql-4.1-bug13814 
into mysql.com:/home/psergey/mysql-4.1-nov08-push
 2005-11-08 05:36:25 +03:00
sergefp@mysql.com
5656740542 Merge mysql.com:/home/psergey/mysql-4.1-bug14480 
into mysql.com:/home/psergey/mysql-4.1-nov08-push
 2005-11-08 05:34:56 +03:00
sasha@asksasha.com
aaaee3f23b Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
 2005-11-07 15:10:48 -07:00
sasha@asksasha.com
41752fa9a0 fix for BUG#7947 - failure to log DO RELEASE_LOCK() if we disconnect in the middle of 
transaction while holding the lock. Also test to make sure other binlogging issues
reported in the bug have been addressed.
 2005-11-07 15:09:35 -07:00
petr@mysql.com
03674968b3 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/cps/mysql/trees/mysql-4.1
 2005-11-08 01:00:15 +03:00
kent@mysql.com
58dd64612c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-07 13:39:03 +01:00
ingo@mysql.com
1f3df2e669 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
Initialized usable_keys from table->keys_in_use instead of ~0
in test_if_skip_sort_order(). It was possible that a disabled
index was used for sorting.
 2005-11-07 12:16:49 +01:00
sergefp@mysql.com
edd094b194 BUG#14480, attempt2: In CREATE ... SELECT ..., don't count the same field twice 
when calculating table->null_fields.
 2005-11-07 09:23:43 +03:00
petr@mysql.com
038b300753 Fix Bug#14672 Bug in deletion 2005-11-06 02:11:12 +03:00
petr@mysql.com
a1f56ea5a6 Fix Bug#13894 Server crashes on update of CSV table 2005-11-05 15:08:15 +03:00
kent@mysql.com
79aaf0754d mysql.spec.sh: 
Always use bundled zlib
 2005-11-05 01:44:35 +01:00
petr@mysql.com
085b48427d fix --ansi --pedantic compilation failure 2005-11-04 16:17:43 +03:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-04 01:15:35 +01:00
ingo@mysql.com
1b99d30c23 Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash 
Version for 4.0.
It fixes two problems:
1. The cause of the bug was that we did not check the table version for
   the HANDLER ... READ commands. We did not notice when a table was
   replaced by a new one. This can happen during ALTER TABLE, REPAIR
   TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
   for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
   Though the function comment clearly said it must.
   I changed the code so that the locking is done when required. I call
   the fix for this problem "the secondary fix".
 2005-11-03 18:24:12 +01:00
jani@ua141d10.elisa.omakaista.fi
b8248334d9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2005-11-03 13:02:05 +02:00
jani@ua141d10.elisa.omakaista.fi
8243eee9db Added test-force to Makefile. 2005-11-03 11:47:54 +02:00
jani@ua141d10.elisa.omakaista.fi
2476aa5a70 Added new build script for pentium64. 2005-11-03 11:19:06 +02:00
jani@ua141d10.elisa.omakaista.fi
d03662cd37 Changed mysql-test-run to correspond to the one in 5.0 tree. 2005-11-03 11:05:52 +02:00
holyfoot@mysql.com
284f652980 Merge bk@192.168.21.1:mysql-4.1 
into mysql.com:/home/hf/work/mysql-4.1.14183
 2005-11-03 12:50:28 +04:00
jimw@mysql.com
592a4c7cb3 Don't add optimization flags to CFLAGS if the user specified their 
own CFLAGS (ditto for CXXFLAGS). (Bug #12640)
 2005-11-02 18:29:06 -08:00
jonas@perch.ndb.mysql.com
0bd3e7eaa2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-11-02 08:30:18 +01:00
jimw@mysql.com
15da5308c3 Avoid possible race condition in accessing slave statistics 
during shutdown. (Bug #11796)
 2005-11-01 11:48:55 -08:00
jimw@mysql.com
d012c49ebf Merge mysql.com:/home/jimw/my/mysql-4.1-13774 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-01 09:38:41 -08:00
lenz@mysql.com
f2eeaca387 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
 2005-11-01 17:46:00 +01:00
evgen@moonbone.local
47059b89f5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14186-bug-4.1-mysql
 2005-11-01 17:34:19 +03:00
monty@mysql.com
19502e8eb5 Review of new pushed code 
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values
 2005-11-01 13:00:02 +02:00
hf@deer.(none)
bb17195a1c Fix for bug #14183 (ctype_cp983.test fails with the embedded server) 2005-11-01 13:18:46 +04:00
jonas@perch.ndb.mysql.com
1862c8ea94 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-11-01 08:25:44 +01:00
ramil@mysql.com
fdcb437bdf Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-4.1
 2005-11-01 09:52:45 +04:00
jimw@mysql.com
6894cbc9eb Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469) 2005-10-31 15:56:52 -08:00
jimw@mysql.com
1d9bfbf7d2 Handle decision to use mysqld-max over mysqld within mysqld_safe 
even when --ledir option is specified. (Bug #13774)
 2005-10-31 11:15:44 -08:00
joerg@mysql.com
4c73ac6671 Accept any shared library for "libz", not just the static one. Bug#6584 2005-10-31 18:35:26 +01:00
ramil@mysql.com
afbd0fafd3 Check for NULLs only if we don't replace column results, 
get real results after all checks.
(see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).
 2005-10-31 16:28:45 +04:00
hf@deer.(none)
5150bd8f9f Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.12839
 2005-10-31 12:24:43 +04:00
hf@deer.(none)
16c66d49ca Additional fix for #12839 2005-10-31 12:05:27 +04:00