mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41192 commits 2778 branches 343 tags 1.6 GiB
Commit graph

41192 commits

This branch
This branch
All branches
Author SHA1 Message Date
malff/marcsql@weblab.(none)
f22dad8bd7 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-merge2
 2006-12-12 13:50:55 -07:00
kostja@bodhi.local
b893d347a1 Post-merge fixes. 2006-12-12 23:22:46 +03:00
kostja@bodhi.local
bc6e73873d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2006-12-12 13:57:28 +03:00
malff/marcsql@weblab.(none)
64b7a75ae1 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
 2006-12-11 19:01:48 -07:00
malff/marcsql@weblab.(none)
7696592b09 minor cleanup 2006-12-11 18:52:24 -07:00
malff/marcsql@weblab.(none)
996fa0dfbb Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-19194
 2006-12-11 17:15:08 -07:00
malff/marcsql@weblab.(none)
506c2a722f Bug#19194 (Right recursion in parser for CASE causes excessive stack usage, 
limitation)
Bug#24854 (Mixing Searched Case with Simple Case inside Stored Procedure
  crashes Mysqld)

Implemented code review (19194) comments
 2006-12-11 16:59:02 -07:00
andrey@example.com
c24381bdaa Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/mysql-5.1-maint
 2006-12-07 13:58:56 +01:00
andrey@example.com
12a68db3d3 Additional fix for bug#22369 2006-12-07 13:57:39 +01:00
msvensson@neptunus.(none)
961275a356 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-06 23:45:09 +01:00
msvensson@neptunus.(none)
94eb027f6b Only call mysql_server_end if mysql_server_init has been called. 
Remove DBUG_ENTER in my_end
 2006-12-06 23:43:36 +01:00
msvensson@neptunus.(none)
eb1ba91d14 Flush stderr after print of error message to get predictable output 2006-12-06 22:03:56 +01:00
msvensson@neptunus.(none)
8022e9fcce Adjust replace to mask win paths 2006-12-06 16:44:31 +01:00
msvensson@neptunus.(none)
d1c9edf47b Initialize guarded_instance to NULL in constuctor. Avoid looping over 
uninitialized list of guarded instances.
 2006-12-06 11:25:18 +01:00
msvensson@neptunus.(none)
ccec047fb5 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 20:46:18 +01:00
msvensson@neptunus.(none)
7cb305ca77 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-05 19:56:49 +01:00
msvensson@neptunus.(none)
90226bbc33 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 19:19:58 +01:00
msvensson@neptunus.(none)
244ec63ac4 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-05 19:14:09 +01:00
msvensson@neptunus.(none)
be212d3486 Remove hack that removes vardir 2006-12-05 19:13:31 +01:00
msvensson@neptunus.(none)
a507459762 Merge bk-internal:/home/bk/mysql-4.1-build 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-12-05 19:12:12 +01:00
msvensson@neptunus.(none)
3ad4878385 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 18:52:58 +01:00
msvensson@neptunus.(none)
d8e6f01396 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-12-05 18:50:46 +01:00
msvensson@neptunus.(none)
6d71f74743 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883 2006-12-05 18:46:08 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
21435418cb Raise version number after cloning 5.1.14-beta 2006-12-05 17:20:47 +01:00
petr/cps@outpost.site
c25429f1a6 remove assert 2006-12-05 19:04:46 +03:00
iggy@rolltop.ignatz42.dyndns.org
ee85368237 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-12-05 10:32:38 -05:00
iggy@rolltop.ignatz42.dyndns.org
f18d064da5 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-12-05 10:32:16 -05:00
iggy@rolltop.ignatz42.dyndns.org
c1c082af86 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
 2006-12-05 09:41:02 -05:00
iggy@rolltop.ignatz42.dyndns.org
5dcf553159 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
 2006-12-05 09:39:48 -05:00
iggy@rolltop.ignatz42.dyndns.org
71970547da Bug#20836 Selecting into variables results in wrong results being returned 
- Comment Cleanup.
 2006-12-05 09:29:32 -05:00
msvensson@neptunus.(none)
04ae69850f Update rsult file after merge, error message number increased 2006-12-05 12:18:33 +01:00
msvensson@neptunus.(none)
dcf675d2c7 Use "sql_print_error" instead of "sql_print_warning" to get a better 
error message in the logs before shutting down the server
 2006-12-05 12:11:45 +01:00
msvensson@neptunus.(none)
ea49384d2e mysql.binlog_index renamed to mysql.ndb_binlog_index 2006-12-05 11:27:51 +01:00
msvensson@neptunus.(none)
58baec3f76 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-05 11:18:00 +01:00
msvensson@neptunus.(none)
23a059b224 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 10:54:17 +01:00
df@kahlann.erinye.com
a5fe05f0f8 fix test cases after change to error messages file 2006-12-05 10:51:30 +01:00
df@kahlann.erinye.com
5c6d74c258 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-05 10:07:11 +01:00
df@kahlann.erinye.com
41a2a6080c Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-05 10:05:15 +01:00
df@kahlann.erinye.com
6541302bb2 re-enable multiple test runs in sequence for 4.1 on non-windows 2006-12-05 10:03:24 +01:00
mskold/marty@mysql.com/linux.site
f8bd5d312b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-12-05 06:38:08 +01:00
malff/marcsql@weblab.(none)
b593a7afdb No bug number. 
Fixed typos in the comments.
 2006-12-04 16:31:30 -07:00
andrey@example.com
6fd50a5ff6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/bug22369-v2/my51
 2006-12-05 00:31:23 +01:00
thek@kpdesk.mysql.com
57f78d4ddc Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
 2006-12-04 23:51:54 +01:00
Kristofer.Pettersson@naruto.
9036b003d6 Merge kpettersson@bk-internal:/home/bk/mysql-5.1-new-maint 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-12-04 22:55:44 +01:00
Kristofer.Pettersson@naruto.
6c4c315210 Disabled testcase flush2 until pushbild framework can handle test which 
disables binlog.
 2006-12-04 22:51:52 +01:00
thek@kpdesk.mysql.com
05410c7db8 Disabled flush2 until pushbuild framework can handle test which 
disables binlog.
 2006-12-04 22:46:12 +01:00
tsmith/tim@siva.hindu.god
97f48ef129 Change ::fileno() to fileno() in ndb/common/util/File.cpp. 
fileno(), and many other stdio functions, may be macros
(at least on *BSD).

Don't explicitly qualify it with global scope (::fileno()),
because it causes syntax errors.

<cstdio> doesn't define *most* of these macros.

It still has a macro for fileno(), however, on FreeBSD 6.1,
so even using <cstdio> isn't a fix for this.  Better to
just avoid ::standard_library_function() in general, in
order to be portable.
 2006-12-04 14:41:08 -07:00
andrey@example.com
05f61b2493 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/bug22369-v2/my51
 2006-12-04 22:40:51 +01:00
iggy@rolltop.ignatz42.dyndns.org
f427935804 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-12-04 15:32:16 -05:00
iggy@rolltop.ignatz42.dyndns.org
50222ce9ff Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-12-04 15:30:55 -05:00