mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18767 commits 2788 branches 343 tags 1.7 GiB
Commit graph

9067 commits

Author SHA1 Message Date
guilhem@mysql.com
de1ff0698b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-15 10:22:05 +01:00
ram@gw.mysql.r18.ru
4b3996d587 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
 2005-01-14 18:32:43 +04:00
ram@gw.mysql.r18.ru
e6510c896b A fix for bit type. 
pack_length_in_rec() func has been introduced.
 2005-01-14 18:24:32 +04:00
guilhem@mysql.com
2c6738cd7d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-14 15:06:53 +01:00
marko@hundin.mysql.fi
7ef8a20950 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/j/mysql-5.0
 2005-01-14 13:06:46 +02:00
guilhem@mysql.com
4c41a0d5e4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-14 11:32:17 +01:00
anjuta@arthur.local
a8e6b5e68c Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into arthur.local:/my/mysql-5.0-clean
 2005-01-14 01:17:01 +02:00
jimw@mysql.com
fdc16dc434 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 12:40:34 -08:00
guilhem@mysql.com
d6c99656b0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-13 21:36:28 +01:00
heikki@hundin.mysql.fi
94cc8442b0 ha_innodb.cc: 
"Add a comment why data modifying SQL statements MUST always use a locking read in tables that they read: otherwise the execution is not serializable, and in many cases is not well-defined; we also merged the associated bug fix from 4.1"
 2005-01-13 21:58:47 +02:00
anjuta@arthur.local
8f169155d1 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0 
into arthur.local:/my/mysql-5.0-clean
 2005-01-13 21:56:18 +02:00
jimw@mysql.com
9b798253eb Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 11:50:10 -08:00
heikki@hundin.mysql.fi
bdf26a4f9d Merge hundin.mysql.fi:/home/heikki/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-01-13 21:42:37 +02:00
heikki@hundin.mysql.fi
21666e4207 ha_innodb.cc: 
Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
 2005-01-13 20:08:28 +02:00
jani@ua141d10.elisa.omakaista.fi
83a57807e8 Applied a patch for Netware. 2005-01-13 19:46:46 +02:00
jimw@mysql.com
80c56602d3 Merge 2005-01-13 09:31:54 -08:00
anjuta@arthur.local
224fcd4717 Merge 2005-01-13 19:14:10 +02:00
jimw@mysql.com
ce1cd9f0ee Merge mysql.com:/home/jimw/my/mysql-4.1-bdb-init 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 09:09:46 -08:00
jimw@mysql.com
28ee2a67b3 Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 09:09:10 -08:00
konstantin@mysql.com
9e10645cff Fix valgrind warning + post-merge fixes. 2005-01-13 19:03:21 +03:00
guilhem@mysql.com
c7c5cc80ad Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-13 15:59:48 +01:00
konstantin@mysql.com
a676498977 manual merge 2005-01-13 17:31:49 +03:00
bar@mysql.com
e3d6e6736b bug#7284: strnxfrm returns different results for equal strings 2005-01-13 18:12:04 +04:00
paul@kite-hub.kitebird.com
969b8ca5c4 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 20:39:04 -06:00
paul@kite-hub.kitebird.com
231632e34f user_limits.result: 
Fix test result affected by error message rewording.
errmsg.txt:
  Reword error messages.
set_var.cc:
  Reorder variables.
mysqld.cc:
  Reorder options.
 2005-01-12 20:38:05 -06:00
jimw@mysql.com
3d2481ba4a Fix small memory leak that occured when BerkeleyDB failed to initialize. 2005-01-12 17:20:43 -08:00
jimw@mysql.com
0a3fba7f18 Small fix for Field_str::store() to avoid trying to read past beginning 
of log_10 array.
 2005-01-13 00:52:19 +01:00
jimw@mysql.com
51781b0bfc Fix conversion of floating point values to character fields when the 
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774)
 2005-01-13 00:41:45 +01:00
konstantin@mysql.com
019ff4c577 Manual merge. 2005-01-13 02:19:35 +03:00
konstantin@mysql.com
30c4d10e1a Add logging of COM_EXECUTE in the general query log. 2005-01-13 02:13:19 +03:00
guilhem@mysql.com
7d81a1d399 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-12 22:25:12 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
3e3e140e3d Minor clean up. 2005-01-12 22:55:10 +02:00
paul@kite-hub.kitebird.com
72ce1f5055 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 14:53:11 -06:00
sergefp@mysql.com
106509992e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2
 2005-01-12 23:22:12 +03:00
paul@kite-hub.kitebird.com
e608d27f5a Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 14:17:56 -06:00
vtkachenko@mail.mysql.com
306df48731 Merge 2005-01-12 21:03:06 +01:00
vtkachenko@mail.mysql.com
9f640bbad9 logging_ok: 
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
 2005-01-12 20:55:06 +01:00
konstantin@mysql.com
f01f721672 manual merge 2005-01-12 21:51:04 +03:00
guilhem@mysql.com
20e494424a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-12 19:44:35 +01:00
paul@kite-hub.kitebird.com
e7810fa9b9 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 12:42:53 -06:00
jimw@mysql.com
77fae11832 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-12 19:19:55 +01:00
guilhem@mysql.com
db56a953f6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-12 18:32:49 +01:00
jimw@mysql.com
0b041fe2e1 Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-12 18:09:44 +01:00
paul@kite-hub.kitebird.com
48802d5b32 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 10:27:09 -06:00
heikki@hundin.mysql.fi
f55cb90f93 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-01-12 18:26:56 +02:00
heikki@hundin.mysql.fi
bdc9823cb6 ha_innodb.cc: 
Add comments about why the InnoDB latching order is obeyed also for the MySQL query cache mutex; add an error printf if that is not the case
sync0sync.h:
  Assign sync0sync.h ranks also for the MySQL query cache mutex and the MySQL binlog mutex; the latching order must be obeyed also for these
row0ins.c:
  Add a comment why the query cache invalidate operation cannot deadlock in a cascaded FOREIGN KEY operation
 2005-01-12 18:25:39 +02:00
guilhem@mysql.com
443d6c45e3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-01-12 17:06:53 +01:00
jimw@mysql.com
fd7d355fbd Merge mysql.com:/home/jwinstead2/mysql-4.1-clean 
into mysql.com:/home/jwinstead2/mysql-5.0-clean
 2005-01-12 17:05:33 +01:00
paul@kite-hub.kitebird.com
86ed717a3f Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2005-01-12 10:05:33 -06:00
konstantin@mysql.com
2cc2844bbb Merge mysql.com:/home/kostja/work/mysql-4.0-6761 
into mysql.com:/home/kostja/work/mysql-4.1-root
 2005-01-12 19:00:04 +03:00