mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
22304 commits 2774 branches 343 tags 1.6 GiB
Commit graph

5202 commits

Author SHA1 Message Date
serg@serg.mylan
98601055b6 backport kill.test fix from 5.0 2005-04-11 22:36:07 +02:00
reggie@mdk10.(none)
4bb4a285ab Merge mdk10.(none):/home/reggie/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-5.0
 2005-04-11 09:29:49 -05:00
bar@mysql.com
71f530c4ea merge 2005-04-11 15:11:52 +05:00
dlenev@mysql.com
b0dd388190 Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796 
into mysql.com:/home/dlenev/src/mysql-4.1-merges
 2005-04-11 09:53:54 +04:00
dlenev@mysql.com
06e3647274 Fix for bug #9796 "Query Cache caches queries with CURRENT_USER() 
function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
 2005-04-11 00:30:23 +04:00
bar@mysql.com
16e186779f ctype_collate.result, ctype_collate.test, union.result, union.test: 
fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
 2005-04-10 12:40:33 +05:00
pem@mysql.comhem.se
2038ced40c Fixed BUG#9073: Able to declare two handlers for same condition in same scope 2005-04-08 19:58:04 +02:00
pem@mysql.com
e6d72f1c48 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-08 17:32:50 +02:00
pem@mysql.comhem.se
ce2e40ac19 Fixed BUG#6900: Stored procedure inner handler ignored 
and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied
 2005-04-08 17:31:37 +02:00
pem@mysql.comhem.se
e99da54fd5 Fixed BUG#7299: Stored procedures: exception handler catches not-found conditions 2005-04-08 16:05:16 +02:00
ingo@mysql.com
3add511de7 Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145) 
Since 4.1 keys are compared with trailing spaces. 
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did.
 2005-04-08 14:13:02 +02:00
mskold@mysql.com
7c38f9d8e7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-08 11:50:01 +02:00
mskold@mysql.com
817f2c6a13 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-08 11:39:22 +02:00
mskold@mysql.com
813cc0eaf0 Added more tests for auto_increment 2005-04-08 11:38:40 +02:00
monty@mysql.com
211638f539 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-08 00:56:29 +03:00
msvensson@neptunus.(none)
f9dd856d9e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-07 21:29:33 +02:00
monty@mysql.com
551ebb8a60 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-07 22:02:24 +03:00
msvensson@neptunus.(none)
960410274c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-07 20:21:17 +02:00
msvensson@neptunus.(none)
7a0e28feb5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-07 20:19:25 +02:00
msvensson@neptunus.(none)
12b6252145 BUG#6762 ALTER TABLE gives weird results and error message 
- Removed hardcoded error message from 4.1
 2005-04-07 20:17:37 +02:00
mskold@mysql.com
e66eaaa2a0 Merge 2005-04-07 18:37:04 +02:00
monty@mysql.com
780202f130 Moved some old test and added a new test to only be run with mysql-test-run --big 
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
 2005-04-07 19:24:14 +03:00
mskold@mysql.com
89b140340c Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
dlenev@brandersnatch.localdomain
8d05aa0f02 Moved test for bug #9566 "explicit LOCK TABLE and store procedures result in illegal 
state" to sp-error.test.

According to Per-Erik all SP related tests which should result in error
should go into sp-error.test and not in sp.test, because we want to be
able to run sp.test using normal client.
 2005-04-07 11:57:47 +04:00
dlenev@mysql.com
f374b21d07 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg9566
 2005-04-07 10:41:07 +04:00
dlenev@brandersnatch.localdomain
d85bed1121 Fix for bug #9566 "explicit LOCK TABLE and store procedures result in 
illegal state".

We should not assume that mysql.proc table does not exist if we are
unable to open it under LOCK TABLES or in prelocked mode (and
remember this fact by setting mysql_proc_table_exists to zero).
 2005-04-07 01:40:29 +04:00
serg@serg.mylan
5cd866610d after merge fix 2005-04-06 23:12:10 +02:00
serg@serg.mylan
e1e5b97dea manually merged 
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
 2005-04-06 21:19:20 +02:00
kent@mysql.com
053d3b2897 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-04-06 19:18:47 +02:00
monty@mysql.com
a7c6348192 Fixed errors found during review 2005-04-06 19:43:35 +03:00
kent@mysql.com
2aa8253f70 Merge 2005-04-06 18:19:05 +02:00
monty@mysql.com
beb28b27e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f Fixed errors descovered by valgrind 2.4 
Added suppression file for some valgrind warnings that are not real errors
 2005-04-06 17:22:21 +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@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
msvensson@neptunus.(none)
a47bc28876 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-06 10:56:02 +02:00
jimw@mysql.com
2f398fc3ae Update tests after merge of bug fix. 2005-04-05 20:55:06 -07:00
jimw@mysql.com
b95cb4e654 Merge 2005-04-05 19:45:34 -07:00
msvensson@neptunus.(none)
771133bc6c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-05 21:31:54 +02:00
msvensson@neptunus.(none)
9a3a9d037f Merge neptunus.(none):/home/msvensson/mysql/bug6762-1.2152.20.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5
 2005-04-05 21:30:24 +02:00
jimw@mysql.com
9ff854dd12 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-04-05 07:59:11 -07:00
pem@mysql.com
3f7901c6ed Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-05 16:01:29 +02:00
mskold@mysql.com
f792eaf061 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-05 16:01:28 +02:00
pem@mysql.comhem.se
b18ca48c47 Additional fix for BUG#5907: Traditional mode: invalid value can be inserted via a stored procedure 
... make the handler catch too.
 2005-04-05 15:49:10 +02:00
serg@serg.mylan
7f2a12bbbf fix broken mix_innodb_myisam_binlog.test 2005-04-05 15:36:52 +02:00
jimw@mysql.com
39cd93e867 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-04-05 06:36:16 -07:00
mskold@mysql.com
9189816e07 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-05 14:58:42 +02:00
serg@serg.mylan
c796ea598c Merge 2005-04-05 13:23:11 +02:00
serg@serg.mylan
810b2c3d40 remove the rest of isam/merge references 
fix a race condition in TC_LOG_BINLOG::unlog
 2005-04-05 13:17:49 +02:00