mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-11 09:38:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43079 commits 2851 branches 349 tags 1.6 GiB
Commit graph

533 commits

Author SHA1 Message Date
msvensson@pilot.mysql.com
7e6e518a47 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-13 10:00:59 +01:00
joerg@trift2.
e8669853b9 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-02-09 12:08:41 +01:00
hhunger@hh-nb.hungers
816b8b4193 updates caused by 5.1.16 2007-02-08 10:03:17 +01:00
msvensson@neptunus.(none)
e4001b3b5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 15:46:17 +01:00
hhunger@hh-nb.hungers
e6055e21f5 copy from test-extra-5.1 to main tree 2007-02-06 13:35:54 +01:00
monty@narttu.mysql.fi
bb464613ce Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-01-29 01:57:07 +02:00
monty@mysql.com/narttu.mysql.fi
410fc81a72 After merge fixes 
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
 2007-01-29 01:47:35 +02:00
mtaylor@qualinost.(none)
d29c6a2547 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-19 14:30:41 -08:00
mtaylor@qualinost.(none)
d116ff2973 Merge recycle.(none):/src/bug22807/my50-bug22807 
into  recycle.(none):/src/mysql-5.0-maint
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
---
I cut and pasted in the wrong direction I think. We don't have storage until 5.1... 
---
missed storage in one more place
---
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
---
added storage back to patch after merge from 5.0-maint
---
Removed ndb/src dir and libndb.ver.in from it that got introduced from the 5.0-maint merge.
 2007-01-19 14:29:01 -08:00
mtaylor@qualinost.(none)
8e6f3ab33b Added libndb.ver to BUILT_SOURCES to force it to get removed during make distclean 2007-01-19 14:26:06 -08:00
malff/marcsql@weblab.(none)
564309e416 Merge 5.1-main -> 5.1-runtime, added ignore entry for missing symbolic link 2007-01-02 17:49:05 -07:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
971c783f7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-04 19:11:55 +01:00
monty@narttu.mysql.fi
717284b85c Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-29 23:07:15 +02:00
monty@mysql.com/narttu.mysql.fi
0bee93e038 Ignore some generated files 
Don't return from my_thread_global_end() until all threads have called my_thread_end()
Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io)
 2006-11-29 22:14:08 +02:00
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 15:44:09 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 20:59:57 +01:00
jpipes@shakedown.(none)
03a5dcd7ce Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
 2006-11-27 14:58:57 -05:00
jpipes@shakedown.(none)
7c7b1ede76 Merge shakedown.(none):/home/jpipes/dev/mysql-5.0-maint 
into  shakedown.(none):/home/jpipes/dev/mysql-5.1-new-maint2
 2006-11-27 14:46:48 -05:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-22 14:11:36 +02:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
 2006-11-20 22:42:06 +02:00
msvensson@neptunus.(none)
74d8113c2e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 22:02:33 +02:00
msvensson@neptunus.(none)
e0985bef96 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
ac5b37ef00 Pass --core-file option to mysqld when bootstrapping 2006-10-24 21:02:04 +02:00
msvensson@neptunus.(none)
1a7676fa65 WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks 
BUG#23427 incompatible ABI change in 5.0.26?
   - Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file
 2006-10-24 20:32:07 +02:00
jpipes@shakedown.(none)
b57051381a Fix for Bug (client allows DELIMITER with backslash character) 2006-10-02 11:45:48 -04:00
msvensson@neptunus.(none)
8ee337a590 Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-28 11:05:28 +02:00
msvensson@neptunus.(none)
3f59918eab Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-28 10:39:55 +02:00
msvensson@neptunus.(none)
c4a50dea3f Build fixes for netware/ directory 
- Create the file netware/libmysql.imp from libmysql/libmysql.def
 - Remove the outdated netware/libmysql.imp file from version control
 2006-09-27 17:11:19 +02:00
msvensson@shellback.(none)
fe0cfacf35 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-21 20:31:35 +02:00
istruewing@chilla.local
1782889d35 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
 2006-09-20 08:33:46 +02:00
istruewing@chilla.local
c49c58cbf4 Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty 
into  chilla.local:/home/mydev/mysql-5.1-bug14400-monty
 2006-09-19 14:33:29 +02:00
istruewing@chilla.local
5d509b32d4 Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty 
into  chilla.local:/home/mydev/mysql-5.0-bug14400-monty
 2006-09-19 11:27:00 +02:00
istruewing@chilla.local
47dc3fbe8a Merge bk-internal:/home/bk/mysql-4.0 
into  chilla.local:/home/mydev/mysql-4.1-bug14400-monty
 2006-09-19 10:17:25 +02:00
msvensson@shellback.(none)
f415523c17 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-18 11:34:07 +02:00
msvensson@shellback.(none)
0a59967cb0 Remove trailing whitespace 
Add linebreak
 2006-09-18 11:27:21 +02:00
ramil/ram@myoffice.izhnet.ru
8445f3e3de Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
 2006-09-15 14:15:09 +05:00
dlenev@mockturtle.local
5ba1b83c98 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-14 23:53:35 +04:00
iggy@rolltop.ignatz42.dyndns.org
e9ff111d1e Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-13 14:18:36 -04:00
iggy@rolltop.ignatz42.dyndns.org
eb641f4a43 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
 2006-09-13 14:16:53 -04:00
iggy@rolltop.ignatz42.dyndns.org
1cae186141 These bitKeeper changes will allow Windows to be used as a primary development platform. 2006-09-13 14:15:22 -04:00
msvensson@shellback.(none)
a63285a647 Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtr 
into  shellback.(none):/home/msvensson/mysql/mtr/my51-mtr
 2006-09-01 10:32:20 +02:00
msvensson@shellback.(none)
7afee46c55 Merge shellback.(none):/home/msvensson/mysql/mtr/my41-mtr 
into  shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
 2006-09-01 10:25:50 +02:00
msvensson@shellback.(none)
324cf4ccb3 Add target to make "mtr", shortcut for running test suite 2006-09-01 10:21:08 +02:00
cmiller@zippy.cornsilk.net
05df2f9402 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint
 2006-08-23 18:37:04 -04:00
cmiller@zippy.cornsilk.net
2a06452bde Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-08-23 18:29:44 -04:00
cmiller@zippy.cornsilk.net
a4f32ff2e8 String broken up to avoid silly MICROS~1 string-size limit. 2006-08-23 18:29:05 -04:00
andrey@example.com
53089a19d9 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 
into  example.com:/work/mysql-5.1-runtime-wl3337
 2006-08-14 15:26:59 +02:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-12 21:06:51 +04:00
monty@mysql.com/narttu.mysql.fi
7d0b042ec5 Better bug fix for "Query joins wrong rows from table which is subject of "concurrent insert"" 
The previous bug fix didn't work when using partial keys.
Don't use GNUC min/max operations are they are depricated.
Fixed valgrind warning
 2006-08-10 22:41:19 +03:00