diff options
| author | unknown <kaa@polly.(none)> | 2007-10-04 13:07:11 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-04 13:07:11 +0400 |
| commit | 3fc334817f01f38d33f654de5375352d1f09f49f (patch) | |
| tree | ae48b1b559347ca1e4c8b0692d99e5be67c900a3 /mysql-test/r/variables.result | |
| parent | 79fcc28560292235b979faebb9eba12e8bd70e42 (diff) | |
| parent | 78348d4ed10a3a77870d956ad861c3fdcadd96a5 (diff) | |
| download | mariadb-git-3fc334817f01f38d33f654de5375352d1f09f49f.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
mysql-test/r/variables.result:
Auto merged
mysys/my_getopt.c:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/t/variables.test:
Manual merge.
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 19b48efe6b4..638d71c6940 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -286,6 +286,8 @@ select * from information_schema.session_variables where variable_name like 'net VARIABLE_NAME VARIABLE_VALUE NET_BUFFER_LENGTH 1024 set net_buffer_length=2000000000; +Warnings: +Warning 1292 Truncated incorrect net_buffer_length value: '2000000000' show variables like 'net_buffer_length'; Variable_name Value net_buffer_length 1048576 |