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
26238 commits 2784 branches 343 tags 1.6 GiB
Commit graph

26238 commits

This branch
This branch
All branches
Author SHA1 Message Date
ramil@mysql.com
f402871a5e Print a dummy section in order not to interference 
with /etc/my.cnf and ~/.my.cnf [client] section.
 2005-09-13 16:41:39 +05:00
ndbdev@dl145c.mysql.com
a80d0e5d39 merge 2005-09-13 13:18:14 +02:00
timour@mysql.com
dc935404c3 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-09-13 13:51:25 +03:00
kent@mysql.com
ffc213a192 sql_prepare.cc: 
VC6 can't handle initializing const in declaration
 2005-09-13 10:15:48 +02:00
tulin@dl145c.mysql.com
5f122007fa minor compile error fix 2005-09-13 10:03:50 +02:00
jimw@mysql.com
8369e7de8a Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-12 19:34:07 -07:00
kent@mysql.com
1313a30c83 innochecksum.c: 
Changed from C++ comments to C comments
  Did some adaption to MySQL Coding Style
 2005-09-13 02:31:47 +02:00
jimw@mysql.com
a60ed0b75d Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-12 17:00:50 -07:00
jimw@mysql.com
0eec7c3cf4 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-09-12 16:48:00 -07:00
kent@mysql.com
b5dbd1c7a1 mysql-test-run.pl: 
Corrected typo
 2005-09-13 01:41:15 +02:00
kent@mysql.com
0fa6cb9b19 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-09-13 01:22:11 +02:00
kent@mysql.com
b3446746b9 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-09-13 01:12:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e760a58f07 Merged from 4.1 to 5.0. 2005-09-13 01:44:50 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
cb55497bdb Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-09-13 01:11:55 +03:00
jmiller@mysql.com
9f573f0ac8 Adding comment for force manual merge 5.0 -> wl1012 2005-09-12 22:47:15 +02:00
jimw@mysql.com
d7dc2f68db Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-09-12 12:47:45 -07:00
jimw@mysql.com
7efd9582a2 Update test result 2005-09-12 12:45:03 -07:00
ndbdev@dl145b.mysql.com
e17e8b38a3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
 2005-09-12 20:41:50 +02:00
SergeyV@selena.
2ca1a688cd Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  selena.:H:/MYSQL/src/#05588-mysql-4.1
 2005-09-12 22:19:04 +04:00
paul@kite-hub.kitebird.com
d6f32f1361 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  kite-hub.kitebird.com:/tmp/merge-4.1
 2005-09-12 12:53:49 -05:00
paul@kite-hub.kitebird.com
bbb8e309de Merge kite-hub.kitebird.com:/tmp/merge-4.0 
into  kite-hub.kitebird.com:/tmp/merge-4.1
 2005-09-12 12:44:52 -05:00
paul@kite-hub.kitebird.com
7240863009 README: 
Update README (2nd try)
 2005-09-12 12:44:13 -05:00
jimw@mysql.com
16e5f22162 Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-09-12 10:19:56 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
01ce8a8aa9 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-09-12 20:18:49 +03:00
timour@mysql.com
d0f585f11f BUG#12943 - post-merge fix 2005-09-12 19:18:17 +03:00
timour@mysql.com
54db60c080 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-12943
 2005-09-12 19:05:55 +03:00
tulin@dl145b.mysql.com
63aef9d58b Corrected construct of faked Node fail signals in ndb SignalSender 2005-09-12 17:49:48 +02:00
gluh@mysql.com
c398940326 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
 2005-09-12 20:49:48 +05:00
monty@mishka.mysql.com
bdc33e2356 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.mysql.com:/home/my/mysql-4.1
 2005-09-12 18:49:47 +03:00
monty@mishka.mysql.com
0965bfa832 Review fixes since last pull 
Fix for bug #13025; Server crash in filesort because wrong call to handler::position()
 2005-09-12 18:48:17 +03:00
bar@mysql.com
2315c4f224 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-09-12 19:38:53 +05:00
bar@mysql.com
833bccfe57 Many files: 
Adding esperanto collation
 2005-09-12 19:35:50 +05:00
timour@mysql.com
9d862db743 Fix for BUG#6808. 
The problem was in that add_table_to_list was testing for duplicate tables
in a list of tables that included the created view.
 2005-09-12 17:01:17 +03:00
gluh@mysql.com
96e2471a32 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
 2005-09-12 17:43:02 +05:00
gluh@mysql.com
d91fb61b37 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
 2005-09-12 17:33:21 +05:00
jonas@eel.(none)
40cc9e5c42 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-09-12 14:30:52 +02:00
tulin@dl145c.mysql.com
e382a0fb12 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-09-12 14:11:28 +02:00
gluh@eagle.intranet.mysql.r18.ru
d9bd3c11e4 Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS 
produce warning for 'create database if not exists' if database exists
  do not update database options in this case  
  produce warning for 'create table if not exists' if table exists
 2005-09-12 17:09:19 +05:00
tulin@dl145c.mysql.com
f80e113d0e removed a few aborts from mgmapi 
corrected typo in ndb Parser
 2005-09-12 14:03:23 +02:00
lars@mysql.com
fd85a82559 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
 2005-09-12 13:00:55 +02:00
ramil@mysql.com
fa2cb2ae82 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12917
 2005-09-12 15:38:21 +05:00
ramil@mysql.com
4b57db2447 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12917
 2005-09-12 15:28:09 +05:00
bar@mysql.com
0d97562bd3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12891
 2005-09-12 15:26:01 +05:00
gluh@mysql.com
2db09b4cfc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-09-12 15:04:22 +05:00
gluh@mysql.com
bada46cbf0 manual merge 2005-09-12 15:02:57 +05:00
ramil@mysql.com
b0ae5792c8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12917
 2005-09-12 14:55:17 +05:00
jonas@eel.(none)
f9134bd920 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-09-12 11:43:22 +02:00
gluh@eagle.intranet.mysql.r18.ru
2a07350854 ps_6bdb, ps_7ndb tests failure fix 2005-09-12 14:21:38 +05:00
bar@mysql.com
2f13c5c12c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12891
 2005-09-12 14:09:44 +05:00
lars@mysql.com
683edc6599 Reverted old fix with sync_slave_with_master and added a replace commands 
to eliminate nondeterminism in slave start
 2005-09-12 10:50:42 +02:00