database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

post-merge fixes.

Browse Source 
most tests pass.
5.3 merge is next
This commit is contained in:
Sergei Golubchik
2011-07-02 22:12:12 +02:00
parent 9809f05199
commit b4a0b2c2f8
221 changed files with 2070 additions and 1880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.h
View File

@@ -446,6 +446,7 @@ typedef struct system_variables
ulong max_tmp_tables;
ulong max_insert_delayed_threads;
ulong min_examined_row_limit;
ulong multi_range_count;
ulong net_buffer_length;
ulong net_interactive_timeout;
ulong net_read_timeout;
@@ -2103,7 +2104,6 @@ public:
char scramble[SCRAMBLE_LENGTH+1];
bool slave_thread, one_shot_set;
bool no_errors, password;
bool extra_port; /* If extra connection */
bool no_errors;