summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* I had forgotten to delete an already disabled line of C++ code.guilhem@gbichot3.local2006-08-011-2/+0
* Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2006-07-314-10/+16
|\
| * Make innodb_flush_log_at_trx_commit a settable global variable.aivanov/alexi@mysql.com/mysqld.localdomain2006-07-294-7/+10
| * Make innodb_thread_concurrency 0 by default, and extendaivanov/alexi@mysql.com/mysqld.localdomain2006-07-291-2/+4
| * Applied innodb-5.1-ss660 snapshot.aivanov/alexi@mysql.com/mysqld.localdomain2006-07-261-1/+2
* | Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-287-10/+43
|\ \
| * | mergingholyfoot/hf@mysql.com/deer.(none)2006-07-181-0/+1
| * | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-181-5/+12
| |\ \
| | * \ Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-131-6/+12
| | |\ \
| | | * | bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-011-6/+12
| * | | | 4.1 -> 5.0 merge fixesigreenhoe/greenman@anubis.greendragongames.com2006-07-142-2/+0
| * | | | 4.1 -> 5.0 mergeigreenhoe/greenman@anubis.greendragongames.com2006-07-136-4/+31
| |\ \ \ \ | | |/ / /
| | * | | Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-4.1mkindahl@dl145k.mysql.com2006-07-121-3/+5
| | |\ \ \
| | * \ \ \ Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@maint1.mysql.com2006-07-121-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.(none)2006-07-111-1/+1
| | | |\ \ \ \
| | | | * | | | Bug#20729: Bad date_format() call makes mysql server crashcmiller@zippy.(none)2006-07-111-1/+1
| | * | | | | | Merge zippy.(none):/home/cmiller/work/mysql/mysql-4.0__bug19006cmiller@zippy.(none)2006-07-111-1/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Bug#19006: 4.0 valgrind problems (in test func_str)cmiller@zippy.(none)2006-07-013-3/+14
| | | * | | | | Fix for bug #12728: Very strange behaviour of ELTramil@mysql.com2006-06-132-0/+12
| | * | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug14400ingo/mydev@chilla.local2006-07-081-3/+3
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2006-07-071-1/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bugs#17647: Trouble with "create database"bar@mysql.com2006-05-041-1/+3
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@bodhi.netgear2006-07-074-7/+36
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | A fix and a test case for Bug#19399 "res 'Lost Connection' when konstantin@bodhi.netgear2006-07-064-7/+36
| * | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-ktholyfoot/hf@mysql.com/deer.(none)2006-07-1338-242/+2219
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | func_str.result, func_str.test:bar@myoffice.izhnet.ru2006-07-071-2/+2
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-07-2823-107/+1853
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add sql_locale.cc to cmake scripts.kostja@bodhi.local2006-07-281-1/+1
| * | | | | | | | | | | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-2621-105/+1839
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fix a valgrind warning in type_date test.kostja@bodhi.local2006-07-121-2/+3
| | * | | | | | | | | | | Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0mkindahl@dl145k.mysql.com2006-07-124-28/+83
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rplguilhem@gbichot3.local2006-07-101-2/+3
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM...aelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi2006-07-101-2/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | BUG#20919 temp tables closing fails when binlog is offaelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi2006-07-101-3/+5
| | * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-07-114-6/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix yet another Windows build failure: "true" -> TRUEkostja@bodhi.local2006-07-111-14/+14
| | * | | | | | | | | | | | | | Fix a Windows build failure. kostja@bodhi.local2006-07-101-95/+95
| | * | | | | | | | | | | | | | Fix compiler warnings in sql_udf.h: ISO C++ forbids castingkostja@bodhi.local2006-07-093-23/+25
| | * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-07-088-67/+111
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | A post-merge fix.kostja@bodhi.local2006-07-081-1/+1
| | * | | | | | | | | | | | | | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-089-29/+1732
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | WL#2928 Date Translation NREbar@mysql.com2006-07-049-29/+1734
| | | * | | | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2006-07-011-4/+179
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-rootkostja@bodhi.local2006-07-0718-89/+264
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimedlenev@mysql.com2006-07-0611-37/+182
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-07-055-45/+69
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-07-045-45/+69
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | Bug#20570: CURRENT_USER() in a VIEW with SQL SECURITY DEFINER returnskroki@mysql.com2006-07-025-45/+69
| | | * | | | | | | | | | | | | | | | | A fix and a test case for Bug#17843 "Certain stored procedures fail to konstantin@mysql.com2006-07-042-0/+7
| | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | auxilliary -> auxiliarykonstantin@mysql.com2006-07-042-2/+2
View Lorry Controller Status