mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30124 commits 2793 branches 343 tags 1.5 GiB
Commit graph

30124 commits

This branch
This branch
All branches
Author SHA1 Message Date
konstantin@mysql.com
a55b7a9f13 A post-merge fix. 2006-02-03 23:21:17 +03:00
konstantin@mysql.com
5e03bf7f93 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-03 21:10:03 +03:00
anozdrin@mysql.com
c6881fb936 Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1.6-release-15588 
into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree

The idea of this merge is to "synchronize" 5.1-release tree (5.1.6) and
the main 5.1 tree. A patch for BUG#15588/BUG#16621 was copied into
5.1-release from 5.0 since it is important. This patch is expected to
come into the 5.1 tree after resolving 5.0 -> 5.1 megrge logjam.
 2006-02-03 11:59:55 +03:00
anozdrin@mysql.com
c69961ff7f Copied patch for BUG#15588 (BUG#16621) from 5.0 into 5.1-release. 2006-02-03 01:49:33 +03:00
konstantin@mysql.com
9f0bb47f87 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 23:27:06 +03:00
dlenev@mysql.com
36e9bd0344 Merge mysql.com:/home/dlenev/src/mysql-5.1-bfix 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2006-02-02 22:12:06 +03:00
joerg@mysql.com
af396ba40f storage/example/ha_example.cc 
Copied from the general tree, to solve a build problem:
    ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
      build fix when building with example storage engine.
 2006-02-02 19:40:58 +01:00
konstantin@mysql.com
e3663e7659 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 20:54:07 +03:00
tomas@poseidon.ndb.mysql.com
6e0d64565f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
 2006-02-02 16:44:22 +01:00
tomas@poseidon.ndb.mysql.com
ce8308a503 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
 2006-02-02 16:19:49 +01:00
tomas@poseidon.ndb.mysql.com
8978db5ec6 added more logging in ndb handler 
enable extra logging in ndb handler during test runs
 2006-02-02 16:12:18 +01:00
tomas@poseidon.ndb.mysql.com
a4357007cd disabled test because of bug, bug assigned and being worked on 2006-02-02 15:53:44 +01:00
tomas@poseidon.ndb.mysql.com
467720abf0 disbled sporadically failing testcase 2006-02-02 15:24:52 +01:00
konstantin@mysql.com
c2cc87aab7 Merge mysql.com:/home/kostja/mysql/tmp_merge1 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 17:20:44 +03:00
konstantin@mysql.com
92b41ba92a Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 16:57:34 +03:00
dlenev@mysql.com
3fc6cf1494 Merge mysqldev@production.mysql.com:my/mysql-5.1-release/ 
into  mysql.com:/home/dlenev/src/mysql-5.1-bfix
 2006-02-02 13:53:35 +03:00
dlenev@mysql.com
5845476009 Yet another addition to the fix for BUG#9412 "Triggers: should have trigger 
privilege".

Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.
 2006-02-02 13:36:07 +03:00
tomas@poseidon.ndb.mysql.com
b40c942509 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-release 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
 2006-02-02 11:13:36 +01:00
tomas@poseidon.ndb.mysql.com
c62ce023d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
 2006-02-02 11:09:12 +01:00
tomas@poseidon.ndb.mysql.com
92ffe8cf0d Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 10:56:04 +01:00
konstantin@mysql.com
065f8066d5 Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 12:03:35 +03:00
stewart@mysql.com
bcb4178c73 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
 2006-02-02 18:11:10 +11:00
elliot@mysql.com
6d4c7e5741 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
 2006-02-02 01:46:10 -05:00
bar@mysql.com
5b3e50efb9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1.new.ctype
 2006-02-02 10:09:35 +04:00
