mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31793 commits 2781 branches 343 tags 1.6 GiB
Commit graph

31793 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@rama.(none)
bd2825f5bb Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.test 
so that 4.1 and 5.0 tests are all in the right place and no tests are duplicated.
 2006-08-31 20:53:34 -07:00
jimw@rama.(none)
5884eea9a3 Resolve conflicts 2006-08-31 18:24:37 -07:00
cmiller@zippy.cornsilk.net
797b8206ed Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my41-no-strange-literals 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no-strange-literals
 2006-08-31 11:27:55 -04:00
cmiller@zippy.cornsilk.net
436d3a3798 Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a 
single file is a bad practice.
 2006-08-31 11:14:04 -04:00
iggy@rolltop.ignatz42.dyndns.org
bfe86ca448 Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the information_schema database. 
init_dumping now accepts a function pointer to the table or view specific init_dumping function.  This allows both tables and views to use the init_dumping function.
 2006-08-28 17:48:06 -04:00
cmiller@zippy.cornsilk.net
5ea2a01fee Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_mergable 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-maint
 2006-08-25 11:55:43 -04:00
cmiller@zippy.cornsilk.net
89d759b93e Bug#21543: 5.0.24 breaks ABI compatibility for python bindings: \ 
InterfaceError on connect

Removed the bool flag from the st_mysql_options struct, since it adds 
another word in size to the memory size and shifts member memory locations
down, both of which break binary-interface compatibility.

Instead, use a flag, 2**30, in the client_options bit-field to represent
that the client should check the SSL certificate of the server.
 2006-08-25 11:54:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
e4bfce3058 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972
 2006-08-24 11:19:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
8bc745456f Bug #11972: client uses wrong character set after reconnect. 
The mysql client uses the default character set on reconnect.  The default character set is now controled by the client charset command while the client is running.  The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.
 2006-08-24 11:15:08 -04:00
msvensson@neptunus.(none)
0b3c2aa1b3 Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-24 16:46:37 +02:00
msvensson@neptunus.(none)
984e9ce099 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-24 16:08:25 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
68e1e60f27 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint
 2006-08-24 14:51:54 +02:00
msvensson@neptunus.(none)
b25b49a05a Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060612110740|13873 2006-08-24 11:39:52 +02:00
tsmith@maint1.mysql.com
2225f14755 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/50
 2006-08-24 02:49:03 +02:00
tsmith/tim@siva.hindu.god
80e565dfe1 Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-08-23 18:31:15 -06:00
tsmith/tim@siva.hindu.god
df6b8516c4 Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41 
into  siva.hindu.god:/usr/home/tim/m/bk/beef-50
 2006-08-23 18:24:59 -06:00
tsmith/tim@siva.hindu.god
45460bd0af Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets 
- Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
- Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors
 2006-08-23 18:02:31 -06: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
a4f32ff2e8 String broken up to avoid silly MICROS~1 string-size limit. 2006-08-23 18:29:05 -04:00
tsmith/tim@siva.hindu.god
ade64d467e Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-08-23 16:28:53 -06:00
tsmith/tim@siva.hindu.god
0831d404e1 Manual merge 2006-08-23 15:46:57 -06:00
tsmith/tim@siva.hindu.god
dba7b8e81c Bug #20402: DROP USER failure logged as ERROR rather than WARNING 
Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all).

Also, convert an sql_print_error -> sql_print_information for a non-error server event.
 2006-08-23 15:37:54 -06:00
tsmith/tim@siva.hindu.god
bf8fc6e82a Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-08-23 13:43:28 -06:00
cmiller@maint1.mysql.com
c640ed93b6 Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
 2006-08-23 19:41:46 +02:00
cmiller@maint1.mysql.com
977e696677 Bug #20908: Crash if select @@"" 
Zero-length variables caused failures when using the length to look
up the name in a hash.  Instead, signal that no zero-length name can
ever be found and that to encounter one is a syntax error.
 2006-08-23 19:14:58 +02:00
cmiller@maint1.mysql.com
5572348ba5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
 2006-08-23 17:37:18 +02:00
cmiller@zippy.cornsilk.net
73963de637 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/m50-maint-b21224
 2006-08-23 10:47:46 -04:00
tnurnberg@salvation.intern.azundris.com
f07937730a Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
 2006-08-22 17:27:36 +02:00
tnurnberg@salvation.intern.azundris.com
a74c4c0d4d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
 2006-08-22 17:22:46 +02:00
cmiller@zippy.cornsilk.net
34fd70452c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-22 10:32:07 -04:00
tnurnberg@salvation.intern.azundris.com
10c351b124 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20411
 2006-08-22 14:31:57 +02:00
tnurnberg@salvation.intern.azundris.com
002adef0e1 Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both 
when X.509 subject was required for a connect, we tested whether it was the right
one, but did not refuse the connexion if not. fixed.

(corrected CS now --replace_results socket-path)
 2006-08-22 14:29:48 +02:00
tnurnberg@salvation.intern.azundris.com
0ead4ec836 Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-4.1-maint-20987 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987
 2006-08-22 14:03:52 +02:00
kent@mysql.com/g4-2.local
c8b6563dfc mysql.spec.sh: 
Added ndb_error_reporter to the RPM install (bug#20426)
 2006-08-22 11:55:08 +02:00
kent@mysql.com/g4-2.local
d210c8cfc3 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194 
into  mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194
 2006-08-22 11:52:26 +02:00
kent@mysql.com/g4-2.local
442c111b72 mysql.spec.sh: 
Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)
 2006-08-22 11:48:58 +02:00
msvensson@neptunus.(none)
1682c8b463 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-22 08:31:18 +02:00
msvensson@neptunus.(none)
aa944afbe7 Remove debug printout from mysql_client_test 2006-08-22 08:30:33 +02:00
iggy@rolltop.ignatz42.dyndns.org
39a8fe6e44 Bug#21757: mysql_client_test fails in testcase when reading master.log file 2006-08-21 20:29:11 -04:00
msvensson@neptunus.(none)
4930281dd4 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-21 15:47:01 +02:00
msvensson@neptunus.(none)
2f0b080aea Bug#19810 Bundled YASSL in libmysqlclient conflicts with OpenSSL 
- Rename yaSSL version of 'SSL_peek' to 'yaSSL_peek' by using a macro
 2006-08-21 14:51:59 +02:00
msvensson@shellback.(none)
adaa3a2a60 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-21 14:09:38 +02:00
msvensson@shellback.(none)
2b2985e0ea Print lines from log file to see what's in them 2006-08-21 14:06:59 +02:00
jani@hasky.mysql.fi
6dc1122084 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hasky.mysql.fi:/home/jani/mysql-5.0_bug21537
 2006-08-21 13:06:45 +03:00
petr/cps@mysql.com/owlet
30ef47a93c Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2006-08-18 16:48:32 +04:00
tnurnberg@salvation.intern.azundris.com
c8d1c498fb innodb r702 
innodb r719
 2006-08-18 14:16:11 +02:00
jimw@rama.(none)
abc148000d Bug #21288: mysqldump segmentation fault when using --where 
The problem was that the error handling was using a too-small buffer to
  print the error message generated. We fix this by not using a buffer at
  all, but by using fprintf() directly. There were also some problems with
  the error handling in table dumping that was exposed by this fix that were
  also corrected.
 2006-08-17 14:09:24 -07:00
cmiller@zippy.cornsilk.net
64092ca93b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:55:57 -04:00
cmiller@zippy.cornsilk.net
6998c5140b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:53:12 -04:00
cmiller@zippy.cornsilk.net
7d38d61398 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:49:56 -04:00