database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-13 18:02:43 +03:00
Code Activity
24,176 Commits 3,367 Branches 1,099 Tags
ca2ad9cdf6c2510fedaa16e94e64cbeb274da170
Commit Graph

11520 Commits

Author SHA1 Message Date
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
763250e7db Fixed compiler failure 2005-05-14 17:08:43 +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
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +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
monty@mysql.com
b4e92e6360 Merge with 4.0 2005-05-14 00:01:40 +03: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
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
jimw@mysql.com
6b85ca33a7 Fixup from 4.1 to 5.0 merge 2005-05-13 09:55:03 -07:00
ramil@ram-book.(none)
d85e052d71 a fix (bug #6267: ENUM ... NOT NULL w/o default treated differently than other data types). 
the behavior of enum changed to be consistent.
 2005-05-13 16:44:14 +05:00
konstantin@mysql.com
e5c916f7e8 Merge 2005-05-13 13:26:08 +02:00
ramil@mysql.com
122c72e248 a fix (bug #10339: Incorrect error is displayed if try to set value of internal ' warning_count '). 2005-05-13 16:18:27 +05:00
monty@mysql.com
b54d7d04bd Fixes during review 2005-05-13 14:04:32 +03:00
monty@mishka.local
2d4a417330 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-13 13:36:02 +03:00
hf@deer.(none)
3dbe7fb2ca Fix for valgrind bug in decimal code 2005-05-13 14:29:30 +05:00
monty@mishka.local
2d25da2a4b concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
 2005-05-13 12:08:08 +03:00
ramil@mysql.com
524b988260 a fix (bug #6961: Traditional: assignment of string to numeric column should fail). 2005-05-13 13:22:27 +05:00
monty@mysql.com
20f969b256 Change create_field->offset to store offset from start of fields, independent of null bits. 
Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236
 2005-05-13 11:11:50 +03:00
bell@book.sanja.is.com.ua
6e71a81915 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-bug-5.0
 2005-05-13 09:22:48 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
187ee4712b Fixed bug 10465. 2005-05-12 17:37:38 +03:00
serg@serg.mylan
047fa11461 Merge 2005-05-12 14:45:24 +02:00
ramil@mysql.com
152f751831 fix (Bug #8295 and #8296: varchar and varbinary conversion) 
select, gis & gis-tree tests fails at the moment, but
I will push this CS because it was tested before and I'm absolutely
sure it's right.
 2005-05-12 15:56:04 +05:00
konstantin@mysql.com
7ca3f018e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/media/sda1/mysql/mysql-5.0-9478
 2005-05-12 11:17:38 +04:00
konstantin@mysql.com
d0e24153b9 A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute" 
(crash on attempt to re-execute a statement with an open cursor) + 
post-review fixes.
 2005-05-12 11:16:12 +04:00
igor@rurik.mysql.com
3351233349 Manual merge 2005-05-10 16:41:47 -07:00
igor@rurik.mysql.com
9d4b228b61 Many files: 
Fixed bug #8528.
  Representation for single-table views was made similar to
  representation for multi-table views.
view.test:
  Added test case for bug #8528.
view.result:
  Added test case for bug #8528. Fixed other test cases.
 2005-05-10 16:31:13 -07:00
msvensson@neptunus.(none)
edae3e07df Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/bug9626
 2005-05-10 20:35:13 +02:00
gbichot@quadita2.mysql.com
3c81444476 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-10 20:35:12 +02:00
gluh@mysql.com
efaeb069e7 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Devel/mysql-5.0
 2005-05-10 18:35:11 +00:00
gluh@mysql.com
75b7fef44f Bug#10018: use INFORMATION_SCHEMA works, but show tables in it returns error 
additional fix after review
 2005-05-10 18:34:04 +00:00
gbichot@quadita2.mysql.com
b6ca1a1485 comment change (post-review of "replication of triggers"). Btw date_formats segfaults with --ps-protocol - not caused by my changes though; I'll file a bug report. 2005-05-10 15:55:22 +02:00
gbichot@quadita2.mysql.com
d6e1e5b417 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-10 11:31:46 +02:00
msvensson@neptunus.(none)
f3890e9440 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-10 10:49:50 +02:00
msvensson@neptunus.(none)
7133dc5a22 Remove testcode 2005-05-10 10:45:16 +02:00
jimw@mysql.com
cde9f56b45 Merge 2005-05-09 11:28:57 -07:00
mskold@mysql.com
145f7b2983 Fix for Bug #9246 Condition pushdown and left join, wrong result 2005-05-09 18:56:29 +02:00
bar@noter.(none)
c783cb3d7e SUBSTR with negative argument didn't work 
with multi-byte strings, length() instead
of numchars() where used in a mistake.
 2005-05-09 20:55:06 +05:00
antony@ltantony.mysql.com
ddf6225def Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733
 2005-05-09 14:50:56 +01:00
antony@ltantony.mysql.com
cc3bfc6ff1 Bug#8733 - server accepts malformed query (multiply mentioned distinct) 
Detect conflicting options in SELECT
 2005-05-09 14:31:46 +01:00
dlenev@mysql.com
feb8a43c4d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-05-09 17:01:23 +04:00
bell@book.sanja.is.com.ua
e4fe89fab2 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-bug-5.0
 2005-05-09 15:34:41 +03:00
jimw@mysql.com
3591b93874 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-09 05:30:11 -07:00
dlenev@mysql.com
e7f29e1904 Manual merge of fix for bug #9913 into 5.0 tree. 2005-05-09 16:21:57 +04:00
holyfoot@mysql.com
8d12a8b124 Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into mysql.com:/home/hf/work/mysql-5.0.emb
 2005-05-09 17:11:37 +05:00
holyfoot@hf-ibm.(none)
5ddaf35c26 Fix for bug #9632 (strict.test fails in -embedded-server mode) 2005-05-09 16:26:06 +05:00
msvensson@neptunus.(none)
1e889f3beb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-09 12:48:32 +02:00