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

21923 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
serg@serg.mylan
3c3defaa0a add changeset key to the bk commit mail 2005-04-05 15:16:15 +02: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
71811298b9 sql/item.cc 
after merge fix
sql/mysqld.cc
    too early for sync-binlog=1 by default :)
 2005-04-05 14:46:18 +02:00
marko@hundin.mysql.fi
8d6427659f InnoDB: Disable an assertion that fails on old data due to Bug #9526 2005-04-05 15:13:14 +03: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
pekka@mysql.com
114b421c8b ndb - csc#4847 release scan op early to save memory 2005-04-05 13:14:03 +02:00
msvensson@neptunus.(none)
4c55238e46 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug6762
 2005-04-05 13:11:21 +02:00
gluh@eagle.intranet.mysql.r18.ru
6c8624f6d5 Fix for bug#9383: INFORMATION_SCHEMA.COLUMNS, JOIN, Crash, prepared statement 
restore original 'lex->query_tables' table list after
   processing of information schema table
   remove unnecessary operations
 2005-04-05 16:09:56 +05:00
msvensson@neptunus.(none)
f8275510ed Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-05 13:08:00 +02:00
msvensson@neptunus.(none)
36120cd6af Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug6762
 2005-04-05 13:07:46 +02:00
msvensson@neptunus.(none)
f22b8930c3 Fix swedish error message 2005-04-05 13:01:16 +02:00
jani@ua141d10.elisa.omakaista.fi
6ed11e3bb3 A fix for Netware. 2005-04-05 13:15:04 +03:00
gluh@mysql.com
9dd3e180b9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/mysql-5.0
 2005-04-05 15:13:07 +05:00
gluh@eagle.intranet.mysql.r18.ru
6c8c2d22b9 Fix for bug#7214: information_schema: unauthorized user can see metadata 
the fix for 'columns' table only
    Rights check for 'routines' table is already done
    (see WL2131 Access control for SHOW ... PROCEDURE|FUNCTION ...)
    rename 'testtets' database to 'mysqltest' to keep number of
      DBs which created by mysql-test as small as possible
 2005-04-05 15:12:15 +05:00
ramil@mysql.com
0ba6c67d13 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/mysql-5.0
 2005-04-05 14:42:18 +05:00
gluh@eagle.intranet.mysql.r18.ru
fed0ba272a Code optimization(discussed with Monty) 2005-04-05 14:31:46 +05: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
msvensson@neptunus.(none)
f8ae1e53c8 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug6762
 2005-04-05 11:23:17 +02:00
ramil@mysql.com
f57c7d8b11 Fix for bug #9571: Primary key creation causes server crash. 2005-04-05 13:40:34 +05: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
bb215f648b Merge 2005-04-04 23:03:56 -07:00
petr@mysql.com
8197710349 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-04-05 06:12:41 +04: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
c13464b813 Skip new test with embedded server 2005-04-04 17:08:12 -07:00
sergefp@mysql.com
ea43deb9e3 Merge mysql.com:/home/psergey/mysql-4.1-bug8877 
into mysql.com:/home/psergey/mysql-5.0-bug8877-merge
 2005-04-05 03:36:14 +04:00
sergefp@mysql.com
53e0b5b5db Removed extra comment 2005-04-05 03:34:39 +04:00
jimw@mysql.com
8adf572cca Fix merge of tests that were split out of other test files 2005-04-04 16:34:24 -07:00
sergefp@mysql.com
99eb6814b2 Manually merged (will need a post-merge fix) 2005-04-05 03:07:37 +04:00
sergefp@mysql.com
d0c9b36224 Fix for BUG#8877: Implementation of 
"Early NULL-values filtering for ref access" (attempt2+post-review fixes)
1. update_ref_and_keys() accumulates info about null-rejecting
predicates in in KEY_FIELD::null_rejecting, add_key_part saves
these to KEYUSE.
2. create_ref_for_key copies them to TABLE_REF.
3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond of
appropiate JOIN_TAB members.

Includes code cleanups: 
* add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
passed to it)
* add_key_fields() params: JOIN_TAB *stat removed (wasn't used)
 2005-04-05 02:42:23 +04:00
jimw@mysql.com
2f0bb42d12 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-04-04 15:19:50 -07:00
jimw@mysql.com
eeacad63c1 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-04-04 15:19:49 -07:00
monty@mysql.com
48de1ff277 Don't generate message in send_kill_message() if wrong data. (Caused core dump for wrong data in ALTER TABLE on some system) 2005-04-05 01:19:48 +03:00
monty@mysql.com
e726bbb3d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-05 00:33:35 +03:00
monty@mysql.com
1be0a0c82a Now one gets an error if one tries to insert an invalid value via a stored procedure in STRICT mode. (Bug #5907) 2005-04-05 00:32:48 +03: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
jimw@mysql.com
c18307e8a2 Cleanup tests and results after merge from 4.1 of embedded 
server testing cleanups.
 2005-04-04 12:43:58 -07:00
mskold@mysql.com
8e19abff0e Fix Bug #9517 Condition pushdown to storage engine does not work for update/delete 2005-04-04 21:38:05 +02:00
heikki@hundin.mysql.fi
a226b4aff2 ha_innodb.cc, row0sel.c: 
Fix Bug #9526 in 5.0: MySQL ENUM and SET columns are internally actually unsigned integer types; we must take care that old tables still treat ENUM and SET (incorrectly) as a character string, while new created tables treat it correctly as an unsigned integer
 2005-04-04 20:31:04 +03: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
0acec5fefc Merge hundin.mysql.fi:/home/heikki/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-04-04 19:47:26 +03: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
serg@sergbook.mylan
2b8ff6949f delete isam/merge files 2005-04-04 17:58:21 +02:00
jimw@mysql.com
c2cfa5e435 Merge 2005-04-04 08:54:36 -07:00