bar@mysql.com
d7c773834b WL#1386 - CTYPE table for unicode character sets 
A prerequisite for several fulltext and XML bugs.
MY_CHARSET_HANDLER now has a new function "ctype"
to detect a type of the next character in a string
(i.e. digit, letter, space, punctuation, control, etc),
which now works correctly for both 8bit and multibyte charsets.
Previously only 8bit charsets worked correctly,
while any multibyte character was considered as letter
in multibyte charsets.
Many files:
  Adding new function
Makefile.am:
  Adding build rules for uctypedump,
  a dump tool to create my_uctype.h
  using Unicode Character Database file.
m_ctype.h:
  Adding declaration of my_uni_ctype,
  ctype data for Unicode.
  Adding new member into MY_CHARSET_HANDLER
Makefile.am:
  Adding my_uctype.h into noinst_HEADERS
my_uctype.h, uctypedump.c:
  new files:
  ctype data for unicode,
  and the tool to generate it from 
  a Unicode Character Database file.
 2006-02-02 10:07:47 +04:00
elliot@mysql.com
e1759fea1b Post-merge fixes. 2006-02-02 00:37:42 -05:00
stewart@mysql.com
3ca777e443 build fix for solaris 10 sparc -max 2006-02-02 16:14:31 +11:00
elliot@mysql.com
d843b119d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
 2006-02-01 19:35:15 -05:00
stewart@mysql.com
d5e09711b3 build fix when building with example storage engine. 2006-02-02 11:02:09 +11:00
tomas@poseidon.ndb.mysql.com
8c024b9072 Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 00:52:58 +01:00
tomas@poseidon.ndb.mysql.com
6232190797 bug, added error handling to information_schema files 2006-02-02 00:24:42 +01:00
tomas@poseidon.ndb.mysql.com
bdf72a56fe bug, retry handling in "ndb schema propagation" incorrect 2006-02-01 23:55:04 +01:00
elliot@mysql.com
9d282e31e4 Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
Null-merge InnoDB snapshots from 5.0 to 5.1
 2006-02-01 17:04:44 -05:00
tomas@poseidon.ndb.mysql.com
029fb75cb5 bug, ndb onject on thread unitialized on handlerton call in files information schema 2006-02-01 22:37:25 +01:00
dlenev@mysql.com
e4cf914b31 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2006-02-02 00:05:23 +03:00
mskold@mysql.com
4be67dec39 Disabled ndb_blob 2006-02-01 21:49:15 +01:00
mskold@mysql.com
ff13fc6da6 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892
 2006-02-01 21:29:21 +01:00
dlenev@mysql.com
ba053272e6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2006-02-01 22:19:18 +03:00
dlenev@mysql.com
934714442f Merge mysql.com:/home/dlenev/src/mysql-5.1-bfix 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2006-02-01 21:49:11 +03:00
konstantin@mysql.com
e84cf2c782 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-01 21:41:33 +03:00
dlenev@mysql.com
730a711f93 Addition to the fix for BUG#9412 "Triggers: should have trigger privilege". 
When we add new privilege we should update mysql-test/lib/init_db.sql
accordingly.
 2006-02-01 21:27:12 +03:00
pekka@mysql.com
8d699b1f28 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-02-01 18:20:40 +01:00
pekka@mysql.com
d85ee5105b ndb - wl#2972 fix some mem leaks 2006-02-01 18:09:38 +01:00
tomas@poseidon.ndb.mysql.com
a0da84efbf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
 2006-02-01 17:15:33 +01:00
konstantin@mysql.com
781cc33d6d Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge2 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-01 18:56:29 +03:00
konstantin@mysql.com
d02215bbb6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-01 18:43:53 +03:00
mskold@mysql.com
267801e581 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892
 2006-02-01 14:58:15 +01:00
mskold@mysql.com
1df5f9b37f Fixes to BLOB replication code for changes to event(now stores own copy of table) 2006-02-01 14:55:56 +01:00
stewart@mysql.com
37f4eba897 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge
 2006-02-02 00:53:45 +11:00
stewart@mysql.com
72b9f287df Merge mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge
 2006-02-02 00:52:32 +11:00